BaseNode.to_json() now accepts a processing function

Author: stasm

fluent/syntax/ast.py

@@ -3,13 +3,13 @@
 import json
 
 
-def to_json(value, **kwargs):
+def to_json(value, fn=None):
     if isinstance(value, BaseNode):
-        return value.to_json(**kwargs)
+        return value.to_json(fn)
     if isinstance(value, list):
-        return list(to_json(item, **kwargs) for item in value)
+        return list(to_json(item, fn) for item in value)
     if isinstance(value, tuple):
-        return list(to_json(item, **kwargs) for item in value)
+        return list(to_json(item, fn) for item in value)
     else:
         return value
 
@@ -119,16 +119,15 @@ def equals(self, other, ignored_fields=['span']):
 
         return True
 
-    def to_json(self, with_spans=True):
+    def to_json(self, fn=None):
         obj = {
-            name: to_json(value, with_spans=with_spans)
+            name: to_json(value, fn)
             for name, value in vars(self).items()
-            if with_spans or name != 'span'
         }
         obj.update(
             {'type': self.__class__.__name__}
         )
-        return obj
+        return fn(obj) if fn else obj
 
     def __str__(self):
         return json.dumps(self.to_json())

tests/syntax/test_reference.py

@@ -25,6 +25,13 @@ def read_file(path):
 class TestReferenceMeta(type):
     def __new__(mcs, name, bases, attrs):
 
+        def remove_untested(obj):
+            if obj['type'] == 'Junk':
+                obj['annotations'] = []
+            if 'span' in obj:
+                del obj['span']
+            return obj
+
         def gen_test(file_name):
             def test(self):
                 ftl_path = os.path.join(fixtures, file_name + '.ftl')
@@ -34,12 +41,8 @@ def test(self):
                 expected = read_file(ast_path)
 
                 ast = parse(source)
-                for entry in ast.body:
-                    if isinstance(entry, ftl.Junk):
-                        entry.annotations = []
-
                 self.assertEqual(
-                    ast.to_json(with_spans=False), json.loads(expected))
+                    ast.to_json(remove_untested), json.loads(expected))
 
             return test