lint fix/prettier

Author: pvdz

README.md

@@ -21,6 +21,7 @@ socket --help
 - `socket optimize` - Optimize dependencies with
   [`@socketregistry`](https://github.com/SocketDev/socket-registry) overrides!
   _(👀 [our blog post](https://socket.dev/blog/introducing-socket-optimize))_
+
   - `--pin` - Pin overrides to their latest version.
   - `--prod` - Add overrides for only production dependencies.
 
@@ -95,7 +96,8 @@ npm run build:dist
 npm exec socket
 ```
 
-That should invoke it from local sources. If you make changes you run `build:dist` again.
+That should invoke it from local sources. If you make changes you run
+`build:dist` again.
 
 ### Environment variables for development
 

src/commands/sbom/index.ts

@@ -5,8 +5,9 @@ import { scala } from './scala'
 
 import type { CliSubcommand } from '../../utils/meow-with-subcommands'
 
-const description = 'Generate a "Software Bill of Materials" for given file or dir'
-const help = (name:string) => `
+const description =
+  'Generate a "Software Bill of Materials" for given file or dir'
+const help = (name: string) => `
   Usage
 
     $ ${name} <language> <target>
@@ -24,7 +25,7 @@ const help = (name:string) => `
   Examples
 
     $ ${name} ./build.sbt
-`;
+`
 
 export const sbom: CliSubcommand = {
   description,
@@ -34,14 +35,11 @@ export const sbom: CliSubcommand = {
     // Note: this won't catch `socket sbom -xyz --help` sort of cases which
     //       would fallback to the default meow help behavior. That's fine.
     if (argv.length === 0 || argv[0] === '--help') {
-      meow(
-        help(name),
-        {
-          argv: ['--help'] as const, // meow will exit() when --help is passed
-          description,
-          importMeta
-        }
-      )
+      meow(help(name), {
+        argv: ['--help'] as const, // meow will exit() when --help is passed
+        description,
+        importMeta
+      })
     }
 
     // argv = argv.filter(o => o !== '--help');

src/commands/sbom/scala.ts

@@ -1,20 +1,23 @@
-import util from 'node:util';
-import fs from 'node:fs';
-import child_process from 'node:child_process';
-import path from 'node:path';
+import util from 'node:util'
+import fs from 'node:fs'
+import child_process from 'node:child_process'
+import path from 'node:path'
 
 import meow from 'meow'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import type { CliSubcommand } from '../../utils/meow-with-subcommands'
 
-type ListDescription = string | { description: string, type?: string, default?: string }
+type ListDescription =
+  | string
+  | { description: string; type?: string; default?: string }
 
-const execp = util.promisify(child_process.exec);
-const renamep = util.promisify(fs.rename);
+const execp = util.promisify(child_process.exec)
+const renamep = util.promisify(fs.rename)
 
-const description = 'Generate a "Software Bill of Materials" (`pom.xml`) from Scala\'s `build.sbt` file'
+const description =
+  'Generate a "Software Bill of Materials" (`pom.xml`) from Scala\'s `build.sbt` file'
 
 const sbomFlags: Record<string, ListDescription> = {
   bin: {
@@ -25,7 +28,8 @@ const sbomFlags: Record<string, ListDescription> = {
   out: {
     type: 'string',
     default: './socket.pom.xml',
-    description: 'Path of output file; where to store the resulting sbom, see also --stdout'
+    description:
+      'Path of output file; where to store the resulting sbom, see also --stdout'
   },
   stdout: {
     type: 'boolean',
@@ -42,7 +46,7 @@ const sbomFlags: Record<string, ListDescription> = {
   }
 }
 
-const help = (name:string, flags: Record<string, ListDescription>) => `
+const help = (name: string, flags: Record<string, ListDescription>) => `
   Usage
     $ ${name} [--sbt=path/to/sbt/binary] [--out=path/to/result] FILE|DIR
 
@@ -73,78 +77,96 @@ const help = (name:string, flags: Record<string, ListDescription>) => `
 
     $ ${name} ./build.sbt
     $ ${name} --bin=/usr/bin/sbt ./build.sbt
-`;
+`
 
 export const scala: CliSubcommand = {
   description,
   async run(argv, importMeta, { parentName }) {
     const name = `${parentName} scala`
     // note: meow will exit if it prints the --help screen
-    const cli = meow(
-      help(name, sbomFlags),
-      {
-        argv: argv.length === 0 ? ['--help'] : argv,
-        description,
-        importMeta
-      }
-    )
+    const cli = meow(help(name, sbomFlags), {
+      argv: argv.length === 0 ? ['--help'] : argv,
+      description,
+      importMeta
+    })
 
     const target = cli.input[0]
 
     if (!target) {
       // will exit.
-      new Spinner().start('Parsing...').error(`Failure: Missing FILE|DIR argument. See \`${name} --help\` for details.`);
-      process.exit(1);
+      new Spinner()
+        .start('Parsing...')
+        .error(
+          `Failure: Missing FILE|DIR argument. See \`${name} --help\` for details.`
+        )
+      process.exit(1)
     }
 
     if (cli.input.length > 1) {
       // will exit.
-      new Spinner().start('Parsing...').error(`Failure: Can only accept one FILE or DIR, received ${cli.input.length} (make sure to escape spaces!). See \`${name} --help\` for details.`);
-      process.exit(1);
+      new Spinner()
+        .start('Parsing...')
+        .error(
+          `Failure: Can only accept one FILE or DIR, received ${cli.input.length} (make sure to escape spaces!). See \`${name} --help\` for details.`
+        )
+      process.exit(1)
     }
 
-    let bin:string = 'sbt'
+    let bin: string = 'sbt'
     if (cli.flags['bin']) {
       bin = cli.flags['bin'] as string
     }
 
-    let out:string = './socket.pom.xml'
+    let out: string = './socket.pom.xml'
     if (cli.flags['out']) {
       out = cli.flags['out'] as string
     }
     if (cli.flags['stdout']) {
-      out = '-';
+      out = '-'
     }
 
     // TODO: we can make `-` (accept from stdin) work by storing it into /tmp
     if (target === '-') {
-      new Spinner().start('Parsing...').error(`Failure: Currently source code from stdin is not supported. See \`${name} --help\` for details.`);
-      process.exit(1);
+      new Spinner()
+        .start('Parsing...')
+        .error(
+          `Failure: Currently source code from stdin is not supported. See \`${name} --help\` for details.`
+        )
+      process.exit(1)
     }
 
-    const verbose = cli.flags['verbose'] as boolean ?? false;
+    const verbose = (cli.flags['verbose'] as boolean) ?? false
 
-    let sbtOpts:Array<string> = [];
+    let sbtOpts: Array<string> = []
     if (cli.flags['sbtOpts']) {
-      sbtOpts = (cli.flags['sbtOpts'] as string).split(' ').map(s => s.trim()).filter(Boolean)
+      sbtOpts = (cli.flags['sbtOpts'] as string)
+        .split(' ')
+        .map(s => s.trim())
+        .filter(Boolean)
     }
 
-    await startConversion(target, bin, out, verbose, sbtOpts);
+    await startConversion(target, bin, out, verbose, sbtOpts)
   }
 }
 
-async function startConversion(target: string, bin: string, out: string, verbose: boolean, sbtOpts: Array<string>) {
-  const spinner = new Spinner();
-
-  const rbin = path.resolve(bin);
-  const rtarget = path.resolve(target);
-  const rout = out === '-' ? '-' : path.resolve(out);
-
-  if (verbose){
-    spinner.clear();
-    console.log(`- Absolute bin path: \`${rbin}\``);
-    console.log(`- Absolute target path: \`${rtarget}\``);
-    console.log(`- Absolute out path: \`${rout}\``);
+async function startConversion(
+  target: string,
+  bin: string,
+  out: string,
+  verbose: boolean,
+  sbtOpts: Array<string>
+) {
+  const spinner = new Spinner()
+
+  const rbin = path.resolve(bin)
+  const rtarget = path.resolve(target)
+  const rout = out === '-' ? '-' : path.resolve(out)
+
+  if (verbose) {
+    spinner.clear()
+    console.log(`- Absolute bin path: \`${rbin}\``)
+    console.log(`- Absolute target path: \`${rtarget}\``)
+    console.log(`- Absolute out path: \`${rout}\``)
   }
 
   spinner.start(`Running sbt from \`${bin}\` on \`${target}\`...`)
@@ -153,50 +175,55 @@ async function startConversion(target: string, bin: string, out: string, verbose
     // We must now run sbt, pick the generated xml from the /target folder (the stdout should tell you the location upon success) and store it somewhere else.
     // TODO: Not sure what this somewhere else might be tbh.
 
-    const output = await execp(bin +` makePom ${sbtOpts.join(' ')}`, {cwd: target || '.'});
-    spinner.success();
+    const output = await execp(bin + ` makePom ${sbtOpts.join(' ')}`, {
+      cwd: target || '.'
+    })
+    spinner.success()
     if (verbose) {
       console.group('sbt stdout:')
-      console.log(output);
-      console.groupEnd();
+      console.log(output)
+      console.groupEnd()
     }
 
     if (output.stderr) {
-      spinner.error('There were errors while running sbt');
+      spinner.error('There were errors while running sbt')
       // (In verbose mode, stderr was printed above, no need to repeat it)
-      if (!verbose) console.error(output.stderr);
-      process.exit(1);
+      if (!verbose) console.error(output.stderr)
+      process.exit(1)
     }
 
-    const loc = output.stdout?.match(/Wrote (.*?.pom)\n/)?.[1]?.trim();
+    const loc = output.stdout?.match(/Wrote (.*?.pom)\n/)?.[1]?.trim()
     if (!loc) {
-      spinner.error('There were no errors from sbt but could not find the location of resulting .pom file either');
-      process.exit(1);
+      spinner.error(
+        'There were no errors from sbt but could not find the location of resulting .pom file either'
+      )
+      process.exit(1)
     }
 
     // Move the pom file to ...? initial cwd? loc will be an absolute path, or dump to stdout
     if (out === '-') {
-      spinner.start('Result:\n```').success();
-      console.log(fs.readFileSync(loc, 'utf8'));
+      spinner.start('Result:\n```').success()
+      console.log(fs.readFileSync(loc, 'utf8'))
       console.log('```')
-      spinner.start().success(`OK`);
+      spinner.start().success(`OK`)
     } else {
       if (verbose) {
-        spinner.start(`Moving sbom file from \`${loc.replace(/^\/home\/[^\/]*?\//, '~/')}\` to \`${out}\``);
+        spinner.start(
+          `Moving sbom file from \`${loc.replace(/^\/home\/[^/]*?\//, '~/')}\` to \`${out}\``
+        )
       } else {
-        spinner.start('Moving output pom file');
+        spinner.start('Moving output pom file')
       }
       // TODO: do we prefer fs-extra? renaming can be gnarly on windows and fs-extra's version is better
-      await renamep(loc, out);
-      spinner.success();
-      spinner.start().success(`OK. File should be available in \`${out}\``);
+      await renamep(loc, out)
+      spinner.success()
+      spinner.start().success(`OK. File should be available in \`${out}\``)
     }
   } catch (e) {
     spinner.error('There was an unexpected error while running this')
     if (verbose) {
-      console.log(e);
+      console.log(e)
     }
-    process.exit(1);
+    process.exit(1)
   }
-
 }