spawn-term 0.1.37 → 0.1.38

package/dist/cjs/components/ChildProcess.cjs

@@ -60,10 +60,10 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-var REGEX_NEW_LINE = /\r\n|[\n\v\f\r\x85\u2028\u2029]/g;
+var _REGEX_NEW_LINE = /\r\n|[\n\v\f\r\x85\u2028\u2029]/g;
 var REGEX_ANSI = (0, _ansiRegex.default)();
-var DEFAULT_SUMMARY = {
-    type: _types.DataType.stdout,
+var _DEFAULT_SUMMARY = {
+    type: _types.LineType.stdout,
     text: ''
 };
 // From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2
@@ -123,29 +123,9 @@ var Lines = /*#__PURE__*/ (0, _react.memo)(function Lines(param) {
         }, /*#__PURE__*/ _react.default.createElement(_ink.Text, null, line.text)));
     }));
 });
-var useLines = function(data) {
-    return (0, _react.useMemo)(function() {
-        var finished = data.length > 0 ? data[data.length - 1].text === null : false;
-        if (finished) data.pop(); // null at end means done
-        var lines = [];
-        data.forEach(function(x) {
-            x.text.split(REGEX_NEW_LINE).forEach(function(text) {
-                return lines.push({
-                    type: x.type,
-                    text: text
-                });
-            });
-        });
-        if (!finished) lines.pop(); // remove partial lines
-        return lines;
-    }, [
-        data
-    ]);
-};
 var Expanded = /*#__PURE__*/ (0, _react.memo)(function Expanded(param) {
     var item = param.item;
-    var data = item.data;
-    var lines = useLines(data);
+    var lines = item.lines;
     return /*#__PURE__*/ _react.default.createElement(_ink.Box, {
         flexDirection: "column"
     }, /*#__PURE__*/ _react.default.createElement(Header, {
@@ -158,25 +138,20 @@ var Expanded = /*#__PURE__*/ (0, _react.memo)(function Expanded(param) {
 });
 var Contracted = /*#__PURE__*/ (0, _react.memo)(function Contracted(param) {
     var item = param.item;
-    var state = item.state, data = item.data;
-    var lines = useLines(data);
+    var state = item.state, lines = item.lines;
     // remove ansi codes when displaying single lines
     var errors = (0, _react.useMemo)(function() {
         return lines.filter(function(line) {
-            return line.type === _types.DataType.stderr;
+            return line.type === _types.LineType.stderr;
         });
     }, [
         lines
     ]);
     var summary = (0, _react.useMemo)(function() {
-        var finished = data.length > 0 ? data[data.length - 1].text === null : false;
-        var summary = lines.filter(function(line) {
+        return lines.filter(function(line) {
             return line.text.length > 0 && errors.indexOf(line) < 0;
         }).pop();
-        if (!summary && !finished) summary = DEFAULT_SUMMARY;
-        return summary;
     }, [
-        data,
         lines,
         errors
     ]);

package/dist/cjs/components/ChildProcess.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/ChildProcess.tsx"],"sourcesContent":["import React, { memo, useMemo } from 'react';\nimport { Box, Text } from '../ink.mjs';\nimport ansiRegex from '../lib/ansiRegex';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { ChildProcess as ChildProcessT, Data, State } from '../types';\nimport { DataType } from '../types';\n\nconst REGEX_NEW_LINE = /\\r\\n|[\\n\\v\\f\\r\\x85\\u2028\\u2029]/g;\nconst REGEX_ANSI = ansiRegex();\nconst DEFAULT_SUMMARY = { type: DataType.stdout, text: '' };\n\ntype ItemProps = {\n  item: ChildProcessT;\n};\n\n// From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2\nconst spinner = {\n  interval: 80,\n  frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],\n};\n\nconst ICONS = {\n  error: <Text color=\"red\">{figures.cross}</Text>,\n  success: <Text color=\"green\">{figures.tick}</Text>,\n  running: <Spinner {...spinner} />,\n};\n\ntype HeaderProps = {\n  group?: string;\n  title: string;\n  state: State;\n};\n\nconst Header = memo(\n  function Header({ group, title, state }: HeaderProps) {\n    const icon = ICONS[state];\n\n    return (\n      <Box>\n        <Box marginRight={1}>{icon}</Box>\n        {group && <Text bold>{`${group}${figures.pointer} `}</Text>}\n        <Text>{title}</Text>\n      </Box>\n    );\n  },\n  (a, b) => a.group === b.group && a.title === b.title && a.state === b.state\n);\n\ntype RunningSummaryProps = {\n  line: Data;\n};\n\nconst RunningSummary = memo(function RunningSummary({ line }: RunningSummaryProps) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{line.text.replace(REGEX_ANSI, '')}</Text>\n    </Box>\n  );\n});\n\ntype LinesProps = {\n  lines: Data[];\n};\n\nconst Lines = memo(function Lines({ lines }: LinesProps) {\n  return (\n    <Box flexDirection=\"column\" marginLeft={2}>\n      {lines.map((line, index) => (\n        // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>\n        <Box key={index} flexDirection=\"column\">\n          <Text>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n});\n\nconst useLines = (data: Data[]) =>\n  useMemo(() => {\n    const finished = data.length > 0 ? data[data.length - 1].text === null : false;\n    if (finished) data.pop(); // null at end means done\n    const lines = [];\n    data.forEach((x) => {\n      x.text.split(REGEX_NEW_LINE).forEach((text) => lines.push({ type: x.type, text }));\n    });\n    if (!finished) lines.pop(); // remove partial lines\n    return lines;\n  }, [data]) as Data[];\n\nconst Expanded = memo(function Expanded({ item }: ItemProps) {\n  const { data } = item;\n  const lines = useLines(data);\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      <Lines lines={lines} />\n    </Box>\n  );\n});\n\nconst Contracted = memo(function Contracted({ item }: ItemProps) {\n  const { state, data } = item;\n  const lines = useLines(data);\n\n  // remove ansi codes when displaying single lines\n  const errors = useMemo(() => lines.filter((line) => line.type === DataType.stderr), [lines]);\n  const summary = useMemo(() => {\n    const finished = data.length > 0 ? data[data.length - 1].text === null : false;\n    let summary = lines.filter((line) => line.text.length > 0 && errors.indexOf(line) < 0).pop();\n    if (!summary && !finished) summary = DEFAULT_SUMMARY;\n    return summary;\n  }, [data, lines, errors]);\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      {state === 'running' && summary && <RunningSummary line={summary} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n});\n\nexport default memo(function ChildProcess({ item }: ItemProps) {\n  const { expanded } = item;\n  return expanded ? <Expanded item={item} /> : <Contracted item={item} />;\n});\n"],"names":["REGEX_NEW_LINE","REGEX_ANSI","ansiRegex","DEFAULT_SUMMARY","type","DataType","stdout","text","spinner","interval","frames","ICONS","error","Text","color","figures","cross","success","tick","running","Spinner","Header","memo","group","title","state","icon","Box","marginRight","bold","pointer","a","b","RunningSummary","line","marginLeft","replace","Lines","lines","flexDirection","map","index","key","useLines","data","useMemo","finished","length","pop","forEach","x","split","push","Expanded","item","Contracted","errors","filter","stderr","summary","indexOf","ChildProcess","expanded"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/ChildProcess.tsx"],"sourcesContent":["import React, { memo, useMemo } from 'react';\nimport { Box, Text } from '../ink.mjs';\nimport ansiRegex from '../lib/ansiRegex';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { ChildProcess as ChildProcessT, Line, State } from '../types';\nimport { LineType } from '../types';\n\nconst _REGEX_NEW_LINE = /\\r\\n|[\\n\\v\\f\\r\\x85\\u2028\\u2029]/g;\nconst REGEX_ANSI = ansiRegex();\nconst _DEFAULT_SUMMARY = { type: LineType.stdout, text: '' };\n\ntype ItemProps = {\n  item: ChildProcessT;\n};\n\n// From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2\nconst spinner = {\n  interval: 80,\n  frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],\n};\n\nconst ICONS = {\n  error: <Text color=\"red\">{figures.cross}</Text>,\n  success: <Text color=\"green\">{figures.tick}</Text>,\n  running: <Spinner {...spinner} />,\n};\n\ntype HeaderProps = {\n  group?: string;\n  title: string;\n  state: State;\n};\n\nconst Header = memo(\n  function Header({ group, title, state }: HeaderProps) {\n    const icon = ICONS[state];\n\n    return (\n      <Box>\n        <Box marginRight={1}>{icon}</Box>\n        {group && <Text bold>{`${group}${figures.pointer} `}</Text>}\n        <Text>{title}</Text>\n      </Box>\n    );\n  },\n  (a, b) => a.group === b.group && a.title === b.title && a.state === b.state\n);\n\ntype RunningSummaryProps = {\n  line: Line;\n};\n\nconst RunningSummary = memo(function RunningSummary({ line }: RunningSummaryProps) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{line.text.replace(REGEX_ANSI, '')}</Text>\n    </Box>\n  );\n});\n\ntype LinesProps = {\n  lines: Line[];\n};\n\nconst Lines = memo(function Lines({ lines }: LinesProps) {\n  return (\n    <Box flexDirection=\"column\" marginLeft={2}>\n      {lines.map((line, index) => (\n        // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>\n        <Box key={index} flexDirection=\"column\">\n          <Text>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n});\n\nconst Expanded = memo(function Expanded({ item }: ItemProps) {\n  const { lines } = item;\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      <Lines lines={lines} />\n    </Box>\n  );\n});\n\nconst Contracted = memo(function Contracted({ item }: ItemProps) {\n  const { state, lines } = item;\n\n  // remove ansi codes when displaying single lines\n  const errors = useMemo(() => lines.filter((line) => line.type === LineType.stderr), [lines]);\n  const summary = useMemo(() => lines.filter((line) => line.text.length > 0 && errors.indexOf(line) < 0).pop(), [lines, errors]);\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      {state === 'running' && summary && <RunningSummary line={summary} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n});\n\nexport default memo(function ChildProcess({ item }: ItemProps) {\n  const { expanded } = item;\n  return expanded ? <Expanded item={item} /> : <Contracted item={item} />;\n});\n"],"names":["_REGEX_NEW_LINE","REGEX_ANSI","ansiRegex","_DEFAULT_SUMMARY","type","LineType","stdout","text","spinner","interval","frames","ICONS","error","Text","color","figures","cross","success","tick","running","Spinner","Header","memo","group","title","state","icon","Box","marginRight","bold","pointer","a","b","RunningSummary","line","marginLeft","replace","Lines","lines","flexDirection","map","index","key","Expanded","item","Contracted","errors","useMemo","filter","stderr","summary","length","indexOf","pop","ChildProcess","expanded"],"mappings":"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"}

package/dist/cjs/lib/{addData.cjs → addLines.cjs}

@@ -9,15 +9,21 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _readablestream = require("readable-stream");
+var REGEX_NEW_LINE = /\r\n|[\n\v\f\r\x85\u2028\u2029]/g;
 function addLines(fn) {
+    var last = '';
     var stream = new _readablestream.Writable({
-        write: function write(data, _enc, callback) {
-            fn(data);
+        write: function write(chunk, _enc, callback) {
+            var more = last + chunk.toString('utf8');
+            var lines = more.split(REGEX_NEW_LINE);
+            last = lines.pop();
+            if (lines.length > 0) fn(lines);
             callback();
         }
     });
     stream.on('finish', function() {
-        return fn(null);
+        if (last.length) fn(last);
+        last = '';
     });
     return stream;
 }

package/dist/cjs/lib/addLines.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/addLines.ts"],"sourcesContent":["import { Writable } from 'readable-stream';\n\nconst REGEX_NEW_LINE = /\\r\\n|[\\n\\v\\f\\r\\x85\\u2028\\u2029]/g;\n\nexport default function addLines(fn) {\n  let last = '';\n\n  const stream = new Writable({\n    write(chunk, _enc, callback) {\n      const more = last + chunk.toString('utf8');\n      const lines = more.split(REGEX_NEW_LINE);\n      last = lines.pop();\n      if (lines.length > 0) fn(lines);\n      callback();\n    },\n  });\n  stream.on('finish', () => {\n    if (last.length) fn(last);\n    last = '';\n  });\n  return stream;\n}\n"],"names":["addLines","REGEX_NEW_LINE","fn","last","stream","Writable","write","chunk","_enc","callback","more","toString","lines","split","pop","length","on"],"mappings":";;;;+BAIA;;;eAAwBA;;;8BAJC;AAEzB,IAAMC,iBAAiB;AAER,SAASD,SAASE,EAAE;IACjC,IAAIC,OAAO;IAEX,IAAMC,SAAS,IAAIC,wBAAQ,CAAC;QAC1BC,OAAAA,SAAAA,MAAMC,KAAK,EAAEC,IAAI,EAAEC,QAAQ;YACzB,IAAMC,OAAOP,OAAOI,MAAMI,QAAQ,CAAC;YACnC,IAAMC,QAAQF,KAAKG,KAAK,CAACZ;YACzBE,OAAOS,MAAME,GAAG;YAChB,IAAIF,MAAMG,MAAM,GAAG,GAAGb,GAAGU;YACzBH;QACF;IACF;IACAL,OAAOY,EAAE,CAAC,UAAU;QAClB,IAAIb,KAAKY,MAAM,EAAEb,GAAGC;QACpBA,OAAO;IACT;IACA,OAAOC;AACT"}

package/dist/cjs/types.cjs

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "DataType", {
+Object.defineProperty(exports, "LineType", {
     enumerable: true,
     get: function() {
-        return DataType;
+        return LineType;
     }
 });
-var DataType = /*#__PURE__*/ function(DataType) {
-    DataType[DataType["stdout"] = 1] = "stdout";
-    DataType[DataType["stderr"] = 2] = "stderr";
-    return DataType;
+var LineType = /*#__PURE__*/ function(LineType) {
+    LineType[LineType["stdout"] = 1] = "stdout";
+    LineType[LineType["stderr"] = 2] = "stderr";
+    return LineType;
 }({});
 /* CJS INTEROP */ if (exports.__esModule && exports.default) { try { Object.defineProperty(exports.default, '__esModule', { value: true }); for (var key in exports) { exports.default[key] = exports[key]; } } catch (_) {}; module.exports = exports.default; }

package/dist/cjs/types.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/types.ts"],"sourcesContent":["// @ts-ignore\nexport type { SpawnOptions, SpawnCallback, SpawnResult } from 'cross-spawn-cb';\n\nexport type TerminalOptions = {\n  group?: string;\n  expanded?: string;\n};\n\nexport enum DataType {\n  stdout = 1,\n  stderr = 2,\n}\nexport type Data = {\n  type: DataType;\n  text: string;\n};\n\nexport type State = 'running' | 'error' | 'success';\nexport type ChildProcess = {\n  id: string;\n  group?: string;\n  title: string;\n  state: State;\n  data: Data[];\n  expanded?: string;\n};\n\nexport interface AppState {\n  processes: ChildProcess[];\n  addProcess: (process: ChildProcess) => void;\n  updateProcess: (process: ChildProcess) => void;\n}\n"],"names":["DataType"],"mappings":"AAAA,aAAa;;;;;+BAQDA;;;eAAAA;;;AAAL,IAAA,AAAKA,kCAAAA;;;WAAAA"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/types.ts"],"sourcesContent":["// @ts-ignore\nexport type { SpawnOptions, SpawnCallback, SpawnResult } from 'cross-spawn-cb';\n\nexport type TerminalOptions = {\n  group?: string;\n  expanded?: string;\n};\n\nexport enum LineType {\n  stdout = 1,\n  stderr = 2,\n}\nexport type Line = {\n  type: LineType;\n  text: string;\n};\n\nexport type State = 'running' | 'error' | 'success';\nexport type ChildProcess = {\n  id: string;\n  group?: string;\n  title: string;\n  state: State;\n  lines: Line[];\n  expanded?: string;\n};\n\nexport interface AppState {\n  processes: ChildProcess[];\n  addProcess: (process: ChildProcess) => void;\n  updateProcess: (process: ChildProcess) => void;\n}\n"],"names":["LineType"],"mappings":"AAAA,aAAa;;;;;+BAQDA;;;eAAAA;;;AAAL,IAAA,AAAKA,kCAAAA;;;WAAAA"}

package/dist/cjs/worker.cjs

@@ -14,7 +14,7 @@ var _liluuid = /*#__PURE__*/ _interop_require_default(require("lil-uuid"));
 var _onone = /*#__PURE__*/ _interop_require_default(require("on-one"));
 var _queuecb = /*#__PURE__*/ _interop_require_default(require("queue-cb"));
 var _createApp = /*#__PURE__*/ _interop_require_default(require("./createApp.cjs"));
-var _addData = /*#__PURE__*/ _interop_require_default(require("./lib/addData.cjs"));
+var _addLines = /*#__PURE__*/ _interop_require_default(require("./lib/addLines.cjs"));
 var _concatWritable = /*#__PURE__*/ _interop_require_default(require("./lib/concatWritable.cjs"));
 var _formatArguments = /*#__PURE__*/ _interop_require_default(require("./lib/formatArguments.cjs"));
 var _types = require("./types.cjs");
@@ -158,7 +158,7 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
                     command
                 ].concat((0, _formatArguments.default)(args)).join(' '),
                 state: 'running',
-                data: []
+                lines: []
             }, options));
             var cp = (0, _crossspawncb.crossSpawn)(command, args, csOptions);
             var outputs = {
@@ -167,17 +167,17 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
             };
             var queue = new _queuecb.default();
             if (cp.stdout) {
-                outputs.stdout = (0, _addData.default)(function(data) {
+                outputs.stdout = (0, _addLines.default)(function(lines) {
                     var item = store.getState().processes.find(function(x) {
                         return x.id === id;
                     });
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
-                        data: item.data.concat([
-                            {
-                                type: _types.DataType.stdout,
-                                text: data === null ? null : data.toString('utf8')
-                            }
-                        ])
+                        lines: item.lines.concat(lines.map(function(text) {
+                            return {
+                                type: _types.LineType.stdout,
+                                text: text
+                            };
+                        }))
                     }));
                 });
                 queue.defer(_onone.default.bind(null, cp.stdout.pipe(outputs.stdout), [
@@ -188,17 +188,17 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
                 ]));
             }
             if (cp.stderr) {
-                outputs.stderr = (0, _addData.default)(function(data) {
+                outputs.stderr = (0, _addLines.default)(function(lines) {
                     var item = store.getState().processes.find(function(x) {
                         return x.id === id;
                     });
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
-                        data: item.data.concat([
-                            {
-                                type: _types.DataType.stderr,
-                                text: data === null ? null : data.toString('utf8')
-                            }
-                        ])
+                        lines: item.lines.concat(lines.map(function(text) {
+                            return {
+                                type: _types.LineType.stderr,
+                                text: text
+                            };
+                        }))
                     }));
                 });
                 queue.defer(_onone.default.bind(null, cp.stderr.pipe(outputs.stderr), [

package/dist/cjs/worker.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/worker.ts"],"sourcesContent":["// @ts-ignore\nimport spawn, { crossSpawn, type SpawnResult } from 'cross-spawn-cb';\nimport uuid from 'lil-uuid';\nimport oo from 'on-one';\nimport Queue from 'queue-cb';\n\nimport createApp from './createApp';\nimport addData from './lib/addData';\nimport concatWritable from './lib/concatWritable';\nimport formatArguments from './lib/formatArguments';\n\nimport type { SpawnOptions, TerminalOptions } from './types';\nimport { DataType } from './types';\n\nconst terminal = createApp();\n\nexport default function spawnTerminal(command: string, args: string[], spawnOptions: SpawnOptions, options: TerminalOptions, callback) {\n  const { encoding, stdio, ...csOptions } = spawnOptions;\n\n  if (stdio === 'inherit') {\n    terminal.retain((store) => {\n      const id = uuid();\n      store.getState().addProcess({ id, title: [command].concat(formatArguments(args)).join(' '), state: 'running', data: [], ...options });\n\n      const cp = crossSpawn(command, args, csOptions);\n      const outputs = { stdout: null, stderr: null };\n\n      const queue = new Queue();\n      if (cp.stdout) {\n        outputs.stdout = addData((data) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, data: item.data.concat([{ type: DataType.stdout, text: data === null ? null : data.toString('utf8') }]) });\n        });\n        queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n      }\n      if (cp.stderr) {\n        outputs.stderr = addData((data) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, data: item.data.concat([{ type: DataType.stderr, text: data === null ? null : data.toString('utf8') }]) });\n        });\n        queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n      }\n      queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: 'utf8' }));\n      queue.await((err) => {\n        const res = (err ? err : {}) as SpawnResult;\n        res.stdout = outputs.stdout ? outputs.stdout.output : null;\n        res.stderr = outputs.stderr ? outputs.stderr.output : null;\n        res.output = [res.stdout, res.stderr, null];\n        const item = store.getState().processes.find((x) => x.id === id);\n        store.getState().updateProcess({ ...item, state: err ? 'error' : 'success' });\n\n        // let rendering complete\n        setTimeout(() => {\n          terminal.release();\n          err ? callback(err) : callback(null, res);\n        });\n      });\n    });\n  } else {\n    const cp = crossSpawn(command, args, csOptions);\n    const outputs = { stdout: null, stderr: null };\n\n    const queue = new Queue();\n    if (cp.stdout) {\n      outputs.stdout = concatWritable((output) => {\n        outputs.stdout.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n    }\n    if (cp.stderr) {\n      outputs.stderr = concatWritable((output) => {\n        outputs.stderr.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n    }\n    queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: encoding || 'utf8' }));\n    queue.await((err) => {\n      const res = (err ? err : {}) as SpawnResult;\n      res.stdout = outputs.stdout ? outputs.stdout.output : null;\n      res.stderr = outputs.stderr ? outputs.stderr.output : null;\n      res.output = [res.stdout, res.stderr, null];\n      err ? callback(err) : callback(null, res);\n    });\n  }\n}\n"],"names":["spawnTerminal","terminal","createApp","command","args","spawnOptions","options","callback","encoding","stdio","csOptions","retain","store","id","uuid","getState","addProcess","title","concat","formatArguments","join","state","data","cp","crossSpawn","outputs","stdout","stderr","queue","Queue","addData","item","processes","find","x","updateProcess","type","DataType","text","toString","defer","oo","bind","pipe","spawn","worker","await","err","res","output","setTimeout","release","concatWritable"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/worker.ts"],"sourcesContent":["// @ts-ignore\nimport spawn, { crossSpawn, type SpawnResult } from 'cross-spawn-cb';\nimport uuid from 'lil-uuid';\nimport oo from 'on-one';\nimport Queue from 'queue-cb';\n\nimport createApp from './createApp';\nimport addLines from './lib/addLines';\nimport concatWritable from './lib/concatWritable';\nimport formatArguments from './lib/formatArguments';\n\nimport type { SpawnOptions, TerminalOptions } from './types';\nimport { LineType } from './types';\n\nconst terminal = createApp();\n\nexport default function spawnTerminal(command: string, args: string[], spawnOptions: SpawnOptions, options: TerminalOptions, callback) {\n  const { encoding, stdio, ...csOptions } = spawnOptions;\n\n  if (stdio === 'inherit') {\n    terminal.retain((store) => {\n      const id = uuid();\n      store.getState().addProcess({ id, title: [command].concat(formatArguments(args)).join(' '), state: 'running', lines: [], ...options });\n\n      const cp = crossSpawn(command, args, csOptions);\n      const outputs = { stdout: null, stderr: null };\n\n      const queue = new Queue();\n      if (cp.stdout) {\n        outputs.stdout = addLines((lines) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, lines: item.lines.concat(lines.map((text) => ({ type: LineType.stdout, text }))) });\n        });\n        queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n      }\n      if (cp.stderr) {\n        outputs.stderr = addLines((lines) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, lines: item.lines.concat(lines.map((text) => ({ type: LineType.stderr, text }))) });\n        });\n        queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n      }\n      queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: 'utf8' }));\n      queue.await((err) => {\n        const res = (err ? err : {}) as SpawnResult;\n        res.stdout = outputs.stdout ? outputs.stdout.output : null;\n        res.stderr = outputs.stderr ? outputs.stderr.output : null;\n        res.output = [res.stdout, res.stderr, null];\n        const item = store.getState().processes.find((x) => x.id === id);\n        store.getState().updateProcess({ ...item, state: err ? 'error' : 'success' });\n\n        // let rendering complete\n        setTimeout(() => {\n          terminal.release();\n          err ? callback(err) : callback(null, res);\n        });\n      });\n    });\n  } else {\n    const cp = crossSpawn(command, args, csOptions);\n    const outputs = { stdout: null, stderr: null };\n\n    const queue = new Queue();\n    if (cp.stdout) {\n      outputs.stdout = concatWritable((output) => {\n        outputs.stdout.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n    }\n    if (cp.stderr) {\n      outputs.stderr = concatWritable((output) => {\n        outputs.stderr.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n    }\n    queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: encoding || 'utf8' }));\n    queue.await((err) => {\n      const res = (err ? err : {}) as SpawnResult;\n      res.stdout = outputs.stdout ? outputs.stdout.output : null;\n      res.stderr = outputs.stderr ? outputs.stderr.output : null;\n      res.output = [res.stdout, res.stderr, null];\n      err ? callback(err) : callback(null, res);\n    });\n  }\n}\n"],"names":["spawnTerminal","terminal","createApp","command","args","spawnOptions","options","callback","encoding","stdio","csOptions","retain","store","id","uuid","getState","addProcess","title","concat","formatArguments","join","state","lines","cp","crossSpawn","outputs","stdout","stderr","queue","Queue","addLines","item","processes","find","x","updateProcess","map","text","type","LineType","defer","oo","bind","pipe","spawn","worker","await","err","res","output","setTimeout","release","concatWritable","toString"],"mappings":"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"}

package/dist/esm/components/ChildProcess.mjs

@@ -3,11 +3,11 @@ import { Box, Text } from '../ink.mjs';
 import ansiRegex from '../lib/ansiRegex.mjs';
 import figures from '../lib/figures.mjs';
 import Spinner from './Spinner.mjs';
-import { DataType } from '../types.mjs';
-const REGEX_NEW_LINE = /\r\n|[\n\v\f\r\x85\u2028\u2029]/g;
+import { LineType } from '../types.mjs';
+const _REGEX_NEW_LINE = /\r\n|[\n\v\f\r\x85\u2028\u2029]/g;
 const REGEX_ANSI = ansiRegex();
-const DEFAULT_SUMMARY = {
-    type: DataType.stdout,
+const _DEFAULT_SUMMARY = {
+    type: LineType.stdout,
     text: ''
 };
 // From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2
@@ -60,24 +60,8 @@ const Lines = /*#__PURE__*/ memo(function Lines({ lines }) {
             flexDirection: "column"
         }, /*#__PURE__*/ React.createElement(Text, null, line.text))));
 });
-const useLines = (data)=>useMemo(()=>{
-        const finished = data.length > 0 ? data[data.length - 1].text === null : false;
-        if (finished) data.pop(); // null at end means done
-        const lines = [];
-        data.forEach((x)=>{
-            x.text.split(REGEX_NEW_LINE).forEach((text)=>lines.push({
-                    type: x.type,
-                    text
-                }));
-        });
-        if (!finished) lines.pop(); // remove partial lines
-        return lines;
-    }, [
-        data
-    ]);
 const Expanded = /*#__PURE__*/ memo(function Expanded({ item }) {
-    const { data } = item;
-    const lines = useLines(data);
+    const { lines } = item;
     return /*#__PURE__*/ React.createElement(Box, {
         flexDirection: "column"
     }, /*#__PURE__*/ React.createElement(Header, {
@@ -89,19 +73,12 @@ const Expanded = /*#__PURE__*/ memo(function Expanded({ item }) {
     }));
 });
 const Contracted = /*#__PURE__*/ memo(function Contracted({ item }) {
-    const { state, data } = item;
-    const lines = useLines(data);
+    const { state, lines } = item;
     // remove ansi codes when displaying single lines
-    const errors = useMemo(()=>lines.filter((line)=>line.type === DataType.stderr), [
+    const errors = useMemo(()=>lines.filter((line)=>line.type === LineType.stderr), [
         lines
     ]);
-    const summary = useMemo(()=>{
-        const finished = data.length > 0 ? data[data.length - 1].text === null : false;
-        let summary = lines.filter((line)=>line.text.length > 0 && errors.indexOf(line) < 0).pop();
-        if (!summary && !finished) summary = DEFAULT_SUMMARY;
-        return summary;
-    }, [
-        data,
+    const summary = useMemo(()=>lines.filter((line)=>line.text.length > 0 && errors.indexOf(line) < 0).pop(), [
         lines,
         errors
     ]);

package/dist/esm/components/ChildProcess.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/ChildProcess.tsx"],"sourcesContent":["import React, { memo, useMemo } from 'react';\nimport { Box, Text } from '../ink.mjs';\nimport ansiRegex from '../lib/ansiRegex';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { ChildProcess as ChildProcessT, Data, State } from '../types';\nimport { DataType } from '../types';\n\nconst REGEX_NEW_LINE = /\\r\\n|[\\n\\v\\f\\r\\x85\\u2028\\u2029]/g;\nconst REGEX_ANSI = ansiRegex();\nconst DEFAULT_SUMMARY = { type: DataType.stdout, text: '' };\n\ntype ItemProps = {\n  item: ChildProcessT;\n};\n\n// From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2\nconst spinner = {\n  interval: 80,\n  frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],\n};\n\nconst ICONS = {\n  error: <Text color=\"red\">{figures.cross}</Text>,\n  success: <Text color=\"green\">{figures.tick}</Text>,\n  running: <Spinner {...spinner} />,\n};\n\ntype HeaderProps = {\n  group?: string;\n  title: string;\n  state: State;\n};\n\nconst Header = memo(\n  function Header({ group, title, state }: HeaderProps) {\n    const icon = ICONS[state];\n\n    return (\n      <Box>\n        <Box marginRight={1}>{icon}</Box>\n        {group && <Text bold>{`${group}${figures.pointer} `}</Text>}\n        <Text>{title}</Text>\n      </Box>\n    );\n  },\n  (a, b) => a.group === b.group && a.title === b.title && a.state === b.state\n);\n\ntype RunningSummaryProps = {\n  line: Data;\n};\n\nconst RunningSummary = memo(function RunningSummary({ line }: RunningSummaryProps) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{line.text.replace(REGEX_ANSI, '')}</Text>\n    </Box>\n  );\n});\n\ntype LinesProps = {\n  lines: Data[];\n};\n\nconst Lines = memo(function Lines({ lines }: LinesProps) {\n  return (\n    <Box flexDirection=\"column\" marginLeft={2}>\n      {lines.map((line, index) => (\n        // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>\n        <Box key={index} flexDirection=\"column\">\n          <Text>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n});\n\nconst useLines = (data: Data[]) =>\n  useMemo(() => {\n    const finished = data.length > 0 ? data[data.length - 1].text === null : false;\n    if (finished) data.pop(); // null at end means done\n    const lines = [];\n    data.forEach((x) => {\n      x.text.split(REGEX_NEW_LINE).forEach((text) => lines.push({ type: x.type, text }));\n    });\n    if (!finished) lines.pop(); // remove partial lines\n    return lines;\n  }, [data]) as Data[];\n\nconst Expanded = memo(function Expanded({ item }: ItemProps) {\n  const { data } = item;\n  const lines = useLines(data);\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      <Lines lines={lines} />\n    </Box>\n  );\n});\n\nconst Contracted = memo(function Contracted({ item }: ItemProps) {\n  const { state, data } = item;\n  const lines = useLines(data);\n\n  // remove ansi codes when displaying single lines\n  const errors = useMemo(() => lines.filter((line) => line.type === DataType.stderr), [lines]);\n  const summary = useMemo(() => {\n    const finished = data.length > 0 ? data[data.length - 1].text === null : false;\n    let summary = lines.filter((line) => line.text.length > 0 && errors.indexOf(line) < 0).pop();\n    if (!summary && !finished) summary = DEFAULT_SUMMARY;\n    return summary;\n  }, [data, lines, errors]);\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      {state === 'running' && summary && <RunningSummary line={summary} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n});\n\nexport default memo(function ChildProcess({ item }: ItemProps) {\n  const { expanded } = item;\n  return expanded ? <Expanded item={item} /> : <Contracted item={item} />;\n});\n"],"names":["React","memo","useMemo","Box","Text","ansiRegex","figures","Spinner","DataType","REGEX_NEW_LINE","REGEX_ANSI","DEFAULT_SUMMARY","type","stdout","text","spinner","interval","frames","ICONS","error","color","cross","success","tick","running","Header","group","title","state","icon","marginRight","bold","pointer","a","b","RunningSummary","line","marginLeft","replace","Lines","lines","flexDirection","map","index","key","useLines","data","finished","length","pop","forEach","x","split","push","Expanded","item","Contracted","errors","filter","stderr","summary","indexOf","ChildProcess","expanded"],"mappings":"AAAA,OAAOA,SAASC,IAAI,EAAEC,OAAO,QAAQ,QAAQ;AAC7C,SAASC,GAAG,EAAEC,IAAI,QAAQ,aAAa;AACvC,OAAOC,eAAe,mBAAmB;AACzC,OAAOC,aAAa,iBAAiB;AACrC,OAAOC,aAAa,YAAY;AAGhC,SAASC,QAAQ,QAAQ,WAAW;AAEpC,MAAMC,iBAAiB;AACvB,MAAMC,aAAaL;AACnB,MAAMM,kBAAkB;IAAEC,MAAMJ,SAASK,MAAM;IAAEC,MAAM;AAAG;AAM1D,oHAAoH;AACpH,MAAMC,UAAU;IACdC,UAAU;IACVC,QAAQ;QAAC;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;KAAI;AAC5D;AAEA,MAAMC,QAAQ;IACZC,qBAAO,oBAACf;QAAKgB,OAAM;OAAOd,QAAQe,KAAK;IACvCC,uBAAS,oBAAClB;QAAKgB,OAAM;OAASd,QAAQiB,IAAI;IAC1CC,uBAAS,oBAACjB,SAAYQ;AACxB;AAQA,MAAMU,uBAASxB,KACb,SAASwB,OAAO,EAAEC,KAAK,EAAEC,KAAK,EAAEC,KAAK,EAAe;IAClD,MAAMC,OAAOX,KAAK,CAACU,MAAM;IAEzB,qBACE,oBAACzB,yBACC,oBAACA;QAAI2B,aAAa;OAAID,OACrBH,uBAAS,oBAACtB;QAAK2B,MAAAA;OAAM,GAAGL,QAAQpB,QAAQ0B,OAAO,CAAC,CAAC,CAAC,iBACnD,oBAAC5B,YAAMuB;AAGb,GACA,CAACM,GAAGC,IAAMD,EAAEP,KAAK,KAAKQ,EAAER,KAAK,IAAIO,EAAEN,KAAK,KAAKO,EAAEP,KAAK,IAAIM,EAAEL,KAAK,KAAKM,EAAEN,KAAK;AAO7E,MAAMO,+BAAiBlC,KAAK,SAASkC,eAAe,EAAEC,IAAI,EAAuB;IAC/E,qBACE,oBAACjC;QAAIkC,YAAY;qBACf,oBAACjC;QAAKgB,OAAM;OAAQgB,KAAKtB,IAAI,CAACwB,OAAO,CAAC5B,YAAY;AAGxD;AAMA,MAAM6B,sBAAQtC,KAAK,SAASsC,MAAM,EAAEC,KAAK,EAAc;IACrD,qBACE,oBAACrC;QAAIsC,eAAc;QAASJ,YAAY;OACrCG,MAAME,GAAG,CAAC,CAACN,MAAMO,QAChB,8DAA8D;sBAC9D,oBAACxC;YAAIyC,KAAKD;YAAOF,eAAc;yBAC7B,oBAACrC,YAAMgC,KAAKtB,IAAI;AAK1B;AAEA,MAAM+B,WAAW,CAACC,OAChB5C,QAAQ;QACN,MAAM6C,WAAWD,KAAKE,MAAM,GAAG,IAAIF,IAAI,CAACA,KAAKE,MAAM,GAAG,EAAE,CAAClC,IAAI,KAAK,OAAO;QACzE,IAAIiC,UAAUD,KAAKG,GAAG,IAAI,yBAAyB;QACnD,MAAMT,QAAQ,EAAE;QAChBM,KAAKI,OAAO,CAAC,CAACC;YACZA,EAAErC,IAAI,CAACsC,KAAK,CAAC3C,gBAAgByC,OAAO,CAAC,CAACpC,OAAS0B,MAAMa,IAAI,CAAC;oBAAEzC,MAAMuC,EAAEvC,IAAI;oBAAEE;gBAAK;QACjF;QACA,IAAI,CAACiC,UAAUP,MAAMS,GAAG,IAAI,uBAAuB;QACnD,OAAOT;IACT,GAAG;QAACM;KAAK;AAEX,MAAMQ,yBAAWrD,KAAK,SAASqD,SAAS,EAAEC,IAAI,EAAa;IACzD,MAAM,EAAET,IAAI,EAAE,GAAGS;IACjB,MAAMf,QAAQK,SAASC;IAEvB,qBACE,oBAAC3C;QAAIsC,eAAc;qBACjB,oBAAChB;QAAOC,OAAO6B,KAAK7B,KAAK;QAAEC,OAAO4B,KAAK5B,KAAK;QAAEC,OAAO2B,KAAK3B,KAAK;sBAC/D,oBAACW;QAAMC,OAAOA;;AAGpB;AAEA,MAAMgB,2BAAavD,KAAK,SAASuD,WAAW,EAAED,IAAI,EAAa;IAC7D,MAAM,EAAE3B,KAAK,EAAEkB,IAAI,EAAE,GAAGS;IACxB,MAAMf,QAAQK,SAASC;IAEvB,iDAAiD;IACjD,MAAMW,SAASvD,QAAQ,IAAMsC,MAAMkB,MAAM,CAAC,CAACtB,OAASA,KAAKxB,IAAI,KAAKJ,SAASmD,MAAM,GAAG;QAACnB;KAAM;IAC3F,MAAMoB,UAAU1D,QAAQ;QACtB,MAAM6C,WAAWD,KAAKE,MAAM,GAAG,IAAIF,IAAI,CAACA,KAAKE,MAAM,GAAG,EAAE,CAAClC,IAAI,KAAK,OAAO;QACzE,IAAI8C,UAAUpB,MAAMkB,MAAM,CAAC,CAACtB,OAASA,KAAKtB,IAAI,CAACkC,MAAM,GAAG,KAAKS,OAAOI,OAAO,CAACzB,QAAQ,GAAGa,GAAG;QAC1F,IAAI,CAACW,WAAW,CAACb,UAAUa,UAAUjD;QACrC,OAAOiD;IACT,GAAG;QAACd;QAAMN;QAAOiB;KAAO;IAExB,qBACE,oBAACtD;QAAIsC,eAAc;qBACjB,oBAAChB;QAAOC,OAAO6B,KAAK7B,KAAK;QAAEC,OAAO4B,KAAK5B,KAAK;QAAEC,OAAO2B,KAAK3B,KAAK;QAC9DA,UAAU,aAAagC,yBAAW,oBAACzB;QAAeC,MAAMwB;QACxDH,OAAOT,MAAM,GAAG,mBAAK,oBAACT;QAAMC,OAAOiB;;AAG1C;AAEA,6BAAexD,KAAK,SAAS6D,aAAa,EAAEP,IAAI,EAAa;IAC3D,MAAM,EAAEQ,QAAQ,EAAE,GAAGR;IACrB,OAAOQ,yBAAW,oBAACT;QAASC,MAAMA;uBAAW,oBAACC;QAAWD,MAAMA;;AACjE,GAAG"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/ChildProcess.tsx"],"sourcesContent":["import React, { memo, useMemo } from 'react';\nimport { Box, Text } from '../ink.mjs';\nimport ansiRegex from '../lib/ansiRegex';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { ChildProcess as ChildProcessT, Line, State } from '../types';\nimport { LineType } from '../types';\n\nconst _REGEX_NEW_LINE = /\\r\\n|[\\n\\v\\f\\r\\x85\\u2028\\u2029]/g;\nconst REGEX_ANSI = ansiRegex();\nconst _DEFAULT_SUMMARY = { type: LineType.stdout, text: '' };\n\ntype ItemProps = {\n  item: ChildProcessT;\n};\n\n// From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2\nconst spinner = {\n  interval: 80,\n  frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],\n};\n\nconst ICONS = {\n  error: <Text color=\"red\">{figures.cross}</Text>,\n  success: <Text color=\"green\">{figures.tick}</Text>,\n  running: <Spinner {...spinner} />,\n};\n\ntype HeaderProps = {\n  group?: string;\n  title: string;\n  state: State;\n};\n\nconst Header = memo(\n  function Header({ group, title, state }: HeaderProps) {\n    const icon = ICONS[state];\n\n    return (\n      <Box>\n        <Box marginRight={1}>{icon}</Box>\n        {group && <Text bold>{`${group}${figures.pointer} `}</Text>}\n        <Text>{title}</Text>\n      </Box>\n    );\n  },\n  (a, b) => a.group === b.group && a.title === b.title && a.state === b.state\n);\n\ntype RunningSummaryProps = {\n  line: Line;\n};\n\nconst RunningSummary = memo(function RunningSummary({ line }: RunningSummaryProps) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{line.text.replace(REGEX_ANSI, '')}</Text>\n    </Box>\n  );\n});\n\ntype LinesProps = {\n  lines: Line[];\n};\n\nconst Lines = memo(function Lines({ lines }: LinesProps) {\n  return (\n    <Box flexDirection=\"column\" marginLeft={2}>\n      {lines.map((line, index) => (\n        // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>\n        <Box key={index} flexDirection=\"column\">\n          <Text>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n});\n\nconst Expanded = memo(function Expanded({ item }: ItemProps) {\n  const { lines } = item;\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      <Lines lines={lines} />\n    </Box>\n  );\n});\n\nconst Contracted = memo(function Contracted({ item }: ItemProps) {\n  const { state, lines } = item;\n\n  // remove ansi codes when displaying single lines\n  const errors = useMemo(() => lines.filter((line) => line.type === LineType.stderr), [lines]);\n  const summary = useMemo(() => lines.filter((line) => line.text.length > 0 && errors.indexOf(line) < 0).pop(), [lines, errors]);\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header group={item.group} title={item.title} state={item.state} />\n      {state === 'running' && summary && <RunningSummary line={summary} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n});\n\nexport default memo(function ChildProcess({ item }: ItemProps) {\n  const { expanded } = item;\n  return expanded ? <Expanded item={item} /> : <Contracted item={item} />;\n});\n"],"names":["React","memo","useMemo","Box","Text","ansiRegex","figures","Spinner","LineType","_REGEX_NEW_LINE","REGEX_ANSI","_DEFAULT_SUMMARY","type","stdout","text","spinner","interval","frames","ICONS","error","color","cross","success","tick","running","Header","group","title","state","icon","marginRight","bold","pointer","a","b","RunningSummary","line","marginLeft","replace","Lines","lines","flexDirection","map","index","key","Expanded","item","Contracted","errors","filter","stderr","summary","length","indexOf","pop","ChildProcess","expanded"],"mappings":"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"}

package/dist/esm/lib/addLines.mjs

@@ -0,0 +1,19 @@
+import { Writable } from 'readable-stream';
+const REGEX_NEW_LINE = /\r\n|[\n\v\f\r\x85\u2028\u2029]/g;
+export default function addLines(fn) {
+    let last = '';
+    const stream = new Writable({
+        write (chunk, _enc, callback) {
+            const more = last + chunk.toString('utf8');
+            const lines = more.split(REGEX_NEW_LINE);
+            last = lines.pop();
+            if (lines.length > 0) fn(lines);
+            callback();
+        }
+    });
+    stream.on('finish', ()=>{
+        if (last.length) fn(last);
+        last = '';
+    });
+    return stream;
+}

package/dist/esm/lib/addLines.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/addLines.ts"],"sourcesContent":["import { Writable } from 'readable-stream';\n\nconst REGEX_NEW_LINE = /\\r\\n|[\\n\\v\\f\\r\\x85\\u2028\\u2029]/g;\n\nexport default function addLines(fn) {\n  let last = '';\n\n  const stream = new Writable({\n    write(chunk, _enc, callback) {\n      const more = last + chunk.toString('utf8');\n      const lines = more.split(REGEX_NEW_LINE);\n      last = lines.pop();\n      if (lines.length > 0) fn(lines);\n      callback();\n    },\n  });\n  stream.on('finish', () => {\n    if (last.length) fn(last);\n    last = '';\n  });\n  return stream;\n}\n"],"names":["Writable","REGEX_NEW_LINE","addLines","fn","last","stream","write","chunk","_enc","callback","more","toString","lines","split","pop","length","on"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,kBAAkB;AAE3C,MAAMC,iBAAiB;AAEvB,eAAe,SAASC,SAASC,EAAE;IACjC,IAAIC,OAAO;IAEX,MAAMC,SAAS,IAAIL,SAAS;QAC1BM,OAAMC,KAAK,EAAEC,IAAI,EAAEC,QAAQ;YACzB,MAAMC,OAAON,OAAOG,MAAMI,QAAQ,CAAC;YACnC,MAAMC,QAAQF,KAAKG,KAAK,CAACZ;YACzBG,OAAOQ,MAAME,GAAG;YAChB,IAAIF,MAAMG,MAAM,GAAG,GAAGZ,GAAGS;YACzBH;QACF;IACF;IACAJ,OAAOW,EAAE,CAAC,UAAU;QAClB,IAAIZ,KAAKW,MAAM,EAAEZ,GAAGC;QACpBA,OAAO;IACT;IACA,OAAOC;AACT"}

package/dist/esm/types.mjs

@@ -1,6 +1,6 @@
 // @ts-ignore
-export var DataType = /*#__PURE__*/ function(DataType) {
-    DataType[DataType["stdout"] = 1] = "stdout";
-    DataType[DataType["stderr"] = 2] = "stderr";
-    return DataType;
+export var LineType = /*#__PURE__*/ function(LineType) {
+    LineType[LineType["stdout"] = 1] = "stdout";
+    LineType[LineType["stderr"] = 2] = "stderr";
+    return LineType;
 }({});

package/dist/esm/types.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/types.ts"],"sourcesContent":["// @ts-ignore\nexport type { SpawnOptions, SpawnCallback, SpawnResult } from 'cross-spawn-cb';\n\nexport type TerminalOptions = {\n  group?: string;\n  expanded?: string;\n};\n\nexport enum DataType {\n  stdout = 1,\n  stderr = 2,\n}\nexport type Data = {\n  type: DataType;\n  text: string;\n};\n\nexport type State = 'running' | 'error' | 'success';\nexport type ChildProcess = {\n  id: string;\n  group?: string;\n  title: string;\n  state: State;\n  data: Data[];\n  expanded?: string;\n};\n\nexport interface AppState {\n  processes: ChildProcess[];\n  addProcess: (process: ChildProcess) => void;\n  updateProcess: (process: ChildProcess) => void;\n}\n"],"names":["DataType"],"mappings":"AAAA,aAAa;AAQb,OAAO,IAAA,AAAKA,kCAAAA;;;WAAAA;MAGX"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/types.ts"],"sourcesContent":["// @ts-ignore\nexport type { SpawnOptions, SpawnCallback, SpawnResult } from 'cross-spawn-cb';\n\nexport type TerminalOptions = {\n  group?: string;\n  expanded?: string;\n};\n\nexport enum LineType {\n  stdout = 1,\n  stderr = 2,\n}\nexport type Line = {\n  type: LineType;\n  text: string;\n};\n\nexport type State = 'running' | 'error' | 'success';\nexport type ChildProcess = {\n  id: string;\n  group?: string;\n  title: string;\n  state: State;\n  lines: Line[];\n  expanded?: string;\n};\n\nexport interface AppState {\n  processes: ChildProcess[];\n  addProcess: (process: ChildProcess) => void;\n  updateProcess: (process: ChildProcess) => void;\n}\n"],"names":["LineType"],"mappings":"AAAA,aAAa;AAQb,OAAO,IAAA,AAAKA,kCAAAA;;;WAAAA;MAGX"}

package/dist/esm/worker.mjs

@@ -83,10 +83,10 @@ import uuid from 'lil-uuid';
 import oo from 'on-one';
 import Queue from 'queue-cb';
 import createApp from './createApp.mjs';
-import addData from './lib/addData.mjs';
+import addLines from './lib/addLines.mjs';
 import concatWritable from './lib/concatWritable.mjs';
 import formatArguments from './lib/formatArguments.mjs';
-import { DataType } from './types.mjs';
+import { LineType } from './types.mjs';
 const terminal = createApp();
 export default function spawnTerminal(command, args, spawnOptions, options, callback) {
     const { encoding, stdio } = spawnOptions, csOptions = _object_without_properties(spawnOptions, [
@@ -102,7 +102,7 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
                     command
                 ].concat(formatArguments(args)).join(' '),
                 state: 'running',
-                data: []
+                lines: []
             }, options));
             const cp = crossSpawn(command, args, csOptions);
             const outputs = {
@@ -111,15 +111,13 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
             };
             const queue = new Queue();
             if (cp.stdout) {
-                outputs.stdout = addData((data)=>{
+                outputs.stdout = addLines((lines)=>{
                     const item = store.getState().processes.find((x)=>x.id === id);
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
-                        data: item.data.concat([
-                            {
-                                type: DataType.stdout,
-                                text: data === null ? null : data.toString('utf8')
-                            }
-                        ])
+                        lines: item.lines.concat(lines.map((text)=>({
+                                type: LineType.stdout,
+                                text
+                            })))
                     }));
                 });
                 queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), [
@@ -130,15 +128,13 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
                 ]));
             }
             if (cp.stderr) {
-                outputs.stderr = addData((data)=>{
+                outputs.stderr = addLines((lines)=>{
                     const item = store.getState().processes.find((x)=>x.id === id);
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
-                        data: item.data.concat([
-                            {
-                                type: DataType.stderr,
-                                text: data === null ? null : data.toString('utf8')
-                            }
-                        ])
+                        lines: item.lines.concat(lines.map((text)=>({
+                                type: LineType.stderr,
+                                text
+                            })))
                     }));
                 });
                 queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), [

package/dist/esm/worker.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/worker.ts"],"sourcesContent":["// @ts-ignore\nimport spawn, { crossSpawn, type SpawnResult } from 'cross-spawn-cb';\nimport uuid from 'lil-uuid';\nimport oo from 'on-one';\nimport Queue from 'queue-cb';\n\nimport createApp from './createApp';\nimport addData from './lib/addData';\nimport concatWritable from './lib/concatWritable';\nimport formatArguments from './lib/formatArguments';\n\nimport type { SpawnOptions, TerminalOptions } from './types';\nimport { DataType } from './types';\n\nconst terminal = createApp();\n\nexport default function spawnTerminal(command: string, args: string[], spawnOptions: SpawnOptions, options: TerminalOptions, callback) {\n  const { encoding, stdio, ...csOptions } = spawnOptions;\n\n  if (stdio === 'inherit') {\n    terminal.retain((store) => {\n      const id = uuid();\n      store.getState().addProcess({ id, title: [command].concat(formatArguments(args)).join(' '), state: 'running', data: [], ...options });\n\n      const cp = crossSpawn(command, args, csOptions);\n      const outputs = { stdout: null, stderr: null };\n\n      const queue = new Queue();\n      if (cp.stdout) {\n        outputs.stdout = addData((data) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, data: item.data.concat([{ type: DataType.stdout, text: data === null ? null : data.toString('utf8') }]) });\n        });\n        queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n      }\n      if (cp.stderr) {\n        outputs.stderr = addData((data) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, data: item.data.concat([{ type: DataType.stderr, text: data === null ? null : data.toString('utf8') }]) });\n        });\n        queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n      }\n      queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: 'utf8' }));\n      queue.await((err) => {\n        const res = (err ? err : {}) as SpawnResult;\n        res.stdout = outputs.stdout ? outputs.stdout.output : null;\n        res.stderr = outputs.stderr ? outputs.stderr.output : null;\n        res.output = [res.stdout, res.stderr, null];\n        const item = store.getState().processes.find((x) => x.id === id);\n        store.getState().updateProcess({ ...item, state: err ? 'error' : 'success' });\n\n        // let rendering complete\n        setTimeout(() => {\n          terminal.release();\n          err ? callback(err) : callback(null, res);\n        });\n      });\n    });\n  } else {\n    const cp = crossSpawn(command, args, csOptions);\n    const outputs = { stdout: null, stderr: null };\n\n    const queue = new Queue();\n    if (cp.stdout) {\n      outputs.stdout = concatWritable((output) => {\n        outputs.stdout.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n    }\n    if (cp.stderr) {\n      outputs.stderr = concatWritable((output) => {\n        outputs.stderr.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n    }\n    queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: encoding || 'utf8' }));\n    queue.await((err) => {\n      const res = (err ? err : {}) as SpawnResult;\n      res.stdout = outputs.stdout ? outputs.stdout.output : null;\n      res.stderr = outputs.stderr ? outputs.stderr.output : null;\n      res.output = [res.stdout, res.stderr, null];\n      err ? callback(err) : callback(null, res);\n    });\n  }\n}\n"],"names":["spawn","crossSpawn","uuid","oo","Queue","createApp","addData","concatWritable","formatArguments","DataType","terminal","spawnTerminal","command","args","spawnOptions","options","callback","encoding","stdio","csOptions","retain","store","id","getState","addProcess","title","concat","join","state","data","cp","outputs","stdout","stderr","queue","item","processes","find","x","updateProcess","type","text","toString","defer","bind","pipe","worker","await","err","res","output","setTimeout","release"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/worker.ts"],"sourcesContent":["// @ts-ignore\nimport spawn, { crossSpawn, type SpawnResult } from 'cross-spawn-cb';\nimport uuid from 'lil-uuid';\nimport oo from 'on-one';\nimport Queue from 'queue-cb';\n\nimport createApp from './createApp';\nimport addLines from './lib/addLines';\nimport concatWritable from './lib/concatWritable';\nimport formatArguments from './lib/formatArguments';\n\nimport type { SpawnOptions, TerminalOptions } from './types';\nimport { LineType } from './types';\n\nconst terminal = createApp();\n\nexport default function spawnTerminal(command: string, args: string[], spawnOptions: SpawnOptions, options: TerminalOptions, callback) {\n  const { encoding, stdio, ...csOptions } = spawnOptions;\n\n  if (stdio === 'inherit') {\n    terminal.retain((store) => {\n      const id = uuid();\n      store.getState().addProcess({ id, title: [command].concat(formatArguments(args)).join(' '), state: 'running', lines: [], ...options });\n\n      const cp = crossSpawn(command, args, csOptions);\n      const outputs = { stdout: null, stderr: null };\n\n      const queue = new Queue();\n      if (cp.stdout) {\n        outputs.stdout = addLines((lines) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, lines: item.lines.concat(lines.map((text) => ({ type: LineType.stdout, text }))) });\n        });\n        queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n      }\n      if (cp.stderr) {\n        outputs.stderr = addLines((lines) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          store.getState().updateProcess({ ...item, lines: item.lines.concat(lines.map((text) => ({ type: LineType.stderr, text }))) });\n        });\n        queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n      }\n      queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: 'utf8' }));\n      queue.await((err) => {\n        const res = (err ? err : {}) as SpawnResult;\n        res.stdout = outputs.stdout ? outputs.stdout.output : null;\n        res.stderr = outputs.stderr ? outputs.stderr.output : null;\n        res.output = [res.stdout, res.stderr, null];\n        const item = store.getState().processes.find((x) => x.id === id);\n        store.getState().updateProcess({ ...item, state: err ? 'error' : 'success' });\n\n        // let rendering complete\n        setTimeout(() => {\n          terminal.release();\n          err ? callback(err) : callback(null, res);\n        });\n      });\n    });\n  } else {\n    const cp = crossSpawn(command, args, csOptions);\n    const outputs = { stdout: null, stderr: null };\n\n    const queue = new Queue();\n    if (cp.stdout) {\n      outputs.stdout = concatWritable((output) => {\n        outputs.stdout.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n    }\n    if (cp.stderr) {\n      outputs.stderr = concatWritable((output) => {\n        outputs.stderr.output = output.toString(encoding || 'utf8');\n      });\n      queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), ['error', 'end', 'close', 'finish']));\n    }\n    queue.defer(spawn.worker.bind(null, cp, { ...csOptions, encoding: encoding || 'utf8' }));\n    queue.await((err) => {\n      const res = (err ? err : {}) as SpawnResult;\n      res.stdout = outputs.stdout ? outputs.stdout.output : null;\n      res.stderr = outputs.stderr ? outputs.stderr.output : null;\n      res.output = [res.stdout, res.stderr, null];\n      err ? callback(err) : callback(null, res);\n    });\n  }\n}\n"],"names":["spawn","crossSpawn","uuid","oo","Queue","createApp","addLines","concatWritable","formatArguments","LineType","terminal","spawnTerminal","command","args","spawnOptions","options","callback","encoding","stdio","csOptions","retain","store","id","getState","addProcess","title","concat","join","state","lines","cp","outputs","stdout","stderr","queue","item","processes","find","x","updateProcess","map","text","type","defer","bind","pipe","worker","await","err","res","output","setTimeout","release","toString"],"mappings":"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"}

package/dist/types/types.d.ts

@@ -3,12 +3,12 @@ export type TerminalOptions = {
     group?: string;
     expanded?: string;
 };
-export declare enum DataType {
+export declare enum LineType {
     stdout = 1,
     stderr = 2
 }
-export type Data = {
-    type: DataType;
+export type Line = {
+    type: LineType;
     text: string;
 };
 export type State = 'running' | 'error' | 'success';
@@ -17,7 +17,7 @@ export type ChildProcess = {
     group?: string;
     title: string;
     state: State;
-    data: Data[];
+    lines: Line[];
     expanded?: string;
 };
 export interface AppState {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spawn-term",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "description": "Formats spawn with for terminal grouping",
   "keywords": [
     "spawn",

package/dist/cjs/lib/addData.cjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/addData.ts"],"sourcesContent":["import { Writable } from 'readable-stream';\n\nexport default function addLines(fn) {\n  const stream = new Writable({\n    write(data, _enc, callback) {\n      fn(data);\n      callback();\n    },\n  });\n  stream.on('finish', () => fn(null));\n  return stream;\n}\n"],"names":["addLines","fn","stream","Writable","write","data","_enc","callback","on"],"mappings":";;;;+BAEA;;;eAAwBA;;;8BAFC;AAEV,SAASA,SAASC,EAAE;IACjC,IAAMC,SAAS,IAAIC,wBAAQ,CAAC;QAC1BC,OAAAA,SAAAA,MAAMC,IAAI,EAAEC,IAAI,EAAEC,QAAQ;YACxBN,GAAGI;YACHE;QACF;IACF;IACAL,OAAOM,EAAE,CAAC,UAAU;eAAMP,GAAG;;IAC7B,OAAOC;AACT"}

package/dist/esm/lib/addData.mjs

@@ -1,11 +0,0 @@
-import { Writable } from 'readable-stream';
-export default function addLines(fn) {
-    const stream = new Writable({
-        write (data, _enc, callback) {
-            fn(data);
-            callback();
-        }
-    });
-    stream.on('finish', ()=>fn(null));
-    return stream;
-}

package/dist/esm/lib/addData.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/addData.ts"],"sourcesContent":["import { Writable } from 'readable-stream';\n\nexport default function addLines(fn) {\n  const stream = new Writable({\n    write(data, _enc, callback) {\n      fn(data);\n      callback();\n    },\n  });\n  stream.on('finish', () => fn(null));\n  return stream;\n}\n"],"names":["Writable","addLines","fn","stream","write","data","_enc","callback","on"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,kBAAkB;AAE3C,eAAe,SAASC,SAASC,EAAE;IACjC,MAAMC,SAAS,IAAIH,SAAS;QAC1BI,OAAMC,IAAI,EAAEC,IAAI,EAAEC,QAAQ;YACxBL,GAAGG;YACHE;QACF;IACF;IACAJ,OAAOK,EAAE,CAAC,UAAU,IAAMN,GAAG;IAC7B,OAAOC;AACT"}