chore: use prettier and lint-staged

.commitlintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@commitlint/config-conventional"]
+}

.eslintrc.json

@@ -1,7 +1,8 @@
 {
   "extends": [
     "oclif",
-    "oclif-typescript"
+    "oclif-typescript",
+    "prettier"
   ],
   "rules": {
     "sort-imports": "error",

.github/workflows/automerge.yml

@@ -2,9 +2,10 @@ name: automerge
 on:
   workflow_dispatch:
   schedule:
-    - cron: '17 2,5,8,11 * * *'
+    - cron: "17 2,5,8,11 * * *"
 
 jobs:
   automerge:
-    uses: oclif/github-workflows/.github/workflows/automerge.yml@main
-    secrets: inherit
+    uses: salesforcecli/github-workflows/.github/workflows/automerge.yml@main
+    secrets:
+      SVC_CLI_BOT_GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged --concurrent false

.lintstagedrc.json

@@ -0,0 +1,5 @@
+{
+  "*.json": ["prettier --write"],
+  "*.md": ["prettier --write"],
+  "+(src|test)/**/*.+(ts|js)": ["eslint --fix", "prettier --write"]
+}

package.json

@@ -33,11 +33,11 @@
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^12.1.4",
+    "@commitlint/config-conventional": "^17.7.0",
     "@oclif/plugin-help": "^5.2.8",
     "@oclif/plugin-plugins": "^3.3.0",
-    "@oclif/prettier-config": "^0.1.1",
-    "@oclif/test": "^3.0.0-beta.1",
+    "@oclif/prettier-config": "^0.2.1",
+    "@oclif/test": "^3.0.1",
     "@types/ansi-styles": "^3.2.1",
     "@types/benchmark": "^2.1.2",
     "@types/chai": "^4.3.4",
@@ -46,8 +46,7 @@
     "@types/ejs": "^3.1.2",
     "@types/indent-string": "^4.0.1",
     "@types/js-yaml": "^3.12.7",
-    "@types/mocha": "^8.2.3",
-    "@types/nock": "^11.1.0",
+    "@types/mocha": "^10.0.2",
     "@types/node": "^18",
     "@types/node-notifier": "^8.0.2",
     "@types/slice-ansi": "^4.0.0",
@@ -58,22 +57,24 @@
     "benchmark": "^2.1.4",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "commitlint": "^12.1.4",
+    "commitlint": "^17.7.2",
     "cross-env": "^7.0.3",
     "eslint": "^8.49.0",
     "eslint-config-oclif": "^5.0.0",
     "eslint-config-oclif-typescript": "^2.0.1",
-    "fancy-test": "^3.0.0-beta.2",
+    "eslint-config-prettier": "^9.0.0",
+    "fancy-test": "^3.0.1",
     "globby": "^11.1.0",
-    "husky": "6",
+    "husky": "^8",
+    "lint-staged": "^14.0.1",
     "madge": "^6.1.0",
     "mocha": "^10.2.0",
-    "nock": "^13.3.0",
     "nyc": "^15.1.0",
+    "prettier": "^3.0.3",
     "shx": "^0.3.4",
     "sinon": "^11.1.2",
-    "tsd": "^0.29.0",
     "ts-node": "^10.9.1",
+    "tsd": "^0.29.0",
     "tslib": "^2.5.0",
     "typescript": "^5"
   },
@@ -107,6 +108,7 @@
     "build": "shx rm -rf lib && tsc",
     "commitlint": "commitlint",
     "compile": "tsc",
+    "format": "prettier --write \"+(src|test)/**/*.+(ts|js|json)\"",
     "lint": "eslint . --ext .ts",
     "posttest": "yarn lint && yarn test:circular-deps",
     "prepack": "yarn run build",

src/args.ts

@@ -1,4 +1,3 @@
-
 import {Arg, ArgDefinition} from './interfaces/parser'
 import {dirExists, fileExists, isNotFalsy} from './util'
 import {Command} from './command'
@@ -33,13 +32,12 @@ export function custom<T, P = Record<string, unknown>>(defaults: Partial<Arg<T,
 }
 
 export const boolean = custom<boolean>({
-  parse: async b => Boolean(b) && isNotFalsy(b),
+  parse: async (b) => Boolean(b) && isNotFalsy(b),
 })
 
-export const integer = custom<number, {min?: number; max?: number;}>({
+export const integer = custom<number, {min?: number; max?: number}>({
   async parse(input, _, opts) {
-    if (!/^-?\d+$/.test(input))
-      throw new Error(`Expected an integer but received: ${input}`)
+    if (!/^-?\d+$/.test(input)) throw new Error(`Expected an integer but received: ${input}`)
     const num = Number.parseInt(input, 10)
     if (opts.min !== undefined && num < opts.min)
       throw new Error(`Expected an integer greater than or equal to ${opts.min} but received: ${input}`)

src/cli-ux/action/base.ts

@@ -4,9 +4,9 @@ import {castArray} from '../../util'
 import {inspect} from 'node:util'
 
 export interface ITask {
-  action: string;
-  status: string | undefined;
-  active: boolean;
+  action: string
+  status: string | undefined
+  active: boolean
 }
 
 export type ActionType = 'spinner' | 'simple' | 'debug'
@@ -45,8 +45,8 @@ export class ActionBase {
     this._stdout(false)
   }
 
-  private get globals(): { action: { task?: ITask }; output: string | undefined } {
-    (global as any).ux = (global as any).ux || {}
+  private get globals(): {action: {task?: ITask}; output: string | undefined} {
+    ;(global as any).ux = (global as any).ux || {}
     const globals = (global as any).ux
     globals.action = globals.action || {}
     return globals
@@ -201,19 +201,19 @@ export class ActionBase {
   // write to the real stdout/stderr
   protected _write(std: 'stdout' | 'stderr', s: string | string[]): void {
     switch (std) {
-    case 'stdout': {
-      this.stdmockOrigs.stdout.apply(stdout, castArray(s) as [string])
-      break
-    }
+      case 'stdout': {
+        this.stdmockOrigs.stdout.apply(stdout, castArray(s) as [string])
+        break
+      }
 
-    case 'stderr': {
-      this.stdmockOrigs.stderr.apply(stderr, castArray(s) as [string])
-      break
-    }
+      case 'stderr': {
+        this.stdmockOrigs.stderr.apply(stderr, castArray(s) as [string])
+        break
+      }
 
-    default: {
-      throw new Error(`invalid std: ${std}`)
-    }
+      default: {
+        throw new Error(`invalid std: ${std}`)
+      }
     }
   }
 }

src/cli-ux/action/spinner.ts

@@ -7,6 +7,8 @@ import {errtermwidth} from '../../screen'
 import spinners from './spinners'
 import stripAnsi from 'strip-ansi'
 
+const ansiEscapes = require('ansi-escapes')
+
 function color(s: string): string {
   if (!supportsColor) return s
   const has256 = supportsColor.stdout ? supportsColor.stdout.has256 : (process.env.TERM || '').includes('256')
@@ -34,10 +36,10 @@ export default class SpinnerAction extends ActionBase {
     this._reset()
     if (this.spinner) clearInterval(this.spinner)
     this._render()
-    this.spinner = setInterval(icon =>
-      this._render.bind(this)(icon),
-    process.platform === 'win32' ? 500 : 100,
-    'spinner',
+    this.spinner = setInterval(
+      (icon) => this._render.bind(this)(icon),
+      process.platform === 'win32' ? 500 : 100,
+      'spinner',
     )
     const interval = this.spinner
     interval.unref()
@@ -82,15 +84,12 @@ export default class SpinnerAction extends ActionBase {
 
   private _reset() {
     if (!this.output) return
-    const ansiEscapes = require('ansi-escapes')
     const lines = this._lines(this.output)
     this._write(this.std, ansiEscapes.cursorLeft + ansiEscapes.cursorUp(lines) + ansiEscapes.eraseDown)
     this.output = undefined
   }
 
   private _lines(s: string): number {
-    return (stripAnsi(s).split('\n') as any[])
-    .map(l => Math.ceil(l.length / errtermwidth))
-    .reduce((c, i) => c + i, 0)
+    return (stripAnsi(s).split('\n') as any[]).map((l) => Math.ceil(l.length / errtermwidth)).reduce((c, i) => c + i, 0)
   }
 }

src/cli-ux/action/spinners.ts

@@ -157,7 +157,7 @@ export default {
   },
   flip: {
     interval: 70,
-    frames: ['_', '_', '_', '-', '`', '`', '\'', '´', '-', '_', '_', '_'],
+    frames: ['_', '_', '_', '-', '`', '`', "'", '´', '-', '_', '_', '_'],
   },
   hamburger: {
     interval: 100,

src/cli-ux/action/types.ts

@@ -1,6 +1,6 @@
 import spinners from './spinners'
 
 export type Options = {
-  stdout?: boolean;
-  style?: keyof typeof spinners;
+  stdout?: boolean
+  style?: keyof typeof spinners
 }

src/cli-ux/config.ts

@@ -7,20 +7,20 @@ import spinner from './action/spinner'
 export type Levels = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace'
 
 export interface ConfigMessage {
-  type: 'config';
-  prop: string;
-  value: any;
+  type: 'config'
+  prop: string
+  value: any
 }
 
 const g: any = global
 const globals = g.ux || (g.ux = {})
 
-const actionType = (
-  Boolean(process.stderr.isTTY)
-  && !process.env.CI
-  && !['dumb', 'emacs-color'].includes(process.env.TERM!)
-  && 'spinner'
-) || 'simple'
+const actionType =
+  (Boolean(process.stderr.isTTY) &&
+    !process.env.CI &&
+    !['dumb', 'emacs-color'].includes(process.env.TERM!) &&
+    'spinner') ||
+  'simple'
 
 const Action = actionType === 'spinner' ? spinner : simple
 

src/cli-ux/exit.ts

@@ -1,6 +1,6 @@
 export class ExitError extends Error {
   public ux: {
-    exit: number;
+    exit: number
   }
 
   public code: 'EEXIT'

src/cli-ux/flush.ts

@@ -3,7 +3,7 @@ import {stdout} from './stream'
 
 function timeout(p: Promise<any>, ms: number) {
   function wait(ms: number, unref = false) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       const t: any = setTimeout(() => resolve(null), ms)
       if (unref) t.unref()
     })
@@ -13,7 +13,7 @@ function timeout(p: Promise<any>, ms: number) {
 }
 
 async function _flush() {
-  const p = new Promise(resolve => {
+  const p = new Promise((resolve) => {
     stdout.once('drain', () => resolve(null))
   })
   const flushed = stdout.write('')

src/cli-ux/global.d.ts

@@ -1,5 +1,5 @@
 declare namespace NodeJS {
   interface Global {
-    ux: any;
+    ux: any
   }
 }

src/cli-ux/index.ts

@@ -1,4 +1,3 @@
-
 import * as Errors from '../errors'
 import * as styled from './styled'
 import * as uxPrompt from './prompt'
@@ -169,7 +168,7 @@ const uxProcessExitHandler = async () => {
 
 // to avoid MaxListenersExceededWarning
 // only attach named listener once
-const uxListener = process.listeners('exit').find(fn => fn.name === uxProcessExitHandler.name)
+const uxListener = process.listeners('exit').find((fn) => fn.name === uxProcessExitHandler.name)
 if (!uxListener) {
   process.once('exit', uxProcessExitHandler)
 }

src/cli-ux/list.ts

@@ -15,8 +15,8 @@ export function renderList(items: IListItem[]): string {
     return ''
   }
 
-  const maxLength = maxBy(items, item => item[0].length)?.[0].length ?? 0
-  const lines = items.map(i => {
+  const maxLength = maxBy(items, (item) => item[0].length)?.[0].length ?? 0
+  const lines = items.map((i) => {
     let left = i[0]
     let right = i[1]
     if (!right) {