diff --git a/src/rougail/output_formatter/__init__.py b/src/rougail/output_formatter/__init__.py index 7778850..fd1e71f 100644 --- a/src/rougail/output_formatter/__init__.py +++ b/src/rougail/output_formatter/__init__.py @@ -238,8 +238,7 @@ class RougailOutputFormatter: continue if attr in children: attr = f"_{attr}" - value = self.object_to_yaml(attr, type_, value, False, path) - family[attr] = value + family[attr] = self.object_to_yaml(attr, type_, value, False, path) if type_ == "dynamic" or (children and type_ == "family"): if "_type" in family: del family["_type"] @@ -333,6 +332,8 @@ class RougailOutputFormatter: del variable["type"] if is_multi and obj.multi: del variable["multi"] + if "type" in variable and isinstance(obj.default, IndexCalculation) and variable["type"] == "integer": + del variable["type"] if "type" in variable and variable["type"] in [ "string", "boolean", diff --git a/tests/results/40_2leadership_calculation_index/rougail/00-base.yml b/tests/results/40_2leadership_calculation_index/rougail/00-base.yml index 8c70c64..5bfbc58 100644 --- a/tests/results/40_2leadership_calculation_index/rougail/00-base.yml +++ b/tests/results/40_2leadership_calculation_index/rougail/00-base.yml @@ -13,7 +13,6 @@ leader: follower1: description: a follower - type: integer default: type: index ... diff --git a/tests/test_load.py b/tests/test_load.py index 03f7201..fb0bfdc 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -15,7 +15,7 @@ excludes = [ ] test_ok = get_structures_list(excludes) -# test_ok = [Path('../rougail-tests/structures/00_2default_calculated_variable')] +# test_ok = [Path('../rougail-tests/structures/40_2leadership_calculation_index')] def idfn(fixture_value):