Fix linter

package.json

@@ -31,7 +31,8 @@
         "commander": "^11.0.0",
         "node-fetch": "^2.6.1",
         "prettier": "^2.2.1",
-        "typescript": "^4.9.5"
+        "typescript": "^4.9.5",
+        "eslint": "^8.48.0"
     },
     "resolutions": {
         "@wharfkit/antelope": "^1.0.0"

src/commands/contract/index.ts

@@ -1,17 +1,18 @@
+import * as eslint from 'eslint'
+import * as fs from 'fs'
 import * as prettier from 'prettier'
 import * as ts from 'typescript'
-import * as fs from 'fs'
 
 import type {ABIDef} from '@wharfkit/antelope'
 import {abiToBlob, ContractKit} from '@wharfkit/contract'
 
+import {log, makeClient} from '../../utils'
 import {generateContractClass} from './class'
 import {generateImportStatement, getCoreImports} from './helpers'
 import {generateActionNamesInterface, generateActionsNamespace} from './interfaces'
 import {generateTableMap, generateTableTypesInterface} from './maps'
 import {generateNamespace} from './namespace'
 import {generateStructClasses} from './structs'
-import {log, makeClient} from '../../utils'
 import {generateActionsTypeAlias, generateRowType, generateTablesTypeAlias} from './types'
 
 const printer = ts.createPrinter()
@@ -189,8 +190,9 @@ export async function generateContract(contractName, abi) {
     }
 }
 
-function runPrettier(codeText: string) {
-    return prettier.format(codeText, {
+async function runPrettier(codeText: string) {
+    // First prettier and then eslint fix, cause prettier result cann't pass eslint check
+    const prettiered = prettier.format(codeText, {
         arrowParens: 'always',
         bracketSpacing: false,
         endOfLine: 'lf',
@@ -201,6 +203,14 @@ function runPrettier(codeText: string) {
         trailingComma: 'es5',
         parser: 'typescript',
     })
+
+    const linter = new eslint.ESLint({useEslintrc: true, fix: true})
+    const results = await linter.lintText(prettiered)
+    if (results.length != 0) {
+        return results[0].output
+    } else {
+        return prettiered
+    }
 }
 
 function cleanupImports(imports: string[]) {

test/data/contracts/mock-eosio.ts

@@ -32,8 +32,8 @@ import {
     UInt32,
     UInt64,
     UInt8,
-    VarUInt,
     Variant,
+    VarUInt,
 } from '@wharfkit/antelope'
 import type {ActionOptions, ContractArgs, PartialBy, Table} from '@wharfkit/contract'
 import {Contract as BaseContract} from '@wharfkit/contract'