bump required fp-ts version

CHANGELOG.md

@@ -15,6 +15,8 @@ high state of flux, you're at risk of it changing without notice.
 
 # 2.3.8
 
+Experimental modules require `fp-ts@^2.5.0`.
+
 - **Experimental**
   - `Lens`
     - add `composeIso` (@gcanti)

dtslint/ts3.5/Lens.ts

@@ -1,5 +1,5 @@
 import * as L from '../../src/Lens'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 
 interface A {
   a: string

dtslint/ts3.5/Optional.ts

@@ -1,5 +1,5 @@
 import * as O from '../../src/Optional'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 
 interface A {
   a: string

dtslint/ts3.5/Prism.ts

@@ -1,5 +1,5 @@
 import * as P from '../../src/Prism'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 
 interface A {
   a: string

dtslint/ts3.5/Traversal.ts

@@ -1,5 +1,5 @@
 import * as T from '../../src/Traversal'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 
 interface A {
   a: string

package.json

@@ -37,15 +37,15 @@
   },
   "homepage": "https://github.com/gcanti/monocle-ts",
   "peerDependencies": {
-    "fp-ts": "^2.0.0"
+    "fp-ts": "^2.5.0"
   },
   "devDependencies": {
     "@types/glob": "^7.1.3",
     "@types/jest": "22.2.2",
     "@types/node": "^13.11.0",
     "docs-ts": "^0.6.2",
     "dtslint": "github:gcanti/dtslint",
-    "fp-ts": "^2.9.5",
+    "fp-ts": "^2.5.0",
     "import-path-rewrite": "github:gcanti/import-path-rewrite",
     "jest": "^24.3.0",
     "mocha": "^5.2.0",

scripts/FileSystem.ts

@@ -1,5 +1,5 @@
-import * as TE from 'fp-ts/TaskEither'
-import { flow } from 'fp-ts/function'
+import * as TE from 'fp-ts/lib/TaskEither'
+import { flow } from 'fp-ts/lib/function'
 import * as fs from 'fs'
 import * as G from 'glob'
 
@@ -25,6 +25,6 @@ export const fileSystem: FileSystem = {
   mkdir: flow(
     mkdirTE,
     TE.map(() => undefined),
-    TE.orElse((e) => (e.code === 'EEXIST' ? TE.of(undefined) : TE.left(e)))
+    TE.orElse((e) => (e.code === 'EEXIST' ? TE.right(undefined) : TE.left(e)))
   )
 }

scripts/build.ts

@@ -1,12 +1,12 @@
 import * as path from 'path'
-import * as E from 'fp-ts/Either'
-import { pipe } from 'fp-ts/function'
-import * as RTE from 'fp-ts/ReaderTaskEither'
-import * as A from 'fp-ts/ReadonlyArray'
-import * as TE from 'fp-ts/TaskEither'
+import * as E from 'fp-ts/lib/Either'
+import { pipe } from 'fp-ts/lib/pipeable'
+import * as RTE from 'fp-ts/lib/ReaderTaskEither'
+import * as A from 'fp-ts/lib/ReadonlyArray'
+import * as TE from 'fp-ts/lib/TaskEither'
 import { FileSystem, fileSystem } from './FileSystem'
 import { run } from './run'
-import * as O from 'fp-ts/Option'
+import * as O from 'fp-ts/lib/Option'
 
 interface Build<A> extends RTE.ReaderTaskEither<FileSystem, Error, A> {}
 
@@ -32,18 +32,15 @@ export const copyPackageJson: Build<void> = (C) =>
 export const FILES: ReadonlyArray<string> = ['CHANGELOG.md', 'LICENSE', 'README.md']
 
 export const copyFiles: Build<ReadonlyArray<void>> = (C) =>
-  pipe(
-    FILES,
-    A.traverse(TE.taskEither)((from) => C.copyFile(from, path.resolve(OUTPUT_FOLDER, from)))
-  )
+  A.readonlyArray.traverse(TE.taskEither)(FILES, (from) => C.copyFile(from, path.resolve(OUTPUT_FOLDER, from)))
 
-const traverse = A.traverse(TE.taskEither)
+const traverse = A.readonlyArray.traverse(TE.taskEither)
 
 export const makeModules: Build<void> = (C) =>
   pipe(
     C.glob(`${OUTPUT_FOLDER}/lib/**/*.js`),
     TE.map(getModules),
-    TE.chain(traverse(makeSingleModule(C))),
+    TE.chain((modules) => traverse(modules, makeSingleModule(C))),
     TE.map(() => undefined)
   )
 

scripts/pre-publish.ts

@@ -1,4 +1,4 @@
-import { left } from 'fp-ts/TaskEither'
+import { left } from 'fp-ts/lib/TaskEither'
 import { run } from './run'
 
 const main = left(new Error('"npm publish" can not be run from root, run "npm run release" instead'))

scripts/release.ts

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

scripts/run.ts

@@ -1,5 +1,5 @@
-import { fold } from 'fp-ts/Either'
-import { TaskEither } from 'fp-ts/TaskEither'
+import { fold } from 'fp-ts/lib/Either'
+import { TaskEither } from 'fp-ts/lib/TaskEither'
 
 export function run<A>(eff: TaskEither<Error, A>): void {
   eff()

src/At.ts

@@ -60,7 +60,7 @@ export const atReadonlyMap = <K>(E: Eq<K>): (<A = never>() => At<ReadonlyMap<K,
   const insertAtE = RM.insertAt(E)
   return () => ({
     at: (key) => ({
-      get: lookupE(key),
+      get: (s) => lookupE(key, s),
       set: O.fold(
         () => deleteAtE(key),
         (a) => insertAtE(key, a)
@@ -82,7 +82,7 @@ export const atReadonlySet = <A>(E: Eq<A>): At<ReadonlySet<A>, A, boolean> => {
       const insert = insertE(a)
       const remove = removeE(a)
       return {
-        get: elemE(a),
+        get: (s) => elemE(a, s),
         set: (b) => (s) => (b ? insert(s) : remove(s))
       }
     }

src/Iso.ts

@@ -15,7 +15,8 @@
  * @since 2.3.0
  */
 import { Category2 } from 'fp-ts/lib/Category'
-import { flow, identity, pipe } from 'fp-ts/lib/function'
+import { flow, identity } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 import { Functor, Functor1, Functor2, Functor3 } from 'fp-ts/lib/Functor'
 import { HKT, Kind, Kind2, Kind3, URIS, URIS2, URIS3 } from 'fp-ts/lib/HKT'
 import { Invariant2 } from 'fp-ts/lib/Invariant'

src/Ix.ts

@@ -73,14 +73,13 @@ export const indexReadonlyMap = <K>(E: Eq<K>): (<A = never>() => Index<ReadonlyM
   const insertAtE = RM.insertAt(E)
   return () => ({
     index: (key) => {
-      const lookup = lookupE(key)
       return {
-        getOption: lookup,
+        getOption: (s) => lookupE(key, s),
         set: (next) => {
           const insert = insertAtE(key, next)
           return (s) =>
             pipe(
-              lookup(s),
+              lookupE(key, s),
               O.fold(
                 () => s,
                 (prev) => (next === prev ? s : insert(s))

test/Iso.ts

@@ -1,5 +1,5 @@
 import * as assert from 'assert'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 import * as _ from '../src/Iso'
 import * as Id from 'fp-ts/lib/Identity'
 import * as O from 'fp-ts/lib/Option'
@@ -63,7 +63,7 @@ describe('Iso', () => {
   it('modifyF', () => {
     const f = pipe(
       double,
-      _.modifyF(O.Functor)((n) => (n > 0 ? O.some(n * 2) : O.none))
+      _.modifyF(O.option)((n) => (n > 0 ? O.some(n * 2) : O.none))
     )
     assert.deepStrictEqual(f(1), O.some(2))
     assert.deepStrictEqual(f(-1), O.none)

test/Lens.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert'
 import * as _ from '../src/Lens'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 import * as O from 'fp-ts/lib/Option'
 import * as A from 'fp-ts/lib/ReadonlyArray'
 import * as T from '../src/Traversal'
@@ -46,7 +46,7 @@ describe('Lens', () => {
     const sa = pipe(_.id<S>(), _.prop('a'))
     const ab = T.fromTraversable(A.readonlyArray)<number>()
     const sb = pipe(sa, _.composeTraversal(ab))
-    assert.deepStrictEqual(sb.modifyF(Id.Applicative)((n) => n * 2)({ a: [1, 2, 3] }), { a: [2, 4, 6] })
+    assert.deepStrictEqual(sb.modifyF(Id.identity)((n) => n * 2)({ a: [1, 2, 3] }), { a: [2, 4, 6] })
   })
 
   it('id', () => {
@@ -241,7 +241,7 @@ describe('Lens', () => {
     const sa: _.Lens<S, number> = pipe(_.id<S>(), _.prop('a'))
     const f = pipe(
       sa,
-      _.modifyF(O.Functor)((n) => (n > 0 ? O.some(n * 2) : O.none))
+      _.modifyF(O.option)((n) => (n > 0 ? O.some(n * 2) : O.none))
     )
     assert.deepStrictEqual(f({ a: 1 }), O.some({ a: 2 }))
     assert.deepStrictEqual(f({ a: -1 }), O.none)

test/Optional.ts

@@ -1,7 +1,7 @@
 import * as assert from 'assert'
 import * as O from 'fp-ts/lib/Option'
 import * as _ from '../src/Optional'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 import * as Id from 'fp-ts/lib/Identity'
 import * as A from 'fp-ts/lib/ReadonlyArray'
 import * as T from '../src/Traversal'
@@ -72,8 +72,8 @@ describe('Optional', () => {
     const sa = pipe(L.id<S>(), L.prop('a'), L.some)
     const ab = T.fromTraversable(A.readonlyArray)<number>()
     const sb = pipe(sa, _.composeTraversal(ab))
-    assert.deepStrictEqual(sb.modifyF(Id.Applicative)((n) => n * 2)({ a: O.none }), { a: O.none })
-    assert.deepStrictEqual(sb.modifyF(Id.Applicative)((n) => n * 2)({ a: O.some([1, 2, 3]) }), { a: O.some([2, 4, 6]) })
+    assert.deepStrictEqual(sb.modifyF(Id.identity)((n) => n * 2)({ a: O.none }), { a: O.none })
+    assert.deepStrictEqual(sb.modifyF(Id.identity)((n) => n * 2)({ a: O.some([1, 2, 3]) }), { a: O.some([2, 4, 6]) })
   })
 
   it('id', () => {
@@ -196,7 +196,7 @@ describe('Optional', () => {
     const sa = pipe(_.id<ReadonlyArray<number>>(), _.index(0))
     const f = pipe(
       sa,
-      _.modifyF(O.Applicative)((n) => (n > 0 ? O.some(n * 2) : O.none))
+      _.modifyF(O.option)((n) => (n > 0 ? O.some(n * 2) : O.none))
     )
     assert.deepStrictEqual(f([]), O.some([]))
     assert.deepStrictEqual(f([1, 2, 3]), O.some([2, 2, 3]))

test/Prism.ts

@@ -1,5 +1,5 @@
 import * as assert from 'assert'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 import * as O from 'fp-ts/lib/Option'
 import * as E from 'fp-ts/lib/Either'
 import * as _ from '../src/Prism'
@@ -162,8 +162,8 @@ describe('Prism', () => {
     const sa = pipe(_.id<S>(), _.some)
     const ab = T.fromTraversable(A.readonlyArray)<number>()
     const sb = pipe(sa, _.composeTraversal(ab))
-    assert.deepStrictEqual(sb.modifyF(Id.Applicative)((n) => n * 2)(O.none), O.none)
-    assert.deepStrictEqual(sb.modifyF(Id.Applicative)((n) => n * 2)(O.some([1, 2, 3])), O.some([2, 4, 6]))
+    assert.deepStrictEqual(sb.modifyF(Id.identity)((n) => n * 2)(O.none), O.none)
+    assert.deepStrictEqual(sb.modifyF(Id.identity)((n) => n * 2)(O.some([1, 2, 3])), O.some([2, 4, 6]))
   })
 
   it('right', () => {
@@ -245,7 +245,7 @@ describe('Prism', () => {
   it('modifyF', () => {
     const f = pipe(
       value,
-      _.modifyF(O.Applicative)((n) => (n > 0 ? O.some(n * 2) : O.none))
+      _.modifyF(O.option)((n) => (n > 0 ? O.some(n * 2) : O.none))
     )
     assert.deepStrictEqual(f(node(1, leaf, leaf)), O.some(node(2, leaf, leaf)))
     assert.deepStrictEqual(f(leaf), O.some(leaf))

test/Traversal.ts

@@ -3,7 +3,7 @@ import * as _ from '../src/Traversal'
 import * as A from 'fp-ts/lib/ReadonlyArray'
 import * as Id from 'fp-ts/lib/Identity'
 import * as O from 'fp-ts/lib/Option'
-import { pipe } from 'fp-ts/lib/function'
+import { pipe } from 'fp-ts/lib/pipeable'
 import { monoidSum } from 'fp-ts/lib/Monoid'
 
 describe('Traversal', () => {