|
1 | 1 | import meowOrExit from 'meow' |
2 | 2 |
|
3 | | -import { Spinner } from '@socketsecurity/registry/lib/spinner' |
4 | | - |
5 | | -import constants from '../../constants' |
6 | | -import { shadowNpmInstall } from '../../utils/npm' |
| 3 | +import { runFix } from './run-fix.ts' |
7 | 4 | import { getFlagListOutput } from '../../utils/output-formatting.ts' |
8 | 5 |
|
9 | 6 | import type { CliCommandConfig } from '../../utils/meow-with-subcommands.ts' |
10 | 7 |
|
11 | | -const { SOCKET_CLI_IN_FIX_CMD, SOCKET_IPC_HANDSHAKE } = constants |
12 | | - |
13 | 8 | const config: CliCommandConfig = { |
14 | 9 | commandName: 'fix', |
15 | 10 | description: 'Fix "fixable" Socket alerts', |
@@ -42,46 +37,5 @@ async function run( |
42 | 37 | flags: config.flags |
43 | 38 | }) |
44 | 39 |
|
45 | | - // const prev = new Set(alerts.map(a => a.key)) |
46 | | - // let ret: SafeNode | undefined |
47 | | - // /* eslint-disable no-await-in-loop */ |
48 | | - // while (alerts.length > 0) { |
49 | | - // await updateAdvisoryNodes(this, alerts) |
50 | | - // ret = await this[kRiskyReify](...args) |
51 | | - // await this.loadActual() |
52 | | - // await this.buildIdealTree() |
53 | | - // needInfoOn = getPackagesToQueryFromDiff(this.diff, { |
54 | | - // includeUnchanged: true |
55 | | - // }) |
56 | | - // alerts = ( |
57 | | - // await getPackagesAlerts(needInfoOn, { |
58 | | - // includeExisting: true, |
59 | | - // includeUnfixable: true |
60 | | - // }) |
61 | | - // ).filter(({ key }) => { |
62 | | - // const unseen = !prev.has(key) |
63 | | - // if (unseen) { |
64 | | - // prev.add(key) |
65 | | - // } |
66 | | - // return unseen |
67 | | - // }) |
68 | | - // } |
69 | | - // /* eslint-enable no-await-in-loop */ |
70 | | - // return ret! |
71 | | - |
72 | | - const spinner = new Spinner().start() |
73 | | - try { |
74 | | - await shadowNpmInstall({ |
75 | | - ipc: { |
76 | | - [SOCKET_IPC_HANDSHAKE]: { |
77 | | - [SOCKET_CLI_IN_FIX_CMD]: true |
78 | | - } |
79 | | - } |
80 | | - }) |
81 | | - } catch (e: any) { |
82 | | - console.error(e) |
83 | | - spinner.error() |
84 | | - } finally { |
85 | | - spinner.stop() |
86 | | - } |
| 40 | + await runFix() |
87 | 41 | } |
0 commit comments