Merge branch 'master' into v1.6

Author: wallymathieu

.github/workflows/dotnetcore.yml

@@ -5,10 +5,6 @@ env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   # Disable sending usage data to Microsoft
   DOTNET_CLI_TELEMETRY_OPTOUT: true
-  # GitHub Packages Feed settings
-  GITHUB_FEED: https://nuget.pkg.github.com/fsprojects
-  GITHUB_USER: fsprojects
-  #GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 on:
   push:
@@ -40,7 +36,9 @@ jobs:
 
   package:
     runs-on: windows-latest
-
+    permissions:
+      packages: write
+      contents: read
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET Core
@@ -71,13 +69,14 @@ jobs:
       with:
         name: nupkg
         path: ./bin/nupkg/*.nupkg
-    #- name: Push to GitHub Feed
-    #  shell: bash
-    #  run: |
-    #      for f in ./bin/nupkg/*.nupkg
-    #      do
-    #        curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED
-    #      done
+    - name: Push to GitHub Feed
+      shell: bash
+      run: |
+          for f in ./bin/nupkg/*.nupkg
+          do
+            echo $f
+            dotnet nuget push $f -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
+          done
 
   docs:
     runs-on: windows-latest

README.md

@@ -1,6 +1,5 @@
 # FSharpPlus
 
-[![Build Status](https://ci.appveyor.com/api/projects/status/25ukpc0lamyf7pdx/branch/master?svg=true)](https://ci.appveyor.com/project/wallymathieu/fsharpplus/branch/master)
 [![Download](https://img.shields.io/nuget/dt/FSharpPlus.svg)](https://www.nuget.org/packages/FSharpPlus)
 [![NuGet](https://img.shields.io/nuget/v/FSharpPlus.svg)](https://www.nuget.org/packages/FSharpPlus)
 [![NuGet Preview](https://img.shields.io/nuget/vpre/FSharpPlus.svg?label=pre)](https://www.nuget.org/packages/FSharpPlus/absoluteLatest)

appveyor.yml

@@ -17,8 +17,8 @@ install:
   - cmd: git submodule update --init --recursive
 build_script:
   - cmd: dotnet restore ./FSharpPlus.sln
-  - cmd: dotnet build -c Release ./FSharpPlus.sln
-  - cmd: dotnet test -f net6.0 -c Test tests/FSharpPlus.Tests
+  #- cmd: dotnet build -c Release ./FSharpPlus.sln
+  - cmd: dotnet test -c Test tests/FSharpPlus.Tests
   - ps: if ($env:VersionSuffix) { dotnet pack build.proj --version-suffix $env:VersionSuffix } else { dotnet pack build.proj }
 test: off
 artifacts:

docsrc/content/abstraction-traversable.fsx

@@ -21,8 +21,20 @@ Minimal complete definition
  * ``traverse f x`` | ``sequence x``
 *)
 (**
-    static member Traverse (t:'Traversable<'T>, f: 'T -> 'Functor<'U>) : 'Functor<'Traversable<'U>>
-    static member Sequence (t:'Traversable<'Functor<'T>>) : 'Functor<'Traversable<'T>>
+    static member Traverse (t: 'Traversable<'T>, f: 'T -> 'Applicative<'U>) : 'Applicative<'Traversable<'U>>
+    static member Sequence (t: 'Traversable<'Applicative<'T>>) : 'Applicative<'Traversable<'T>>
+*)
+(**
+
+
+Other operations
+----------------
+
+ * ``gather f x`` | ``transpose x`` (same as traverse and sequence but operating on ZipApplicatives)
+*)
+(**
+    static member Gather (t: 'Traversable<'T>, f: 'T -> 'ZipApplicative<'U>) : 'ZipApplicative<'Traversable<'U>>
+    static member Transpose (t: 'Traversable<'ZipApplicative<'T>>) : 'ZipApplicative<'Traversable<'T>>
 *)
 (**
 

docsrc/content/abstraction-zipapplicative.fsx

@@ -0,0 +1,138 @@
+(*** hide ***)
+// This block of code is omitted in the generated HTML documentation. Use 
+// it to define helpers that you do not want to show in the documentation.
+#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
+
+(**
+ZipApplicative
+==============
+A functor with application, providing operations to embed pure expressions (``pur``), run computations pointwise and/or paralell and combine their results (``<.>``).
+___
+Minimal complete definition
+---------------------------
+ * ``pur x`` &nbsp; . &nbsp; ``result x``
+ * ``(<.>) f x``
+*)
+(**
+    static member Pure (x: 'T) : 'ZipApplicative<'T>
+    static member (<.>) (f: 'ZipApplicative<'T -> 'U>, x: 'ZipApplicative<'T>) : 'ZipApplicative<'U>
+*)
+(**
+
+
+Other operations
+----------------
+
+* ``zip``
+*)
+(**
+   static member Zip (x1: 'ZipApplicative<'T1>, x2: 'ZipApplicative<'T2>) : 'ZipApplicative<'T1 * 'T2>
+*)
+(**
+* ``map2``
+*)
+(**
+   static member Map2 (f: 'T1 -> 'T2 -> 'T, x1: 'ZipApplicative<'T1>, x2: 'ZipApplicative<'T2>) : 'ZipApplicative<'T>
+*)
+
+(**
+* ``map3``
+*)
+(**
+   static member Map3 (f: 'T1 -> 'T2 -> 'T3 -> 'T, x1: 'ZipApplicative<'T1>, x2: 'ZipApplicative<'T2>, x3: 'ZipApplicative<'T3>) : 'ZipApplicative<'T>
+*)
+
+(**
+
+
+Rules
+-----
+*)
+(**
+    pur id <.> v = v
+    pur (<<) <.> u <.> v <.> w = u <.> (v <.> w)
+    pur f <*> pur x = pur (f x)
+    u <*> pur y = pur ((|>) y) <.> u
+*)
+(**
+Related Abstractions
+--------------------
+ - [Functor](abstraction-functor.html): A zipApplicative is a functor whose ``map`` operation can be splitted in ``pur`` and ``(<.>)`` operations,
+ 
+ - [ZipApplicative](abstraction-applicative.html) : ZipApplicatives are applicatives which usually don't form a [Monad](abstraction-monad.html).
+
+Concrete implementations
+------------------------
+From F#
+ 
+ -  ``seq<'T>``
+ -  ``list<'T>``
+ -  ``option<'T>``   *
+ -  ``voption<'T>``  *
+ -  ``Lazy<'T>``     *
+ -  ``Async<'T>``
+ -  ``Result<'T, 'U>``
+ -  ``Choice<'T, 'U>``
+ -  ``KeyValuePair<'Key, 'T>``  *
+ -  ``'Monoid * 'T``            *
+ -  ``ValueTuple<'Monoid, 'T>`` *
+ -  ``Task<'T>``
+ -  ``ValueTask<'T>``
+ -  ``'R -> 'T``        *
+ -  ``Expr<'T>``        *
+ 
+ 
+From F#+
+
+ -  [``NonEmptySeq<'T>``]
+ -  [``NonEmptyList<'T>``](type-nonempty.html)
+ -  [``Compose<'ZipApplicative1<'ZipApplicative2<'T>>>``](type-compose.html)
+
+ (*) The operation is the same as that for the normal applicative
+ 
+
+Only for <*> operation:
+ -  ``array<'T>``
+ -  ``ResizeArray<'T>``
+ -  ``Map<'Key, 'T>``
+ -  ``Dictionary<'Key, 'T>``
+ -  ``IDictionary<'Key, 'T>``
+ -  ``IReadOnlyDictionary<'Key, 'T>``
+
+
+ [Suggest another](https://github.com/fsprojects/FSharpPlus/issues/new) concrete implementation
+
+Examples
+--------
+*)
+
+
+(**
+```f#
+#r @"nuget: FSharpPlus"
+```
+*)
+
+open FSharpPlus
+
+
+// pointwise operations
+
+let arr1 = (+) <!> [|1;2;3|] <*> [|10;20;30|]
+let arr2 = (+) <!> [|1;2;3|] <.> [|10;20;30|]
+
+// val arr1: int array = [|11; 21; 31; 12; 22; 32; 13; 23; 33|]
+// val arr2: int array = [|11; 22; 33|]
+
+
+// Validations
+
+let validated = app2 {
+    let! x = async { return Ok 1 }
+    and! y = async { return Ok 2 }
+    and! z = async { return Error ["Error"] }
+    return x + y + z
+}
+
+validated |> Async.RunSynchronously
+// val it: Result<int,string list> = Error ["Error"]

docsrc/content/extensions.fsx

@@ -186,6 +186,7 @@ The String type:
    * truncate, drop
    * findIndex, tryFindIndex
    * findSliceIndex, tryFindSliceIndex
+   * findLastSliceIndex, tryFindLastSliceIndex
    * toArray, ofArray, toList, ofList, toSeq, ofSeq, toCodePoints, ofCodePoints
    * getBytes
 
@@ -195,6 +196,7 @@ Collections / Traversable types:
    * intercalate, intersperse,
    * split, replace,
    * findSliceIndex, trySliceIndex,
+   * findLastSliceIndex, tryLastSliceIndex,
    * partitionMap
  * [IList](reference/fsharpplus-ilist.html)
    * toIReadOnlyList
@@ -207,6 +209,7 @@ Collections / Traversable types:
    * split, replace,
    * toIReadOnlyList,
    * findSliceIndex, tryFindSliceIndex,
+   * findLastSliceIndex, tryLastSliceIndex,
    * partitionMap
    * setAt, removeAt
  * [Enumerator](reference/fsharpplus-enumerator.html)
@@ -232,6 +235,7 @@ Collections / Traversable types:
     * replicate
     * toIReadOnlyList
     * findSliceIndex, tryFindSliceIndex
+    * findLastSliceIndex, tryLastSliceIndex,
  * [ IReadOnlyCollection ](reference/fsharpplus-ireadonlycollection.html)
      * ofArray, ofList, ofSeq
      * map