spawn-term 0.1.17 → 0.1.19

package/dist/cjs/components/ChildProcess.cjs

@@ -77,10 +77,6 @@ var spinner = {
         '⠏'
     ]
 };
-var _RUNS = [
-    _figures.default.cross,
-    _figures.default.tick
-].concat(spinner.frames);
 var ICONS = {
     error: /*#__PURE__*/ _react.default.createElement(_ink.Text, {
         color: "red"
@@ -139,10 +135,8 @@ function ChildProcess(param) {
             lines: lines
         }));
     }
-    // const runs = lines.filter((line) => RUNS.some((run) => line.text[0] === run));
-    var runs = [];
     var errors = lines.filter(function(line) {
-        return line.type === _types.LineType.stderr && runs.indexOf(line) < 0;
+        return line.type === _types.LineType.stderr;
     });
     var output = lines.filter(function(line) {
         return line.text.length > 0;
@@ -151,9 +145,7 @@ function ChildProcess(param) {
         flexDirection: "column"
     }, /*#__PURE__*/ _react.default.createElement(Header, {
         item: item
-    }), runs.length > 0 && /*#__PURE__*/ _react.default.createElement(Lines, {
-        lines: runs
-    }), state === 'running' && output && runs.indexOf(output) < 0 && /*#__PURE__*/ _react.default.createElement(Output, {
+    }), state === 'running' && output && /*#__PURE__*/ _react.default.createElement(Output, {
         output: output
     }), errors.length > 0 && /*#__PURE__*/ _react.default.createElement(Lines, {
         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, { 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 _RUNS = [figures.cross, figures.tick].concat(spinner.frames);\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>{`${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\">{`${figures.arrowRight} ${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 runs = lines.filter((line) => RUNS.some((run) => line.text[0] === run));\n  const runs = [];\n  const errors = lines.filter((line) => line.type === LineType.stderr && runs.indexOf(line) < 0);\n  const output = lines.filter((line) => line.text.length > 0).pop();\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header item={item} />\n      {runs.length > 0 && <Lines lines={runs} />}\n      {state === 'running' && output && runs.indexOf(output) < 0 && <Output output={output} />}\n      {errors.length > 0 && <Lines lines={errors} />}\n    </Box>\n  );\n}\n"],"names":["ChildProcess","spinner","interval","frames","_RUNS","figures","cross","tick","concat","ICONS","error","Text","color","success","running","Spinner","Header","item","group","title","state","icon","Box","marginRight","pointer","Output","output","marginLeft","arrowRight","text","Lines","lines","flexDirection","map","line","index","key","height","type","LineType","stderr","id","store","useContext","StoreContext","appState","useStore","processes","find","x","expanded","runs","errors","filter","indexOf","length","pop"],"mappings":"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"}
+{"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>{`${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\">{`${figures.arrowRight} ${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","pointer","Output","output","marginLeft","arrowRight","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,QAAE,AAAC,GAAUE,OAARQ,OAAwB,OAAhBR,gBAAO,CAACc,OAAO,EAAC,qBAC5C,6BAAChB,SAAI,QAAEW;AAGb;AAEA,SAASM,OAAO,KAAU;QAAV,AAAEC,SAAF,MAAEA;IAChB,qBACE,6BAACJ,QAAG;QAACK,YAAY;qBACf,6BAACnB,SAAI;QAACC,OAAM;OAAQ,AAAC,GAAwBiB,OAAtBhB,gBAAO,CAACkB,UAAU,EAAC,KAAe,OAAZF,OAAOG,IAAI;AAG9D;AAEA,SAASC,MAAM,KAAS;QAAT,AAAEC,QAAF,MAAEA;IACf,qBACE,6BAACT,QAAG;QAACU,eAAc;QAASL,YAAY;OACrCI,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,IAAMd,SAASK,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,aAAaM,wBAAU,6BAACD;QAAOC,QAAQA;QACjDyB,OAAOE,MAAM,GAAG,mBAAK,6BAACvB;QAAMC,OAAOoB;;AAG1C"}

package/dist/cjs/worker.cjs

@@ -265,7 +265,7 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
             ]));
         }
         queue.defer(_crossspawncb.default.worker.bind(null, cp, _object_spread_props(_object_spread({}, csOptions), {
-            encoding: 'utf8'
+            encoding: encoding || 'utf8'
         })));
         queue.await(function(err) {
             var res = err ? err : {};

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 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: '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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"}
+{"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

@@ -21,10 +21,6 @@ const spinner = {
         '⠏'
     ]
 };
-const _RUNS = [
-    figures.cross,
-    figures.tick
-].concat(spinner.frames);
 const ICONS = {
     error: /*#__PURE__*/ React.createElement(Text, {
         color: "red"
@@ -75,17 +71,13 @@ export default function ChildProcess({ id }) {
             lines: lines
         }));
     }
-    // const runs = lines.filter((line) => RUNS.some((run) => line.text[0] === run));
-    const runs = [];
-    const errors = lines.filter((line)=>line.type === LineType.stderr && runs.indexOf(line) < 0);
+    const errors = lines.filter((line)=>line.type === LineType.stderr);
     const output = lines.filter((line)=>line.text.length > 0).pop();
     return /*#__PURE__*/ React.createElement(Box, {
         flexDirection: "column"
     }, /*#__PURE__*/ React.createElement(Header, {
         item: item
-    }), runs.length > 0 && /*#__PURE__*/ React.createElement(Lines, {
-        lines: runs
-    }), state === 'running' && output && runs.indexOf(output) < 0 && /*#__PURE__*/ React.createElement(Output, {
+    }), state === 'running' && output && /*#__PURE__*/ React.createElement(Output, {
         output: output
     }), errors.length > 0 && /*#__PURE__*/ React.createElement(Lines, {
         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, { 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 _RUNS = [figures.cross, figures.tick].concat(spinner.frames);\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>{`${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\">{`${figures.arrowRight} ${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 runs = lines.filter((line) => RUNS.some((run) => line.text[0] === run));\n  const runs = [];\n  const errors = lines.filter((line) => line.type === LineType.stderr && runs.indexOf(line) < 0);\n  const output = lines.filter((line) => line.text.length > 0).pop();\n\n  return (\n    <Box flexDirection=\"column\">\n      <Header item={item} />\n      {runs.length > 0 && <Lines lines={runs} />}\n      {state === 'running' && output && runs.indexOf(output) < 0 && <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","_RUNS","cross","tick","concat","ICONS","error","color","success","running","Header","item","group","title","state","icon","marginRight","pointer","Output","output","marginLeft","arrowRight","text","Lines","lines","flexDirection","map","line","index","key","height","type","stderr","ChildProcess","id","store","appState","processes","find","x","expanded","runs","errors","filter","indexOf","length","pop"],"mappings":"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"}
+{"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>{`${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\">{`${figures.arrowRight} ${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","pointer","Output","output","marginLeft","arrowRight","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,YAAM,GAAGgB,QAAQf,QAAQoB,OAAO,CAAC,CAAC,CAAC,iBAC9C,oBAACrB,YAAMiB;AAGb;AAEA,SAASK,OAAO,EAAEC,MAAM,EAAE;IACxB,qBACE,oBAACxB;QAAIyB,YAAY;qBACf,oBAACxB;QAAKS,OAAM;OAAQ,GAAGR,QAAQwB,UAAU,CAAC,CAAC,EAAEF,OAAOG,IAAI,EAAE;AAGhE;AAEA,SAASC,MAAM,EAAEC,KAAK,EAAE;IACtB,qBACE,oBAAC7B;QAAI8B,eAAc;QAASL,YAAY;OACrCI,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,MAAMb,SAASK,MAAMkB,MAAM,CAAC,CAACf,OAASA,KAAKL,IAAI,CAACqB,MAAM,GAAG,GAAGC,GAAG;IAE/D,qBACE,oBAACjD;QAAI8B,eAAc;qBACjB,oBAACf;QAAOC,MAAMA;QACbG,UAAU,aAAaK,wBAAU,oBAACD;QAAOC,QAAQA;QACjDsB,OAAOE,MAAM,GAAG,mBAAK,oBAACpB;QAAMC,OAAOiB;;AAG1C"}

package/dist/esm/worker.mjs

@@ -199,7 +199,7 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
             ]));
         }
         queue.defer(spawn.worker.bind(null, cp, _object_spread_props(_object_spread({}, csOptions), {
-            encoding: 'utf8'
+            encoding: encoding || 'utf8'
         })));
         queue.await((err)=>{
             const res = err ? err : {};

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 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: '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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"}
+{"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.17",
+  "version": "0.1.19",
   "description": "Formats spawn with for terminal grouping",
   "keywords": [
     "spawn",