#1386 add StubInterfaces config

src/compiler/WebSharper.Compiler.CSharp/ProjectReader.fs

@@ -129,7 +129,7 @@ let private getConstraints (genParams: seq<ITypeParameterSymbol>) (sr: CodeReade
         }
     ) |> List.ofSeq
 
-let private transformInterface (sr: R.SymbolReader) (annot: A.TypeAnnotation) (intf: INamedTypeSymbol) =
+let private transformInterface (sr: R.SymbolReader) stubInterfaces (annot: A.TypeAnnotation) (intf: INamedTypeSymbol) =
     if intf.TypeKind <> TypeKind.Interface || annot.IsForcedNotJavaScript then None else
     let methods = ResizeArray()
     let def =
@@ -170,7 +170,7 @@ let private transformInterface (sr: R.SymbolReader) (annot: A.TypeAnnotation) (i
             NotResolvedMethods = List.ofSeq methods 
             Generics = getConstraints intf.TypeParameters sr
             Type = annot.Type
-            IsStub = annot.IsStub
+            IsStub = stubInterfaces || annot.IsStub
         }
     )
 
@@ -1521,7 +1521,7 @@ let transformAssembly (comp : Compilation) (config: WsConfig) (rcomp: CSharpComp
     for TypeWithAnnotation(t, d, a) in allTypes do
         match t.TypeKind with
         | TypeKind.Interface ->
-            transformInterface sr a t |> Option.iter comp.AddInterface
+            transformInterface sr config.StubInterfaces a t |> Option.iter comp.AddInterface
             transformClass rcomp sr comp d a t |> Option.iter comp.AddClass
         | TypeKind.Struct | TypeKind.Class ->
             transformClass rcomp sr comp d a t |> Option.iter comp.AddClass

src/compiler/WebSharper.Compiler.FSharp/ProjectReader.fs

@@ -104,7 +104,7 @@ let private getConstraints (genParams: seq<FSharpGenericParameter>) (sr: CodeRea
         }
     ) |> List.ofSeq
 
-let private transformInterface (sr: CodeReader.SymbolReader) parentAnnot (intf: FSharpEntity) =
+let private transformInterface (sr: CodeReader.SymbolReader) stubInterfaces parentAnnot (intf: FSharpEntity) =
     let annot =
        sr.AttributeReader.GetTypeAnnot(parentAnnot, intf.Attributes)
     if annot.IsForcedNotJavaScript then None else
@@ -155,7 +155,7 @@ let private transformInterface (sr: CodeReader.SymbolReader) parentAnnot (intf:
             NotResolvedMethods = List.ofSeq methods
             Generics = getConstraints intf.GenericParameters sr tparams
             Type = annot.Type
-            IsStub = annot.IsStub
+            IsStub = stubInterfaces || annot.IsStub
         }
     )
 
@@ -224,7 +224,7 @@ let private transformInitAction (sc: Lazy<_ * StartupCode>) (comp: Compilation)
 
 let private nrInline = N.Inline false
 
-let rec private transformClass (sc: Lazy<_ * StartupCode>) (comp: Compilation) (ac: ArgCurrying.ResolveFuncArgs) (sr: CodeReader.SymbolReader) (classAnnots: Dictionary<FSharpEntity, TypeDefinition * A.TypeAnnotation>) (isInterface: TypeDefinition -> bool) (recMembers: Dictionary<FSMFV, Id * FSharpExpr>) (cls: FSharpEntity) (members: IList<SourceMemberOrEntity>) =
+let rec private transformClass (sc: Lazy<_ * StartupCode>) (comp: Compilation) (ac: ArgCurrying.ResolveFuncArgs) (sr: CodeReader.SymbolReader) (classAnnots: Dictionary<FSharpEntity, TypeDefinition * A.TypeAnnotation>) (isInterface: TypeDefinition -> bool) stubInterfaces (recMembers: Dictionary<FSMFV, Id * FSharpExpr>) (cls: FSharpEntity) (members: IList<SourceMemberOrEntity>) =
     let thisDef, annot = classAnnots.[cls]
 
     if isResourceType sr cls then
@@ -953,10 +953,10 @@ let rec private transformClass (sc: Lazy<_ * StartupCode>) (comp: Compilation) (
                 comp.AddQuotedMethod(td.Entity, m.Entity)
             )
         | SourceEntity (ent, nmembers) ->
-            transformClass sc comp ac sr classAnnots isInterface recMembers ent nmembers |> Option.iter comp.AddClass   
+            transformClass sc comp ac sr classAnnots isInterface stubInterfaces recMembers ent nmembers |> Option.iter comp.AddClass   
         | SourceInterface i ->
-            transformInterface sr annot i |> Option.iter comp.AddInterface
-            transformClass sc comp ac sr classAnnots isInterface recMembers i (ResizeArray()) |> Option.iter comp.AddClass   
+            transformInterface sr stubInterfaces annot i |> Option.iter comp.AddInterface
+            transformClass sc comp ac sr classAnnots isInterface stubInterfaces recMembers i (ResizeArray()) |> Option.iter comp.AddClass   
         | InitAction expr ->
             transformInitAction sc comp sr annot recMembers expr    
 
@@ -1709,10 +1709,10 @@ let transformAssembly (logger: LoggerBase) (comp : Compilation) assemblyName (co
             | SourceMember _ -> failwith "impossible: top level member"
             | InitAction _ -> failwith "impossible: top level init action"
             | SourceEntity (c, m) ->
-                transformClass sc comp argCurrying sr classAnnotations isInterface recMembers c m |> Option.iter comp.AddClass
+                transformClass sc comp argCurrying sr classAnnotations isInterface config.StubInterfaces recMembers c m |> Option.iter comp.AddClass
             | SourceInterface i ->
-                transformInterface sr rootTypeAnnot i |> Option.iter comp.AddInterface
-                transformClass sc comp argCurrying sr classAnnotations isInterface recMembers i [||] |> Option.iter comp.AddClass
+                transformInterface sr config.StubInterfaces rootTypeAnnot i |> Option.iter comp.AddInterface
+                transformClass sc comp argCurrying sr classAnnotations isInterface config.StubInterfaces recMembers i [||] |> Option.iter comp.AddClass
 
         let getStartupCodeClass (def: TypeDefinition, sc: StartupCode) =
 

src/compiler/WebSharper.Compiler/CommandTools.fs

@@ -95,6 +95,7 @@ type WsConfig =
         AnalyzeClosures : bool option
         JavaScriptScope : JavaScriptScope
         JavaScriptExport : JsExport[]
+        StubInterfaces : bool
         JSOutputPath : string option
         MinJSOutputPath : string option
         SingleNoJSErrors : bool
@@ -135,6 +136,7 @@ type WsConfig =
             AnalyzeClosures = None
             JavaScriptScope = JSDefault
             JavaScriptExport = [||]
+            StubInterfaces = false
             JSOutputPath = None
             MinJSOutputPath = None
             SingleNoJSErrors = false
@@ -260,6 +262,8 @@ type WsConfig =
                         ) |> Array.ofSeq
                     | _ -> argError (sprintf "Invalid value in %s for JavaScriptExport, expecting true or false or an array of strings." fileName) 
                 res <- { res with JavaScriptExport = Array.append this.JavaScriptExport j }
+            | "stubinterfaces" ->
+                res <- { res with StubInterfaces = getBool k v }
             | "jsoutput" ->
                 let path = getPath k v
                 //if path.EndsWith(".js") then

tests/WebSharper.Module.Tests/Main.fs

@@ -30,5 +30,6 @@ do()
 [<JavaScript>]
 let RunTests () =
     Runner.RunTests [|
+        StubInterfaces.Tests
         Import.Tests
     |]

tests/WebSharper.Module.Tests/StubInterfaces.fs

@@ -0,0 +1,43 @@
+// $begin{copyright}
+//
+// This file is part of WebSharper
+//
+// Copyright (c) 2008-2016 IntelliFactory
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you
+// may not use this file except in compliance with the License.  You may
+// obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+// implied.  See the License for the specific language governing
+// permissions and limitations under the License.
+//
+// $end{copyright}
+
+module WebSharper.Module.Tests.StubInterfaces
+
+open WebSharper
+open WebSharper.JavaScript
+open WebSharper.Testing
+
+type ITest =
+    abstract member Something: int -> int
+
+[<JavaScript>]
+type TestImpl() =
+    interface ITest with
+        member this.Something x = x + 1
+
+[<JavaScript>]
+let Tests =
+    TestCategory "Stub Interfaces" {
+        Test "Config setting" {
+            let o = TestImpl()
+            equal ((o :> ITest).Something(3)) 4
+            equal (o?Something(3)) 4
+        }
+    }

tests/WebSharper.Module.Tests/WebSharper.Module.Tests.fsproj

@@ -8,6 +8,7 @@
     <Tests>True</Tests>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="StubInterfaces.fs" />
     <Compile Include="Import.fs" />
     <Compile Include="Main.fs" />
     <EmbeddedResource Include="sayHi.js" />

tests/WebSharper.Module.Tests/wsconfig.json

@@ -0,0 +1,4 @@
+{
+  "Project": "Library",
+  "StubInterfaces": true
+}