feat: improve ast output

tests/cli/vyper_json/test_output_dict.py

@@ -17,7 +17,10 @@ def test_keys():
     assert sorted(output_json.keys()) == ["compiler", "contracts", "sources"]
     assert output_json["compiler"] == f"vyper-{vyper.__version__}"
     data = compiler_data["foo.vy"]
-    assert output_json["sources"]["foo.vy"] == {"id": 0, "ast": data["ast_dict"]["ast"]}
+    assert output_json["sources"]["foo.vy"] == {
+        "id": 0,
+        "ast": data["ast_dict"]["ast"],
+    }
     assert output_json["contracts"]["foo.vy"]["foo"] == {
         "abi": data["abi"],
         "devdoc": data["devdoc"],

tests/parser/ast_utils/test_ast_dict.py

@@ -69,7 +69,9 @@ def test_basic_ast():
             "lineno": 2,
             "node_id": 2,
             "src": "1:1:0",
+            "type": "int128",
         },
+        "type": "int128",
         "value": None,
     }
 

vyper/ast/nodes.py

@@ -389,6 +389,10 @@ def to_dict(self) -> dict:
                 ast_dict[key] = [_to_dict(i) for i in value]
             else:
                 ast_dict[key] = _to_dict(value)
+
+        if "type" in self._metadata:
+            ast_dict["type"] = str(self._metadata["type"])
+
         return ast_dict
 
     def get_ancestor(self, node_type: Union["VyperNode", tuple, None] = None) -> "VyperNode":

vyper/builtin_functions/functions.py

@@ -101,7 +101,12 @@
 SHA256_PER_WORD_GAS = 12
 
 
-class _SimpleBuiltinFunction:
+class _BuiltinFunction:
+    def __repr__(self):
+        return f"builtin function {self._id}"
+
+
+class _SimpleBuiltinFunction(_BuiltinFunction):
     def fetch_call_return(self, node):
         validate_call_args(node, len(self._inputs), getattr(self, "_kwargs", []))
         for arg, (_, expected) in zip(node.args, self._inputs):
@@ -167,7 +172,7 @@ def build_IR(self, expr, args, kwargs, context):
         )
 
 
-class Convert:
+class Convert(_BuiltinFunction):
 
     _id = "convert"
 
@@ -245,7 +250,7 @@ def _build_adhoc_slice_node(sub: IRnode, start: IRnode, length: IRnode, context:
     return IRnode.from_list(node, typ=ByteArrayType(length.value), location=MEMORY)
 
 
-class Slice:
+class Slice(_BuiltinFunction):
 
     _id = "slice"
     _inputs = [("b", ("Bytes", "bytes32", "String")), ("start", "uint256"), ("length", "uint256")]
@@ -450,7 +455,7 @@ def build_IR(self, node, context):
         return get_bytearray_length(arg)
 
 
-class Concat:
+class Concat(_BuiltinFunction):
 
     _id = "concat"
 
@@ -684,7 +689,7 @@ def build_IR(self, expr, args, kwargs, context):
         )
 
 
-class MethodID:
+class MethodID(_BuiltinFunction):
 
     _id = "method_id"
 
@@ -950,7 +955,7 @@ def build_IR(self, expr, args, kwargs, context):
         )
 
 
-class AsWeiValue:
+class AsWeiValue(_BuiltinFunction):
 
     _id = "as_wei_value"
     _inputs = [("value", NumericAbstractType()), ("unit", "str_literal")]
@@ -1250,7 +1255,7 @@ def build_IR(self, expr, args, kwargs, contact):
         )
 
 
-class RawLog:
+class RawLog(_BuiltinFunction):
 
     _id = "raw_log"
     _inputs = [("topics", "*"), ("data", ("bytes32", "Bytes"))]
@@ -1651,11 +1656,14 @@ def build_IR(self, expr, args, kwargs, context):
         )
 
 
-class _UnsafeMath:
+class _UnsafeMath(_BuiltinFunction):
 
     # TODO add unsafe math for `decimal`s
     _inputs = [("a", IntegerAbstractType()), ("b", IntegerAbstractType())]
 
+    def __repr__(self):
+        return f"builtin function unsafe_{self.op}"
+
     def fetch_call_return(self, node):
         validate_call_args(node, 2)
 
@@ -1713,7 +1721,7 @@ class UnsafeDiv(_UnsafeMath):
     op = "div"
 
 
-class _MinMax:
+class _MinMax(_BuiltinFunction):
 
     _inputs = [("a", NumericAbstractType()), ("b", NumericAbstractType())]
 
@@ -1854,7 +1862,7 @@ def build_IR(self, expr, args, kwargs, context):
         )
 
 
-class Empty:
+class Empty(_BuiltinFunction):
 
     _id = "empty"
     _inputs = [("typename", "*")]

vyper/cli/vyper_compile.py

@@ -302,7 +302,12 @@ def compile_files(
         output_formats = combined_json_outputs
         show_version = True
 
-    translate_map = {"abi_python": "abi", "json": "abi", "ast": "ast_dict", "ir_json": "ir_dict"}
+    translate_map = {
+        "abi_python": "abi",
+        "json": "abi",
+        "ast": "ast_dict",
+        "ir_json": "ir_dict",
+    }
     final_formats = [translate_map.get(i, i) for i in output_formats]
 
     compiler_data = vyper.compile_codes(

vyper/compiler/__init__.py

@@ -16,7 +16,7 @@
 
 OUTPUT_FORMATS = {
     # requires vyper_module
-    "ast_dict": output.build_ast_dict,
+    "ast_dict": output.build_unfolded_ast_dict,
     "layout": output.build_layout_output,
     # requires global_ctx
     "devdoc": output.build_devdoc,

vyper/compiler/output.py

@@ -23,6 +23,14 @@ def build_ast_dict(compiler_data: CompilerData) -> dict:
     return ast_dict
 
 
+def build_unfolded_ast_dict(compiler_data: CompilerData) -> dict:
+    unfolded_ast_dict = {
+        "contract_name": compiler_data.contract_name,
+        "ast": ast_to_dict(compiler_data.vyper_module_unfolded),
+    }
+    return unfolded_ast_dict
+
+
 def build_devdoc(compiler_data: CompilerData) -> dict:
     userdoc, devdoc = parse_natspec(compiler_data.vyper_module_folded)
     return devdoc

vyper/compiler/phases.py

@@ -87,6 +87,15 @@ def vyper_module(self) -> vy_ast.Module:
 
         return self._vyper_module
 
+    @property
+    def vyper_module_unfolded(self) -> vy_ast.Module:
+        if not hasattr(self, "_vyper_module_unfolded"):
+            self._vyper_module_unfolded = generate_unfolded_ast(
+                self.vyper_module, self.interface_codes
+            )
+
+        return self._vyper_module_unfolded
+
     @property
     def vyper_module_folded(self) -> vy_ast.Module:
         if not hasattr(self, "_vyper_module_folded"):
@@ -184,6 +193,19 @@ def generate_ast(source_code: str, source_id: int, contract_name: str) -> vy_ast
     return vy_ast.parse_to_ast(source_code, source_id, contract_name)
 
 
+def generate_unfolded_ast(
+    vyper_module: vy_ast.Module,
+    interface_codes: Optional[InterfaceImports],
+) -> vy_ast.Module:
+
+    vy_ast.validation.validate_literal_nodes(vyper_module)
+    vy_ast.folding.replace_builtin_constants(vyper_module)
+    vy_ast.folding.replace_builtin_functions(vyper_module)
+    validate_semantics(vyper_module, interface_codes)
+
+    return vyper_module
+
+
 def generate_folded_ast(
     vyper_module: vy_ast.Module,
     interface_codes: Optional[InterfaceImports],

vyper/semantics/types/function.py

@@ -123,7 +123,8 @@ def __init__(
         self.nonreentrant = nonreentrant
 
     def __repr__(self):
-        return f"contract function '{self.name}'"
+        arg_types = ",".join(repr(a) for a in self.arguments.values())
+        return f"contract function {self.name}({arg_types})"
 
     @classmethod
     def from_abi(cls, abi: Dict) -> "ContractFunction":

vyper/semantics/types/user/event.py

@@ -41,6 +41,10 @@ def __init__(self, name: str, arguments: OrderedDict, indexed: List) -> None:
         self.indexed = indexed
         self.event_id = int(keccak256(self.signature.encode()).hex(), 16)
 
+    def __repr__(self):
+        arg_types = ",".join(repr(a) for a in self.arguments.values())
+        return f"event {self.name}({arg_types})"
+
     @property
     def signature(self):
         return f"{self.name}({','.join(v.canonical_abi_type for v in self.arguments.values())})"