Use integer and boolean literal types when deriving return type for loadJsonContent (#18466)

Resolves #18416

Author: jeskew

src/Bicep.Core.IntegrationTests/ScenarioTests.cs

@@ -7508,4 +7508,33 @@ public void Test_Issue18217_module()
 
         result.Should().NotHaveAnyDiagnostics();
     }
+
+    [TestMethod]
+    public void Test_Issue18416()
+    {
+        var result = CompilationHelper.CompileParams(
+            ("foo.json", """
+                {
+                    "default": 5,
+                    "boolLiteral": true
+                }
+                """),
+            ("main.bicep", """
+                type fooType = 5 | 10 | 15
+
+                param foo fooType
+
+                param bar true
+                """),
+            ("parameters.bicepparam", """
+                using 'main.bicep'
+
+                var fooVar = loadJsonContent('foo.json')
+
+                param foo = fooVar.default
+                param bar = fooVar.boolLiteral
+                """));
+
+        result.Should().NotHaveAnyDiagnostics();
+    }
 }

src/Bicep.Core.IntegrationTests/TypeSystem/TypeValidationTests.cs

@@ -366,6 +366,7 @@ public void Json_function_can_obtain_types_for_string_literal_json_args()
 var floatJson = json('1234.1224')
 var stringJson = json('""hello!""')
 var nullJson = json('null')
+var boolJson = json('true')
 var jsonWithComments = json('''
 {
     //here's a comment!
@@ -385,10 +386,11 @@ public void Json_function_can_obtain_types_for_string_literal_json_args()
             GetTypeForNamedSymbol(model, "objectJson").Name.Should().Be("object");
             GetTypeForNamedSymbol(model, "propAccess").Name.Should().Be("'validValue'");
 
-            GetTypeForNamedSymbol(model, "intJson").Name.Should().Be("int");
+            GetTypeForNamedSymbol(model, "intJson").Name.Should().Be("123");
             GetTypeForNamedSymbol(model, "floatJson").Name.Should().Be("any");
             GetTypeForNamedSymbol(model, "stringJson").Name.Should().Be("'hello!'");
             GetTypeForNamedSymbol(model, "nullJson").Name.Should().Be("null");
+            GetTypeForNamedSymbol(model, "boolJson").Name.Should().Be("true");
             GetTypeForNamedSymbol(model, "commentsPropAccess").Name.Should().Be("'value'");
 
             GetTypeForNamedSymbol(model, "invalidPropAccess").Name.Should().Be("error");

src/Bicep.Core.Samples/Files/baselines/LoadFunctions_CRLF/main.symbols.bicep

@@ -100,9 +100,9 @@ var testJson = json(loadTextContent('./Assets/test.json.txt'))
 var testJsonString = testJson.string
 //@[4:18) Variable testJsonString. Type: 'someVal'. Declaration start char: 0, length: 36
 var testJsonInt = testJson.int
-//@[4:15) Variable testJsonInt. Type: int. Declaration start char: 0, length: 30
+//@[4:15) Variable testJsonInt. Type: 123. Declaration start char: 0, length: 30
 var testJsonArrayVal = testJson.array[0]
-//@[4:20) Variable testJsonArrayVal. Type: int. Declaration start char: 0, length: 40
+//@[4:20) Variable testJsonArrayVal. Type: 1 | 2. Declaration start char: 0, length: 40
 var testJsonObject = testJson.object
 //@[4:18) Variable testJsonObject. Type: object. Declaration start char: 0, length: 36
 var testJsonNestedString = testJson.object.nestedString
@@ -115,13 +115,13 @@ var testJsonString2 = testJson.string
 var testJsonString2_1 = loadJsonContent('./Assets/test.json.txt', '.string')
 //@[4:21) Variable testJsonString2_1. Type: 'someVal'. Declaration start char: 0, length: 76
 var testJsonInt2 = testJson.int
-//@[4:16) Variable testJsonInt2. Type: int. Declaration start char: 0, length: 31
+//@[4:16) Variable testJsonInt2. Type: 123. Declaration start char: 0, length: 31
 var testJsonInt2_1 = loadJsonContent('./Assets/test.json.txt', '.int')
-//@[4:18) Variable testJsonInt2_1. Type: int. Declaration start char: 0, length: 70
+//@[4:18) Variable testJsonInt2_1. Type: 123. Declaration start char: 0, length: 70
 var testJsonArrayVal2 = testJson.array[0]
-//@[4:21) Variable testJsonArrayVal2. Type: int. Declaration start char: 0, length: 41
+//@[4:21) Variable testJsonArrayVal2. Type: 1 | 2. Declaration start char: 0, length: 41
 var testJsonArrayVal2_1 = loadJsonContent('./Assets/test.json.txt', '.array[0]')
-//@[4:23) Variable testJsonArrayVal2_1. Type: int. Declaration start char: 0, length: 80
+//@[4:23) Variable testJsonArrayVal2_1. Type: 1. Declaration start char: 0, length: 80
 var testJsonObject2 = testJson.object
 //@[4:19) Variable testJsonObject2. Type: object. Declaration start char: 0, length: 37
 var testJsonObject2_1 = loadJsonContent('./Assets/test.json.txt', '.object')
@@ -146,29 +146,29 @@ var testYaml = loadYamlContent('./Assets/test.yaml.txt')
 var testYamlString = testYaml.string
 //@[4:18) Variable testYamlString. Type: 'someVal'. Declaration start char: 0, length: 36
 var testYamlInt = testYaml.int
-//@[4:15) Variable testYamlInt. Type: int. Declaration start char: 0, length: 30
+//@[4:15) Variable testYamlInt. Type: 123. Declaration start char: 0, length: 30
 var testYamlBool = testYaml.bool
-//@[4:16) Variable testYamlBool. Type: bool. Declaration start char: 0, length: 32
+//@[4:16) Variable testYamlBool. Type: true. Declaration start char: 0, length: 32
 var testYamlArrayInt = testYaml.arrayInt
-//@[4:20) Variable testYamlArrayInt. Type: int[]. Declaration start char: 0, length: 40
+//@[4:20) Variable testYamlArrayInt. Type: (1 | 2)[]. Declaration start char: 0, length: 40
 var testYamlArrayIntVal = testYaml.arrayInt[0]
-//@[4:23) Variable testYamlArrayIntVal. Type: int. Declaration start char: 0, length: 46
+//@[4:23) Variable testYamlArrayIntVal. Type: 1 | 2. Declaration start char: 0, length: 46
 var testYamlArrayString = testYaml.arrayString
 //@[4:23) Variable testYamlArrayString. Type: ('someVal' | 'someVal2')[]. Declaration start char: 0, length: 46
 var testYamlArrayStringVal = testYaml.arrayString[0]
 //@[4:26) Variable testYamlArrayStringVal. Type: 'someVal' | 'someVal2'. Declaration start char: 0, length: 52
 var testYamlArrayBool = testYaml.arrayBool
-//@[4:21) Variable testYamlArrayBool. Type: bool[]. Declaration start char: 0, length: 42
+//@[4:21) Variable testYamlArrayBool. Type: true[]. Declaration start char: 0, length: 42
 var testYamlArrayBoolVal = testYaml.arrayBool[0]
-//@[4:24) Variable testYamlArrayBoolVal. Type: bool. Declaration start char: 0, length: 48
+//@[4:24) Variable testYamlArrayBoolVal. Type: true. Declaration start char: 0, length: 48
 var testYamlObject = testYaml.object
 //@[4:18) Variable testYamlObject. Type: object. Declaration start char: 0, length: 36
 var testYamlObjectNestedString = testYaml.object.nestedString
 //@[4:30) Variable testYamlObjectNestedString. Type: 'someVal'. Declaration start char: 0, length: 61
 var testYamlObjectNestedInt = testYaml.object.nestedInt
-//@[4:27) Variable testYamlObjectNestedInt. Type: int. Declaration start char: 0, length: 55
+//@[4:27) Variable testYamlObjectNestedInt. Type: 123. Declaration start char: 0, length: 55
 var testYamlObjectNestedBool = testYaml.object.nestedBool
-//@[4:28) Variable testYamlObjectNestedBool. Type: bool. Declaration start char: 0, length: 57
+//@[4:28) Variable testYamlObjectNestedBool. Type: true. Declaration start char: 0, length: 57
 
 output testYamlString string = testYamlString
 //@[7:21) Output testYamlString. Type: string. Declaration start char: 0, length: 45

src/Bicep.Core.Samples/Files/baselines_bicepparam/Imports/parameters.symbols.bicepparam

@@ -3,7 +3,7 @@ import * as bicepconfig from 'bicepconfig.bicep'
 //@[12:23) ImportedNamespace bicepconfig. Type: bicepconfig. Declaration start char: 7, length: 16
 // ok
 param one = bicepconfig.directExport
-//@[06:09) ParameterAssignment one. Type: bool. Declaration start char: 0, length: 36
+//@[06:09) ParameterAssignment one. Type: true. Declaration start char: 0, length: 36
 // Failed to evaluate parameter "two"
 // Unhandled exception during evaluating template language function 'variables' is not handled.bicep(BCP338)
 param two = bicepconfig.functionExport

src/Bicep.Core/Semantics/Namespaces/SystemNamespaceType.cs

@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.Numerics;
 using System.Text;
+using Azure.Deployments.Expression.Extensions;
 using Bicep.Core.Analyzers.Linter;
 using Bicep.Core.Diagnostics;
 using Bicep.Core.Extensions;
@@ -1666,10 +1667,10 @@ public static TypeSymbol ConvertJsonToBicepType(JToken token)
                 JValue value => value.Type switch
                 {
                     JTokenType.String => TypeFactory.CreateStringLiteralType(value.ToString(CultureInfo.InvariantCulture)),
-                    JTokenType.Integer => LanguageConstants.Int,
+                    JTokenType.Integer => TypeFactory.CreateIntegerLiteralType(value.ToLong()),
                     // Floats are currently not supported in Bicep, so fall back to the default behavior of "any"
                     JTokenType.Float => LanguageConstants.Any,
-                    JTokenType.Boolean => LanguageConstants.Bool,
+                    JTokenType.Boolean => TypeFactory.CreateBooleanLiteralType(value.ToObject<bool>()),
                     JTokenType.Null => LanguageConstants.Null,
                     _ => LanguageConstants.Any,
                 },