Refactor v4 to v7 (#656)

fsprojects · Jan 16, 2025 · 7c2bd70 · 7c2bd70
1 parent 5253a15
commit 7c2bd70
Show file tree

Hide file tree

Showing 21 changed files with 315 additions and 1,599 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "6.3.15",
+      "version": "7.0.0",
       "commands": [
         "fantomas"
       ],

diff --git a/build.fsx b/build.fsx
@@ -13,9 +13,9 @@ let astPort = 7412
 let oakPort = 8904
 let fantomasMainPort = 11084
 let fantomasPreviewPort = 12007
-let fantomasV4Port = 10707
 let fantomasV5Port = 11009
 let fantomasV6Port = 13042
+let fantomasV7Port = 10707
 let pwd = __SOURCE_DIRECTORY__
 let fantomasDepDir = pwd </> ".deps" </> "fantomas"
 let previewBranch = "v7.0"
@@ -101,9 +101,9 @@ let setViteToProduction () =
 
     setEnv "VITE_AST_BACKEND" $"{mainStageUrl}/ast-viewer"
     setEnv "VITE_OAK_BACKEND" $"{mainStageUrl}/oak-viewer"
-    setEnv "VITE_FANTOMAS_V4" $"{mainStageUrl}/fantomas/v4"
     setEnv "VITE_FANTOMAS_V5" $"{mainStageUrl}/fantomas/v5"
     setEnv "VITE_FANTOMAS_V6" $"{mainStageUrl}/fantomas/v6"
+    setEnv "VITE_FANTOMAS_V7" $"{mainStageUrl}/fantomas/v7"
     setEnv "VITE_FANTOMAS_MAIN" $"{mainStageUrl}/fantomas/main"
     setEnv "VITE_FANTOMAS_PREVIEW" $"{mainStageUrl}/fantomas/preview"
 
@@ -139,9 +139,9 @@ pipeline "Build" {
     stage "publish lambdas" {
         stage "parallel ones" {
             paralle
-            run (publishLambda "FantomasOnlineV4")
             run (publishLambda "FantomasOnlineV5")
             run (publishLambda "FantomasOnlineV6")
+            run (publishLambda "FantomasOnlineV7")
             run (publishLambda "ASTViewer")
         }
         run (publishLambda "FantomasOnlineMain")
@@ -245,9 +245,9 @@ let prepareEnvironmentVariables =
                 setEnv "NODE_ENV" "development"
                 setEnv "VITE_AST_BACKEND" (localhostBackend astPort "ast-viewer")
                 setEnv "VITE_OAK_BACKEND" (localhostBackend oakPort "oak-viewer")
-                setEnv "VITE_FANTOMAS_V4" (localhostBackend fantomasV4Port "fantomas/v4")
                 setEnv "VITE_FANTOMAS_V5" (localhostBackend fantomasV5Port "fantomas/v5")
                 setEnv "VITE_FANTOMAS_V6" (localhostBackend fantomasV6Port "fantomas/v6")
+                setEnv "VITE_FANTOMAS_V7" (localhostBackend fantomasV7Port "fantomas/v7")
                 setEnv "VITE_FANTOMAS_MAIN" (localhostBackend fantomasMainPort "fantomas/main")
                 setEnv "VITE_FANTOMAS_PREVIEW" (localhostBackend fantomasPreviewPort "fantomas/preview")
                 return 0
@@ -262,9 +262,9 @@ pipeline "Watch" {
         paralle
         run (runLambda "ASTViewer")
         run (runLambda "OakViewer")
-        run (runLambda "FantomasOnlineV4")
         run (runLambda "FantomasOnlineV5")
         run (runLambda "FantomasOnlineV6")
+        run (runLambda "FantomasOnlineV7")
         run (runLambda "FantomasOnlineMain")
         run (runLambda "FantomasOnlinePreview")
         stage "frontend" {
@@ -297,9 +297,9 @@ pipeline "Start" {
         paralle
         runPublishedLambda "ASTViewer"
         runPublishedLambda "OakViewer"
-        runPublishedLambda "FantomasOnlineV4"
         runPublishedLambda "FantomasOnlineV5"
         runPublishedLambda "FantomasOnlineV6"
+        runPublishedLambda "FantomasOnlineV7"
         runPublishedLambda "FantomasOnlineMain"
         runPublishedLambda "FantomasOnlinePreview"
         stage "frontend" {

diff --git a/fantomas-tools.sln b/fantomas-tools.sln
@@ -13,7 +13,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ASTViewer", "src\server\AST
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FantomasOnlineMain", "src\server\FantomasOnlineMain\FantomasOnlineMain.fsproj", "{5D394D9E-CBEF-40CD-9EBD-ECC624A68665}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FantomasOnlineV4", "src\server\FantomasOnlineV4\FantomasOnlineV4.fsproj", "{691DC36D-C0CC-481B-AA25-4E7C6C35E73D}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FantomasOnlineV7", "src\server\FantomasOnlineV7\FantomasOnlineV7.fsproj", "{691DC36D-C0CC-481B-AA25-4E7C6C35E73D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".deps", ".deps", "{9F0DEF2C-4315-4E09-AE92-A5A422C24709}"
 EndProject

diff --git a/infrastructure/Program.fs b/infrastructure/Program.fs
@@ -94,11 +94,6 @@ let getAllLambdas (lastSha, lastTime) =
           "OakViewer"
           [ mkLambdaInfo "GetVersion" "GET" "/oak-viewer/version" List.empty
             mkLambdaInfo "GetOak" "POST" "/oak-viewer/get-oak" List.empty ]
-      mkLambdaProject
-          "FantomasOnlineV4"
-          [ mkLambdaInfo "GetVersion" "GET" "/fantomas/v4/version" List.empty
-            mkLambdaInfo "GetOptions" "GET" "/fantomas/v4/options" List.empty
-            mkLambdaInfo "PostFormat" "POST" "/fantomas/v4/format" List.empty ]
       mkLambdaProject
           "FantomasOnlineV5"
           [ mkLambdaInfo "GetVersion" "GET" "/fantomas/v5/version" List.empty
@@ -109,6 +104,11 @@ let getAllLambdas (lastSha, lastTime) =
           [ mkLambdaInfo "GetVersion" "GET" "/fantomas/v6/version" List.empty
             mkLambdaInfo "GetOptions" "GET" "/fantomas/v6/options" List.empty
             mkLambdaInfo "PostFormat" "POST" "/fantomas/v6/format" List.empty ]
+      mkLambdaProject
+          "FantomasOnlineV7"
+          [ mkLambdaInfo "GetVersion" "GET" "/fantomas/v7/version" List.empty
+            mkLambdaInfo "GetOptions" "GET" "/fantomas/v7/options" List.empty
+            mkLambdaInfo "PostFormat" "POST" "/fantomas/v7/format" List.empty ]
       mkLambdaProject
           "FantomasOnlineMain"
           [ mkLambdaInfo

diff --git a/src/client/fsharp/FantomasOnline/Model.fs b/src/client/fsharp/FantomasOnline/Model.fs
@@ -4,11 +4,11 @@ open FantomasOnline.Shared
 open FantomasTools.Client
 
 type FantomasMode =
-    | V4
     | V5
     | V6
+    | V7
     | Main // main branch
-    | Preview // v7.0 branch
+    | Preview // also main branch
 
 type Msg =
     | Bubble of BubbleMessage

diff --git a/src/client/fsharp/FantomasOnline/State.fs b/src/client/fsharp/FantomasOnline/State.fs
@@ -9,21 +9,15 @@ open FantomasTools.Client.FantomasOnline.Model
 open Fetch
 open Thoth.Json
 
-[<Emit("import.meta.env.VITE_FANTOMAS_V2")>]
-let private v2Backend: string = jsNative
-
-[<Emit("import.meta.env.VITE_FANTOMAS_V3")>]
-let private v3Backend: string = jsNative
-
-[<Emit("import.meta.env.VITE_FANTOMAS_V4")>]
-let private v4Backend: string = jsNative
-
 [<Emit("import.meta.env.VITE_FANTOMAS_V5")>]
 let private v5Backend: string = jsNative
 
 [<Emit("import.meta.env.VITE_FANTOMAS_V6")>]
 let private v6Backend: string = jsNative
 
+[<Emit("import.meta.env.VITE_FANTOMAS_V7")>]
+let private v7Backend: string = jsNative
+
 [<Emit("import.meta.env.VITE_FANTOMAS_MAIN")>]
 let private mainBackend: string = jsNative
 
@@ -32,9 +26,9 @@ let private previewBackend: string = jsNative
 
 let private backend =
     Map.ofList
-        [ (FantomasMode.V4, v4Backend)
-          (FantomasMode.V5, v5Backend)
+        [ (FantomasMode.V5, v5Backend)
           (FantomasMode.V6, v6Backend)
+          (FantomasMode.V7, v7Backend)
           (FantomasMode.Main, mainBackend)
           (FantomasMode.Preview, previewBackend) ]
 

diff --git a/src/client/fsharp/FantomasOnline/View.fs b/src/client/fsharp/FantomasOnline/View.fs
@@ -87,11 +87,7 @@ let options model dispatch =
                 optionList
             else
                 let settingsFilter =
-                    model.SettingsFilter
-                        .Replace("fsharp_", "")
-                        .Replace("_", "")
-                        .Replace(" ", "")
-                        .ToLowerInvariant()
+                    model.SettingsFilter.Replace("fsharp_", "").Replace("_", "").Replace(" ", "").ToLowerInvariant()
 
                 optionList
                 |> List.filter (fun (n, _) ->
@@ -307,11 +303,11 @@ let settings isFsi model dispatch =
     | FantomasTabState.LoadingOptions -> Loader.loading
     | _ ->
         let fantomasMode =
-            [ FantomasMode.V4, "4.x"
-              FantomasMode.V5, "5.x"
+            [ FantomasMode.V5, "5.x"
               FantomasMode.V6, "6.x"
+              FantomasMode.V7, "7.x"
               FantomasMode.Main, "Main"
-              FantomasMode.Preview, "7.0 preview" ]
+              FantomasMode.Preview, "Preview" ]
             |> List.map (fun (m, l) ->
                 { IsActive = model.Mode = m
                   Label = l

diff --git a/src/client/fsharp/Navigation.fs b/src/client/fsharp/Navigation.fs
@@ -29,9 +29,9 @@ let toHash =
     | HomeTab -> "#/"
     | OakTab -> "#/oak"
     | ASTTab -> "#/ast"
-    | FantomasTab FantomasOnline.Model.V4 -> "#/fantomas/v4"
     | FantomasTab FantomasOnline.Model.V5 -> "#/fantomas/v5"
     | FantomasTab FantomasOnline.Model.V6 -> "#/fantomas/v6"
+    | FantomasTab FantomasOnline.Model.V7 -> "#/fantomas/v7"
     | FantomasTab FantomasOnline.Model.Main -> "#/fantomas/main"
     | FantomasTab FantomasOnline.Model.Preview -> "#/fantomas/preview"
 
@@ -41,8 +41,12 @@ let parseUrl segments =
     | [ "ast"; Route.Query [ "data", _ ] ] -> ActiveTab.ASTTab
     | [ "oak" ]
     | [ "oak"; Route.Query [ "data", _ ] ] -> ActiveTab.OakTab
-    | [ "fantomas"; "v4" ]
-    | [ "fantomas"; "v4"; Route.Query [ "data", _ ] ] -> ActiveTab.FantomasTab(FantomasOnline.Model.V4)
+    | [ "fantomas"; "v5" ]
+    | [ "fantomas"; "v5"; Route.Query [ "data", _ ] ] -> ActiveTab.FantomasTab(FantomasOnline.Model.V5)
+    | [ "fantomas"; "v6" ]
+    | [ "fantomas"; "v6"; Route.Query [ "data", _ ] ] -> ActiveTab.FantomasTab(FantomasOnline.Model.V6)
+    | [ "fantomas"; "v7" ]
+    | [ "fantomas"; "v7"; Route.Query [ "data", _ ] ] -> ActiveTab.FantomasTab(FantomasOnline.Model.V7)
     | [ "fantomas"; "main" ]
     | [ "fantomas"; "main"; Route.Query [ "data", _ ] ] -> ActiveTab.FantomasTab(FantomasOnline.Model.Main)
     | [ "fantomas"; "preview" ]

diff --git a/src/client/fsharp/State.fs b/src/client/fsharp/State.fs
@@ -137,9 +137,9 @@ let update msg model =
             let changeVersion (hashWithoutQuery: string) =
                 let version m =
                     match m with
-                    | FantomasOnline.Model.V4 -> "v4"
                     | FantomasOnline.Model.V5 -> "v5"
                     | FantomasOnline.Model.V6 -> "v6"
+                    | FantomasOnline.Model.V7 -> "v7"
                     | FantomasOnline.Model.Main -> "main"
                     | FantomasOnline.Model.Preview -> "preview"
 

diff --git a/src/server/FantomasOnlineV4/FormatCode.fs b/src/server/FantomasOnlineV4/FormatCode.fs