upgrade eslint

.eslintrc.json

@@ -2,12 +2,12 @@
   "parserOptions": {
     "project": "./tsconfig.json"
   },
-  "plugins": ["deprecation"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended"
   ],
+  "plugins": ["deprecation", "import", "simple-import-sort"],
   "rules": {
     "@typescript-eslint/array-type": ["warn", { "default": "generic", "readonly": "generic" }],
     "@typescript-eslint/prefer-readonly": "warn",
@@ -20,6 +20,13 @@
     "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
     "prefer-rest-params": "off",
     "prefer-spread": "off",
-    "deprecation/deprecation": "off"
+    "deprecation/deprecation": "off",
+    "import/first": "error",
+    "import/no-cycle": "error",
+    "import/newline-after-import": "error",
+    "import/no-duplicates": "error",
+    "import/no-unresolved": "off",
+    "import/order": "off",
+    "simple-import-sort/imports": "error"
   }
 }

.vscode/settings.json

@@ -1,3 +1,8 @@
 {
-  "typescript.tsdk": "./node_modules/typescript/lib"
+  "typescript.tsdk": "./node_modules/typescript/lib",
+  "eslint.validate": ["markdown", "javascript", "typescript"],
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "files.insertFinalNewline": true
 }

package.json

@@ -8,6 +8,7 @@
   "sideEffects": false,
   "scripts": {
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\" \"scripts/**/*.ts\"",
+    "lint-fix": "eslint --fix \"src/**/*.ts\" \"test/**/*.ts\" \"scripts/**/*.ts\"",
     "prettier": "prettier --list-different \"./{src,test,examples,scripts}/**/*.ts\"",
     "fix-prettier": "prettier --write \"./{src,test,examples,scripts}/**/*.ts\"",
     "test": "npm run lint && npm run prettier && npm run dtslint && npm run vitest && npm run docs",
@@ -41,14 +42,16 @@
     "@types/glob": "^7.1.3",
     "@types/jest": "22.2.2",
     "@types/node": "^12.6.8",
-    "@typescript-eslint/eslint-plugin": "^5.35.1",
-    "@typescript-eslint/parser": "^5.35.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.0",
+    "@typescript-eslint/parser": "^5.59.0",
     "@vitest/coverage-istanbul": "^0.23.4",
     "benchmark": "2.1.4",
     "docs-ts": "^0.7.2",
     "dtslint": "github:gcanti/dtslint",
-    "eslint": "^8.23.0",
+    "eslint": "^8.38.0",
     "eslint-plugin-deprecation": "^1.4.1",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "fast-check": "^3.1.3",
     "glob": "^7.1.6",
     "mocha": "^5.2.0",

scripts/FileSystem.ts

@@ -1,8 +1,9 @@
-import * as TE from '../src/TaskEither'
-import { flow } from '../src/function'
 import * as fs from 'fs'
 import G from 'glob'
 
+import { flow } from '../src/function'
+import * as TE from '../src/TaskEither'
+
 export interface FileSystem {
   readonly readFile: (path: string) => TE.TaskEither<Error, string>
   readonly writeFile: (path: string, content: string) => TE.TaskEither<Error, void>

scripts/build.ts

@@ -1,4 +1,5 @@
 import * as path from 'path'
+
 import * as E from '../src/Either'
 import { pipe } from '../src/function'
 import * as J from '../src/Json'

scripts/linter.ts

@@ -1,10 +1,11 @@
-import * as ast from 'ts-morph'
-import * as RA from '../src/ReadonlyArray'
-import { pipe } from '../src/function'
 import * as glob from 'glob'
 import * as path from 'path'
-import * as O from '../src/Option'
+import * as ast from 'ts-morph'
+
+import { pipe } from '../src/function'
 import * as M from '../src/Monoid'
+import * as O from '../src/Option'
+import * as RA from '../src/ReadonlyArray'
 import * as string from '../src/string'
 
 // -------------------------------------------------------------------------------------

scripts/release.ts

@@ -1,7 +1,8 @@
-import { run } from './run'
 import * as child_process from 'child_process'
+
 import { left, right } from '../src/Either'
 import * as TE from '../src/TaskEither'
+import { run } from './run'
 
 const DIST = 'dist'
 

src/Alternative.ts

@@ -26,9 +26,9 @@ import {
 } from './Applicative'
 import { getApplySemigroup } from './Apply'
 import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
-import { Zero, Zero1, Zero2, Zero2C, Zero3, Zero3C, Zero4 } from './Zero'
 import { Monoid } from './Monoid'
 import { Semigroup } from './Semigroup'
+import { Zero, Zero1, Zero2, Zero2C, Zero3, Zero3C, Zero4 } from './Zero'
 
 // -------------------------------------------------------------------------------------
 // model

src/Applicative.ts

@@ -17,17 +17,17 @@
  *
  * @since 2.0.0
  */
-import { Apply, Apply1, Apply2, Apply2C, Apply3, Apply3C, Apply4, ap, getApplySemigroup } from './Apply'
+import { ap, Apply, Apply1, Apply2, Apply2C, Apply3, Apply3C, Apply4, getApplySemigroup } from './Apply'
 import { pipe } from './function'
 import {
   FunctorComposition,
+  FunctorComposition2C1,
   FunctorComposition11,
   FunctorComposition12,
   FunctorComposition12C,
   FunctorComposition21,
   FunctorComposition22,
   FunctorComposition22C,
-  FunctorComposition2C1,
   FunctorCompositionHKT1,
   FunctorCompositionHKT2,
   FunctorCompositionHKT2C,

src/Apply.ts

@@ -35,11 +35,11 @@
  *
  * @since 2.0.0
  */
-import { Functor, Functor1, Functor2, Functor2C, Functor3, Functor4, Functor3C } from './Functor'
-import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
 import { tuple } from './function'
-import { Semigroup } from './Semigroup'
+import { Functor, Functor1, Functor2, Functor2C, Functor3, Functor3C, Functor4 } from './Functor'
+import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
 import * as _ from './internal'
+import { Semigroup } from './Semigroup'
 
 // -------------------------------------------------------------------------------------
 // model

src/Array.ts

@@ -21,7 +21,7 @@ import { Foldable1 } from './Foldable'
 import { FoldableWithIndex1 } from './FoldableWithIndex'
 import { FromEither1, fromEitherK as fromEitherK_ } from './FromEither'
 import { identity, Lazy, pipe } from './function'
-import { let as let__, bindTo as bindTo_, flap as flap_, Functor1 } from './Functor'
+import { bindTo as bindTo_, flap as flap_, Functor1, let as let__ } from './Functor'
 import { FunctorWithIndex1 } from './FunctorWithIndex'
 import { HKT } from './HKT'
 import * as _ from './internal'
@@ -36,7 +36,7 @@ import { Predicate } from './Predicate'
 import * as RA from './ReadonlyArray'
 import { Refinement } from './Refinement'
 import { Semigroup } from './Semigroup'
-import { separated, Separated } from './Separated'
+import { Separated, separated } from './Separated'
 import { Show } from './Show'
 import { PipeableTraverse1, Traversable1 } from './Traversable'
 import { PipeableTraverseWithIndex1, TraversableWithIndex1 } from './TraversableWithIndex'
@@ -49,7 +49,7 @@ import {
   Witherable1,
   witherDefault
 } from './Witherable'
-import { Zero1, guard as guard_ } from './Zero'
+import { guard as guard_, Zero1 } from './Zero'
 
 import NonEmptyArray = NEA.NonEmptyArray
 

src/Bifunctor.ts

@@ -1,7 +1,7 @@
 /**
  * @since 2.0.0
  */
-import { HKT2, Kind2, Kind3, URIS2, URIS3, URIS4, Kind4 } from './HKT'
+import { HKT2, Kind2, Kind3, Kind4, URIS2, URIS3, URIS4 } from './HKT'
 
 // -------------------------------------------------------------------------------------
 // model

src/BooleanAlgebra.ts

@@ -10,8 +10,8 @@
  *
  * @since 2.0.0
  */
-import { HeytingAlgebra } from './HeytingAlgebra'
 import { getBooleanAlgebra } from './function'
+import { HeytingAlgebra } from './HeytingAlgebra'
 
 // -------------------------------------------------------------------------------------
 // model

src/Category.ts

@@ -1,7 +1,7 @@
 /**
  * @since 2.0.0
  */
-import { HKT2, Kind2, Kind3, URIS2, URIS3, URIS4, Kind4 } from './HKT'
+import { HKT2, Kind2, Kind3, Kind4, URIS2, URIS3, URIS4 } from './HKT'
 import { Semigroupoid, Semigroupoid2, Semigroupoid3, Semigroupoid4 } from './Semigroupoid'
 
 // -------------------------------------------------------------------------------------

src/Chain.ts

@@ -10,7 +10,7 @@
  *
  * @since 2.0.0
  */
-import { Apply, Apply1, Apply2, Apply2C, Apply3, Apply4, Apply3C } from './Apply'
+import { Apply, Apply1, Apply2, Apply2C, Apply3, Apply3C, Apply4 } from './Apply'
 import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
 
 // -------------------------------------------------------------------------------------

src/Choice.ts

@@ -28,11 +28,11 @@
  *
  * @since 2.0.0
  */
-import { Either } from './Either'
-import { HKT2, Kind2, Kind3, URIS2, URIS3, URIS4, Kind4 } from './HKT'
-import { Profunctor, Profunctor2, Profunctor3, Profunctor4 } from './Profunctor'
 import { Category, Category2, Category3, Category4 } from './Category'
+import { Either } from './Either'
 import { identity } from './function'
+import { HKT2, Kind2, Kind3, Kind4, URIS2, URIS3, URIS4 } from './HKT'
+import { Profunctor, Profunctor2, Profunctor3, Profunctor4 } from './Profunctor'
 
 // -------------------------------------------------------------------------------------
 // model

src/Compactable.ts

@@ -18,6 +18,7 @@ import {
   Functor2C,
   Functor3C,
   FunctorComposition,
+  FunctorComposition2C1,
   FunctorComposition11,
   FunctorComposition12,
   FunctorComposition12C,
@@ -26,7 +27,6 @@ import {
   FunctorComposition22C,
   FunctorComposition23,
   FunctorComposition23C,
-  FunctorComposition2C1,
   getFunctorComposition,
   map
 } from './Functor'

src/Contravariant.ts

@@ -1,7 +1,7 @@
 /**
  * @since 2.0.0
  */
-import { HKT, Kind, Kind2, Kind3, URIS, URIS2, URIS3, URIS4, Kind4 } from './HKT'
+import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
 
 // -------------------------------------------------------------------------------------
 // model

src/Date.ts

@@ -4,8 +4,8 @@
 import * as E from './Eq'
 import { pipe } from './function'
 import { IO } from './IO'
-import * as O from './Ord'
 import * as N from './number'
+import * as O from './Ord'
 
 // -------------------------------------------------------------------------------------
 // instances

src/DistributiveLattice.ts

@@ -7,7 +7,7 @@
  * @since 2.0.0
  */
 import { Lattice } from './Lattice'
-import { Ord, max, min } from './Ord'
+import { max, min, Ord } from './Ord'
 
 // -------------------------------------------------------------------------------------
 // model

src/EitherT.ts

@@ -728,6 +728,7 @@ export function toUnion<F>(F: Functor<F>): <E, A>(fa: HKT<F, Either<E, A>>) => H
 // deprecated
 // -------------------------------------------------------------------------------------
 
+// eslint-disable-next-line import/first
 import URI = E.URI
 
 /**

src/Extend.ts

@@ -1,8 +1,8 @@
 /**
  * @since 2.0.0
  */
-import { Functor, Functor1, Functor2, Functor2C, Functor3, Functor4, Functor3C } from './Functor'
-import { HKT, Kind, Kind2, Kind3, URIS, URIS2, URIS3, URIS4, Kind4 } from './HKT'
+import { Functor, Functor1, Functor2, Functor2C, Functor3, Functor3C, Functor4 } from './Functor'
+import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
 
 // -------------------------------------------------------------------------------------
 // model

src/Field.ts

@@ -3,8 +3,8 @@
  *
  * @since 2.0.0
  */
-import { Ring } from './Ring'
 import { Eq } from './Eq'
+import { Ring } from './Ring'
 
 // -------------------------------------------------------------------------------------
 // model

src/Filterable.ts

@@ -46,7 +46,7 @@ import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT
 import { getLeft, getRight, Option } from './Option'
 import { not, Predicate } from './Predicate'
 import { Refinement } from './Refinement'
-import { separated, Separated } from './Separated'
+import { Separated, separated } from './Separated'
 
 // -------------------------------------------------------------------------------------
 // model

src/FilterableWithIndex.ts

@@ -1,28 +1,28 @@
 /**
  * @since 2.0.0
  */
-import { Separated } from './Separated'
 import { Either } from './Either'
 import {
   Filterable,
   Filterable1,
   Filterable2,
   Filterable2C,
   Filterable3,
-  Filterable4,
-  Filterable3C
+  Filterable3C,
+  Filterable4
 } from './Filterable'
 import {
   FunctorWithIndex,
   FunctorWithIndex1,
   FunctorWithIndex2,
   FunctorWithIndex2C,
   FunctorWithIndex3,
-  FunctorWithIndex4,
-  FunctorWithIndex3C
+  FunctorWithIndex3C,
+  FunctorWithIndex4
 } from './FunctorWithIndex'
-import { HKT, Kind, Kind2, Kind3, URIS, URIS2, URIS3, URIS4, Kind4 } from './HKT'
+import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
 import { Option } from './Option'
+import { Separated } from './Separated'
 
 // -------------------------------------------------------------------------------------
 // model

src/Foldable.ts

@@ -3,7 +3,7 @@
  */
 import { Applicative, Applicative1, Applicative2, Applicative2C, Applicative3 } from './Applicative'
 import { constant, pipe } from './function'
-import { HKT, Kind, Kind2, Kind3, URIS, URIS2, URIS3, URIS4, Kind4 } from './HKT'
+import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'
 import { Monad, Monad1, Monad2, Monad2C, Monad3, Monad3C } from './Monad'
 import { Monoid } from './Monoid'
 

src/FoldableWithIndex.ts

@@ -19,13 +19,13 @@ import {
   Foldable3C,
   Foldable4,
   FoldableComposition,
+  FoldableComposition2C1,
   FoldableComposition11,
   FoldableComposition12,
   FoldableComposition12C,
   FoldableComposition21,
   FoldableComposition22,
   FoldableComposition22C,
-  FoldableComposition2C1,
   getFoldableComposition
 } from './Foldable'
 import { pipe } from './function'

src/FunctorWithIndex.ts

@@ -21,13 +21,13 @@ import {
   Functor3C,
   Functor4,
   FunctorComposition,
+  FunctorComposition2C1,
   FunctorComposition11,
   FunctorComposition12,
   FunctorComposition12C,
   FunctorComposition21,
   FunctorComposition22,
   FunctorComposition22C,
-  FunctorComposition2C1,
   getFunctorComposition
 } from './Functor'
 import { HKT, Kind, Kind2, Kind3, Kind4, URIS, URIS2, URIS3, URIS4 } from './HKT'