Merge pull request ethereum#4771 from ethereum/newLinter2

Linter rules

Author: yann300

.eslintrc.json

@@ -54,7 +54,13 @@
         "react-hooks/exhaustive-deps": "off",
         "array-callback-return": "off",
         "prefer-spread": "off",
-        "indent": ["error", 2]
+        "indent": ["error", 2],
+        "keyword-spacing": ["error", { "after": true, "before": true }],
+        "array-bracket-spacing": ["error", "never"],
+        "object-curly-spacing": ["error", "always", { "arraysInObjects": false }],
+        "no-trailing-spaces": "error",
+        "no-multi-spaces": "error",
+        "no-multiple-empty-lines": ["error" , { "max": 1}]
       }
     },
     {

apps/circuit-compiler/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/circuit-compiler/project.json

@@ -35,6 +35,14 @@
           }
         }
       },
+      "lint": {
+        "executor": "@nrwl/linter:eslint",
+        "outputs": ["{options.outputFile}"],
+        "options": {
+          "lintFilePatterns": ["apps/circuit-compiler/**/*.ts"],
+          "eslintConfig": "apps/circuit-compiler/.eslintrc"
+        }
+      },
       "serve": {
         "executor": "@nrwl/webpack:dev-server",
         "defaultConfiguration": "development",

apps/circuit-compiler/src/app/contexts/index.ts

@@ -1,4 +1,4 @@
-import {createContext} from 'react'
-import {ICircuitAppContext} from '../types'
+import { createContext } from 'react'
+import { ICircuitAppContext } from '../types'
 
 export const CircuitAppContext = createContext<ICircuitAppContext>({} as ICircuitAppContext)

apps/circuit-compiler/src/app/reducers/state.ts

@@ -1,4 +1,4 @@
-import {Actions, AppState} from '../types'
+import { Actions, AppState } from '../types'
 import { compiler_list } from 'circom_wasm'
 
 export const appInitialState: AppState = {

apps/circuit-compiler/src/app/services/circomPluginClient.ts

@@ -163,7 +163,7 @@ export class CircomPluginClient extends PluginClient {
     } else {
       this.lastCompiledFile = path
       const fileName = extractNameFromKey(path)
-      
+
       this.lastCompiledCircuitPath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'wasm')
       // @ts-ignore
       await this.call('fileManager', 'writeFile', this.lastCompiledCircuitPath, circuitProgram, { encoding: null })
@@ -179,7 +179,7 @@ export class CircomPluginClient extends PluginClient {
         this.internalEvents.emit('circuit_compiling_done', [])
       }
       circuitApi.log().map(log => {
-        log && this.call('terminal', 'log', { type: 'log', value: log })  
+        log && this.call('terminal', 'log', { type: 'log', value: log })
       })
       // @ts-ignore
       this.call('terminal', 'log', { type: 'typewritersuccess', value: 'Everything went okay' })
@@ -222,11 +222,11 @@ export class CircomPluginClient extends PluginClient {
       this.internalEvents.emit('circuit_generating_r1cs_done')
       const fileName = extractNameFromKey(path)
       const writePath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'r1cs')
-  
+
       // @ts-ignore
       await this.call('fileManager', 'writeFile', writePath, r1csProgram, true)
       r1csApi.log().map(log => {
-        log && this.call('terminal', 'log', { type: 'log', value: log })  
+        log && this.call('terminal', 'log', { type: 'log', value: log })
       })
       // @ts-ignore
       this.call('terminal', 'log', { type: 'typewritersuccess', value: 'Everything went okay' })
@@ -339,7 +339,7 @@ export class CircomPluginClient extends PluginClient {
 
           absFilePath = include.startsWith('circomlib') ? absFilePath.substring(1) : absFilePath
           if (!blackPath.includes(absFilePath)) {
-            if(!includeName.startsWith('circomlib')) {
+            if (!includeName.startsWith('circomlib')) {
               dependencyContent = dependencyContent.replace(`${includeName}`, `${absFilePath}`)
               return absFilePath
             }

apps/circuit-compiler/src/app/types/index.ts

@@ -1,5 +1,5 @@
 import { compiler_list } from 'circom_wasm'
-import {Dispatch} from 'react'
+import { Dispatch } from 'react'
 import type { CircomPluginClient } from '../services/circomPluginClient'
 
 export type CompilerStatus = "compiling" | "generating" | "computing" | "idle" | "errored" | "warning"

apps/debugger/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/debugger/project.json

@@ -40,6 +40,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/debugger/**/*.ts"],
+        "eslintConfig": "apps/debugger/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/debugger/src/app/debugger.ts

@@ -1,13 +1,13 @@
 import { PluginClient } from "@remixproject/plugin";
 import { createClient } from "@remixproject/plugin-webview";
-import { IDebuggerApi, LineColumnLocation, 
+import { IDebuggerApi, LineColumnLocation,
   onBreakpointClearedListener, onBreakpointAddedListener, onEditorContentChanged, onEnvChangedListener, TransactionReceipt } from '@remix-ui/debugger-ui'
 import { DebuggerApiMixin } from '@remix-ui/debugger-ui'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 
-export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) {  
+export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) {
   constructor () {
-    super()    
+    super()
     createClient(this as any)
     this.initDebuggerApi()
   }