From b19f08d0b98bece2436d977c36349beb3a8fe905 Mon Sep 17 00:00:00 2001
From: GyGerg <gyalus.gergo.98@gmail.com>
Date: Tue, 5 Sep 2023 10:45:01 +0200
Subject: [PATCH] #1 - Update binding to version 11.7 and convert to be npm
 based (#2)

* #1  Initial update to WS7 (beta)
- Uses npm package instead of concrete cdn link
- Upgrade to SweetAlert2 (https://sweetalert2.github.io/), version 11.7+

* Moved helper pattern into its own sub-module

* meta/info changes

* typo fix in paket template + removed AssemblyTitle/Desc attributes
---
 WebSharper.SweetAlert Sample Page/Client.fs   |  77 +++--
 .../WebSharper.SweetAlert Sample Page.fsproj  |   9 +-
 WebSharper.SweetAlert Sample Page/index.html  |   6 +-
 .../package-lock.json                         |  25 ++
 .../package.json                              |  14 +
 WebSharper.SweetAlert/Main.fs                 | 323 ++++++++++++------
 .../WebSharper.SweetAlert.fsproj              |  11 +-
 WebSharper.SweetAlert/wsconfig.json           |   4 +
 nuget/WebSharper.SweetAlert.paket.template    |   2 +-
 paket.dependencies                            |   3 +-
 paket.lock                                    |  20 +-
 11 files changed, 343 insertions(+), 151 deletions(-)
 create mode 100644 WebSharper.SweetAlert Sample Page/package-lock.json
 create mode 100644 WebSharper.SweetAlert Sample Page/package.json
 create mode 100644 WebSharper.SweetAlert/wsconfig.json

diff --git a/WebSharper.SweetAlert Sample Page/Client.fs b/WebSharper.SweetAlert Sample Page/Client.fs
index 6154811..bd10e49 100644
--- a/WebSharper.SweetAlert Sample Page/Client.fs	
+++ b/WebSharper.SweetAlert Sample Page/Client.fs	
@@ -24,73 +24,82 @@ open WebSharper.JavaScript
 open WebSharper.UI
 open WebSharper.UI.Html
 open WebSharper.UI.Client
-open WebSharper.UI.Notation
-open WebSharper.UI.Templating
 open WebSharper.SweetAlert
 
 [<JavaScript>]
 module Client =
+    module Helpers =
+        let (|IsConfirmed|IsDenied|IsDismissed|) (res: SweetAlertResult<'T>) =
+            if res.IsConfirmed then IsConfirmed(res.Value)
+            else if res.IsDismissed then IsDismissed(res.Dismiss)
+            else if res.IsDenied then IsDenied
+            else failwith "SweetAlert JS failure: Result not set as confirmed, dimissed or denied"
+
+    open Helpers
 
     [<SPAEntryPoint>]
     let Main () =
-        let Alert0= 
-            SweetAlert.Box(
+        let Alert0 () =
+            Swal.Fire<unit>(SweetAlertOptions(
                 TitleText = "Information",
                 Text = "It works!",
-                Type = "info",
+                Icon = SweetAlertIcon.Info,
                 AllowOutsideClick = true,
                 ShowCancelButton = true
-            )
-        let Alert1 =
-            SweetAlert.Box(
+            ))
+        let Alert1 () =
+            Swal.Fire<unit>(SweetAlertOptions(
                 TitleText = "Click",
                 Text = "You have clicked on the button!",
-                Type = "success",
+                Icon = SweetAlertIcon.Success,
                 ConfirmButtonText = "Cool",
                 ConfirmButtonColor = "#000000"
-            )
-
-        let Alert2 =
-            SweetAlert.Box(
+            ))
+        let InputAlert () =
+            Swal.Fire<string>(SweetAlertOptions(
                 TitleText = "Input",
                 Text = "Hello! Please say something",
-                Type = "info",
-                Input = "text"
-            )
-        SweetAlert.SetDefaults Alert0
-        SweetAlert.ShowBox Alert0 |> ignore
+                Icon = SweetAlertIcon.Info,
+                Input = SweetAlertInput.Text
+            ))
+
+        Alert0() |> ignore
         let btn1 = 
             Doc.Button "Click me!" [] (fun () ->
-                SweetAlert.ShowBox Alert1 |> ignore
+                Alert1() |> ignore
             )
         let rResult = Var.Create ""
 
 
         let btn2 =
+            
             Doc.Button "Input" [] (fun () ->
-  //              (SweetAlert.ShowBox Alert2).Then(fun r -> 
-  //                  let Alert = Box(Text = "You have wrote: "+string(r), TitleText = "Result")
-  //                  Console.Log r
-  //                  SweetAlert.ShowBox(Alert)|>ignore) |> ignore
-   
-                SweetAlert.ShowBox(Alert2).Then(fun x -> rResult := x)|> ignore
-  //              SweetAlert.Close()
-  //              SweetAlert.ShowBox(Alert2).State() |> Console.Log
-  //              SweetAlert.ShowBox(Alert2).Then (fun result -> Console.Log result) |> ignore
-  //              SweetAlert.Then(SweetAlert(Alert2)) |> Console.Log
                 
-  //              rValue.Value <- SweetAlert.Then(SweetAlert.ShowBox(Alert2))
-  //              SweetAlert.GetInput |> Console.Log
+                promise {
+                    let! result = InputAlert()
+                    Console.Log result
 
+                    return! 
+                        match result with 
+                        | IsConfirmed v ->
+                                rResult.Set v
+                                ("Result", $"You have wrote: {v}")
+                        | IsDismissed reason -> 
+                                ("Dismissed", $"Dismissed with reason: {reason}")
+                        | IsDenied -> 
+                                ("Denied", "Dialog denied.")
+                        |> Swal.Fire
+                } |> ignore
+                ()
 
             )
 
         Doc.Concat[
             btn1
-            br[][]
+            br [] []
             btn2
-            h2[][text "The last input was: "]
-            p[][textView rResult.View]
+            h2 [] [text "The last input was: "]
+            p [] [textView rResult.View]
         ]
         |> Doc.RunById "main"
 
diff --git a/WebSharper.SweetAlert Sample Page/WebSharper.SweetAlert Sample Page.fsproj b/WebSharper.SweetAlert Sample Page/WebSharper.SweetAlert Sample Page.fsproj
index e013065..a69d7a7 100644
--- a/WebSharper.SweetAlert Sample Page/WebSharper.SweetAlert Sample Page.fsproj	
+++ b/WebSharper.SweetAlert Sample Page/WebSharper.SweetAlert Sample Page.fsproj	
@@ -9,9 +9,14 @@
   <ItemGroup>
     <Compile Include="Client.fs" />
   </ItemGroup>
-  <ItemGroup>
+  <!--<ItemGroup>
     <ProjectReference Include="../WebSharper.SweetAlert/WebSharper.SweetAlert.fsproj" />
-  </ItemGroup>
+  </ItemGroup>-->
+    <ItemGroup>
+	    <Reference Include="WebSharper.SweetAlert">
+		    <HintPath>..\WebSharper.SweetAlert\bin\Debug\netstandard2.0\WebSharper.SweetAlert.dll</HintPath>
+	    </Reference>
+    </ItemGroup>
   <Import Project="..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets" Condition="Exists('..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets')" />
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
\ No newline at end of file
diff --git a/WebSharper.SweetAlert Sample Page/index.html b/WebSharper.SweetAlert Sample Page/index.html
index dad977a..1090ae6 100644
--- a/WebSharper.SweetAlert Sample Page/index.html	
+++ b/WebSharper.SweetAlert Sample Page/index.html	
@@ -4,17 +4,17 @@
     <title>WebSharper.SweetAlert_Sample_Page</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="stylesheet" type="text/css" href="Content/WebSharper.SweetAlert_Sample_Page.css" />
+    <link rel="stylesheet" type="text/css" href="./Content/WebSharper.SweetAlert%20Sample%20Page.css" />
     <style>
         /* Don't show the not-yet-loaded templates */
         [ws-template], [ws-children-template] { display: none; }
     </style>
-    <script type="text/javascript" src="Content/WebSharper.SweetAlert_Sample_Page.head.js"></script>
+    <script type="module" src="./Content/WebSharper.SweetAlert%20Sample%20Page.head.js"></script>
 </head>
 <body>
     <h1>WebSharper.SweetAlert sample page</h1>
     <div id="main">
     </div>
-    <script type="text/javascript" src="Content/WebSharper.SweetAlert_Sample_Page.min.js"></script>
+    <script type="module" src="./Content/WebSharper.SweetAlert%20Sample%20Page.js"></script>
 </body>
 </html>
diff --git a/WebSharper.SweetAlert Sample Page/package-lock.json b/WebSharper.SweetAlert Sample Page/package-lock.json
new file mode 100644
index 0000000..ce2bff7
--- /dev/null
+++ b/WebSharper.SweetAlert Sample Page/package-lock.json	
@@ -0,0 +1,25 @@
+{
+  "name": "websharper.sweetalert-sample-page",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "websharper.sweetalert-sample-page",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "sweetalert2": "^11.7.27"
+      }
+    },
+    "node_modules/sweetalert2": {
+      "version": "11.7.27",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.27.tgz",
+      "integrity": "sha512-QbRXGQn1sb7HEhzA/K2xtWIwQHh/qkSbb1w6jYcTql2xy17876lTREEt1D4X6Q0x2wHtfUjKJ+Cb8IVkRoq7DQ==",
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/sponsors/limonte"
+      }
+    }
+  }
+}
diff --git a/WebSharper.SweetAlert Sample Page/package.json b/WebSharper.SweetAlert Sample Page/package.json
new file mode 100644
index 0000000..59b7e4c
--- /dev/null
+++ b/WebSharper.SweetAlert Sample Page/package.json	
@@ -0,0 +1,14 @@
+{
+  "name": "websharper.sweetalert-sample-page",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "sweetalert2": "^11.7.27"
+  }
+}
diff --git a/WebSharper.SweetAlert/Main.fs b/WebSharper.SweetAlert/Main.fs
index 84f9d22..1d02ffa 100644
--- a/WebSharper.SweetAlert/Main.fs
+++ b/WebSharper.SweetAlert/Main.fs
@@ -19,126 +19,257 @@
 // $end{copyright}
 namespace WebSharper.SweetAlert
 
+open System
 open WebSharper
 open WebSharper.JavaScript
 open WebSharper.InterfaceGenerator
-open WebSharper.JQuery
 
 module Definition =
-    let SweetAlert = Class "sweetAlert"
+    
+    let DismissReason = Pattern.EnumStrings "DismissReason" [
+        "cancel"
+        "backdrop"
+        "close"
+        "esc"
+        "timer"
+    ]
 
-    let SweetAlertProm =
-        Class "SweetAlertPromise"
-        |=> Inherits T<Promise>
-        |+> Instance [
-            "then" => T<string -> unit> ^-> T<unit>
+    let SweetAlertResult = Generic - fun t ->
+        Pattern.Config "SweetAlertResult" {
+            Required = [
+                "isConfirmed", T<bool>
+                "isDenied", T<bool>
+                "isDismissed", T<bool>
+            ]
+            Optional = [
+                "value", t.Type
+                "dismiss", DismissReason.Type // todo Swal.DismissReason
+            ]
+        }
+    let SweetAlertIcon = Pattern.EnumStrings "SweetAlertIcon" [
+        "success"
+        "error"
+        "warning"
+        "info"
+    ]
+        
+    let SweetAlertInput = Pattern.EnumStrings "SweetAlertInput" [
+        "text"; "email"; "password"; "number"; "tel"; "range";
+        "textarea"; "select"; "radio"; "checkbox"; "file"; "url";
+    ]
+    
+    let SweetAlertPosition = Pattern.EnumStrings "SweetAlertPosition" [
+        "top"; "top-start"; "top-end"; "top-left"; "top-right"
+        "center"; "center-start"; "center-end"; "center-left"; "center-right"
+        "bottom"; "bottom-start"; "bottom-end"; "bottom-left"; "bottom-right"
+    ]
+    
+    
+    let SweetAlertCustomClass = Pattern.Config "SweetAlertCustomClass" {
+        Required = []
+        Optional = []
+    }
+
+
+    let SweetAlertHideShowClass = Pattern.Config "SweetAlertHideShowClass" {
+        Required = []
+        Optional = [
+            "backdrop", T<string> + T<string[]>
+            "icon", T<string> + T<string[]>
+            "popup", T<string> + T<string[]>
         ]
+    }
+    let ValueOrThunk (t:Type.Type) = t + (T<unit> ^-> t)
+    let SyncOrAsync (t:Type.Type) = t + T<Promise<_>>[t]
 
-    let Box =
-        Pattern.Config "Box"{
+    let updatableParameters = [
+        "allowEscapeKey", ValueOrThunk T<bool>
+        "allowOutsideClick", ValueOrThunk T<bool>
+        "background", T<string>
+        "buttonsStyling", T<bool>
+        "cancelButtonAriaLabel", T<string>
+        "cancelButtonColor", T<string>
+        "cancelButtonText", T<string>
+        "closeButtonAriaLabel", T<string>
+        "closeButtonHtml", T<string>
+        "confirmButtonAriaLabel", T<string>
+        "confirmButtonColor", T<string>
+        "confirmButtonText", T<string>
+        "currentProgressStep", !? T<int>
+        "customClass", SweetAlertCustomClass.Type + T<string>
+        "denyButtonAriaLabel", T<string>
+        "denyButtonColor", T<string>
+        "denyButtonText", T<string>
+        "didClose", T<unit> ^-> T<unit>
+        "didDestroy", T<unit> ^-> T<unit>
+        "footer", T<string> + T<HTMLElement>
+        "hideClass", SweetAlertHideShowClass.Type
+        "html", T<string> + T<HTMLElement>
+        "icon", SweetAlertIcon.Type
+        "iconColor", T<string>
+        "imageAlt", T<string>
+        "imageHeight", T<int> + T<string>
+        "imageUrl", T<string>
+        "imageWidth", T<int> + T<string>
+        "preConfirm", T<obj>?inputValue ^-> SyncOrAsync T<obj>
+        "preDeny", T<obj>?value ^-> SyncOrAsync (T<obj> + T<unit>)
+        "progressSteps", Type.ArrayOf T<string>
+        "reverseButtons", T<bool>
+        "showCancelButton", T<bool>
+        "showCloseButton", T<bool>
+        "showConfirmButton", T<bool>
+        "showDenyButton", T<bool>
+        "text", T<string>
+        "title", T<string> + T<HTMLElement>
+        "titleText", T<string>
+        "willClose", T<HTMLElement>?popup ^-> T<unit>
+    ]
+    
+    let SweetAlertUpdatableParameters = Pattern.Config "SweetAlertUpdatableParameters" {
+        Required = []
+        Optional =  updatableParameters
+    }
+    
+
+
+    let SweetAlertGrow = (Pattern.EnumStrings "SweetAlertGrow" [
+        "row"; "column"; "fullscreen"; false.ToString()
+    ])
+
+    let inputType = T<string> + T<int> + T<File> + T<FileList>
+    let SweetAlertOptions =
+        Pattern.Config "SweetAlertOptions" {
             Required = []
-            Optional =
-            [
-                "title", T<string>
-                "titleText", T<string>
-                "text", T<string>
-                "html", T<string>
-                "type", T<string>
-                "target", T<string>
-                "input", T<string>
-                "width", T<string>
-                "padding", T<int>
-                "background", T<string>
-                "customClass", T<string>
+            Optional = [
+                "iconHtml", T<string>
+                "template", T<string> + T<HTMLTemplateElement> // is this good
+                "backdrop", T<bool> + T<string>
+                "toast", T<bool>
+                "target", T<string> + T<HTMLElement>
+                "input", SweetAlertInput.Type
+                "width", T<double> + T<string>
+                "padding", T<double> + T<string>
+                "color", T<string>
+                "position", SweetAlertPosition.Type
+                // "grow", SweetAlertGrow.Type
+                "showClass", SweetAlertHideShowClass.Type
                 "timer", T<int>
-                "animation", T<bool>
-                "allowOutsideClick", T<bool>
-                "allowEscapeKey", T<bool>
-                "allowEnterKey", T<bool>
-                "showConfirmButton", T<bool>
-                "showCancelButton", T<bool>
-                "confirmButtonText", T<string>
-                "cancelButtonText", T<string>
-                "confirmButtonColor", T<string>
-                "cancleButtonColor", T<string>
-                "confirmButtonClass", T<string>
-                "cancelButtonClass", T<string>
-                "buttonsStyling", T<bool>
-                "reverseButtons", T<bool>
+                "timerProgressBar", T<bool>
+                "heightAuto", T<bool>
+                "allowEnterKey", SyncOrAsync T<obj> // TODO generic SyncOrAsync
+                "stopKeydownPropagation", T<bool>
+                "keydownListenerCapture", T<bool>
+                "focusConfirm", T<bool>
+                "focusDeny", T<bool>
                 "focusCancel", T<bool>
-                "showCloseButton", T<bool>
+                "returnFocus", T<bool>
+                "loaderHtml", T<string>
                 "showLoaderOnConfirm", T<bool>
-                "preConfirm", T<string> ^-> SweetAlertProm
-                "imageUrl", T<string>
-                "imageWidth", T<int>
-                "imageHeight", T<int>
-                "imageClass", T<string>
+                "showLoaderOnDeny", T<bool>
+                "inputLabel", T<string>
                 "inputPlaceholder", T<string>
-                "inputValue", T<string>
-                "inputOptions", T<string[]>
+                
+                "inputValue", SyncOrAsync inputType // TODO: wrap in SyncOrAsync
+                "inputOptions", T<obj> // TODO SyncOrAsync<readonlymap<str,str> | record<str,any>>
+                "inputAutoFocus", T<bool>
                 "inputAutoTrim", T<bool>
-                "inputAttributes", T<System.Collections.Generic.Dictionary<_,_>>.[T<string>, T<string>]
-                "inputValidator", T<string> ^-> SweetAlertProm
-                "inputClass", T<string>
-                "progressSteps", T<int[]>
-                "currentProgressStep", T<unit> ^-> T<int>
-                "progressStepDistance", T<string>
-                "onOpen", T<JavaScript.Dom.Node> ^-> T<unit>
-                "onClose", T<JavaScript.Dom.Node> ^-> T<unit>
-                "useRejections", T<bool>
-            ]
+                "inputAttributes", T<obj> // Record<str,str>
+                "inputValidator", T<string*string> ^-> (T<string> + T<unit>) // TODO string,string -> string | null | void
+                "returnInputValueOnDeny", T<bool>
+                "validationMessage", T<string>
+                "progressStepsDistance", (!? T<int>) + T<string> // default undef
+                "willOpen", T<HTMLElement> ^-> T<unit>
+                "didOpen", T<HTMLElement> ^-> T<unit>
+                "didRender", T<HTMLElement> ^-> T<unit>
+                "scrollbarPadding", T<bool>
+
+                yield! updatableParameters
+            
+            ] 
         }
 
-    SweetAlert
-        |+> Static[
-            "showBox" => Box?box ^-> SweetAlertProm
-            |> WithInline ("return Sweetalert2($box);")
+    let Swal = 
+        Class "Swal"
+        |+> Static [
+            //Generic - fun t ->
+            //    Method "fire" (SweetAlertOptions.Type ^-> t)
+
+            Generic - fun t ->
+                "fire" =>  SweetAlertOptions.Type ^-> T<Promise<_>>[SweetAlertResult[t]] // TODO: class as input
+            Generic - fun t -> 
+                "fire" => !? T<string>?title * !? T<string>?html * !? SweetAlertIcon.Type?icon ^-> T<Promise<_>>[SweetAlertResult[t]]
+
+            "mixin" => SweetAlertOptions.Type?options ^-> TSelf
             "isVisible" => T<unit> ^-> T<bool>
-            "setDefaults" => Box ^-> T<unit>
-            "resetDefaults" => T<unit> ^-> T<unit>
-            "close" => T<unit> ^-> T<unit>
-            "enableButtons" => T<unit> ^-> T<unit>
-            "getTitle" =? T<string>
-            "getContent" =? T<string>
-            "getImage" =? T<string>
-            "getConfirmButton" =? T<JavaScript.Dom.Node>
-            "getCancelButton" =? T<JavaScript.Dom.Node>
-            "disableButtons" => T<unit> ^-> T<unit>
-            "enableConfirmButton" => T<unit> ^-> T<unit>
-            "disableConfirmButton" => T<unit> ^-> T<unit>
-            "showLoading" => T<unit> ^-> T<unit>
-            "hideLoading" => T<unit> ^-> T<unit>
-            "clickConfirm" => T<unit> ^-> T<unit>
-            "clickCancel" => T<unit> ^-> T<unit>
-            "showValidationErrorMessage" => T<string> ^-> T<unit>
-            "resetValidationError" => T<unit> ^-> T<unit>
-            "getInput" =? T<JavaScript.Dom.Node>
-            "disableInput" => T<unit> ^-> T<unit>
-            "enableInput" => T<unit> ^-> T<unit>
-            "queue" => Type.ArrayOf Box ^-> T<unit>
-            "getQueueStep" =? T<int>
-            "insertQueueStep" => (Box * !? T<int>) ^-> T<unit>
-            "deleteQueueStep" => T<int> ^-> T<unit>
-            "getProgressSteps" =? T<int>
-            "setProgressSteps" => T<int> ^-> T<unit>
-            "showProgressSteps" => T<unit> ^-> T<unit>
-            "hideProgressSteps" => T<unit> ^-> T<unit>
-        ]|>ignore
+            "update" => SweetAlertUpdatableParameters.Type?options ^-> T<unit>
+            Generic - fun t ->
+                "close" => SweetAlertResult[t] ^-> T<unit>
+            
+            let get (name:string) (t:Type.Type) =
+                $"get{name}" => T<unit> ^-> t
+
+            for n in [ 
+                "Container";"Popup";"Title";"ProgressSteps";"HtmlContainer";"Image"
+                "CloseButton";"Icon";"IconContent";"ConfirmButton";"DenyButton";"CancelButton"
+                "Actions";"Footer";"TimerProgressBar";"ValidationMessage"
+            ] do 
+                (get n !? T<HTMLElement>) :> CodeModel.IClassMember
+
+            get"FocusableElements" !| T<HTMLElement>
+
+            for n in [
+                "hideLoading"
+                "isLoading"
+                "clickConfirm"
+                "clickDeny"
+                "clickCancel"
+                "disableInput"
+                "enableInput"
+                "resetValidationMessage"
+            ] do 
+                (n => T<unit> ^-> T<unit>) :> CodeModel.IClassMember
+
+            get"Input" !? T<HTMLInputElement>
+
+            for n in [
+                "getTimerLeft"
+                "stopTimer"
+                "resumeTimer"
+                "toggleTimer"
+            ] do 
+                (n => T<unit> ^-> !| T<int>) :> CodeModel.IClassMember
+
+            "increaseTimer" => T<int>?n ^-> !| T<int>
+            "isTimerRunning" => T<unit> ^-> !| T<bool>
+            
+            "version" =? T<string>
+
+        ] |> ImportDefault "sweetalert2"
+
+    
  
 
     let Assembly =
         Assembly [
             Namespace "WebSharper.SweetAlert.Resources" [
-                Resource "Css" "https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/6.6.6/sweetalert2.min.css"
-                |> AssemblyWide
-                Resource "Js" "https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/6.6.6/sweetalert2.min.js"
-                |> AssemblyWide
+                // Resource "Css" "https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/6.6.6/sweetalert2.min.css"
+                // |> AssemblyWide
+                //Resource "Js" "sweetalert2"
+                //|> AssemblyWide
             ]
-            Namespace "WebSharper.SweetAlert"[
-                Box
-                SweetAlert
-                SweetAlertProm
+            
+            Namespace "WebSharper.SweetAlert" [
+                SweetAlertIcon
+                SweetAlertInput
+                SweetAlertPosition
+                SweetAlertCustomClass
+                SweetAlertHideShowClass
+                SweetAlertUpdatableParameters
+                DismissReason
+                SweetAlertResult
+                SweetAlertOptions
 
+                Swal
             ]
         ]
 
diff --git a/WebSharper.SweetAlert/WebSharper.SweetAlert.fsproj b/WebSharper.SweetAlert/WebSharper.SweetAlert.fsproj
index 08369e4..d92d932 100644
--- a/WebSharper.SweetAlert/WebSharper.SweetAlert.fsproj
+++ b/WebSharper.SweetAlert/WebSharper.SweetAlert.fsproj
@@ -1,13 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <WebSharperProject>Extension</WebSharperProject>
+    <WebSharperProject>binding</WebSharperProject>
     <WebSharperSourceMap>false</WebSharperSourceMap>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+	<Product>WebSharper.SweetAlert 11.7+</Product>
+	<Title>https://github.com/dotnet-websharper/sweetalert/</Title>
+	<Company>IntelliFactory</Company>
+	<Copyright>(c) 2023 IntelliFactory</Copyright>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.fs" />
   </ItemGroup>
+  <PropertyGroup>
+    <NpmDependencies>
+        <NpmPackage Name="sweetalert2" Version="gt= 11.7.0 lt 12.0.0" ResolutionStrategy="Max" />
+    </NpmDependencies>
+  </PropertyGroup>
   <Import Project="..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets" Condition="Exists('..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets')" />
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
\ No newline at end of file
diff --git a/WebSharper.SweetAlert/wsconfig.json b/WebSharper.SweetAlert/wsconfig.json
new file mode 100644
index 0000000..dfcba5e
--- /dev/null
+++ b/WebSharper.SweetAlert/wsconfig.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://websharper.com/wsconfig.schema.json",
+    "project": "binding"
+}
\ No newline at end of file
diff --git a/nuget/WebSharper.SweetAlert.paket.template b/nuget/WebSharper.SweetAlert.paket.template
index e09b92a..3bcfa0e 100644
--- a/nuget/WebSharper.SweetAlert.paket.template
+++ b/nuget/WebSharper.SweetAlert.paket.template
@@ -10,7 +10,7 @@ licenseUrl https://github.com/dotnet-websharper/sweetalert/blob/master/LICENSE.m
 iconUrl https://github.com/dotnet-websharper/core/raw/websharper50/tools/WebSharper.png
 projectUrl https://github.com/dotnet-websharper/sweetalert
 description
-    WebSharper extension for SweetALert
+    WebSharper bindings for SweetAlert2 11.7
 tags
     Web JavaScript F# C#
 files
diff --git a/paket.dependencies b/paket.dependencies
index 80d00cb..ab42b85 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,8 +1,7 @@
 source https://api.nuget.org/v3/index.json
 source https://nuget.pkg.github.com/dotnet-websharper/index.json
-source ../localnuget
 
-framework: netstandard2.0, net6.0
+framework: netstandard2.0
 strategy: min
 storage: none
 
diff --git a/paket.lock b/paket.lock
index 44e9f54..f625a73 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,6 +1,6 @@
 STORAGE: NONE
 STRATEGY: MIN
-RESTRICTION: || (== net50) (== netcoreapp2.1) (== netcoreapp3.1) (== netstandard2.0)
+RESTRICTION: == netstandard2.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     FSharp.Core (6.0)
@@ -147,9 +147,9 @@ NUGET
       System.IO (>= 4.3)
       System.Reflection.Primitives (>= 4.3)
       System.Runtime (>= 4.3)
-    System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net50) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (< portable-net45+wp8)) (&& (== net50) (>= uap10.1)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (< portable-net45+wp8)) (&& (== netcoreapp2.1) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0) (< netstandard2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (< portable-net45+wp8)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
+    System.Reflection.Emit.ILGeneration (4.7)
     System.Reflection.Emit.Lightweight (4.7)
-      System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net50) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (< portable-net45+wp8)) (&& (== net50) (>= uap10.1)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (< portable-net45+wp8)) (&& (== netcoreapp2.1) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0) (< netstandard2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (< portable-net45+wp8)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
+      System.Reflection.Emit.ILGeneration (>= 4.7)
     System.Reflection.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
@@ -295,12 +295,12 @@ NUGET
       System.Runtime (>= 4.3)
       System.Text.Encoding (>= 4.3)
     System.Text.RegularExpressions (4.3)
-      System.Collections (>= 4.3) - restriction: || (&& (== net50) (< netcoreapp1.1)) (&& (== netcoreapp2.1) (< netcoreapp1.1)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
-      System.Globalization (>= 4.3) - restriction: || (&& (== net50) (< netcoreapp1.1)) (&& (== netcoreapp2.1) (< netcoreapp1.1)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net50) (< netcoreapp1.1)) (&& (== netcoreapp2.1) (< netcoreapp1.1)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
+      System.Collections (>= 4.3)
+      System.Globalization (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
       System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net50) (< netcoreapp1.1)) (&& (== netcoreapp2.1) (< netcoreapp1.1)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
-      System.Threading (>= 4.3) - restriction: || (&& (== net50) (< netcoreapp1.1)) (&& (== netcoreapp2.1) (< netcoreapp1.1)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
+      System.Runtime.Extensions (>= 4.3)
+      System.Threading (>= 4.3)
     System.Threading (4.3)
       System.Runtime (>= 4.3)
       System.Threading.Tasks (>= 4.3)
@@ -366,12 +366,8 @@ NUGET
       System.Reflection.Emit.Lightweight (>= 4.7)
     WebSharper.FSharp (7.0.1.324-beta2)
       WebSharper (7.0.1.324-beta2)
-    WebSharper.JQuery (7.0.0.321-beta2)
-      WebSharper (>= 7.0 < 7.1)
     WebSharper.MathJS (7.0.1.324-beta2)
       WebSharper (7.0.1.324-beta2)
-    WebSharper.Testing (7.0.1.324-beta2)
-      WebSharper (7.0.1.324-beta2)
     WebSharper.UI (7.0.0.321-beta2)
       HtmlAgilityPack (>= 1.11)
       WebSharper (>= 7.0 < 7.1)