chore: more eslint changes

eslint.config.mjs

@@ -37,6 +37,9 @@ export default [
       'perfectionist/sort-classes': 'off',
       'perfectionist/sort-objects': 'off',
       'unicorn/consistent-function-scoping': 'off',
+      'unicorn/no-abusive-eslint-disable': 'off',
+      'unicorn/no-static-only-class': 'off',
+      'unicorn/no-useless-undefined': 'off',
     },
   },
   {
@@ -46,6 +49,8 @@ export default [
       'mocha/no-nested-tests': 'off',
       'mocha/no-sibling-hooks': 'off',
       'mocha/no-top-level-hooks': 'off',
+      'unicorn/prefer-object-from-entries': 'off',
+      'unicorn/prefer-top-level-await': 'off',
     },
   },
   {
@@ -54,6 +59,7 @@ export default [
       '@typescript-eslint/no-unused-expressions': 'off',
       camelcase: 'off',
       'no-undef': 'off',
+      'unicorn/filename-case': 'off',
     },
   },
 ]

package.json

@@ -51,8 +51,7 @@
     "commitlint": "^19",
     "cross-env": "^7.0.3",
     "eslint": "^9",
-    "eslint-config-oclif": "^5.2.2",
-    "eslint-config-oclif-typescript": "^3.1.13",
+    "eslint-config-oclif": "^6",
     "eslint-config-prettier": "^10",
     "husky": "^9.1.7",
     "lint-staged": "^15",

src/command.ts

@@ -215,7 +215,7 @@ export abstract class Command {
 
   protected async init(): Promise<any> {
     this.debug('init version: %s argv: %o', this.ctor._base, this.argv)
-    const g: any = global
+    const g: any = globalThis
     g['http-call'] = g['http-call'] || {}
     g['http-call']!.userAgent = this.config.userAgent
     this.warnIfCommandDeprecated()
@@ -237,9 +237,9 @@ export abstract class Command {
     const jsonIndex = this.argv.indexOf('--json')
     return passThroughIndex === -1
       ? // If '--' is not present, then check for `--json` in this.argv
-        jsonIndex > -1
+        jsonIndex !== -1
       : // If '--' is present, return true only the --json flag exists and is before the '--'
-        jsonIndex > -1 && jsonIndex < passThroughIndex
+        jsonIndex !== -1 && jsonIndex < passThroughIndex
   }
 
   public log(message = '', ...args: any[]): void {

src/config/config.ts

@@ -420,8 +420,8 @@ export class Config implements IConfig {
     }
 
     const [defaultTheme, userTheme] = await Promise.all([
-      await getDefaultTheme(),
-      await safeReadJson<Record<string, string>>(userThemeFile),
+      getDefaultTheme(),
+      safeReadJson<Record<string, string>>(userThemeFile),
     ])
 
     // Merge the default theme with the user theme, giving the user theme precedence.

src/config/plugin.ts

@@ -304,7 +304,7 @@ export class Plugin implements IPlugin {
           }),
         )
       )
-
+        // eslint-disable-next-line unicorn/prefer-native-coercion-functions
         .filter((f): f is [string, Command.Cached] => Boolean(f))
         .reduce<{[k: string]: Command.Cached}>((commands, [id, c]) => {
           commands[id] = c

src/errors/handle.ts

@@ -16,7 +16,7 @@ import prettyPrint from './errors/pretty-print'
  */
 export const Exit = {
   exit(code = 0) {
-    // eslint-disable-next-line n/no-process-exit
+    // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
     process.exit(code)
   },
 }

src/parser/parse.ts

@@ -62,9 +62,9 @@ export const readStdin = async (): Promise<null | string> => {
 
   if (stdin.isTTY) return null
 
-  if (global.oclif?.stdinCache) {
-    debug('resolved stdin from global cache', global.oclif.stdinCache)
-    return global.oclif.stdinCache
+  if (globalThis.oclif?.stdinCache) {
+    debug('resolved stdin from global cache', globalThis.oclif.stdinCache)
+    return globalThis.oclif.stdinCache
   }
 
   return new Promise((resolve) => {
@@ -86,7 +86,7 @@ export const readStdin = async (): Promise<null | string> => {
     rl.once('close', () => {
       clearTimeout(timeout)
       debug('resolved from stdin', result)
-      global.oclif = {...global.oclif, stdinCache: result}
+      globalThis.oclif = {...globalThis.oclif, stdinCache: result}
       resolve(result)
     })
 

src/settings.ts

@@ -35,6 +35,6 @@ export type Settings = {
 }
 
 // Set global.oclif to the new object if it wasn't set before
-if (!(global as any).oclif) (global as any).oclif = {}
+if (!(globalThis as any).oclif) (globalThis as any).oclif = {}
 
-export const settings: Settings = (global as any).oclif as Settings
+export const settings: Settings = (globalThis as any).oclif as Settings

src/util/cache-command.ts

@@ -90,8 +90,8 @@ export async function cacheCommand(
   const uncachedBaseFlags = cmd.baseFlags ?? cmd._baseFlags
 
   const [flags, args] = await Promise.all([
-    await cacheFlags(aggregateFlags(uncachedFlags, uncachedBaseFlags, cmd.enableJsonFlag), respectNoCacheDefault),
-    await cacheArgs(ensureArgObject(cmd.args), respectNoCacheDefault),
+    cacheFlags(aggregateFlags(uncachedFlags, uncachedBaseFlags, cmd.enableJsonFlag), respectNoCacheDefault),
+    cacheArgs(ensureArgObject(cmd.args), respectNoCacheDefault),
   ])
 
   const stdProperties = {

src/util/util.ts

@@ -9,6 +9,7 @@ export function pickBy<T extends {[s: string]: T[keyof T]} | ArrayLike<T[keyof T
 }
 
 export function compact<T>(a: (T | undefined)[]): T[] {
+  // eslint-disable-next-line unicorn/prefer-native-coercion-functions
   return a.filter((a): a is T => Boolean(a))
 }
 

src/ux/action/base.ts

@@ -21,8 +21,8 @@ export class ActionBase {
   }
 
   private get globals(): {action: {task?: Task | undefined}; output: string | undefined} {
-    ;(global as any).ux = (global as any).ux || {}
-    const globals = (global as any).ux
+    ;(globalThis as any).ux = (globalThis as any).ux || {}
+    const globals = (globalThis as any).ux
     globals.action = globals.action || {}
     return globals
   }

test/command/helpers/test-help-in-src/src/test-help-plugin.ts

@@ -4,7 +4,7 @@ import {HelpBase, Interfaces} from '../../../../../src'
 
 export type TestHelpClassConfig = Interfaces.Config & {showCommandHelpSpy?: SinonSpy; showHelpSpy?: SinonSpy}
 
-export default class extends HelpBase {
+export default class CustomHelp extends HelpBase {
   showCommandHelp = spy(async () => {
     console.log('hello from test-help-plugin #showCommandHelp')
   })

test/config/config.test.ts

@@ -146,8 +146,11 @@ describe('Config', () => {
       process.env.LOCALAPPDATA = '/my/home/localappdata'
       const config = await Config.load()
 
+      // eslint-disable-next-line unicorn/prefer-string-raw
       expect(config).to.have.property('cacheDir', join('/my/home/localappdata/@oclif\\core'))
+      // eslint-disable-next-line unicorn/prefer-string-raw
       expect(config).to.have.property('configDir', join('/my/home/localappdata/@oclif\\core'))
+      // eslint-disable-next-line unicorn/prefer-string-raw
       expect(config).to.have.property('dataDir', join('/my/home/localappdata/@oclif\\core'))
       expect(config).to.have.property('home', join('/my/home'))
     })

test/help/_test-help-class.ts

@@ -5,7 +5,7 @@
 
 import {HelpBase} from '../../src'
 
-export default class extends HelpBase {
+export default class CustomHelp extends HelpBase {
   getCommandHelpForReadme(): string {
     return 'help for readme'
   }

test/help/format-command-with-options.test.ts

@@ -3,7 +3,7 @@ import {expect} from 'chai'
 import {Args, Config, Flags as flags} from '../../src'
 import {makeCommandClass, makeLoadable, TestHelpWithOptions as TestHelp} from './help-test-utils'
 
-const g: any = global
+const g: any = globalThis
 g.oclif.columns = 80
 
 describe('formatCommand', () => {
@@ -178,7 +178,7 @@ ALIASES
   })
 
   describe('description', () => {
-    it('should output command description with values after a \\n newline character', async () => {
+    it(`should output command description with values after a \n newline character`, async () => {
       const cmd = await makeLoadable(
         makeCommandClass({
           aliases: ['app:init', 'create'],

test/help/format-command.test.ts

@@ -3,7 +3,7 @@ import {expect} from 'chai'
 import {Args, Config, Flags as flags} from '../../src'
 import {makeCommandClass, makeLoadable, TestHelp} from './help-test-utils'
 
-const g: any = global
+const g: any = globalThis
 g.oclif.columns = 80
 
 describe('formatCommand', () => {
@@ -235,7 +235,7 @@ DESCRIPTION
   })
 
   describe('description', () => {
-    it('should output the command description with the values after a \\n newline character', async () => {
+    it(`should output the command description with the values after a \n newline character`, async () => {
       const cmd = await makeLoadable(
         makeCommandClass({
           id: 'apps:create',

test/help/format-commands.test.ts

@@ -2,7 +2,7 @@ import {expect} from 'chai'
 
 import {Command} from '../../src/command'
 
-const g: any = global
+const g: any = globalThis
 g.oclif.columns = 80
 import {Config} from '../../src'
 import {Help} from '../../src/help'

test/help/format-root.test.ts

@@ -40,7 +40,7 @@ USAGE
   })
 
   describe('description', () => {
-    it('splits on \\n for the description into the top-level and description sections', () => {
+    it(`splits on \n for the description into the top-level and description sections`, () => {
       sinon
         .stub(config.pjson, 'description')
         .value(

test/help/format-topic.test.ts

@@ -46,7 +46,7 @@ USAGE
 `)
   })
 
-  it('shows topic descriptions split from \\n for top-level and description section descriptions', () => {
+  it(`shows topic descriptions split from \n for top-level and description section descriptions`, () => {
     const topic = {
       name: 'topic',
       hidden: false,
@@ -63,7 +63,7 @@ DESCRIPTION
 `)
   })
 
-  it('shows templated topic descriptions split from \\n for top-level and description section descriptions', () => {
+  it(`shows templated topic descriptions split from \n for top-level and description section descriptions`, () => {
     const topic = {
       name: 'topic',
       hidden: false,

test/helpers/init.js

@@ -7,6 +7,6 @@ const chaiAsPromised = require('chai-as-promised')
 
 chai.use(chaiAsPromised)
 
-global.oclif = global.oclif || {}
-global.oclif.columns = 80
-global.columns = '80'
+globalThis.oclif = globalThis.oclif || {}
+globalThis.oclif.columns = 80
+globalThis.columns = '80'

test/parser/parse.test.ts

@@ -524,13 +524,13 @@ See more help with --help`)
         expect(out.flags).to.deep.include({foo: ['a', 'b']})
       })
 
-      it('parses single flag starting with with \\ escape char', async () => {
-        const out = await parse(['--foo', '\\file:foo'], {
+      it(`parses single flag starting with with escape char`, async () => {
+        const out = await parse(['--foo', String.raw`\file:foo`], {
           flags: {
             foo: Flags.custom({multiple: true})(),
           },
         })
-        expect(out.flags).to.deep.include({foo: ['\\file:foo']})
+        expect(out.flags).to.deep.include({foo: [String.raw`\file:foo`]})
       })
 
       it('parses multiple space-delimited flags', async () => {
@@ -540,14 +540,14 @@ See more help with --help`)
         expect(out.flags).to.deep.include({foo: ['a', 'b', 'c']})
       })
 
-      it('parses multiple space-delimited flags ending with with \\ escape char', async () => {
+      it(`parses multiple space-delimited flags ending with with escape char`, async () => {
         const out = await parse(['--foo', 'c:\\', 'd:\\'], {
           flags: {foo: Flags.string({multiple: true})},
         })
         expect(out.flags).to.deep.include({foo: ['c:\\', 'd:\\']})
       })
 
-      it('parses multiple space-delimited flags ending with with \\ escape char', async () => {
+      it(`parses multiple space-delimited flags ending with with escape char`, async () => {
         const out = await parse(['--foo', 'c:\\', 'd:\\'], {
           flags: {foo: Flags.string({multiple: true})},
         })
@@ -703,7 +703,7 @@ See more help with --help`)
         })
 
         it('does not split on escaped delimiter', async () => {
-          const out = await parse(['--foo', 'a\\,b,c'], {
+          const out = await parse(['--foo', String.raw`a\,b,c`], {
             flags: {
               foo: Flags.string({multiple: true, delimiter: ','}),
             },
@@ -712,7 +712,7 @@ See more help with --help`)
         })
 
         it('escapes with multiple invocation', async () => {
-          const out = await parse(['--foo', 'a\\,b', '--foo', 'b'], {
+          const out = await parse(['--foo', String.raw`a\,b`, '--foo', 'b'], {
             flags: {
               foo: Flags.string({multiple: true, delimiter: ','}),
             },
@@ -721,7 +721,7 @@ See more help with --help`)
         })
 
         it('comma-escaped stringified json', async () => {
-          const val = '{"a":"b"\\,"c":"d"}'
+          const val = String.raw`{"a":"b"\,"c":"d"}`
           const expected = '{"a":"b","c":"d"}'
           const out = await parse(['--foo', val], {
             flags: {

test/ux/colorize-json.test.ts

@@ -104,8 +104,8 @@ describe('colorizeJson', () => {
   })
 
   it('tokenizes a string literal with an escaped quote', () => {
-    const result = tokenize('"a\\"b"')
-    expect(result).to.deep.equal([{type: 'string', value: '"a\\"b"'}])
+    const result = tokenize(String.raw`"a\"b"`)
+    expect(result).to.deep.equal([{type: 'string', value: String.raw`"a\"b"`}])
   })
 
   it('tokenizes a key-value pair with whitespace between the :', () => {