From feec0173bdc17d4603a489831dab51bdcb07b378 Mon Sep 17 00:00:00 2001
From: "Angel D. Munoz" <scythes.lol@gmail.com>
Date: Wed, 22 Nov 2023 22:56:04 -0600
Subject: [PATCH] Switch to structs, change icon signature (#2)

This pull request includes several changes to the codebase. The main changes are:

Switching to using structs instead of classes for improved performance and memory efficiency.

Updating the icon signature to match the new struct implementation.

Switch to a valid protocol

This pull request updates the protocol used in the codebase from "mandadin-web" to "web+mandadin". This change ensures that the protocol follows the correct format and is compatible with other systems.

Add FsToolkit, add The Blunt Parser

This pull request adds the FsToolkit.ErrorHandling and TheBlunt packages to the project. These packages provide additional functionality and error handling capabilities.

Add Parser module for checkbox parsing

This pull request introduces a new Parser module for parsing checkboxes in the codebase. This module allows for more efficient and accurate parsing of checkbox data.

Add logging
---
 src/Mandadin.Client/Mandadin.Client.fsproj    |  7 +-
 src/Mandadin.Client/Modals.fs                 | 12 +--
 src/Mandadin.Client/Parser.fs                 | 76 ++++++++++++++++++
 src/Mandadin.Client/Parser.fsi                |  7 ++
 src/Mandadin.Client/Startup.fs                | 29 +++++--
 src/Mandadin.Client/Types.fs                  | 33 ++++----
 src/Mandadin.Client/Views/Import.fs           | 78 ++++++++++---------
 src/Mandadin.Client/Views/Notes.fs            |  8 +-
 src/Mandadin.Client/Views/TrackListItems.fs   | 10 +--
 src/Mandadin.Client/Views/TrackLists.fs       | 46 +++++++----
 .../wwwroot/manifest.webmanifest              |  2 +-
 11 files changed, 221 insertions(+), 87 deletions(-)
 create mode 100644 src/Mandadin.Client/Parser.fs
 create mode 100644 src/Mandadin.Client/Parser.fsi

diff --git a/src/Mandadin.Client/Mandadin.Client.fsproj b/src/Mandadin.Client/Mandadin.Client.fsproj
index 4de225b..78a5ddf 100644
--- a/src/Mandadin.Client/Mandadin.Client.fsproj
+++ b/src/Mandadin.Client/Mandadin.Client.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -8,6 +8,8 @@
   <ItemGroup>
     <Compile Include="Types.fs" />
     <Compile Include="Components/Navbar.fs" />
+    <Compile Include="Parser.fsi" />
+    <Compile Include="Parser.fs" />
     <Compile Include="Modals.fs" />
     <Compile Include="Views/Import.fs" />
     <Compile Include="Views/Notes.fs" />
@@ -20,6 +22,9 @@
     <PackageReference Include="Bolero" Version="0.*" />
     <PackageReference Include="Bolero.Build" Version="0.*" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.*" />
+    
+    <PackageReference Include="FsToolkit.ErrorHandling" Version="4.11.0" />
+    <PackageReference Include="TheBlunt" Version="1.0.1" />
   </ItemGroup>
   <!-- <ItemGroup>
     <Content Remove="wwwroot\**" />
diff --git a/src/Mandadin.Client/Modals.fs b/src/Mandadin.Client/Modals.fs
index bffd593..5f6a4ee 100644
--- a/src/Mandadin.Client/Modals.fs
+++ b/src/Mandadin.Client/Modals.fs
@@ -54,7 +54,7 @@ module Modals =
               label {
                 attr.``class`` "btn-close"
                 on.click (fun _ -> dispatch Dismiss)
-                Icon.Get Close None
+                Icon.Get Close
               }
 
               h4 {
@@ -90,14 +90,14 @@ module Modals =
 
                 on.click (fun _ -> dispatch Import)
 
-                Icon.Get Check None
+                Icon.Get Check
                 text "Importar contenido"
               }
 
               button {
                 attr.``class`` "paper-btn btn-danger-outline"
                 on.click (fun _ -> dispatch Dismiss)
-                Icon.Get Trash None
+                Icon.Get Trash
                 text "Cancelar"
               }
             }
@@ -146,7 +146,7 @@ module Modals =
           label {
             attr.``class`` "btn-close"
             on.click (fun _ -> Error() |> action)
-            Icon.Get Close None
+            Icon.Get Close
           }
 
           h4 {
@@ -167,14 +167,14 @@ module Modals =
           button {
             attr.``class`` "paper-btn btn-danger-outline"
             on.click (fun _ -> Ok true |> action)
-            Icon.Get Check None
+            Icon.Get Check
             text "Si, Continuar"
           }
 
           button {
             attr.``class`` "paper-btn btn-success-outline"
             on.click (fun _ -> Ok false |> action)
-            Icon.Get Trash None
+            Icon.Get Trash
             text "Cancelar"
           }
         }
diff --git a/src/Mandadin.Client/Parser.fs b/src/Mandadin.Client/Parser.fs
new file mode 100644
index 0000000..221e524
--- /dev/null
+++ b/src/Mandadin.Client/Parser.fs
@@ -0,0 +1,76 @@
+namespace Mandadin.Client
+
+open TheBlunt
+open FsToolkit.ErrorHandling
+
+module Parse =
+  let openCheckBox =
+    pchar (fun c -> c = '[') (fun c ->
+      $"'{c}' is not a valid character at this position")
+
+  let closeCheckBox =
+    pchar (fun c -> c = ']') (fun c ->
+      $"'{c}' is not a valid character at this position")
+
+  let completedCheckBox =
+    pchar (fun c -> c = 'x') (fun c ->
+      $"'{c}' is not a valid character at this position")
+
+  let checkBox =
+    parse {
+      let! ``open`` = openCheckBox
+      let! em1 = ptry blanks
+
+      let! isChecked =
+        ptry completedCheckBox
+        |> map (fun check ->
+          match check with
+          | Some _ -> true
+          | None -> false)
+
+      let! em2 = ptry blanks
+      let! ``close`` = closeCheckBox
+
+      return
+        { range =
+            Range.merge
+              [ ``open``.range
+                em1.range
+                isChecked.range
+                em2.range
+                ``close``.range ]
+          result = isChecked.result }
+    }
+
+  let eol =
+    pchoice [ pstr "\r\n"; pstr "\n"; pstr "\r" ]
+
+  let content =
+    parse {
+      let! init = blanks
+      let! content = many anyChar |> pconcat
+      let! endl = eoi
+
+      return
+        { range =
+            Range.merge
+              [ init.range
+                content.range
+                endl.range ]
+          result = content.result }
+    }
+
+  let mandadinEntry =
+    content |> andThen checkBox
+
+  let inline parseLine line =
+    match run line mandadinEntry with
+    | POk { result = isChecked, content } ->
+      Ok([| box isChecked; box content |])
+    | PError e -> Error(line, e)
+
+  let entries lines =
+    lines
+    |> List.ofArray
+    |> List.traverseResultA parseLine
+    |> Result.map List.toArray
diff --git a/src/Mandadin.Client/Parser.fsi b/src/Mandadin.Client/Parser.fsi
new file mode 100644
index 0000000..80c427d
--- /dev/null
+++ b/src/Mandadin.Client/Parser.fsi
@@ -0,0 +1,7 @@
+namespace Mandadin.Client
+
+open TheBlunt
+
+[<RequireQualifiedAccess>]
+module Parse =
+    val entries: lines: string array -> Result<obj array array, (string * ParseError) list>
diff --git a/src/Mandadin.Client/Startup.fs b/src/Mandadin.Client/Startup.fs
index 62dadfd..f338361 100644
--- a/src/Mandadin.Client/Startup.fs
+++ b/src/Mandadin.Client/Startup.fs
@@ -1,19 +1,36 @@
 namespace Mandadin.Client
 
+open Microsoft.Extensions.Logging
 open Microsoft.AspNetCore.Components.WebAssembly.Hosting
 
 module Program =
 
   [<EntryPoint>]
   let Main args =
-    let builder =
-      WebAssemblyHostBuilder.CreateDefault(args)
+    task {
+      let builder =
+        WebAssemblyHostBuilder.CreateDefault(args)
 
-    builder.RootComponents.Add<Main.Mandadin>("#main")
+      builder.RootComponents.Add<Main.Mandadin>("#main")
 
-    builder.Build().RunAsync()
-    |> Async.AwaitTask
-    |> Async.Start
+      let level =
+        if builder.HostEnvironment.Environment = "Production" then
+          LogLevel.Information
+        else
+          LogLevel.Debug
+
+      builder.Logging.AddFilter(
+        "Microsoft.AspNetCore.Components.RenderTree.*",
+        LogLevel.Warning
+      )
+      |> ignore
+
+      builder.Logging.SetMinimumLevel(level) |> ignore
+
+      let app = builder.Build()
+
+      do! app.RunAsync()
+    }
     |> ignore
 
     0
diff --git a/src/Mandadin.Client/Types.fs b/src/Mandadin.Client/Types.fs
index 9ce3a21..fa67751 100644
--- a/src/Mandadin.Client/Types.fs
+++ b/src/Mandadin.Client/Types.fs
@@ -1,7 +1,6 @@
 namespace Mandadin.Client
 
 open Bolero
-open Bolero.Html
 
 [<RequireQualifiedAccess>]
 type View =
@@ -10,22 +9,25 @@ type View =
   | [<EndPoint "lists/{listId}">] ListDetail of listId: string
   | [<EndPoint "/import">] Import
 
-[<RequireQualifiedAccess>]
+[<RequireQualifiedAccess; Struct>]
 type Theme =
   | Light
   | Dark
   | Custom
 
+[<Struct>]
 type SaveResult = { Id: string; Ok: bool; Rev: string }
 
+[<Struct>]
 type Note =
   { Id: string
     Content: string
     Rev: string }
 
-
+[<Struct>]
 type TrackList = { Id: string; Rev: string }
 
+[<Struct>]
 type TrackListItem =
   { Id: string
     IsDone: bool
@@ -33,6 +35,7 @@ type TrackListItem =
     Name: string
     Rev: string }
 
+[<Struct>]
 type Icon =
   | Copy
   | Share
@@ -58,17 +61,19 @@ module Icon =
   type Check = Template<"wwwroot/icons/check.html">
   type Back = Template<"wwwroot/icons/back.html">
 
-  let Get (icon: Icon) (color: Option<string>) : Node =
+type Icon with
+
+  static member Get(icon: Icon, ?color: string) =
     let color = defaultArg color "currentColor"
 
     match icon with
-    | Copy -> Copy().Fill(color).Elt()
-    | Share -> Share().Fill(color).Elt()
-    | Trash -> Trash().Fill(color).Elt()
-    | Clipboard -> Clipboard().Fill(color).Elt()
-    | Save -> Save().Fill(color).Elt()
-    | Text -> Text().Fill(color).Elt()
-    | Import -> Import().Fill(color).Elt()
-    | Close -> Close().Fill(color).Elt()
-    | Check -> Check().Fill(color).Elt()
-    | Back -> Back().Fill(color).Elt()
+    | Copy -> Icon.Copy().Fill(color).Elt()
+    | Share -> Icon.Share().Fill(color).Elt()
+    | Trash -> Icon.Trash().Fill(color).Elt()
+    | Clipboard -> Icon.Clipboard().Fill(color).Elt()
+    | Save -> Icon.Save().Fill(color).Elt()
+    | Text -> Icon.Text().Fill(color).Elt()
+    | Import -> Icon.Import().Fill(color).Elt()
+    | Close -> Icon.Close().Fill(color).Elt()
+    | Check -> Icon.Check().Fill(color).Elt()
+    | Back -> Icon.Back().Fill(color).Elt()
diff --git a/src/Mandadin.Client/Views/Import.fs b/src/Mandadin.Client/Views/Import.fs
index 0bea473..fbd47d8 100644
--- a/src/Mandadin.Client/Views/Import.fs
+++ b/src/Mandadin.Client/Views/Import.fs
@@ -1,41 +1,32 @@
 namespace Mandadin.Client.Views
 
-open Elmish
+open System
+open Microsoft.Extensions.Logging
+open Microsoft.AspNetCore.Components
 open Microsoft.JSInterop
+
+open Elmish
+
 open Bolero
 open Bolero.Html
 open Bolero.Remoting.Client
-open Mandadin.Client
-open Microsoft.AspNetCore.Components
 
+open Mandadin.Client
 
 [<RequireQualifiedAccess>]
 module Import =
-  open System
 
-  let parseContentString (content: string) : array<array<obj>> =
-    let parseRow (row: string) =
-      let split = row.Split("] ")
-
-      let isDone =
-        match split |> Array.tryItem 0 with
-        | Some content -> content.Contains('x')
-        | None -> false
-
-      let nameStr =
-        match split |> Array.tryItem 1 with
-        | Some content -> content.Trim()
-        | None -> "Error de linea"
-
-      [| box isDone; box nameStr |]
-
-    content.Split('\n') |> Array.Parallel.map parseRow
+  let inline parseContentString (content: string) =
+    content.Split(Environment.NewLine)
+    |> Parse.entries
 
+  [<Struct>]
   type ShareDataPayload =
     { Text: string
       Title: string
       Url: string }
 
+  [<Struct>]
   type State =
     { ShareData: ValueOption<ShareDataPayload> }
 
@@ -58,6 +49,7 @@ module Import =
     (state: State)
     (goToList: string -> unit)
     (js: IJSRuntime)
+    (logger: ILogger)
     =
     match msg with
     | RequestImportData ->
@@ -74,11 +66,20 @@ module Import =
     | ImportResult result ->
       match result with
       | Ok(title, content) ->
-        let items = parseContentString content
-        state, Cmd.ofMsg (CreateFromImport(title, items))
-      | Result.Error() ->
-
-        { state with ShareData = ValueNone }, Cmd.none
+        match parseContentString content with
+        | Ok items -> state, Cmd.ofMsg (CreateFromImport(title, items))
+        | Result.Error errs ->
+          errs
+          |> List.iter (fun (line, err) ->
+            logger.LogDebug(
+              "Failed at {index} with: {error} for '{line}'",
+              err.idx,
+              err.message,
+              line
+            ))
+
+          state, Cmd.none
+      | Result.Error() -> { state with ShareData = ValueNone }, Cmd.none
     | CreateFromImport(title, items) ->
       state,
       Cmd.OfJS.either
@@ -91,28 +92,25 @@ module Import =
       goToList trackList.Id
       state, Cmd.none
     | Error err ->
-      eprintfn "%O" err
+      logger.LogDebug("Error: {error}", err)
       { state with ShareData = ValueNone }, Cmd.none
 
   let view (state: State) (dispatch: Dispatch<Msg>) =
-    let data =
-      state.ShareData
-      |> ValueOption.defaultValue ({ Title = ""; Text = ""; Url = "" })
 
     article {
       a {
         attr.href "/"
-        Icon.Get Back None
+        Icon.Get Back
       }
 
-      cond state.ShareData.IsNone
+      cond state.ShareData
       <| function
-        | true ->
+        | ValueNone ->
           p {
             text
               "No pudimos obtener informacion de lo que nos querias compartir 😢"
           }
-        | false -> empty ()
+        | _ -> empty ()
 
       cond state.ShareData
       <| function
@@ -135,15 +133,21 @@ module Import =
     }
 
 
-  type Page() as this =
+  type Page() =
     inherit ProgramComponent<State, Msg>()
 
+    [<Inject>]
+    member val LoggerFactory = Unchecked.defaultof<ILoggerFactory> with get, set
+
     [<Parameter>]
     member val OnGoToListRequested: string -> unit = ignore with get, set
 
-    override _.Program =
+    override self.Program =
       let update msg state =
-        update msg state this.OnGoToListRequested this.JSRuntime
+        let logger =
+          self.LoggerFactory.CreateLogger("Import Page")
+
+        update msg state self.OnGoToListRequested self.JSRuntime logger
 
 
       Program.mkProgram init update view
diff --git a/src/Mandadin.Client/Views/Notes.fs b/src/Mandadin.Client/Views/Notes.fs
index fdac771..efd95a1 100644
--- a/src/Mandadin.Client/Views/Notes.fs
+++ b/src/Mandadin.Client/Views/Notes.fs
@@ -185,7 +185,7 @@ module Notes =
       button {
         attr.``type`` "button"
         on.click (fun _ -> FromClipboard |> dispatch)
-        Icon.Get Clipboard None
+        Icon.Get Clipboard
       }
     }
 
@@ -203,7 +203,7 @@ module Notes =
           button {
             attr.``class`` "paper-btn btn-small btn-muted-outline"
             on.click (fun _ -> ToClipboard item |> dispatch)
-            Icon.Get Copy None
+            Icon.Get Copy
           }
 
           cond canShare
@@ -213,13 +213,13 @@ module Notes =
               button {
                 attr.``class`` "paper-btn btn-small btn-muted-outline"
                 on.click (fun _ -> ShareContent item |> dispatch)
-                Icon.Get Share None
+                Icon.Get Share
               }
 
           button {
             attr.``class`` "paper-btn btn-small btn-danger-outline"
             on.click (fun _ -> DeleteNote(item.Id, item.Rev) |> dispatch)
-            Icon.Get Trash None
+            Icon.Get Trash
           }
         }
       }
diff --git a/src/Mandadin.Client/Views/TrackListItems.fs b/src/Mandadin.Client/Views/TrackListItems.fs
index 45d6fe2..927d279 100644
--- a/src/Mandadin.Client/Views/TrackListItems.fs
+++ b/src/Mandadin.Client/Views/TrackListItems.fs
@@ -333,7 +333,7 @@ module ListItems =
         attr.``type`` "submit"
         attr.``class`` "paper-btn btn-small"
         attr.disabled (not state.CanAddCurrentItem)
-        Icon.Get Save None
+        Icon.Get Save
       }
     }
 
@@ -361,7 +361,7 @@ module ListItems =
       button {
         attr.``class`` "paper-btn btn-small btn-danger-outline m-0"
         on.click (fun _ -> ShowConfirmDeleteModal(ValueSome item) |> dispatch)
-        Icon.Get Trash None
+        Icon.Get Trash
       }
     }
 
@@ -383,7 +383,7 @@ module ListItems =
         button {
           attr.``class`` "paper-btn btn-small"
           on.click (fun _ -> dispatch GoBack)
-          Icon.Get Back None
+          Icon.Get Back
         }
 
         cond state.CanShare
@@ -392,14 +392,14 @@ module ListItems =
             button {
               attr.``class`` "paper-btn btn-small"
               on.click (fun _ -> ShareRequest state.Items |> dispatch)
-              Icon.Get Share None
+              Icon.Get Share
             }
           | false -> empty ()
 
         button {
           attr.``class`` "paper-btn btn-small"
           on.click (fun _ -> ToClipboard state.Items |> dispatch)
-          Icon.Get Copy None
+          Icon.Get Copy
         }
       }
     }
diff --git a/src/Mandadin.Client/Views/TrackLists.fs b/src/Mandadin.Client/Views/TrackLists.fs
index a03602a..1a3c1ac 100644
--- a/src/Mandadin.Client/Views/TrackLists.fs
+++ b/src/Mandadin.Client/Views/TrackLists.fs
@@ -1,12 +1,16 @@
 namespace Mandadin.Client.Views
 
-open Elmish
 open Microsoft.JSInterop
+open Microsoft.AspNetCore.Components
+open Microsoft.Extensions.Logging
+
+open Elmish
 open Bolero
 open Bolero.Html
 open Bolero.Remoting.Client
+
 open Mandadin.Client
-open Microsoft.AspNetCore.Components
+
 
 [<RequireQualifiedAccess>]
 module Lists =
@@ -61,6 +65,7 @@ module Lists =
     (msg: Msg)
     (state: State)
     (js: IJSRuntime)
+    (logger: ILogger)
     (onRouteRequested: string -> unit)
     =
     match msg with
@@ -130,10 +135,19 @@ module Lists =
       let cmd =
         match result with
         | Ok(title, content) ->
-          let parsed =
-            Import.parseContentString content
-
-          Cmd.ofMsg (CreateFromImport(title, parsed))
+          match Import.parseContentString content with
+          | Ok parsed -> Cmd.ofMsg (CreateFromImport(title, parsed))
+          | Result.Error errs ->
+            errs
+            |> List.iter (fun (line, err) ->
+              logger.LogDebug(
+                "Failed at {index} with: {error} for '{line}'",
+                err.idx,
+                err.message,
+                line
+              ))
+
+            Cmd.none
         | _ -> Cmd.ofMsg (ShowImportDialog false)
 
       { state with FromClipboard = ValueNone }, cmd
@@ -206,14 +220,14 @@ module Lists =
       button {
         attr.``type`` "submit"
         attr.disabled (not state.CanAddCurrentName)
-        Icon.Get Save None
+        Icon.Get Save
       }
 
       button {
         attr.``class`` "paper-btn btn-small"
         attr.``type`` "button"
         on.click (fun _ -> FromClipboard |> dispatch)
-        Icon.Get Import None
+        Icon.Get Import
       }
 
     }
@@ -232,13 +246,13 @@ module Lists =
       button {
         attr.``class`` "paper-btn btn-small btn-primary-outline"
         on.click (fun _ -> RequestRoute item.Id |> dispatch)
-        Icon.Get Text None
+        Icon.Get Text
       }
 
       button {
         attr.``class`` "paper-btn btn-small btn-danger-outline"
         on.click (fun _ -> ShowConfirmDeleteModal(ValueSome item) |> dispatch)
-        Icon.Get Trash None
+        Icon.Get Trash
       }
     }
 
@@ -300,15 +314,21 @@ module Lists =
 
 
 
-  type Page() as this =
+  type Page() =
     inherit ProgramComponent<State, Msg>()
 
+    [<Inject>]
+    member val LoggerFactory = Unchecked.defaultof<ILoggerFactory> with get, set
+
     [<Parameter>]
     member val OnRouteRequested: (string -> unit) = ignore with get, set
 
-    override _.Program =
+    override self.Program =
       let update msg state =
-        update msg state this.JSRuntime this.OnRouteRequested
+        let logger =
+          self.LoggerFactory.CreateLogger("Lists Page")
+
+        update msg state self.JSRuntime logger self.OnRouteRequested
 
       Program.mkProgram init update view
 #if DEBUG
diff --git a/src/Mandadin.Client/wwwroot/manifest.webmanifest b/src/Mandadin.Client/wwwroot/manifest.webmanifest
index 41d6179..7097673 100644
--- a/src/Mandadin.Client/wwwroot/manifest.webmanifest
+++ b/src/Mandadin.Client/wwwroot/manifest.webmanifest
@@ -59,7 +59,7 @@
   ],
   "protocol_handlers": [
     {
-      "protocol": "mandadin-web",
+      "protocol": "web+mandadin",
       "url": "/lists/%s"
     }
   ],