python-hcl2 7.2.0__tar.gz → 7.2.1__tar.gz

{python_hcl2-7.2.0 → python_hcl2-7.2.1}/CHANGELOG.md

@@ -7,7 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## \[Unreleased\]
 
-- Nothing Yet
+- Nothing yet.
+
+## \[7.2.1\] - 2025-05-16
+
+### Fixed
+
+- More robust escaping for special characters. Thanks, @eranor ([#224](https://github.com/amplify-education/python-hcl2/pull/224))
+- Issue parsing interpolation string as an object key ([#232](https://github.com/amplify-education/python-hcl2/pull/232))
 
 ## \[7.2.0\] - 2025-04-24
 

{python_hcl2-7.2.0 → python_hcl2-7.2.1}/PKG-INFO

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

{python_hcl2-7.2.0 → python_hcl2-7.2.1}/hcl2/hcl2.lark

@@ -77,7 +77,7 @@ EQ : /[ \t]*=(?!=|>)/
 tuple : "[" (new_line_or_comment* expression new_line_or_comment* ",")* (new_line_or_comment* expression)? new_line_or_comment* "]"
 object : "{" new_line_or_comment? (new_line_or_comment* (object_elem | (object_elem COMMA)) new_line_or_comment*)* "}"
 object_elem : object_elem_key ( EQ | COLON ) expression
-object_elem_key : float_lit | int_lit | identifier | STRING_LIT | object_elem_key_dot_accessor | object_elem_key_expression
+object_elem_key : float_lit | int_lit | identifier | STRING_LIT | object_elem_key_dot_accessor | object_elem_key_expression | string_with_interpolation
 object_elem_key_expression : LPAR expression RPAR
 object_elem_key_dot_accessor : identifier (DOT identifier)+
 

{python_hcl2-7.2.0 → python_hcl2-7.2.1}/hcl2/reconstructor.py

@@ -353,11 +353,21 @@ class HCLReverseTransformer:
 
     @staticmethod
     def _escape_interpolated_str(interp_s: str) -> str:
-        # begin by doing basic JSON string escaping, to add backslashes
-        interp_s = json.dumps(interp_s)
-
+        if interp_s.strip().startswith('<<-') or interp_s.strip().startswith('<<'):
+            # For heredoc strings, preserve their format exactly
+            return reverse_quotes_within_interpolation(interp_s)
+        # Escape backslashes first (very important to do this first)
+        escaped = interp_s.replace('\\', '\\\\')
+        # Escape quotes
+        escaped = escaped.replace('"', '\\"')
+        # Escape control characters
+        escaped = escaped.replace('\n', '\\n')
+        escaped = escaped.replace('\r', '\\r')
+        escaped = escaped.replace('\t', '\\t')
+        escaped = escaped.replace('\b', '\\b')
+        escaped = escaped.replace('\f', '\\f')
         # find each interpolation within the string and remove the backslashes
-        interp_s = reverse_quotes_within_interpolation(interp_s)
+        interp_s = reverse_quotes_within_interpolation(f'"{escaped}"')
         return interp_s
 
     @staticmethod

{python_hcl2-7.2.0 → python_hcl2-7.2.1}/hcl2/transformer.py

@@ -102,10 +102,12 @@ class DictTransformer(Transformer):
         # This returns a dict with a single key/value pair to make it easier to merge these
         # into a bigger dict that is returned by the "object" function
 
-        key = self.strip_quotes(str(args[0].children[0]))
-        value = args[2]
+        key = str(args[0].children[0])
+        if not re.match(r".*?(\${).*}.*", key):
+            # do not strip quotes of a interpolation string
+            key = self.strip_quotes(key)
 
-        value = self.to_string_dollar(value)
+        value = self.to_string_dollar(args[2])
         return {key: value}
 
     def object_elem_key_dot_accessor(self, args: List) -> str:

{python_hcl2-7.2.0 → python_hcl2-7.2.1}/hcl2/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '7.2.0'
-__version_tuple__ = version_tuple = (7, 2, 0)
+__version__ = version = '7.2.1'
+__version_tuple__ = version_tuple = (7, 2, 1)

{python_hcl2-7.2.0 → python_hcl2-7.2.1}/python_hcl2.egg-info/PKG-INFO

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