python-hcl2 6.0.0__tar.gz → 6.1.1__tar.gz

{python-hcl2-6.0.0 → python-hcl2-6.1.1}/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## \[6.1.1\] - 2025-02-13
+
+### Fixed
+
+- `DictTransformer.to_tf_inline` - handle float type. ([#188](https://github.com/amplify-education/python-hcl2/pull/188))
+
+## \[6.1.0\] - 2025-01-24
+
+### Fixed
+
+- fix e-notation and negative numbers literals. ([#182](https://github.com/amplify-education/python-hcl2/pull/182))
+- fix parsing of `null`.  ([#184](https://github.com/amplify-education/python-hcl2/pull/184))
+- DictTransformer - do not wrap type literals into `${` and `}`. ([#186](https://github.com/amplify-education/python-hcl2/pull/186))
+
 ## \[6.0.0\] - 2025-01-15
 
 ### Added

{python-hcl2-6.0.0 → python-hcl2-6.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-hcl2
-Version: 6.0.0
+Version: 6.1.1
 Summary: A parser for HCL2
 Author-email: Amplify Education <github@amplify.com>
 License: MIT

{python-hcl2-6.0.0 → python-hcl2-6.1.1}/hcl2/hcl2.lark

@@ -61,11 +61,12 @@ STRING_CHARS : /(?:(?!\${)([^"\\]|\\.))+/ // any character except '"'
 string_with_interpolation: "\"" (STRING_CHARS)* interpolation_maybe_nested (STRING_CHARS | interpolation_maybe_nested)* "\""
 interpolation_maybe_nested: "${" expression "}"
 
-int_lit : DECIMAL+
-!float_lit: DECIMAL+ "." DECIMAL+ (EXP_MARK DECIMAL+)?
-            | DECIMAL+ ("." DECIMAL+)? EXP_MARK DECIMAL+
+int_lit : NEGATIVE_DECIMAL? DECIMAL+ | NEGATIVE_DECIMAL+
+!float_lit: (NEGATIVE_DECIMAL? DECIMAL+ | NEGATIVE_DECIMAL+) "." DECIMAL+ (EXP_MARK)?
+            |  (NEGATIVE_DECIMAL? DECIMAL+ | NEGATIVE_DECIMAL+) ("." DECIMAL+)? (EXP_MARK)
+NEGATIVE_DECIMAL : "-" DECIMAL
 DECIMAL : "0".."9"
-EXP_MARK : ("e" | "E") ("+" | "-")?
+EXP_MARK : ("e" | "E") ("+" | "-")? DECIMAL+
 EQ : /[ \t]*=(?!=|>)/
 
 tuple : "[" (new_line_or_comment* expression new_line_or_comment* ",")* (new_line_or_comment* expression)? new_line_or_comment* "]"

{python-hcl2-6.0.0 → python-hcl2-6.1.1}/hcl2/transformer.py

@@ -30,6 +30,10 @@ class DictTransformer(Transformer):
 
     with_meta: bool
 
+    @staticmethod
+    def is_type_keyword(value: str) -> bool:
+        return value in {"bool", "number", "string"}
+
     def __init__(self, with_meta: bool = False):
         """
         :param with_meta: If set to true then adds `__start_line__` and `__end_line__`
@@ -301,6 +305,10 @@ class DictTransformer(Transformer):
             if value.startswith('"') and value.endswith('"'):
                 value = str(value)[1:-1]
                 return self.process_escape_sequences(value)
+
+            if self.is_type_keyword(value):
+                return value
+
             return f"${{{value}}}"
         return value
 
@@ -341,8 +349,10 @@ class DictTransformer(Transformer):
             return "true" if value else "false"
         if isinstance(value, str):
             return value
-        if isinstance(value, int):
+        if isinstance(value, (int, float)):
             return str(value)
+        if value is None:
+            return "None"
 
         raise RuntimeError(f"Invalid type to convert to inline HCL: {type(value)}")
 

{python-hcl2-6.0.0 → python-hcl2-6.1.1}/hcl2/version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '6.0.0'
-__version_tuple__ = version_tuple = (6, 0, 0)
+__version__ = version = '6.1.1'
+__version_tuple__ = version_tuple = (6, 1, 1)

{python-hcl2-6.0.0 → python-hcl2-6.1.1}/python_hcl2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-hcl2
-Version: 6.0.0
+Version: 6.1.1
 Summary: A parser for HCL2
 Author-email: Amplify Education <github@amplify.com>
 License: MIT