spawn-term 0.1.23 → 0.1.24

package/dist/cjs/components/ChildProcess.cjs

@@ -12,6 +12,7 @@ var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _zustand = require("zustand");
 var _Store = /*#__PURE__*/ _interop_require_default(require("../contexts/Store.cjs"));
 var _ink = require("../ink.cjs");
+var _ansiRegex = /*#__PURE__*/ _interop_require_default(require("../lib/ansiRegex.cjs"));
 var _figures = /*#__PURE__*/ _interop_require_default(require("../lib/figures.cjs"));
 var _Spinner = /*#__PURE__*/ _interop_require_default(require("./Spinner.cjs"));
 var _types = require("../types.cjs");
@@ -61,6 +62,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+var ansiRegex = (0, _ansiRegex.default)();
 // From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2
 var spinner = {
     interval: 80,
@@ -137,10 +139,17 @@ function ChildProcess(param) {
             lines: lines
         }));
     }
-    var errors = lines.filter(function(line) {
+    // remove ansi codes when displaying single lines
+    var cleaned = lines.map(function(x) {
+        return {
+            type: x.type,
+            text: x.text.replace(ansiRegex, '')
+        };
+    });
+    var errors = cleaned.filter(function(line) {
         return line.type === _types.LineType.stderr;
     });
-    var output = lines.filter(function(line) {
+    var output = cleaned.filter(function(line) {
         return line.text.length > 0;
     }).pop();
     return /*#__PURE__*/ _react.default.createElement(_ink.Box, {

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, { useContext } from 'react';\nimport { useStore } from 'zustand';\nimport StoreContext from '../contexts/Store';\nimport { Box, Text } from '../ink.mjs';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { AppState } from '../types';\nimport { LineType } from '../types';\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 ChildProcessProps = {\n  id: string;\n};\n\nfunction Header({ item }) {\n  const { group, title, state } = item;\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\nfunction Output({ output }) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{output.text}</Text>\n    </Box>\n  );\n}\n\nfunction Lines({ lines }) {\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\" height={1}>\n          <Text color={line.type === LineType.stderr ? 'red' : 'black'}>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n}\n\nexport default function ChildProcess({ id }: ChildProcessProps) {\n  const store = useContext(StoreContext);\n  const appState = useStore(store) as AppState;\n  const item = appState.processes.find((x) => x.id === id);\n  const { state, lines, expanded } = item;\n\n  if (expanded) {\n    return (\n      <Box flexDirection=\"column\">\n        <Header item={item} />\n        <Lines lines={lines} />\n      </Box>\n    );\n  }\n  const errors = lines.filter((line) => line.type === LineType.stderr);\n  const output = lines.filter((line) => line.text.length > 0).pop();\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header item={item} />\n      {state === 'running' && output && <Output output={output} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n}\n"],"names":["ChildProcess","spinner","interval","frames","ICONS","error","Text","color","figures","cross","success","tick","running","Spinner","Header","item","group","title","state","icon","Box","marginRight","bold","pointer","Output","output","marginLeft","text","Lines","lines","flexDirection","map","line","index","key","height","type","LineType","stderr","id","store","useContext","StoreContext","appState","useStore","processes","find","x","expanded","errors","filter","length","pop"],"mappings":";;;;+BA4DA;;;eAAwBA;;;6DA5DU;uBACT;4DACA;mBACC;8DACN;8DACA;qBAGK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,oHAAoH;AACpH,IAAMC,UAAU;IACdC,UAAU;IACVC,QAAQ;QAAC;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;KAAI;AAC5D;AAEA,IAAMC,QAAQ;IACZC,qBAAO,6BAACC,SAAI;QAACC,OAAM;OAAOC,gBAAO,CAACC,KAAK;IACvCC,uBAAS,6BAACJ,SAAI;QAACC,OAAM;OAASC,gBAAO,CAACG,IAAI;IAC1CC,uBAAS,6BAACC,gBAAO,EAAKZ;AACxB;AAMA,SAASa,OAAO,KAAQ;QAAR,AAAEC,OAAF,MAAEA;IAChB,IAAQC,QAAwBD,KAAxBC,OAAOC,QAAiBF,KAAjBE,OAAOC,QAAUH,KAAVG;IACtB,IAAMC,OAAOf,KAAK,CAACc,MAAM;IAEzB,qBACE,6BAACE,QAAG,sBACF,6BAACA,QAAG;QAACC,aAAa;OAAIF,OACrBH,uBAAS,6BAACV,SAAI;QAACgB,MAAAA;OAAM,AAAC,GAAUd,OAARQ,OAAwB,OAAhBR,gBAAO,CAACe,OAAO,EAAC,qBACjD,6BAACjB,SAAI,QAAEW;AAGb;AAEA,SAASO,OAAO,KAAU;QAAV,AAAEC,SAAF,MAAEA;IAChB,qBACE,6BAACL,QAAG;QAACM,YAAY;qBACf,6BAACpB,SAAI;QAACC,OAAM;OAAQkB,OAAOE,IAAI;AAGrC;AAEA,SAASC,MAAM,KAAS;QAAT,AAAEC,QAAF,MAAEA;IACf,qBACE,6BAACT,QAAG;QAACU,eAAc;QAASJ,YAAY;OACrCG,MAAME,GAAG,CAAC,SAACC,MAAMC;eAChB,8DAA8D;sBAC9D,6BAACb,QAAG;YAACc,KAAKD;YAAOH,eAAc;YAASK,QAAQ;yBAC9C,6BAAC7B,SAAI;YAACC,OAAOyB,KAAKI,IAAI,KAAKC,eAAQ,CAACC,MAAM,GAAG,QAAQ;WAAUN,KAAKL,IAAI;;AAKlF;AAEe,SAAS3B,aAAa,KAAyB;QAAzB,AAAEuC,KAAF,MAAEA;IACrC,IAAMC,QAAQC,IAAAA,iBAAU,EAACC,cAAY;IACrC,IAAMC,WAAWC,IAAAA,iBAAQ,EAACJ;IAC1B,IAAMzB,OAAO4B,SAASE,SAAS,CAACC,IAAI,CAAC,SAACC;eAAMA,EAAER,EAAE,KAAKA;;IACrD,IAAQrB,QAA2BH,KAA3BG,OAAOW,QAAoBd,KAApBc,OAAOmB,WAAajC,KAAbiC;IAEtB,IAAIA,UAAU;QACZ,qBACE,6BAAC5B,QAAG;YAACU,eAAc;yBACjB,6BAAChB;YAAOC,MAAMA;0BACd,6BAACa;YAAMC,OAAOA;;IAGpB;IACA,IAAMoB,SAASpB,MAAMqB,MAAM,CAAC,SAAClB;eAASA,KAAKI,IAAI,KAAKC,eAAQ,CAACC,MAAM;;IACnE,IAAMb,SAASI,MAAMqB,MAAM,CAAC,SAAClB;eAASA,KAAKL,IAAI,CAACwB,MAAM,GAAG;OAAGC,GAAG;IAE/D,qBACE,6BAAChC,QAAG;QAACU,eAAc;qBACjB,6BAAChB;QAAOC,MAAMA;QACbG,UAAU,aAAaO,wBAAU,6BAACD;QAAOC,QAAQA;QACjDwB,OAAOE,MAAM,GAAG,mBAAK,6BAACvB;QAAMC,OAAOoB;;AAG1C"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/ChildProcess.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { useStore } from 'zustand';\nimport StoreContext from '../contexts/Store';\nimport { Box, Text } from '../ink.mjs';\nimport _ansiRegex from '../lib/ansiRegex';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { AppState } from '../types';\nimport { LineType } from '../types';\n\nconst ansiRegex = _ansiRegex();\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 ChildProcessProps = {\n  id: string;\n};\n\nfunction Header({ item }) {\n  const { group, title, state } = item;\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\nfunction Output({ output }) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{output.text}</Text>\n    </Box>\n  );\n}\n\nfunction Lines({ lines }) {\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\" height={1}>\n          <Text color={line.type === LineType.stderr ? 'red' : 'black'}>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n}\n\nexport default function ChildProcess({ id }: ChildProcessProps) {\n  const store = useContext(StoreContext);\n  const appState = useStore(store) as AppState;\n  const item = appState.processes.find((x) => x.id === id);\n  const { state, lines, expanded } = item;\n\n  if (expanded) {\n    return (\n      <Box flexDirection=\"column\">\n        <Header item={item} />\n        <Lines lines={lines} />\n      </Box>\n    );\n  }\n  // remove ansi codes when displaying single lines\n  const cleaned = lines.map((x) => ({ type: x.type, text: x.text.replace(ansiRegex, '') }));\n  const errors = cleaned.filter((line) => line.type === LineType.stderr);\n  const output = cleaned.filter((line) => line.text.length > 0).pop();\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header item={item} />\n      {state === 'running' && output && <Output output={output} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n}\n"],"names":["ChildProcess","ansiRegex","_ansiRegex","spinner","interval","frames","ICONS","error","Text","color","figures","cross","success","tick","running","Spinner","Header","item","group","title","state","icon","Box","marginRight","bold","pointer","Output","output","marginLeft","text","Lines","lines","flexDirection","map","line","index","key","height","type","LineType","stderr","id","store","useContext","StoreContext","appState","useStore","processes","find","x","expanded","cleaned","replace","errors","filter","length","pop"],"mappings":"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"}

package/dist/cjs/worker.cjs

@@ -15,7 +15,6 @@ 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 _addLines = /*#__PURE__*/ _interop_require_default(require("./lib/addLines.cjs"));
-var _ansiRegex = /*#__PURE__*/ _interop_require_default(require("./lib/ansiRegex.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");
@@ -144,7 +143,6 @@ function _object_without_properties_loose(source, excluded) {
     }
     return target;
 }
-var ansiRegex = (0, _ansiRegex.default)();
 var terminal = (0, _createApp.default)();
 function spawnTerminal(command, args, spawnOptions, options, callback) {
     var encoding = spawnOptions.encoding, stdio = spawnOptions.stdio, csOptions = _object_without_properties(spawnOptions, [
@@ -176,7 +174,7 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
                     var lines = item.lines.concat(texts.map(function(text) {
                         return {
                             type: _types.LineType.stdout,
-                            text: text.replace(ansiRegex, '')
+                            text: text
                         };
                     }));
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
@@ -198,7 +196,7 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
                     var lines = item.lines.concat(texts.map(function(text) {
                         return {
                             type: _types.LineType.stderr,
-                            text: text.replace(ansiRegex, '')
+                            text: text
                         };
                     }));
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {

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 addLines from './lib/addLines';\nimport _ansiRegex from './lib/ansiRegex';\nimport concatWritable from './lib/concatWritable';\nimport formatArguments from './lib/formatArguments';\n\nimport type { SpawnOptions, TerminalOptions } from './types';\nimport { LineType } from './types';\n\nconst ansiRegex = _ansiRegex();\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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stdout, text: text.replace(ansiRegex, '') })));\n          store.getState().updateProcess({ ...item, lines });\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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stderr, text: text.replace(ansiRegex, '') })));\n          store.getState().updateProcess({ ...item, lines });\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","ansiRegex","_ansiRegex","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","texts","item","processes","find","x","map","text","type","LineType","replace","updateProcess","defer","oo","bind","pipe","spawn","worker","await","err","res","output","setTimeout","release","concatWritable","toString"],"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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stdout, text })));\n          store.getState().updateProcess({ ...item, lines });\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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stderr, text })));\n          store.getState().updateProcess({ ...item, lines });\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","texts","item","processes","find","x","map","text","type","LineType","updateProcess","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

@@ -2,9 +2,11 @@ import React, { useContext } from 'react';
 import { useStore } from 'zustand';
 import StoreContext from '../contexts/Store.mjs';
 import { Box, Text } from '../ink.mjs';
+import _ansiRegex from '../lib/ansiRegex.mjs';
 import figures from '../lib/figures.mjs';
 import Spinner from './Spinner.mjs';
 import { LineType } from '../types.mjs';
+const ansiRegex = _ansiRegex();
 // From: https://github.com/sindresorhus/cli-spinners/blob/00de8fbeee16fa49502fa4f687449f70f2c8ca2c/spinners.json#L2
 const spinner = {
     interval: 80,
@@ -73,8 +75,13 @@ export default function ChildProcess({ id }) {
             lines: lines
         }));
     }
-    const errors = lines.filter((line)=>line.type === LineType.stderr);
-    const output = lines.filter((line)=>line.text.length > 0).pop();
+    // remove ansi codes when displaying single lines
+    const cleaned = lines.map((x)=>({
+            type: x.type,
+            text: x.text.replace(ansiRegex, '')
+        }));
+    const errors = cleaned.filter((line)=>line.type === LineType.stderr);
+    const output = cleaned.filter((line)=>line.text.length > 0).pop();
     return /*#__PURE__*/ React.createElement(Box, {
         flexDirection: "column"
     }, /*#__PURE__*/ React.createElement(Header, {

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, { useContext } from 'react';\nimport { useStore } from 'zustand';\nimport StoreContext from '../contexts/Store';\nimport { Box, Text } from '../ink.mjs';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { AppState } from '../types';\nimport { LineType } from '../types';\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 ChildProcessProps = {\n  id: string;\n};\n\nfunction Header({ item }) {\n  const { group, title, state } = item;\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\nfunction Output({ output }) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{output.text}</Text>\n    </Box>\n  );\n}\n\nfunction Lines({ lines }) {\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\" height={1}>\n          <Text color={line.type === LineType.stderr ? 'red' : 'black'}>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n}\n\nexport default function ChildProcess({ id }: ChildProcessProps) {\n  const store = useContext(StoreContext);\n  const appState = useStore(store) as AppState;\n  const item = appState.processes.find((x) => x.id === id);\n  const { state, lines, expanded } = item;\n\n  if (expanded) {\n    return (\n      <Box flexDirection=\"column\">\n        <Header item={item} />\n        <Lines lines={lines} />\n      </Box>\n    );\n  }\n  const errors = lines.filter((line) => line.type === LineType.stderr);\n  const output = lines.filter((line) => line.text.length > 0).pop();\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header item={item} />\n      {state === 'running' && output && <Output output={output} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n}\n"],"names":["React","useContext","useStore","StoreContext","Box","Text","figures","Spinner","LineType","spinner","interval","frames","ICONS","error","color","cross","success","tick","running","Header","item","group","title","state","icon","marginRight","bold","pointer","Output","output","marginLeft","text","Lines","lines","flexDirection","map","line","index","key","height","type","stderr","ChildProcess","id","store","appState","processes","find","x","expanded","errors","filter","length","pop"],"mappings":"AAAA,OAAOA,SAASC,UAAU,QAAQ,QAAQ;AAC1C,SAASC,QAAQ,QAAQ,UAAU;AACnC,OAAOC,kBAAkB,oBAAoB;AAC7C,SAASC,GAAG,EAAEC,IAAI,QAAQ,aAAa;AACvC,OAAOC,aAAa,iBAAiB;AACrC,OAAOC,aAAa,YAAY;AAGhC,SAASC,QAAQ,QAAQ,WAAW;AAEpC,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,oBAACR;QAAKS,OAAM;OAAOR,QAAQS,KAAK;IACvCC,uBAAS,oBAACX;QAAKS,OAAM;OAASR,QAAQW,IAAI;IAC1CC,uBAAS,oBAACX,SAAYE;AACxB;AAMA,SAASU,OAAO,EAAEC,IAAI,EAAE;IACtB,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGH;IAChC,MAAMI,OAAOZ,KAAK,CAACW,MAAM;IAEzB,qBACE,oBAACnB,yBACC,oBAACA;QAAIqB,aAAa;OAAID,OACrBH,uBAAS,oBAAChB;QAAKqB,MAAAA;OAAM,GAAGL,QAAQf,QAAQqB,OAAO,CAAC,CAAC,CAAC,iBACnD,oBAACtB,YAAMiB;AAGb;AAEA,SAASM,OAAO,EAAEC,MAAM,EAAE;IACxB,qBACE,oBAACzB;QAAI0B,YAAY;qBACf,oBAACzB;QAAKS,OAAM;OAAQe,OAAOE,IAAI;AAGrC;AAEA,SAASC,MAAM,EAAEC,KAAK,EAAE;IACtB,qBACE,oBAAC7B;QAAI8B,eAAc;QAASJ,YAAY;OACrCG,MAAME,GAAG,CAAC,CAACC,MAAMC,QAChB,8DAA8D;sBAC9D,oBAACjC;YAAIkC,KAAKD;YAAOH,eAAc;YAASK,QAAQ;yBAC9C,oBAAClC;YAAKS,OAAOsB,KAAKI,IAAI,KAAKhC,SAASiC,MAAM,GAAG,QAAQ;WAAUL,KAAKL,IAAI;AAKlF;AAEA,eAAe,SAASW,aAAa,EAAEC,EAAE,EAAqB;IAC5D,MAAMC,QAAQ3C,WAAWE;IACzB,MAAM0C,WAAW3C,SAAS0C;IAC1B,MAAMxB,OAAOyB,SAASC,SAAS,CAACC,IAAI,CAAC,CAACC,IAAMA,EAAEL,EAAE,KAAKA;IACrD,MAAM,EAAEpB,KAAK,EAAEU,KAAK,EAAEgB,QAAQ,EAAE,GAAG7B;IAEnC,IAAI6B,UAAU;QACZ,qBACE,oBAAC7C;YAAI8B,eAAc;yBACjB,oBAACf;YAAOC,MAAMA;0BACd,oBAACY;YAAMC,OAAOA;;IAGpB;IACA,MAAMiB,SAASjB,MAAMkB,MAAM,CAAC,CAACf,OAASA,KAAKI,IAAI,KAAKhC,SAASiC,MAAM;IACnE,MAAMZ,SAASI,MAAMkB,MAAM,CAAC,CAACf,OAASA,KAAKL,IAAI,CAACqB,MAAM,GAAG,GAAGC,GAAG;IAE/D,qBACE,oBAACjD;QAAI8B,eAAc;qBACjB,oBAACf;QAAOC,MAAMA;QACbG,UAAU,aAAaM,wBAAU,oBAACD;QAAOC,QAAQA;QACjDqB,OAAOE,MAAM,GAAG,mBAAK,oBAACpB;QAAMC,OAAOiB;;AAG1C"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/components/ChildProcess.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { useStore } from 'zustand';\nimport StoreContext from '../contexts/Store';\nimport { Box, Text } from '../ink.mjs';\nimport _ansiRegex from '../lib/ansiRegex';\nimport figures from '../lib/figures';\nimport Spinner from './Spinner';\n\nimport type { AppState } from '../types';\nimport { LineType } from '../types';\n\nconst ansiRegex = _ansiRegex();\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 ChildProcessProps = {\n  id: string;\n};\n\nfunction Header({ item }) {\n  const { group, title, state } = item;\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\nfunction Output({ output }) {\n  return (\n    <Box marginLeft={2}>\n      <Text color=\"gray\">{output.text}</Text>\n    </Box>\n  );\n}\n\nfunction Lines({ lines }) {\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\" height={1}>\n          <Text color={line.type === LineType.stderr ? 'red' : 'black'}>{line.text}</Text>\n        </Box>\n      ))}\n    </Box>\n  );\n}\n\nexport default function ChildProcess({ id }: ChildProcessProps) {\n  const store = useContext(StoreContext);\n  const appState = useStore(store) as AppState;\n  const item = appState.processes.find((x) => x.id === id);\n  const { state, lines, expanded } = item;\n\n  if (expanded) {\n    return (\n      <Box flexDirection=\"column\">\n        <Header item={item} />\n        <Lines lines={lines} />\n      </Box>\n    );\n  }\n  // remove ansi codes when displaying single lines\n  const cleaned = lines.map((x) => ({ type: x.type, text: x.text.replace(ansiRegex, '') }));\n  const errors = cleaned.filter((line) => line.type === LineType.stderr);\n  const output = cleaned.filter((line) => line.text.length > 0).pop();\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header item={item} />\n      {state === 'running' && output && <Output output={output} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n}\n"],"names":["React","useContext","useStore","StoreContext","Box","Text","_ansiRegex","figures","Spinner","LineType","ansiRegex","spinner","interval","frames","ICONS","error","color","cross","success","tick","running","Header","item","group","title","state","icon","marginRight","bold","pointer","Output","output","marginLeft","text","Lines","lines","flexDirection","map","line","index","key","height","type","stderr","ChildProcess","id","store","appState","processes","find","x","expanded","cleaned","replace","errors","filter","length","pop"],"mappings":"AAAA,OAAOA,SAASC,UAAU,QAAQ,QAAQ;AAC1C,SAASC,QAAQ,QAAQ,UAAU;AACnC,OAAOC,kBAAkB,oBAAoB;AAC7C,SAASC,GAAG,EAAEC,IAAI,QAAQ,aAAa;AACvC,OAAOC,gBAAgB,mBAAmB;AAC1C,OAAOC,aAAa,iBAAiB;AACrC,OAAOC,aAAa,YAAY;AAGhC,SAASC,QAAQ,QAAQ,WAAW;AAEpC,MAAMC,YAAYJ;AAElB,oHAAoH;AACpH,MAAMK,UAAU;IACdC,UAAU;IACVC,QAAQ;QAAC;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;QAAK;KAAI;AAC5D;AAEA,MAAMC,QAAQ;IACZC,qBAAO,oBAACV;QAAKW,OAAM;OAAOT,QAAQU,KAAK;IACvCC,uBAAS,oBAACb;QAAKW,OAAM;OAAST,QAAQY,IAAI;IAC1CC,uBAAS,oBAACZ,SAAYG;AACxB;AAMA,SAASU,OAAO,EAAEC,IAAI,EAAE;IACtB,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGH;IAChC,MAAMI,OAAOZ,KAAK,CAACW,MAAM;IAEzB,qBACE,oBAACrB,yBACC,oBAACA;QAAIuB,aAAa;OAAID,OACrBH,uBAAS,oBAAClB;QAAKuB,MAAAA;OAAM,GAAGL,QAAQhB,QAAQsB,OAAO,CAAC,CAAC,CAAC,iBACnD,oBAACxB,YAAMmB;AAGb;AAEA,SAASM,OAAO,EAAEC,MAAM,EAAE;IACxB,qBACE,oBAAC3B;QAAI4B,YAAY;qBACf,oBAAC3B;QAAKW,OAAM;OAAQe,OAAOE,IAAI;AAGrC;AAEA,SAASC,MAAM,EAAEC,KAAK,EAAE;IACtB,qBACE,oBAAC/B;QAAIgC,eAAc;QAASJ,YAAY;OACrCG,MAAME,GAAG,CAAC,CAACC,MAAMC,QAChB,8DAA8D;sBAC9D,oBAACnC;YAAIoC,KAAKD;YAAOH,eAAc;YAASK,QAAQ;yBAC9C,oBAACpC;YAAKW,OAAOsB,KAAKI,IAAI,KAAKjC,SAASkC,MAAM,GAAG,QAAQ;WAAUL,KAAKL,IAAI;AAKlF;AAEA,eAAe,SAASW,aAAa,EAAEC,EAAE,EAAqB;IAC5D,MAAMC,QAAQ7C,WAAWE;IACzB,MAAM4C,WAAW7C,SAAS4C;IAC1B,MAAMxB,OAAOyB,SAASC,SAAS,CAACC,IAAI,CAAC,CAACC,IAAMA,EAAEL,EAAE,KAAKA;IACrD,MAAM,EAAEpB,KAAK,EAAEU,KAAK,EAAEgB,QAAQ,EAAE,GAAG7B;IAEnC,IAAI6B,UAAU;QACZ,qBACE,oBAAC/C;YAAIgC,eAAc;yBACjB,oBAACf;YAAOC,MAAMA;0BACd,oBAACY;YAAMC,OAAOA;;IAGpB;IACA,iDAAiD;IACjD,MAAMiB,UAAUjB,MAAME,GAAG,CAAC,CAACa,IAAO,CAAA;YAAER,MAAMQ,EAAER,IAAI;YAAET,MAAMiB,EAAEjB,IAAI,CAACoB,OAAO,CAAC3C,WAAW;QAAI,CAAA;IACtF,MAAM4C,SAASF,QAAQG,MAAM,CAAC,CAACjB,OAASA,KAAKI,IAAI,KAAKjC,SAASkC,MAAM;IACrE,MAAMZ,SAASqB,QAAQG,MAAM,CAAC,CAACjB,OAASA,KAAKL,IAAI,CAACuB,MAAM,GAAG,GAAGC,GAAG;IAEjE,qBACE,oBAACrD;QAAIgC,eAAc;qBACjB,oBAACf;QAAOC,MAAMA;QACbG,UAAU,aAAaM,wBAAU,oBAACD;QAAOC,QAAQA;QACjDuB,OAAOE,MAAM,GAAG,mBAAK,oBAACtB;QAAMC,OAAOmB;;AAG1C"}

package/dist/esm/worker.mjs

@@ -84,11 +84,9 @@ import oo from 'on-one';
 import Queue from 'queue-cb';
 import createApp from './createApp.mjs';
 import addLines from './lib/addLines.mjs';
-import _ansiRegex from './lib/ansiRegex.mjs';
 import concatWritable from './lib/concatWritable.mjs';
 import formatArguments from './lib/formatArguments.mjs';
 import { LineType } from './types.mjs';
-const ansiRegex = _ansiRegex();
 const terminal = createApp();
 export default function spawnTerminal(command, args, spawnOptions, options, callback) {
     const { encoding, stdio } = spawnOptions, csOptions = _object_without_properties(spawnOptions, [
@@ -117,7 +115,7 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
                     const item = store.getState().processes.find((x)=>x.id === id);
                     const lines = item.lines.concat(texts.map((text)=>({
                             type: LineType.stdout,
-                            text: text.replace(ansiRegex, '')
+                            text
                         })));
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
                         lines
@@ -135,7 +133,7 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
                     const item = store.getState().processes.find((x)=>x.id === id);
                     const lines = item.lines.concat(texts.map((text)=>({
                             type: LineType.stderr,
-                            text: text.replace(ansiRegex, '')
+                            text
                         })));
                     store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
                         lines

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 addLines from './lib/addLines';\nimport _ansiRegex from './lib/ansiRegex';\nimport concatWritable from './lib/concatWritable';\nimport formatArguments from './lib/formatArguments';\n\nimport type { SpawnOptions, TerminalOptions } from './types';\nimport { LineType } from './types';\n\nconst ansiRegex = _ansiRegex();\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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stdout, text: text.replace(ansiRegex, '') })));\n          store.getState().updateProcess({ ...item, lines });\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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stderr, text: text.replace(ansiRegex, '') })));\n          store.getState().updateProcess({ ...item, lines });\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","_ansiRegex","concatWritable","formatArguments","LineType","ansiRegex","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","texts","item","processes","find","x","map","text","type","replace","updateProcess","defer","bind","pipe","worker","await","err","res","output","setTimeout","release","toString"],"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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stdout, text })));\n          store.getState().updateProcess({ ...item, lines });\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((texts) => {\n          const item = store.getState().processes.find((x) => x.id === id);\n          const lines = item.lines.concat(texts.map((text) => ({ type: LineType.stderr, text })));\n          store.getState().updateProcess({ ...item, lines });\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","texts","item","processes","find","x","map","text","type","updateProcess","defer","bind","pipe","worker","await","err","res","output","setTimeout","release","toString"],"mappings":"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"}

package/package.json

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