pycep-parser 0.6.1.dev6__tar.gz → 0.6.1.dev7__tar.gz

{pycep_parser-0.6.1.dev6 → pycep_parser-0.6.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycep-parser
-Version: 0.6.1.dev6
+Version: 0.6.1.dev7
 Summary: A Python based Bicep parser
 Keywords: bicep,parser,lark
 Author: Anton Grübel

{pycep_parser-0.6.1.dev6 → pycep_parser-0.6.1.dev7}/pycep/bicep.lark

@@ -4,7 +4,7 @@ element: "targetScope" "=" QUOTED_INTERPOLATION
        | "extension" STRING ["with" object] ["as" STRING]                               -> extension
        | "metadata" STRING "=" metadata_value                                           -> metadata
        | [decorator] "param" STRING data_type ["=" value_brackets]                      -> param
-       | [decorator] "var" STRING "=" var_value                                         -> var
+       | [decorator] "var" STRING [data_type] "=" var_value                             -> var
        | [decorator] "output" STRING data_type "=" output_value                         -> output
        | [decorator] "resource" STRING type_api_pair [EXISTING] "=" resource_value      -> resource
        | [decorator] "module" STRING module_path "=" module_value                       -> module

{pycep_parser-0.6.1.dev6 → pycep_parser-0.6.1.dev7}/pycep/transformer.py

@@ -160,9 +160,11 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
 
     @v_args(meta=True)
     def var(
-        self, meta: Meta, args: tuple[list[pycep_typing.Decorator] | None, Token, pycep_typing.PossibleValue]
+        self,
+        meta: Meta,
+        args: tuple[list[pycep_typing.Decorator] | None, Token, str | None, pycep_typing.PossibleValue],
     ) -> pycep_typing.VarResponse:
-        decorators, name, value = args
+        decorators, name, data_type, value = args
 
         result: pycep_typing.VarResponse = {
             "variables": {
@@ -174,6 +176,9 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
             }
         }
 
+        if data_type:
+            result["variables"]["__attrs__"]["type"] = data_type
+
         if self.add_line_numbers:
             result["variables"]["__attrs__"]["__start_line__"] = meta.line
             result["variables"]["__attrs__"]["__end_line__"] = meta.end_line

{pycep_parser-0.6.1.dev6 → pycep_parser-0.6.1.dev7}/pycep/typing.py

@@ -114,6 +114,7 @@ class ParamResponse(TypedDict):
 
 class VariableAttributes(TypedDict):
     decorators: list[Decorator]
+    type: NotRequired[str]
     value: PossibleValue
     __start_line__: NotRequired[int]
     __end_line__: NotRequired[int]

{pycep_parser-0.6.1.dev6 → pycep_parser-0.6.1.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pycep-parser"
-version = "0.6.1.dev6"
+version = "0.6.1.dev7"
 description = "A Python based Bicep parser"
 authors = [
     { name = "Anton Grübel", email = "anton.gruebel@gmail.com" }

{pycep_parser-0.6.1.dev6 → pycep_parser-0.6.1.dev7}/tests/examples/complex/10-extension/main.bicep

@@ -1,3 +1,5 @@
+// https://docs.azure.cn/en-us/azure-resource-manager/bicep/bicep-extension
+
 // Simple extension
 extension microsoftGraphV1
 

pycep_parser-0.6.1.dev7/tests/examples/complex/11-typed-var/main.bicep

@@ -0,0 +1,38 @@
+// https://docs.azure.cn/en-us/azure-resource-manager/bicep/variables#typed-variables
+
+// basic types
+var resourceName string = 'myResource'
+var instanceCount int = 3
+var isProduction bool = true
+
+// arrays
+var mixedArray array = [
+  resourceGroup().name
+  1
+  // some comment
+  true
+  'example string'
+  'comma', 'separated', 'elements'
+]
+var subnets array = ['subnet1', 'subnet2']
+
+// objects
+var mixedObject object = {
+  name: resourceGroup().name
+  integer: 1
+  // some comment
+  boolean: true
+  example: 'string'
+}
+var tags object = { environment: 'dev' }
+
+// schema not supported yet
+// var config {
+//   name: string
+//   count: int
+//   enabled: bool
+// } = {
+//   name: 'myApp'
+//   count: 5
+//   enabled: true
+// }

pycep_parser-0.6.1.dev7/tests/examples/complex/11-typed-var/result.json

@@ -0,0 +1,80 @@
+{
+  "globals": {
+    "scope": {
+      "value": "resourceGroup"
+    }
+  },
+  "variables": {
+    "resourceName": {
+      "decorators": [],
+      "value": "myResource",
+      "type": "string"
+    },
+    "instanceCount": {
+      "decorators": [],
+      "value": 3,
+      "type": "int"
+    },
+    "isProduction": {
+      "decorators": [],
+      "value": true,
+      "type": "bool"
+    },
+    "mixedArray": {
+      "decorators": [],
+      "value": [
+        {
+          "function": {
+            "type": "resource_group",
+            "parameters": {
+              "resource_group_name": null,
+              "subscription_id": null
+            },
+            "property_name": "name"
+          }
+        },
+        1,
+        true,
+        "example string",
+        "comma",
+        "separated",
+        "elements"
+      ],
+      "type": "array"
+    },
+    "subnets": {
+      "decorators": [],
+      "value": [
+        "subnet1",
+        "subnet2"
+      ],
+      "type": "array"
+    },
+    "mixedObject": {
+      "decorators": [],
+      "value": {
+        "name": {
+          "function": {
+            "type": "resource_group",
+            "parameters": {
+              "resource_group_name": null,
+              "subscription_id": null
+            },
+            "property_name": "name"
+          }
+        },
+        "integer": 1,
+        "boolean": true,
+        "example": "string"
+      },
+      "type": "object"
+    },
+    "tags": {
+      "decorators": [],
+      "value": {
+        "environment": "dev"
+      },
+      "type": "object"
+    }
+  }
+}

{pycep_parser-0.6.1.dev6 → pycep_parser-0.6.1.dev7}/tests/test_parse_general.py

@@ -215,3 +215,16 @@ def test_parse_extension() -> None:
 
     # then
     assert_that(result).is_equal_to(expected_result)
+
+
+def test_parse_typed_var() -> None:
+    # given
+    sub_dir_path = EXAMPLES_DIR / "complex/11-typed-var"
+    file_path = sub_dir_path / "main.bicep"
+    expected_result = json.loads((sub_dir_path / "result.json").read_text())
+
+    # when
+    result = BICEP_PARSER.parse(file_path=file_path)
+
+    # then
+    assert_that(result).is_equal_to(expected_result)