Add signature tests showing the wrong generation for array values whe…

…n inferring dictionaries in json

tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config

@@ -190,6 +190,14 @@ Json,DictionaryInference.json,false,,,true,true,BackwardCompatible
 Json,DictionaryInference.json,false,,,true,true,ValuesOnly
 Json,DictionaryInference.json,false,,,true,true,ValuesAndInlineSchemasHints
 Json,DictionaryInference.json,false,,,true,true,ValuesAndInlineSchemasOverrides
+Json,DictionaryInference-arrays.json,false,,,true,false,BackwardCompatible
+Json,DictionaryInference-arrays.json,false,,,true,false,ValuesOnly
+Json,DictionaryInference-arrays.json,false,,,true,false,ValuesAndInlineSchemasHints
+Json,DictionaryInference-arrays.json,false,,,true,false,ValuesAndInlineSchemasOverrides
+Json,DictionaryInference-arrays.json,false,,,true,true,BackwardCompatible
+Json,DictionaryInference-arrays.json,false,,,true,true,ValuesOnly
+Json,DictionaryInference-arrays.json,false,,,true,true,ValuesAndInlineSchemasHints
+Json,DictionaryInference-arrays.json,false,,,true,true,ValuesAndInlineSchemasOverrides
 Html,MarketDepth.htm,false,false,
 Html,MarketDepth.htm,true,false,
 Html,SimpleHtmlTablesWithTr.html,false,false,
@@ -207,4 +215,4 @@ Html,doctor_who3.html,false,false,
 Html,SimpleHtmlLists.html,false,false,
 Html,EmptyDefinitionLists.html,false,false,
 Html,zoopla.html,false,false,
-Html,zoopla2.html,false,false,
+Html,zoopla2.html,false,false,

tests/FSharp.Data.DesignTime.Tests/expected/Json,DictionaryInference-arrays.json,False,,,True,False,BackwardCompatible.expected

@@ -0,0 +1,108 @@
+class JsonProvider : obj
+    static member AsyncGetSample: () -> JsonProvider+Root async
+    let f = new Func<_,_>(fun (t:TextReader) -> JsonDocument.Create(t))
+    TextRuntime.AsyncMap((IO.asyncReadTextAtRuntimeWithDesignTimeRules "<RESOLUTION_FOLDER>" "" "JSON" "" "DictionaryInference-arrays.json"), f)
+
+    static member AsyncLoad: uri:string -> JsonProvider+Root async
+    let f = new Func<_,_>(fun (t:TextReader) -> JsonDocument.Create(t))
+    TextRuntime.AsyncMap((IO.asyncReadTextAtRuntime false "<RESOLUTION_FOLDER>" "" "JSON" "" uri), f)
+
+    static member GetSample: () -> JsonProvider+Root
+    JsonDocument.Create(FSharpAsync.RunSynchronously((IO.asyncReadTextAtRuntimeWithDesignTimeRules "<RESOLUTION_FOLDER>" "" "JSON" "" "DictionaryInference-arrays.json")))
+
+    static member Load: stream:System.IO.Stream -> JsonProvider+Root
+    JsonDocument.Create(((new StreamReader(stream)) :> TextReader))
+
+    static member Load: reader:System.IO.TextReader -> JsonProvider+Root
+    JsonDocument.Create(reader)
+
+    static member Load: uri:string -> JsonProvider+Root
+    JsonDocument.Create(FSharpAsync.RunSynchronously((IO.asyncReadTextAtRuntime false "<RESOLUTION_FOLDER>" "" "JSON" "" uri)))
+
+    static member Load: value:JsonValue -> JsonProvider+Root
+    JsonDocument.Create(value, "")
+
+    static member Parse: text:string -> JsonProvider+Root
+    JsonDocument.Create(((new StringReader(text)) :> TextReader))
+
+    static member ParseList: text:string -> JsonProvider+JsonProvider+Root[]
+    JsonDocument.CreateList(((new StringReader(text)) :> TextReader))
+
+
+class JsonProvider+Root : FDR.BaseTypes.IJsonDocument
+    new : mappings:JsonProvider+Mappings -> JsonProvider+Root
+    JsonRuntime.CreateRecord([| ("Mappings",
+                                 (mappings :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+Root
+    JsonDocument.Create(jsonValue, "")
+
+    member Mappings: JsonProvider+Mappings with get
+    JsonRuntime.GetPropertyPacked(this, "Mappings")
+
+
+class JsonProvider+Mappings : FDR.BaseTypes.IJsonDocument
+    new : 123:JsonProvider+JsonProvider+123[] -> 456:JsonProvider+JsonProvider+123[] -> 789:JsonProvider+JsonProvider+789[] -> JsonProvider+Mappings
+    JsonRuntime.CreateRecord([| ("123",
+                                 (123 :> obj))
+                                ("456",
+                                 (456 :> obj))
+                                ("789",
+                                 (789 :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+Mappings
+    JsonDocument.Create(jsonValue, "")
+
+    member 123: JsonProvider+JsonProvider+123[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "123"), new Func<_,_>(id)))
+
+    member 456: JsonProvider+JsonProvider+123[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "456"), new Func<_,_>(id)))
+
+    member 789: JsonProvider+JsonProvider+789[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "789"), new Func<_,_>(id)))
+
+
+class JsonProvider+123 : FDR.BaseTypes.IJsonDocument
+    new : groupId:int -> canDelete:bool -> JsonProvider+123
+    JsonRuntime.CreateRecord([| ("GroupId",
+                                 (groupId :> obj))
+                                ("CanDelete",
+                                 (canDelete :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+123
+    JsonDocument.Create(jsonValue, "")
+
+    member CanDelete: bool with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "CanDelete")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertBoolean(value.JsonOpt), value.JsonOpt)
+
+    member GroupId: int with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "GroupId")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertInteger("", value.JsonOpt), value.JsonOpt)
+
+
+class JsonProvider+789 : FDR.BaseTypes.IJsonDocument
+    new : groupId:int -> canDelete:bool -> errorMessage:string option -> JsonProvider+789
+    JsonRuntime.CreateRecord([| ("GroupId",
+                                 (groupId :> obj))
+                                ("CanDelete",
+                                 (canDelete :> obj))
+                                ("ErrorMessage",
+                                 (errorMessage :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+789
+    JsonDocument.Create(jsonValue, "")
+
+    member CanDelete: bool with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "CanDelete")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertBoolean(value.JsonOpt), value.JsonOpt)
+
+    member ErrorMessage: string option with get
+    JsonRuntime.ConvertString("", JsonRuntime.TryGetPropertyUnpacked(this, "ErrorMessage"))
+
+    member GroupId: int with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "GroupId")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertInteger("", value.JsonOpt), value.JsonOpt)
+
+

tests/FSharp.Data.DesignTime.Tests/expected/Json,DictionaryInference-arrays.json,False,,,True,False,ValuesAndInlineSchemasHints.expected

@@ -0,0 +1,108 @@
+class JsonProvider : obj
+    static member AsyncGetSample: () -> JsonProvider+Root async
+    let f = new Func<_,_>(fun (t:TextReader) -> JsonDocument.Create(t))
+    TextRuntime.AsyncMap((IO.asyncReadTextAtRuntimeWithDesignTimeRules "<RESOLUTION_FOLDER>" "" "JSON" "" "DictionaryInference-arrays.json"), f)
+
+    static member AsyncLoad: uri:string -> JsonProvider+Root async
+    let f = new Func<_,_>(fun (t:TextReader) -> JsonDocument.Create(t))
+    TextRuntime.AsyncMap((IO.asyncReadTextAtRuntime false "<RESOLUTION_FOLDER>" "" "JSON" "" uri), f)
+
+    static member GetSample: () -> JsonProvider+Root
+    JsonDocument.Create(FSharpAsync.RunSynchronously((IO.asyncReadTextAtRuntimeWithDesignTimeRules "<RESOLUTION_FOLDER>" "" "JSON" "" "DictionaryInference-arrays.json")))
+
+    static member Load: stream:System.IO.Stream -> JsonProvider+Root
+    JsonDocument.Create(((new StreamReader(stream)) :> TextReader))
+
+    static member Load: reader:System.IO.TextReader -> JsonProvider+Root
+    JsonDocument.Create(reader)
+
+    static member Load: uri:string -> JsonProvider+Root
+    JsonDocument.Create(FSharpAsync.RunSynchronously((IO.asyncReadTextAtRuntime false "<RESOLUTION_FOLDER>" "" "JSON" "" uri)))
+
+    static member Load: value:JsonValue -> JsonProvider+Root
+    JsonDocument.Create(value, "")
+
+    static member Parse: text:string -> JsonProvider+Root
+    JsonDocument.Create(((new StringReader(text)) :> TextReader))
+
+    static member ParseList: text:string -> JsonProvider+JsonProvider+Root[]
+    JsonDocument.CreateList(((new StringReader(text)) :> TextReader))
+
+
+class JsonProvider+Root : FDR.BaseTypes.IJsonDocument
+    new : mappings:JsonProvider+Mappings -> JsonProvider+Root
+    JsonRuntime.CreateRecord([| ("Mappings",
+                                 (mappings :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+Root
+    JsonDocument.Create(jsonValue, "")
+
+    member Mappings: JsonProvider+Mappings with get
+    JsonRuntime.GetPropertyPacked(this, "Mappings")
+
+
+class JsonProvider+Mappings : FDR.BaseTypes.IJsonDocument
+    new : 123:JsonProvider+JsonProvider+123[] -> 456:JsonProvider+JsonProvider+123[] -> 789:JsonProvider+JsonProvider+789[] -> JsonProvider+Mappings
+    JsonRuntime.CreateRecord([| ("123",
+                                 (123 :> obj))
+                                ("456",
+                                 (456 :> obj))
+                                ("789",
+                                 (789 :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+Mappings
+    JsonDocument.Create(jsonValue, "")
+
+    member 123: JsonProvider+JsonProvider+123[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "123"), new Func<_,_>(id)))
+
+    member 456: JsonProvider+JsonProvider+123[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "456"), new Func<_,_>(id)))
+
+    member 789: JsonProvider+JsonProvider+789[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "789"), new Func<_,_>(id)))
+
+
+class JsonProvider+123 : FDR.BaseTypes.IJsonDocument
+    new : groupId:int -> canDelete:bool -> JsonProvider+123
+    JsonRuntime.CreateRecord([| ("GroupId",
+                                 (groupId :> obj))
+                                ("CanDelete",
+                                 (canDelete :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+123
+    JsonDocument.Create(jsonValue, "")
+
+    member CanDelete: bool with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "CanDelete")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertBoolean(value.JsonOpt), value.JsonOpt)
+
+    member GroupId: int with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "GroupId")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertInteger("", value.JsonOpt), value.JsonOpt)
+
+
+class JsonProvider+789 : FDR.BaseTypes.IJsonDocument
+    new : groupId:int -> canDelete:bool -> errorMessage:string option -> JsonProvider+789
+    JsonRuntime.CreateRecord([| ("GroupId",
+                                 (groupId :> obj))
+                                ("CanDelete",
+                                 (canDelete :> obj))
+                                ("ErrorMessage",
+                                 (errorMessage :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+789
+    JsonDocument.Create(jsonValue, "")
+
+    member CanDelete: bool with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "CanDelete")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertBoolean(value.JsonOpt), value.JsonOpt)
+
+    member ErrorMessage: string option with get
+    JsonRuntime.ConvertString("", JsonRuntime.TryGetPropertyUnpacked(this, "ErrorMessage"))
+
+    member GroupId: int with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "GroupId")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertInteger("", value.JsonOpt), value.JsonOpt)
+
+

tests/FSharp.Data.DesignTime.Tests/expected/Json,DictionaryInference-arrays.json,False,,,True,False,ValuesAndInlineSchemasOverrides.expected

@@ -0,0 +1,108 @@
+class JsonProvider : obj
+    static member AsyncGetSample: () -> JsonProvider+Root async
+    let f = new Func<_,_>(fun (t:TextReader) -> JsonDocument.Create(t))
+    TextRuntime.AsyncMap((IO.asyncReadTextAtRuntimeWithDesignTimeRules "<RESOLUTION_FOLDER>" "" "JSON" "" "DictionaryInference-arrays.json"), f)
+
+    static member AsyncLoad: uri:string -> JsonProvider+Root async
+    let f = new Func<_,_>(fun (t:TextReader) -> JsonDocument.Create(t))
+    TextRuntime.AsyncMap((IO.asyncReadTextAtRuntime false "<RESOLUTION_FOLDER>" "" "JSON" "" uri), f)
+
+    static member GetSample: () -> JsonProvider+Root
+    JsonDocument.Create(FSharpAsync.RunSynchronously((IO.asyncReadTextAtRuntimeWithDesignTimeRules "<RESOLUTION_FOLDER>" "" "JSON" "" "DictionaryInference-arrays.json")))
+
+    static member Load: stream:System.IO.Stream -> JsonProvider+Root
+    JsonDocument.Create(((new StreamReader(stream)) :> TextReader))
+
+    static member Load: reader:System.IO.TextReader -> JsonProvider+Root
+    JsonDocument.Create(reader)
+
+    static member Load: uri:string -> JsonProvider+Root
+    JsonDocument.Create(FSharpAsync.RunSynchronously((IO.asyncReadTextAtRuntime false "<RESOLUTION_FOLDER>" "" "JSON" "" uri)))
+
+    static member Load: value:JsonValue -> JsonProvider+Root
+    JsonDocument.Create(value, "")
+
+    static member Parse: text:string -> JsonProvider+Root
+    JsonDocument.Create(((new StringReader(text)) :> TextReader))
+
+    static member ParseList: text:string -> JsonProvider+JsonProvider+Root[]
+    JsonDocument.CreateList(((new StringReader(text)) :> TextReader))
+
+
+class JsonProvider+Root : FDR.BaseTypes.IJsonDocument
+    new : mappings:JsonProvider+Mappings -> JsonProvider+Root
+    JsonRuntime.CreateRecord([| ("Mappings",
+                                 (mappings :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+Root
+    JsonDocument.Create(jsonValue, "")
+
+    member Mappings: JsonProvider+Mappings with get
+    JsonRuntime.GetPropertyPacked(this, "Mappings")
+
+
+class JsonProvider+Mappings : FDR.BaseTypes.IJsonDocument
+    new : 123:JsonProvider+JsonProvider+123[] -> 456:JsonProvider+JsonProvider+123[] -> 789:JsonProvider+JsonProvider+789[] -> JsonProvider+Mappings
+    JsonRuntime.CreateRecord([| ("123",
+                                 (123 :> obj))
+                                ("456",
+                                 (456 :> obj))
+                                ("789",
+                                 (789 :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+Mappings
+    JsonDocument.Create(jsonValue, "")
+
+    member 123: JsonProvider+JsonProvider+123[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "123"), new Func<_,_>(id)))
+
+    member 456: JsonProvider+JsonProvider+123[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "456"), new Func<_,_>(id)))
+
+    member 789: JsonProvider+JsonProvider+789[] with get
+    JsonRuntime.ConvertArray(JsonRuntime.GetPropertyPackedOrNull(this, "789"), new Func<_,_>(id)))
+
+
+class JsonProvider+123 : FDR.BaseTypes.IJsonDocument
+    new : groupId:int -> canDelete:bool -> JsonProvider+123
+    JsonRuntime.CreateRecord([| ("GroupId",
+                                 (groupId :> obj))
+                                ("CanDelete",
+                                 (canDelete :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+123
+    JsonDocument.Create(jsonValue, "")
+
+    member CanDelete: bool with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "CanDelete")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertBoolean(value.JsonOpt), value.JsonOpt)
+
+    member GroupId: int with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "GroupId")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertInteger("", value.JsonOpt), value.JsonOpt)
+
+
+class JsonProvider+789 : FDR.BaseTypes.IJsonDocument
+    new : groupId:int -> canDelete:bool -> errorMessage:string option -> JsonProvider+789
+    JsonRuntime.CreateRecord([| ("GroupId",
+                                 (groupId :> obj))
+                                ("CanDelete",
+                                 (canDelete :> obj))
+                                ("ErrorMessage",
+                                 (errorMessage :> obj)) |], "")
+
+    new : jsonValue:JsonValue -> JsonProvider+789
+    JsonDocument.Create(jsonValue, "")
+
+    member CanDelete: bool with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "CanDelete")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertBoolean(value.JsonOpt), value.JsonOpt)
+
+    member ErrorMessage: string option with get
+    JsonRuntime.ConvertString("", JsonRuntime.TryGetPropertyUnpacked(this, "ErrorMessage"))
+
+    member GroupId: int with get
+    let value = JsonRuntime.TryGetPropertyUnpackedWithPath(this, "GroupId")
+    JsonRuntime.GetNonOptionalValue(value.Path, JsonRuntime.ConvertInteger("", value.JsonOpt), value.JsonOpt)
+
+