#1372 recognize UI's Content.Page

dotnet-websharper · Apr 15, 2024 · 603580f · 603580f
1 parent df11d58
commit 603580f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/compiler/WebSharper.Compiler.CSharp/CodeReader.fs b/src/compiler/WebSharper.Compiler.CSharp/CodeReader.fs
@@ -2778,6 +2778,12 @@ let contentType =
         FullName = "WebSharper.Sitelets.Content`1"
     }
 
+let uiContentType =
+    TypeDefinition {
+        Assembly = "WebSharper.UI"
+        FullName = "WebSharper.UI.Server.Content"
+    }
+
 exception BundleFail of message: string with
     override this.ToString() = this.message
 
@@ -2791,7 +2797,7 @@ let scanExpression (env: Environment) (node: SyntaxNode) =
                 [ value ]
             | _ ->
                 raise <| BundleFail $"Content.Bundle argument must be constant string %s{m.Value.MethodName} %O{arguments[1]}"   
-        elif typ = contentType && m.Value.MethodName.StartsWith "Page" then
+        elif (typ = contentType || typ = uiContentType) && m.Value.MethodName.StartsWith "Page" then
             match env.SemanticModel.GetConstantValue(Seq.last arguments).Value with
             | :? string as value when value <> null ->
                 [ value ]

diff --git a/src/compiler/WebSharper.Compiler.FSharp/CodeReader.fs b/src/compiler/WebSharper.Compiler.FSharp/CodeReader.fs
@@ -1324,6 +1324,12 @@ let contentModule =
         FullName = "WebSharper.Sitelets.ContentModule"
     }
 
+let uiContentType =
+    TypeDefinition {
+        Assembly = "WebSharper.UI"
+        FullName = "WebSharper.UI.Server.Content"
+    }
+
 let contentType =
     TypeDefinition {
         Assembly = "WebSharper.Sitelets"
@@ -1340,7 +1346,7 @@ let getBundleMethod (typ: TypeDefinition, m: Method, arguments: FSharpExpr list)
             [ string value ]
         | a ->
             raise <| BundleFail $"Content.Bundle argument must be constant string %s{m.Value.MethodName} %A{a}"   
-    elif typ = contentType && m.Value.MethodName.StartsWith "Page" then
+    elif (typ = contentType || typ = uiContentType) && m.Value.MethodName.StartsWith "Page" then
         match arguments |> List.last with
         | P.NewUnionCase (_, c, [ P.Const (value, _) ]) when c.Name = "Some" ->
             [ string value ]