reorganize new and old code

Author: kkozik-amplify

hcl2/__init__.py

@@ -11,7 +11,6 @@
     parse,
     parses,
     transform,
-    reverse_transform,
     writes,
 )
 

hcl2/api.py

@@ -2,9 +2,9 @@
 from typing import TextIO
 
 from lark.tree import Tree
-from hcl2.parser import parser, reconstruction_parser
-from hcl2.dict_transformer import DictTransformer
-from hcl2.reconstructor import HCLReconstructor, HCLReverseTransformer
+from hcl2.parser import parser
+from hcl2.reconstructor import HCLReconstructor
+from hcl2.transformer import RuleTransformer
 
 
 def load(file: TextIO, with_meta=False) -> dict:
@@ -27,7 +27,7 @@ def loads(text: str, with_meta=False) -> dict:
     # This means that all blocks must end in a new line even if the file ends
     # Append a new line as a temporary fix
     tree = parser().parse(text + "\n")
-    return DictTransformer(with_meta=with_meta).transform(tree)
+    return RuleTransformer().transform(tree)
 
 
 def parse(file: TextIO) -> Tree:
@@ -41,7 +41,7 @@ def parses(text: str) -> Tree:
     """Load HCL2 syntax tree from a string.
     :param text: Text with hcl2 to be loaded as a dict.
     """
-    return reconstruction_parser().parse(text)
+    return parser().parse(text)
 
 
 def transform(ast: Tree, with_meta=False) -> dict:
@@ -50,18 +50,11 @@ def transform(ast: Tree, with_meta=False) -> dict:
     :param with_meta: If set to true then adds `__start_line__` and `__end_line__`
         parameters to the output dict. Default to false.
     """
-    return DictTransformer(with_meta=with_meta).transform(ast)
-
-
-def reverse_transform(hcl2_dict: dict) -> Tree:
-    """Convert a dictionary to an HCL2 AST.
-    :param hcl2_dict: a dictionary produced by `load` or `transform`
-    """
-    return HCLReverseTransformer().transform(hcl2_dict)
+    return RuleTransformer().transform(ast)
 
 
 def writes(ast: Tree) -> str:
     """Convert an HCL2 syntax tree to a string.
     :param ast: HCL2 syntax tree, output from `parse` or `parses`
     """
-    return HCLReconstructor(reconstruction_parser()).reconstruct(ast)
+    return HCLReconstructor().reconstruct(ast)

hcl2/rule_transformer/deserializer.py hcl2/deserializer.pyhcl2/rule_transformer/deserializer.py renamed to hcl2/deserializer.py

@@ -8,35 +8,35 @@
 
 from hcl2 import parses
 from hcl2.const import IS_BLOCK
-from hcl2.rule_transformer.rules.abstract import LarkElement, LarkRule
-from hcl2.rule_transformer.rules.base import (
+from hcl2.rules.abstract import LarkElement, LarkRule
+from hcl2.rules.base import (
     BlockRule,
     AttributeRule,
     BodyRule,
     StartRule,
 )
-from hcl2.rule_transformer.rules.containers import (
+from hcl2.rules.containers import (
     TupleRule,
     ObjectRule,
     ObjectElemRule,
     ObjectElemKeyExpressionRule,
     ObjectElemKeyDotAccessor,
     ObjectElemKeyRule,
 )
-from hcl2.rule_transformer.rules.expressions import ExprTermRule
-from hcl2.rule_transformer.rules.literal_rules import (
+from hcl2.rules.expressions import ExprTermRule
+from hcl2.rules.literal_rules import (
     IdentifierRule,
     IntLitRule,
     FloatLitRule,
 )
-from hcl2.rule_transformer.rules.strings import (
+from hcl2.rules.strings import (
     StringRule,
     InterpolationRule,
     StringPartRule,
     HeredocTemplateRule,
     HeredocTrimTemplateRule,
 )
-from hcl2.rule_transformer.rules.tokens import (
+from hcl2.rules.tokens import (
     NAME,
     EQ,
     DBLQUOTE,
@@ -55,9 +55,9 @@
     HEREDOC_TEMPLATE,
     COLON,
 )
-from hcl2.rule_transformer.rules.whitespace import NewLineOrCommentRule
-from hcl2.rule_transformer.transformer import RuleTransformer
-from hcl2.rule_transformer.utils import HEREDOC_TRIM_PATTERN, HEREDOC_PATTERN
+from hcl2.rules.whitespace import NewLineOrCommentRule
+from hcl2.transformer import RuleTransformer
+from hcl2.utils import HEREDOC_TRIM_PATTERN, HEREDOC_PATTERN
 
 
 @dataclass