spawn-term 0.1.15 → 0.1.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -77,7 +77,7 @@ var spinner = {
77
77
  '⠏'
78
78
  ]
79
79
  };
80
- var RUNS = [
80
+ var _RUNS = [
81
81
  _figures.default.cross,
82
82
  _figures.default.tick
83
83
  ].concat(spinner.frames);
@@ -139,11 +139,8 @@ function ChildProcess(param) {
139
139
  lines: lines
140
140
  }));
141
141
  }
142
- var runs = lines.filter(function(line) {
143
- return RUNS.some(function(run) {
144
- return line.text[0] === run;
145
- });
146
- });
142
+ // const runs = lines.filter((line) => RUNS.some((run) => line.text[0] === run));
143
+ var runs = [];
147
144
  var errors = lines.filter(function(line) {
148
145
  return line.type === _types.LineType.stderr && runs.indexOf(line) < 0;
149
146
  });
@@ -1 +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 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","filter","some","run","errors","indexOf","length","pop"],"mappings":"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"}
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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"}
@@ -149,28 +149,24 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
149
149
  "encoding",
150
150
  "stdio"
151
151
  ]);
152
- terminal.retain(function(store) {
153
- var id = (0, _liluuid.default)();
154
- store.getState().addProcess(_object_spread({
155
- id: id,
156
- title: [
157
- command
158
- ].concat((0, _formatArguments.default)(args)).join(' '),
159
- state: 'running',
160
- lines: []
161
- }, options));
162
- var cp = (0, _crossspawncb.crossSpawn)(command, args, csOptions);
163
- var outputs = {
164
- stdout: null,
165
- stderr: null
166
- };
167
- if (cp.stdout && process.stdout.getMaxListeners) {
168
- process.stdout.setMaxListeners(process.stdout.getMaxListeners() + 1);
169
- process.stderr.setMaxListeners(process.stderr.getMaxListeners() + 1);
170
- }
171
- var queue = new _queuecb.default();
172
- if (cp.stdout) {
173
- if (stdio === 'inherit') {
152
+ if (stdio === 'inherit') {
153
+ terminal.retain(function(store) {
154
+ var id = (0, _liluuid.default)();
155
+ store.getState().addProcess(_object_spread({
156
+ id: id,
157
+ title: [
158
+ command
159
+ ].concat((0, _formatArguments.default)(args)).join(' '),
160
+ state: 'running',
161
+ lines: []
162
+ }, options));
163
+ var cp = (0, _crossspawncb.crossSpawn)(command, args, csOptions);
164
+ var outputs = {
165
+ stdout: null,
166
+ stderr: null
167
+ };
168
+ var queue = new _queuecb.default();
169
+ if (cp.stdout) {
174
170
  outputs.stdout = (0, _addLines.default)(function(texts) {
175
171
  var item = store.getState().processes.find(function(x) {
176
172
  return x.id === id;
@@ -185,20 +181,14 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
185
181
  lines: lines
186
182
  }));
187
183
  });
188
- } else {
189
- outputs.stdout = (0, _concatWritable.default)(function(output) {
190
- outputs.stdout.output = output.toString(encoding || 'utf8');
191
- });
184
+ queue.defer(_onone.default.bind(null, cp.stdout.pipe(outputs.stdout), [
185
+ 'error',
186
+ 'end',
187
+ 'close',
188
+ 'finish'
189
+ ]));
192
190
  }
193
- queue.defer(_onone.default.bind(null, cp.stdout.pipe(outputs.stdout), [
194
- 'error',
195
- 'end',
196
- 'close',
197
- 'finish'
198
- ]));
199
- }
200
- if (cp.stderr) {
201
- if (stdio === 'inherit') {
191
+ if (cp.stderr) {
202
192
  outputs.stderr = (0, _addLines.default)(function(texts) {
203
193
  var item = store.getState().processes.find(function(x) {
204
194
  return x.id === id;
@@ -213,11 +203,60 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
213
203
  lines: lines
214
204
  }));
215
205
  });
216
- } else {
217
- outputs.stderr = (0, _concatWritable.default)(function(output) {
218
- outputs.stderr.output = output.toString(encoding || 'utf8');
219
- });
206
+ queue.defer(_onone.default.bind(null, cp.stderr.pipe(outputs.stderr), [
207
+ 'error',
208
+ 'end',
209
+ 'close',
210
+ 'finish'
211
+ ]));
220
212
  }
213
+ queue.defer(_crossspawncb.default.worker.bind(null, cp, _object_spread_props(_object_spread({}, csOptions), {
214
+ encoding: 'utf8'
215
+ })));
216
+ queue.await(function(err) {
217
+ var res = err ? err : {};
218
+ res.stdout = outputs.stdout ? outputs.stdout.output : null;
219
+ res.stderr = outputs.stderr ? outputs.stderr.output : null;
220
+ res.output = [
221
+ res.stdout,
222
+ res.stderr,
223
+ null
224
+ ];
225
+ var item = store.getState().processes.find(function(x) {
226
+ return x.id === id;
227
+ });
228
+ store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
229
+ state: err ? 'error' : 'success'
230
+ }));
231
+ // let rendering complete
232
+ setTimeout(function() {
233
+ terminal.release();
234
+ err ? callback(err) : callback(null, res);
235
+ });
236
+ });
237
+ });
238
+ } else {
239
+ var cp = (0, _crossspawncb.crossSpawn)(command, args, csOptions);
240
+ var outputs = {
241
+ stdout: null,
242
+ stderr: null
243
+ };
244
+ var queue = new _queuecb.default();
245
+ if (cp.stdout) {
246
+ outputs.stdout = (0, _concatWritable.default)(function(output) {
247
+ outputs.stdout.output = output.toString(encoding || 'utf8');
248
+ });
249
+ queue.defer(_onone.default.bind(null, cp.stdout.pipe(outputs.stdout), [
250
+ 'error',
251
+ 'end',
252
+ 'close',
253
+ 'finish'
254
+ ]));
255
+ }
256
+ if (cp.stderr) {
257
+ outputs.stderr = (0, _concatWritable.default)(function(output) {
258
+ outputs.stderr.output = output.toString(encoding || 'utf8');
259
+ });
221
260
  queue.defer(_onone.default.bind(null, cp.stderr.pipe(outputs.stderr), [
222
261
  'error',
223
262
  'end',
@@ -229,10 +268,6 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
229
268
  encoding: 'utf8'
230
269
  })));
231
270
  queue.await(function(err) {
232
- if (cp.stdout && process.stdout.getMaxListeners) {
233
- process.stdout.setMaxListeners(process.stdout.getMaxListeners() - 1);
234
- process.stderr.setMaxListeners(process.stderr.getMaxListeners() - 1);
235
- }
236
271
  var res = err ? err : {};
237
272
  res.stdout = outputs.stdout ? outputs.stdout.output : null;
238
273
  res.stderr = outputs.stderr ? outputs.stderr.output : null;
@@ -241,18 +276,8 @@ function spawnTerminal(command, args, spawnOptions, options, callback) {
241
276
  res.stderr,
242
277
  null
243
278
  ];
244
- var item = store.getState().processes.find(function(x) {
245
- return x.id === id;
246
- });
247
- store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
248
- state: err ? 'error' : 'success'
249
- }));
250
- // let rendering complete
251
- setTimeout(function() {
252
- terminal.release();
253
- err ? callback(err) : callback(null, res);
254
- });
279
+ err ? callback(err) : callback(null, res);
255
280
  });
256
- });
281
+ }
257
282
  }
258
283
  /* 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; }
@@ -1 +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 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 if (cp.stdout && process.stdout.getMaxListeners) {\n process.stdout.setMaxListeners(process.stdout.getMaxListeners() + 1);\n process.stderr.setMaxListeners(process.stderr.getMaxListeners() + 1);\n }\n\n const queue = new Queue();\n if (cp.stdout) {\n if (stdio === 'inherit') {\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 } else {\n outputs.stdout = concatWritable((output) => {\n outputs.stdout.output = output.toString(encoding || 'utf8');\n });\n }\n queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n }\n if (cp.stderr) {\n if (stdio === 'inherit') {\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 } else {\n outputs.stderr = concatWritable((output) => {\n outputs.stderr.output = output.toString(encoding || 'utf8');\n });\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 if (cp.stdout && process.stdout.getMaxListeners) {\n process.stdout.setMaxListeners(process.stdout.getMaxListeners() - 1);\n process.stderr.setMaxListeners(process.stderr.getMaxListeners() - 1);\n }\n\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}\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","process","getMaxListeners","setMaxListeners","queue","Queue","addLines","texts","item","processes","find","x","map","text","type","LineType","updateProcess","concatWritable","output","toString","defer","oo","bind","pipe","spawn","worker","await","err","res","setTimeout","release"],"mappings":"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"}
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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"}
@@ -21,7 +21,7 @@ const spinner = {
21
21
  '⠏'
22
22
  ]
23
23
  };
24
- const RUNS = [
24
+ const _RUNS = [
25
25
  figures.cross,
26
26
  figures.tick
27
27
  ].concat(spinner.frames);
@@ -75,7 +75,8 @@ export default function ChildProcess({ id }) {
75
75
  lines: lines
76
76
  }));
77
77
  }
78
- const runs = lines.filter((line)=>RUNS.some((run)=>line.text[0] === run));
78
+ // const runs = lines.filter((line) => RUNS.some((run) => line.text[0] === run));
79
+ const runs = [];
79
80
  const errors = lines.filter((line)=>line.type === LineType.stderr && runs.indexOf(line) < 0);
80
81
  const output = lines.filter((line)=>line.text.length > 0).pop();
81
82
  return /*#__PURE__*/ React.createElement(Box, {
@@ -1 +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 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","filter","some","run","errors","indexOf","length","pop"],"mappings":"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"}
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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"}
@@ -93,28 +93,24 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
93
93
  "encoding",
94
94
  "stdio"
95
95
  ]);
96
- terminal.retain((store)=>{
97
- const id = uuid();
98
- store.getState().addProcess(_object_spread({
99
- id,
100
- title: [
101
- command
102
- ].concat(formatArguments(args)).join(' '),
103
- state: 'running',
104
- lines: []
105
- }, options));
106
- const cp = crossSpawn(command, args, csOptions);
107
- const outputs = {
108
- stdout: null,
109
- stderr: null
110
- };
111
- if (cp.stdout && process.stdout.getMaxListeners) {
112
- process.stdout.setMaxListeners(process.stdout.getMaxListeners() + 1);
113
- process.stderr.setMaxListeners(process.stderr.getMaxListeners() + 1);
114
- }
115
- const queue = new Queue();
116
- if (cp.stdout) {
117
- if (stdio === 'inherit') {
96
+ if (stdio === 'inherit') {
97
+ terminal.retain((store)=>{
98
+ const id = uuid();
99
+ store.getState().addProcess(_object_spread({
100
+ id,
101
+ title: [
102
+ command
103
+ ].concat(formatArguments(args)).join(' '),
104
+ state: 'running',
105
+ lines: []
106
+ }, options));
107
+ const cp = crossSpawn(command, args, csOptions);
108
+ const outputs = {
109
+ stdout: null,
110
+ stderr: null
111
+ };
112
+ const queue = new Queue();
113
+ if (cp.stdout) {
118
114
  outputs.stdout = addLines((texts)=>{
119
115
  const item = store.getState().processes.find((x)=>x.id === id);
120
116
  const lines = item.lines.concat(texts.map((text)=>({
@@ -125,20 +121,14 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
125
121
  lines
126
122
  }));
127
123
  });
128
- } else {
129
- outputs.stdout = concatWritable((output)=>{
130
- outputs.stdout.output = output.toString(encoding || 'utf8');
131
- });
124
+ queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), [
125
+ 'error',
126
+ 'end',
127
+ 'close',
128
+ 'finish'
129
+ ]));
132
130
  }
133
- queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), [
134
- 'error',
135
- 'end',
136
- 'close',
137
- 'finish'
138
- ]));
139
- }
140
- if (cp.stderr) {
141
- if (stdio === 'inherit') {
131
+ if (cp.stderr) {
142
132
  outputs.stderr = addLines((texts)=>{
143
133
  const item = store.getState().processes.find((x)=>x.id === id);
144
134
  const lines = item.lines.concat(texts.map((text)=>({
@@ -149,11 +139,58 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
149
139
  lines
150
140
  }));
151
141
  });
152
- } else {
153
- outputs.stderr = concatWritable((output)=>{
154
- outputs.stderr.output = output.toString(encoding || 'utf8');
155
- });
142
+ queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), [
143
+ 'error',
144
+ 'end',
145
+ 'close',
146
+ 'finish'
147
+ ]));
156
148
  }
149
+ queue.defer(spawn.worker.bind(null, cp, _object_spread_props(_object_spread({}, csOptions), {
150
+ encoding: 'utf8'
151
+ })));
152
+ queue.await((err)=>{
153
+ const res = err ? err : {};
154
+ res.stdout = outputs.stdout ? outputs.stdout.output : null;
155
+ res.stderr = outputs.stderr ? outputs.stderr.output : null;
156
+ res.output = [
157
+ res.stdout,
158
+ res.stderr,
159
+ null
160
+ ];
161
+ const item = store.getState().processes.find((x)=>x.id === id);
162
+ store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
163
+ state: err ? 'error' : 'success'
164
+ }));
165
+ // let rendering complete
166
+ setTimeout(()=>{
167
+ terminal.release();
168
+ err ? callback(err) : callback(null, res);
169
+ });
170
+ });
171
+ });
172
+ } else {
173
+ const cp = crossSpawn(command, args, csOptions);
174
+ const outputs = {
175
+ stdout: null,
176
+ stderr: null
177
+ };
178
+ const queue = new Queue();
179
+ if (cp.stdout) {
180
+ outputs.stdout = concatWritable((output)=>{
181
+ outputs.stdout.output = output.toString(encoding || 'utf8');
182
+ });
183
+ queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), [
184
+ 'error',
185
+ 'end',
186
+ 'close',
187
+ 'finish'
188
+ ]));
189
+ }
190
+ if (cp.stderr) {
191
+ outputs.stderr = concatWritable((output)=>{
192
+ outputs.stderr.output = output.toString(encoding || 'utf8');
193
+ });
157
194
  queue.defer(oo.bind(null, cp.stderr.pipe(outputs.stderr), [
158
195
  'error',
159
196
  'end',
@@ -165,10 +202,6 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
165
202
  encoding: 'utf8'
166
203
  })));
167
204
  queue.await((err)=>{
168
- if (cp.stdout && process.stdout.getMaxListeners) {
169
- process.stdout.setMaxListeners(process.stdout.getMaxListeners() - 1);
170
- process.stderr.setMaxListeners(process.stderr.getMaxListeners() - 1);
171
- }
172
205
  const res = err ? err : {};
173
206
  res.stdout = outputs.stdout ? outputs.stdout.output : null;
174
207
  res.stderr = outputs.stderr ? outputs.stderr.output : null;
@@ -177,15 +210,7 @@ export default function spawnTerminal(command, args, spawnOptions, options, call
177
210
  res.stderr,
178
211
  null
179
212
  ];
180
- const item = store.getState().processes.find((x)=>x.id === id);
181
- store.getState().updateProcess(_object_spread_props(_object_spread({}, item), {
182
- state: err ? 'error' : 'success'
183
- }));
184
- // let rendering complete
185
- setTimeout(()=>{
186
- terminal.release();
187
- err ? callback(err) : callback(null, res);
188
- });
213
+ err ? callback(err) : callback(null, res);
189
214
  });
190
- });
215
+ }
191
216
  }
@@ -1 +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 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 if (cp.stdout && process.stdout.getMaxListeners) {\n process.stdout.setMaxListeners(process.stdout.getMaxListeners() + 1);\n process.stderr.setMaxListeners(process.stderr.getMaxListeners() + 1);\n }\n\n const queue = new Queue();\n if (cp.stdout) {\n if (stdio === 'inherit') {\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 } else {\n outputs.stdout = concatWritable((output) => {\n outputs.stdout.output = output.toString(encoding || 'utf8');\n });\n }\n queue.defer(oo.bind(null, cp.stdout.pipe(outputs.stdout), ['error', 'end', 'close', 'finish']));\n }\n if (cp.stderr) {\n if (stdio === 'inherit') {\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 } else {\n outputs.stderr = concatWritable((output) => {\n outputs.stderr.output = output.toString(encoding || 'utf8');\n });\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 if (cp.stdout && process.stdout.getMaxListeners) {\n process.stdout.setMaxListeners(process.stdout.getMaxListeners() - 1);\n process.stderr.setMaxListeners(process.stderr.getMaxListeners() - 1);\n }\n\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}\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","process","getMaxListeners","setMaxListeners","queue","texts","item","processes","find","x","map","text","type","updateProcess","output","toString","defer","bind","pipe","worker","await","err","res","setTimeout","release"],"mappings":"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"}
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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "spawn-term",
3
- "version": "0.1.15",
3
+ "version": "0.1.17",
4
4
  "description": "Formats spawn with for terminal grouping",
5
5
  "keywords": [
6
6
  "spawn",