pycep-parser 0.7.0.dev5__tar.gz → 0.7.0.dev6__tar.gz

{pycep_parser-0.7.0.dev5 → pycep_parser-0.7.0.dev6}/PKG-INFO

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

{pycep_parser-0.7.0.dev5 → pycep_parser-0.7.0.dev6}/pycep/bicep.lark

@@ -14,7 +14,7 @@ element: "targetScope" "=" QUOTED_INTERPOLATION
 ?value: _NEWLINE? "null"                      -> null
       | _NEWLINE? "true"                      -> true
       | _NEWLINE? "false"                     -> false
-      | _NEWLINE? INT                         -> int
+      | _NEWLINE? INT                         -> int_type
       | _NEWLINE? STRING                      -> string
       | _NEWLINE? QUOTED_INTERPOLATION        -> string
       | MULTI_LINE_STRING                     -> multi_line_string

{pycep_parser-0.7.0.dev5 → pycep_parser-0.7.0.dev6}/pycep/main.py

@@ -14,7 +14,7 @@ if TYPE_CHECKING:
     from pycep import typing as pycep_typing
 
 
-LARK_GRAMMAR = (files(__package__) / "bicep.lark").read_text()
+LARK_GRAMMAR = (files(__package__) / "bicep.lark").read_text()  # ty: ignore[invalid-argument-type] # can't be `None` here
 
 
 class BicepParser:

{pycep_parser-0.7.0.dev5 → pycep_parser-0.7.0.dev6}/pycep/rules/decorators.py

@@ -62,9 +62,9 @@ def deco_min_val(_deco_name: str, args: tuple[int | dict[str, Any]]) -> pycep_ty
     if isinstance(arg, dict) and (operator := arg.get("operator", {})).get("type") == "minus":
         arg = operator["operands"]["integer_value"] * -1
 
-    return {
+    return {  # ty: ignore[invalid-return-type] # there is no real issue if this returns a dict
         "type": "min_value",
-        "argument": arg,  # type: ignore[typeddict-item] # there is no real issue, if this returns a dict
+        "argument": arg,  # ty: ignore[invalid-argument-type]
     }
 
 

{pycep_parser-0.7.0.dev5 → pycep_parser-0.7.0.dev6}/pycep/rules/functions.py

@@ -45,11 +45,11 @@ def array_func(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) ->
 def concat(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) -> pycep_typing.Concat:
     arg_1, *arg_x = args
 
-    return {
+    return {  # ty: ignore[invalid-return-type] # dynamic operand creation
         "type": "concat",
-        "parameters": {
+        "parameters": {  # ty: ignore[missing-typed-dict-key]
             "arg_1": arg_1,
-            **{f"arg_{idx + 2}": arg for idx, arg in enumerate(arg_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"arg_{idx + 2}": arg for idx, arg in enumerate(arg_x)},
         },
     }
 
@@ -103,7 +103,7 @@ def intersection(_func_name: str, args: tuple[str, ...]) -> pycep_typing.Interse
         "parameters": {
             "arg_1": arg_1,
             "arg_2": arg_2,
-            **{f"arg_{idx + 3}": arg for idx, arg in enumerate(arg_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"arg_{idx + 3}": arg for idx, arg in enumerate(arg_x)},
         },
     }
 
@@ -131,11 +131,11 @@ def length(_func_name: str, args: tuple[pycep_typing.PossibleValue]) -> pycep_ty
 def max_func(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) -> pycep_typing.Max:
     arg_1, *arg_x = args
 
-    return {
+    return {  # ty: ignore[invalid-return-type] # dynamic operand creation
         "type": "max",
-        "parameters": {
+        "parameters": {  # ty: ignore[missing-typed-dict-key]
             "arg_1": arg_1,
-            **{f"arg_{idx + 2}": arg for idx, arg in enumerate(arg_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"arg_{idx + 2}": arg for idx, arg in enumerate(arg_x)},
         },
     }
 
@@ -143,11 +143,11 @@ def max_func(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) -> p
 def min_func(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) -> pycep_typing.Min:
     arg_1, *arg_x = args
 
-    return {
+    return {  # ty: ignore[invalid-return-type] # dynamic operand creation
         "type": "min",
-        "parameters": {
+        "parameters": {  # ty: ignore[missing-typed-dict-key]
             "arg_1": arg_1,
-            **{f"arg_{idx + 2}": arg for idx, arg in enumerate(arg_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"arg_{idx + 2}": arg for idx, arg in enumerate(arg_x)},
         },
     }
 
@@ -195,7 +195,7 @@ def union(_func_name: str, args: tuple[str, ...]) -> pycep_typing.UnionFunc:
         "parameters": {
             "arg_1": arg_1,
             "arg_2": arg_2,
-            **{f"arg_{idx + 3}": arg for idx, arg in enumerate(arg_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"arg_{idx + 3}": arg for idx, arg in enumerate(arg_x)},
         },
     }
 
@@ -588,13 +588,11 @@ def resource_id(_func_name: str, args: list[Token]) -> pycep_typing.ResourceId:
         # resource_name_1 = args[3]
         # resource_name_2 = args[4]
 
-        return {
+        return {  # ty: ignore[invalid-return-type] # dynamic operand creation
             "type": "resource_id",
-            "parameters": {
+            "parameters": {  # ty: ignore[missing-typed-dict-key]
                 "resource_type": resource_type,
-                **{  # type: ignore[typeddict-item] # dynamic operand creation
-                    f"resource_name_{idx}": resource_name for idx, resource_name in enumerate(args[3:], start=1)
-                },
+                **{f"resource_name_{idx}": resource_name for idx, resource_name in enumerate(args[3:], start=1)},
                 "resource_group_name": resource_group_name,
                 "subscription_id": subscription_id,
             },
@@ -793,11 +791,11 @@ def ends_with(
 def format_func(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) -> pycep_typing.Format:
     format_string, *arg_x = args
 
-    return {
+    return {  # ty: ignore[invalid-return-type] # dynamic operand creation
         "type": "format",
-        "parameters": {
+        "parameters": {  # ty: ignore[missing-typed-dict-key]
             "format_string": format_string,
-            **{f"arg_{idx + 1}": extra for idx, extra in enumerate(arg_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"arg_{idx + 1}": extra for idx, extra in enumerate(arg_x)},
         },
     }
 
@@ -809,7 +807,7 @@ def guid(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) -> pycep
         "type": "guid",
         "parameters": {
             "base_string": base_string,
-            **{f"extra_string_{idx + 1}": extra for idx, extra in enumerate(extra_string_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"extra_string_{idx + 1}": extra for idx, extra in enumerate(extra_string_x)},
         },
     }
 
@@ -970,7 +968,7 @@ def unique_string(_func_name: str, args: tuple[pycep_typing.PossibleValue, ...])
         "type": "unique_string",
         "parameters": {
             "base_string": base_string,
-            **{f"extra_string_{idx + 1}": extra for idx, extra in enumerate(extra_string_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+            **{f"extra_string_{idx + 1}": extra for idx, extra in enumerate(extra_string_x)},
         },
     }
 
@@ -1015,9 +1013,9 @@ def uri_component_to_string(
 
 
 def unknown_func(func_name: str, args: tuple[pycep_typing.PossibleValue, ...]) -> pycep_typing.UnknownFunction:
-    return {
+    return {  # ty: ignore[invalid-return-type] # dynamic operand creation
         "type": func_name,
-        "parameters": {f"arg_{idx + 1}": arg for idx, arg in enumerate(args)},  # type: ignore[typeddict-item] # dynamic operand creation
+        "parameters": {f"arg_{idx + 1}": arg for idx, arg in enumerate(args)},  # ty: ignore[invalid-argument-type]
     }
 
 

{pycep_parser-0.7.0.dev5 → pycep_parser-0.7.0.dev6}/pycep/transformer.py

@@ -63,7 +63,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
                 # very unlikely this will happen in a real Bicep file, but in test files possible
                 continue
             for key, value in arg.items():
-                result.setdefault(key, {})[value["__name__"]] = value["__attrs__"]  # type: ignore[misc, index]
+                result.setdefault(key, {})[value["__name__"]] = value["__attrs__"]  # ty: ignore[non-subscriptable, no-matching-overload]
 
         return result
 
@@ -117,7 +117,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
         *name_alias_pairs, file_path = args
 
         for name_alias in name_alias_pairs:
-            result = {
+            result: pycep_typing._Import = {
                 "__name__": str(name_alias["name"]),
                 "__attrs__": {
                     "file_path": transform_string_token(file_path),
@@ -321,7 +321,8 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
                 "__name__": str(name),
                 "__attrs__": {
                     "decorators": decorators or [],
-                    **path,  # type: ignore[typeddict-item] # start and end line are not-required
+                    "type": path["type"],
+                    "detail": path["detail"],
                     "config": config,
                 },
             }
@@ -682,7 +683,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
             "operands": {
                 "operand_1": operand_1,
                 "operand_2": operand_2,
-                **{f"operand_{idx + 3}": op for idx, op in enumerate(operand_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+                **{f"operand_{idx + 3}": op for idx, op in enumerate(operand_x)},
             },
         }
 
@@ -694,7 +695,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
             "operands": {
                 "operand_1": operand_1,
                 "operand_2": operand_2,
-                **{f"operand_{idx + 3}": op for idx, op in enumerate(operand_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+                **{f"operand_{idx + 3}": op for idx, op in enumerate(operand_x)},
             },
         }
 
@@ -714,7 +715,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
             "operands": {
                 "operand_1": operand_1,
                 "operand_2": operand_2,
-                **{f"operand_{idx + 3}": op for idx, op in enumerate(operand_x)},  # type: ignore[typeddict-item] # dynamic operand creation
+                **{f"operand_{idx + 3}": op for idx, op in enumerate(operand_x)},
             },
         }
 
@@ -820,7 +821,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
             "operands": {
                 "operand_1": arg_1,
                 "func_name": str(func_name),
-                **{f"operand_{idx + 2}": extra for idx, extra in enumerate(arg_x) if extra},  # type: ignore[typeddict-item] # dynamic operand creation
+                **{f"operand_{idx + 2}": extra for idx, extra in enumerate(arg_x) if extra},
             },
         }
 
@@ -855,7 +856,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
     def key(self, arg: tuple[Token]) -> str:
         return str(arg[0])
 
-    def int(self, arg: tuple[Token]) -> int:
+    def int_type(self, arg: tuple[Token]) -> int:
         return int(arg[0])
 
     def string(self, arg: tuple[Token]) -> str:
@@ -880,7 +881,7 @@ class BicepToJson(Transformer[Token, pycep_typing.BicepJson]):
             "type": "lambda_expression",
             "detail": {
                 "var_1": str(arg_1),
-                **{f"var_{idx + 2}": str(arg) for idx, arg in enumerate(arg_x)},  # type: ignore[typeddict-item] # dynamic variable creation
+                **{f"var_{idx + 2}": str(arg) for idx, arg in enumerate(arg_x)},
                 "expression": expr,
             },
         }

{pycep_parser-0.7.0.dev5 → pycep_parser-0.7.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pycep-parser"
-version = "0.7.0.dev5"
+version = "0.7.0.dev6"
 description = "A Python based Bicep parser"
 authors = [
     { name = "Anton Grübel", email = "anton.gruebel@gmail.com" }
@@ -37,8 +37,9 @@ Releases = "https://github.com/gruebel/pycep/releases"
 [dependency-groups]
 dev = [
     "assertpy>=1.1,<2.0",
-    "prek>=0.2.18,<0.3.0",
+    "prek>=0.2.22,<0.3.0",
     "pytest>=8.4.2,<9.0.0",
+    "ty>=0.0.3,<0.1.0",
 ]
 
 [build-system]
@@ -53,23 +54,6 @@ source-include = ["tests/**"]
 [tool.uv]
 required-version = "~=0.9.0"
 
-[tool.mypy]
-files = "pycep"
-
-python_version = "3.9"
-local_partial_types = true # will become the new default from version 2
-allow_redefinition_new = true # will become the new default from version 2
-fixed_format_cache = true # new caching mechanism
-pretty = true
-strict = true
-implicit_reexport = true
-
-[[tool.mypy.overrides]]
-module = [
-    "assertpy"
-]
-ignore_missing_imports = true
-
 [tool.ruff]
 exclude = [
     ".git",
@@ -129,3 +113,15 @@ ignore = [
 ]
 
 fixable = ["I001"]
+
+[tool.ty.environment]
+python-version = "3.9"
+
+[tool.ty.src]
+include = [
+    "pycep",
+    "tests",
+]
+
+[tool.ty.rules]
+unused-ignore-comment = "error"