Add @typescript-eslint/array-type rule and cleanup ts rules

Author: jdalton

.oxlintrc.json

@@ -8,11 +8,13 @@
   },
   "settings": {},
   "rules": {
+    "@typescript-eslint/array-type": ["error", { "default": "array-simple" }],
     "@typescript-eslint/no-misused-new": ["error"],
     "@typescript-eslint/no-this-alias": [
       "error",
       { "allowDestructuring": true }
     ],
+    "@typescript-eslint/return-await": ["error", "always"],
     "unicorn/no-empty-file": "off",
     "unicorn/no-new-array": "off",
     "no-control-regex": "off",

eslint.config.js

@@ -159,19 +159,8 @@ module.exports = [
     },
     rules: {
       ...sharedRules,
-      // Define @typescript-eslint/no-extraneous-class because oxlint defines
-      // "no-extraneous-class": ["deny"] and trying to eslint-disable it will
-      // cause an eslint "Definition not found" error otherwise.
-      '@typescript-eslint/no-extraneous-class': ['error'],
-      '@typescript-eslint/no-floating-promises': ['error'],
-      // Define @typescript-eslint/no-misused-new because oxlint defines
-      // "no-misused-new": ["deny"] and trying to eslint-disable it will
-      // cause an eslint "Definition not found" error otherwise.
+      '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
       '@typescript-eslint/no-misused-new': ['error'],
-      '@typescript-eslint/no-misused-promises': ['error'],
-      // Define @typescript-eslint/no-this-alias because oxlint defines
-      // "no-this-alias": ["deny"] and trying to eslint-disable it will
-      // cause an eslint "Definition not found" error otherwise.
       '@typescript-eslint/no-this-alias': [
         'error',
         { allowDestructuring: true }

src/commands/action/cmd-action.ts

@@ -49,7 +49,7 @@ export const cmdAction = {
 }
 
 async function run(
-  argv: string[] | Readonly<string[]>,
+  argv: string[] | readonly string[],
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {

src/commands/action/core/classes.ts

@@ -1,7 +1,7 @@
 // https://github.com/SocketDev/socket-python-cli/blob/6d4fc56faee68d3a4764f1f80f84710635bdaf05/socketsecurity/core/classes.py
 import { components } from '@socketsecurity/sdk/types/api'
 
-type IntroducedBy = [string, string][]
+type IntroducedBy = Array<[string, string]>
 
 export class Alert {
   key = ''
@@ -53,7 +53,7 @@ export class FullScan {
   commit_message = ''
   commit_hash = ''
   pull_request = 0
-  sbom_artifacts: components['schemas']['SocketArtifact'][] = []
+  sbom_artifacts: Array<components['schemas']['SocketArtifact']> = []
   packages = {}
 
   constructor(obj: Partial<FullScan> = {}) {
@@ -151,7 +151,7 @@ export class Package {
   release = ''
   id = ''
   direct = false
-  manifestFiles: { file: string }[] = []
+  manifestFiles: Array<{ file: string }> = []
   author: string[] = []
   size = 0
   score: Score
@@ -172,7 +172,7 @@ export class Package {
     release: string | undefined
     id: string | undefined
     direct: boolean | undefined
-    manifestFiles: { file: string }[] | undefined
+    manifestFiles: Array<{ file: string }> | undefined
     author: string[] | undefined
     size: number | undefined
     score: Score | undefined

src/commands/action/core/index.ts

@@ -37,7 +37,7 @@ export class Core {
     fullScanId
   }: {
     fullScanId: string
-  }): Promise<components['schemas']['SocketArtifact'][]> {
+  }): Promise<Array<components['schemas']['SocketArtifact']>> {
     const orgFullScanResponse = await this.socket.getOrgFullScan(
       this.owner,
       fullScanId,
@@ -90,8 +90,8 @@ export class Core {
   }: {
     pkg: Package
     packages: Record<string, Package>
-  }): [string, string][] {
-    const introducedBy: [string, string][] = []
+  }): Array<[string, string]> {
+    const introducedBy: Array<[string, string]> = []
 
     if (pkg.direct) {
       let manifests = pkg.manifestFiles.map(({ file }) => file).join(';')
@@ -424,7 +424,7 @@ export class Core {
   }
 
   createPackageFromSbomArtifact(
-    sbomArtifact: components['schemas']['SocketArtifact'][]
+    sbomArtifact: Array<components['schemas']['SocketArtifact']>
   ): Package[] {
     return sbomArtifact.map(
       sbomArtifact =>

src/commands/analytics/cmd-analytics.ts

@@ -70,7 +70,7 @@ export const cmdAnalytics = {
 }
 
 async function run(
-  argv: string[] | Readonly<string[]>,
+  argv: string[] | readonly string[],
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {

src/commands/analytics/display-analytics.ts

@@ -415,7 +415,7 @@ function renderLineCharts(
   grid: contrib.grid,
   screen: Widgets.Screen,
   title: string,
-  coords: Array<number>,
+  coords: number[],
   data: Record<string, number>
 ): void {
   const line = grid.set(...coords, contrib.line, {

src/commands/audit-log/cmd-audit-log.ts

@@ -57,7 +57,7 @@ export const cmdAuditLog = {
 }
 
 async function run(
-  argv: string[] | Readonly<string[]>,
+  argv: string[] | readonly string[],
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {

src/commands/audit-log/get-audit-log.ts

@@ -11,7 +11,7 @@ import type { Choice } from '@socketsecurity/registry/lib/prompts'
 
 type AuditChoice = Choice<string>
 
-type AuditChoices = (Separator | AuditChoice)[]
+type AuditChoices = Array<Separator | AuditChoice>
 
 export async function getAuditLog({
   logType,

src/commands/cdxgen/cmd-cdxgen.ts

@@ -132,7 +132,7 @@ export const cmdCdxgen = {
 }
 
 async function run(
-  argv: string[] | Readonly<string[]>,
+  argv: string[] | readonly string[],
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {