From ce059ffb0102f45a7567c53176743334fd15c3d0 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Thu, 11 Jun 2026 07:53:47 +0200 Subject: [PATCH] feat: leadership => sequence --- src/rougail/output_formatter/__init__.py | 42 +++++++++++++++---- .../rougail/00-base.yml | 2 +- tests/results/00_6choice/rougail/00-base.yml | 8 ++-- .../rougail/00-base.yml | 2 +- .../00_6choice_variable/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- tests/results/00_6regexp/rougail/00-base.yml | 2 +- .../00_6regexp_link/rougail/00-base.yml | 2 +- .../00_7choice_quote/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 6 +-- .../00_9choice_variables/rougail/00-base.yml | 2 +- .../00_9default_integer/rougail/00-base.yml | 2 +- .../00_9default_number/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../16_6choice_redefine/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../40_0leadership/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../40_0leadership_empty/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../40_0leadership_reduce/rougail/00-base.yml | 5 ++- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 4 +- .../rougail/00-base.yml | 4 +- .../41_0choice_leader/rougail/00-base.yml | 2 +- .../44_0leadership_hidden/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 5 ++- .../rougail/00-base.yml | 5 ++- .../rougail/00-base.yml | 1 + .../rougail/00-base.yml | 2 + .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- 63 files changed, 112 insertions(+), 76 deletions(-) diff --git a/src/rougail/output_formatter/__init__.py b/src/rougail/output_formatter/__init__.py index 2c4812d..949d404 100644 --- a/src/rougail/output_formatter/__init__.py +++ b/src/rougail/output_formatter/__init__.py @@ -19,6 +19,7 @@ along with this program. If not, see . from io import BytesIO from pathlib import Path from typing import Optional +from copy import deepcopy from ruamel.yaml import YAML, CommentedMap from ruamel.yaml.representer import RoundTripRepresenter @@ -37,6 +38,7 @@ from djlint.reformat import formatter from tiramisu.config import get_common_path from rougail.convert import RougailConvert +from rougail.convert.collect import Collect from rougail.convert.object_model import ( Variable, Family, @@ -240,6 +242,8 @@ class RougailOutputFormatter: family["exists"] = yaml_data["exists"] force_keys = list(yaml_data) type_ = obj.type + if type_ in RENAME_TYPE: + type_ = RENAME_TYPE[type_] if type_ == "dynamic": attributes = self.get_attributes(self.rougail.dynamic) else: @@ -247,17 +251,20 @@ class RougailOutputFormatter: for attr, default_value in attributes.items(): if attr in ["name", "path", "namespace", "version", "xmlfiles"]: continue - try: - value = getattr(obj, attr) - except AttributeError: - continue + if attr == "type": + value = type_ + else: + try: + value = getattr(obj, attr) + except AttributeError: + continue if attr != "type" and attr not in force_keys and value == default_value: continue if attr in children: attr = f"_{attr}" family[attr] = self.object_to_yaml(attr, type_, value, False, path) if type_ == "dynamic" or (children and type_ == "family"): - tmp_family = family.copy() + tmp_family = deepcopy(family) if "_type" in tmp_family: del tmp_family["_type"] else: @@ -276,10 +283,21 @@ class RougailOutputFormatter: elif cpath.replace('{{ identifier }}', '{{ suffix }}') in child: cpath = cpath.replace('{{ identifier }}', '{{ suffix }}') child = child[cpath] - tmp_family[cpath] = child - family_type = self.rougail.is_family_or_variable("", tmp_family, False, "") + tmp_family[cpath] = child + #family_type = self.rougail.is_family_or_variable("", tmp_family, False, "") + collect = Collect( + self.rougail, + name, + parent, + tmp_family, + None, + None, + test_exists=False, + raises=False, + ) + family_type = collect.option_type if family_type == "family": - family_type = self.rougail.get_family_or_variable_type(tmp_family) + family_type = collect.user_type if family_type is None: family_type = 'family' if family_type == type_: @@ -347,8 +365,14 @@ class RougailOutputFormatter: xmlfiles=obj.xmlfiles, ) obj.params.append(param) + if type_ == 'choice': + variable_obj = self.rougail.choices + elif type_ == "regexp": + variable_obj = self.rougail.regexp + else: + variable_obj = self.rougail.variable for attr, default_value in self.get_attributes( - self.rougail.variable, ["name", "path", "namespace", "version", "xmlfiles"] + variable_obj, ["name", "path", "namespace", "version", "xmlfiles"] ).items(): if attr == "type": value = type_ diff --git a/tests/results/00_2default_calculated_params_permissive/rougail/00-base.yml b/tests/results/00_2default_calculated_params_permissive/rougail/00-base.yml index b389034..a87af22 100644 --- a/tests/results/00_2default_calculated_params_permissive/rougail/00-base.yml +++ b/tests/results/00_2default_calculated_params_permissive/rougail/00-base.yml @@ -3,7 +3,7 @@ version: 1.1 leadership: - type: leadership + type: sequence hidden: true var1: # a first variable diff --git a/tests/results/00_6choice/rougail/00-base.yml b/tests/results/00_6choice/rougail/00-base.yml index bba585d..195e693 100644 --- a/tests/results/00_6choice/rougail/00-base.yml +++ b/tests/results/00_6choice/rougail/00-base.yml @@ -18,33 +18,33 @@ var2: var3: description: the third variable + mandatory: false choices: - a - b - c - mandatory: false var4: description: the forth variable + mandatory: false choices: - null - b - c - mandatory: false var5: description: the fifth variable + default: a choices: - a - b - c - default: a var6: description: the sixth variable + default: 1 choices: - 1 - 2 - 3 - default: 1 ... diff --git a/tests/results/00_6choice_calculation/rougail/00-base.yml b/tests/results/00_6choice_calculation/rougail/00-base.yml index b2af556..e88d1b8 100644 --- a/tests/results/00_6choice_calculation/rougail/00-base.yml +++ b/tests/results/00_6choice_calculation/rougail/00-base.yml @@ -4,6 +4,7 @@ version: 1.1 var: description: a variable + default: 9 choices: jinja: |- {% for n in trange(0, 10) %} @@ -11,5 +12,4 @@ var: {% endfor %} return_type: integer description: choices is 0 to 9 - default: 9 ... diff --git a/tests/results/00_6choice_variable/rougail/00-base.yml b/tests/results/00_6choice_variable/rougail/00-base.yml index 02d8d4d..08759fa 100644 --- a/tests/results/00_6choice_variable/rougail/00-base.yml +++ b/tests/results/00_6choice_variable/rougail/00-base.yml @@ -9,7 +9,7 @@ var1: # a second variable var2: description: a first variable + default: a choices: variable: _.var1 - default: a ... diff --git a/tests/results/00_6choice_variable_link/rougail/00-base.yml b/tests/results/00_6choice_variable_link/rougail/00-base.yml index ee93703..819a9f6 100644 --- a/tests/results/00_6choice_variable_link/rougail/00-base.yml +++ b/tests/results/00_6choice_variable_link/rougail/00-base.yml @@ -9,9 +9,9 @@ var1: # a second variable var2: description: a first variable + default: a choices: variable: _.var1 - default: a var3: description: a third variable diff --git a/tests/results/00_6choice_variable_link2/rougail/00-base.yml b/tests/results/00_6choice_variable_link2/rougail/00-base.yml index ccd0e19..ecf4c3a 100644 --- a/tests/results/00_6choice_variable_link2/rougail/00-base.yml +++ b/tests/results/00_6choice_variable_link2/rougail/00-base.yml @@ -9,9 +9,9 @@ var1: # a second variable var2: description: a first variable + default: a choices: variable: _.var1 - default: a family: diff --git a/tests/results/00_6regexp/rougail/00-base.yml b/tests/results/00_6regexp/rougail/00-base.yml index d276d25..f842831 100644 --- a/tests/results/00_6regexp/rougail/00-base.yml +++ b/tests/results/00_6regexp/rougail/00-base.yml @@ -7,6 +7,6 @@ var: test: - '#b1b1b1' - '#b2b2b2' - regexp: ^#(?:[0-9a-f]{3}){1,2}$ default: '#a1a1a1' + regexp: ^#(?:[0-9a-f]{3}){1,2}$ ... diff --git a/tests/results/00_6regexp_link/rougail/00-base.yml b/tests/results/00_6regexp_link/rougail/00-base.yml index 9c079c3..21d8262 100644 --- a/tests/results/00_6regexp_link/rougail/00-base.yml +++ b/tests/results/00_6regexp_link/rougail/00-base.yml @@ -7,8 +7,8 @@ var1: test: - '#b1b1b1' - '#b2b2b2' - regexp: ^#(?:[0-9a-f]{3}){1,2}$ default: '#a1a1a1' + regexp: ^#(?:[0-9a-f]{3}){1,2}$ var2: description: a second variable diff --git a/tests/results/00_7choice_quote/rougail/00-base.yml b/tests/results/00_7choice_quote/rougail/00-base.yml index 9aaf127..8ffe89b 100644 --- a/tests/results/00_7choice_quote/rougail/00-base.yml +++ b/tests/results/00_7choice_quote/rougail/00-base.yml @@ -4,9 +4,9 @@ version: 1.1 var: description: A choice + default: quote' choices: - quote' - quote" - quote"' - default: quote' ... diff --git a/tests/results/00_9choice_variable_multi/rougail/00-base.yml b/tests/results/00_9choice_variable_multi/rougail/00-base.yml index ba5a849..ec1e621 100644 --- a/tests/results/00_9choice_variable_multi/rougail/00-base.yml +++ b/tests/results/00_9choice_variable_multi/rougail/00-base.yml @@ -4,16 +4,16 @@ version: 1.1 variable1: description: a first variable + multi: true choices: - val1 - val2 - multi: true variable2: description: a second variable + multi: true + mandatory: false choices: - val1 - val2 - multi: true - mandatory: false ... diff --git a/tests/results/00_9choice_variables/rougail/00-base.yml b/tests/results/00_9choice_variables/rougail/00-base.yml index 2b55ba0..cc29b06 100644 --- a/tests/results/00_9choice_variables/rougail/00-base.yml +++ b/tests/results/00_9choice_variables/rougail/00-base.yml @@ -8,8 +8,8 @@ source_variable_2: val2 # the second source variable my_variable: description: a variable + default: val1 choices: - variable: _.source_variable_1 - variable: _.source_variable_2 - default: val1 ... diff --git a/tests/results/00_9default_integer/rougail/00-base.yml b/tests/results/00_9default_integer/rougail/00-base.yml index c2d9009..7e2c70c 100644 --- a/tests/results/00_9default_integer/rougail/00-base.yml +++ b/tests/results/00_9default_integer/rougail/00-base.yml @@ -4,6 +4,7 @@ version: 1.1 var: description: a variable + default: 9 choices: jinja: |- {% for item in trange(0, 10) %} @@ -11,5 +12,4 @@ var: {%- endfor %} return_type: integer description: choice for 0 to 9 - default: 9 ... diff --git a/tests/results/00_9default_number/rougail/00-base.yml b/tests/results/00_9default_number/rougail/00-base.yml index c2d9009..7e2c70c 100644 --- a/tests/results/00_9default_number/rougail/00-base.yml +++ b/tests/results/00_9default_number/rougail/00-base.yml @@ -4,6 +4,7 @@ version: 1.1 var: description: a variable + default: 9 choices: jinja: |- {% for item in trange(0, 10) %} @@ -11,5 +12,4 @@ var: {%- endfor %} return_type: integer description: choice for 0 to 9 - default: 9 ... diff --git a/tests/results/01_9choice_variable_optional/rougail/00-base.yml b/tests/results/01_9choice_variable_optional/rougail/00-base.yml index 5a88782..876b28a 100644 --- a/tests/results/01_9choice_variable_optional/rougail/00-base.yml +++ b/tests/results/01_9choice_variable_optional/rougail/00-base.yml @@ -4,6 +4,7 @@ version: 1.1 variable: description: a variable + default: c choices: variable: _.unknown_variable optional: true @@ -11,5 +12,4 @@ variable: - a - b - c - default: c ... diff --git a/tests/results/16_6choice_redefine/rougail/00-base.yml b/tests/results/16_6choice_redefine/rougail/00-base.yml index e04fb65..39d093d 100644 --- a/tests/results/16_6choice_redefine/rougail/00-base.yml +++ b/tests/results/16_6choice_redefine/rougail/00-base.yml @@ -4,9 +4,9 @@ version: 1.1 var: description: A choice + default: c choices: - a - b - c - default: c ... diff --git a/tests/results/17_5redefine_leadership/rougail/00-base.yml b/tests/results/17_5redefine_leadership/rougail/00-base.yml index a8d86a8..14a7906 100644 --- a/tests/results/17_5redefine_leadership/rougail/00-base.yml +++ b/tests/results/17_5redefine_leadership/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/40_0leadership/rougail/00-base.yml b/tests/results/40_0leadership/rougail/00-base.yml index 282b39a..804bf67 100644 --- a/tests/results/40_0leadership/rougail/00-base.yml +++ b/tests/results/40_0leadership/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader diff --git a/tests/results/40_0leadership_diff_name/rougail/00-base.yml b/tests/results/40_0leadership_diff_name/rougail/00-base.yml index 58a50f0..40001bc 100644 --- a/tests/results/40_0leadership_diff_name/rougail/00-base.yml +++ b/tests/results/40_0leadership_diff_name/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership: description: a leadership - type: leadership + type: sequence leader: [] # a leader diff --git a/tests/results/40_0leadership_empty/rougail/00-base.yml b/tests/results/40_0leadership_empty/rougail/00-base.yml index 0a3f37e..8f920c3 100644 --- a/tests/results/40_0leadership_empty/rougail/00-base.yml +++ b/tests/results/40_0leadership_empty/rougail/00-base.yml @@ -3,5 +3,5 @@ version: 1.1 empty_leader: - type: leadership + type: sequence ... diff --git a/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml index 68b9f76..0e78064 100644 --- a/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader diff --git a/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml index 1dc752c..18494bc 100644 --- a/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - leader diff --git a/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml index 7cde7f8..fd8d4a6 100644 --- a/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # the leader - leader diff --git a/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml index 0151720..7e4e069 100644 --- a/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/40_0leadership_leader_follower/rougail/00-base.yml b/tests/results/40_0leadership_leader_follower/rougail/00-base.yml index af66225..d0a0841 100644 --- a/tests/results/40_0leadership_leader_follower/rougail/00-base.yml +++ b/tests/results/40_0leadership_leader_follower/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml b/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml index 0b92940..fb9a5aa 100644 --- a/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml +++ b/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml @@ -10,7 +10,7 @@ general1: leader: description: leader - type: leadership + type: sequence leader: # leader diff --git a/tests/results/40_0leadership_reduce/rougail/00-base.yml b/tests/results/40_0leadership_reduce/rougail/00-base.yml index d41716a..33fdec2 100644 --- a/tests/results/40_0leadership_reduce/rougail/00-base.yml +++ b/tests/results/40_0leadership_reduce/rougail/00-base.yml @@ -4,13 +4,16 @@ version: 1.1 leadership: description: a leadership - type: leadership + type: sequence leader: description: a leader examples: - val1 - val2 + test: + - val1 + - val2 default: - value_1 - value_2 diff --git a/tests/results/40_1leadership_append_follower/rougail/00-base.yml b/tests/results/40_1leadership_append_follower/rougail/00-base.yml index ebee0a2..e662b89 100644 --- a/tests/results/40_1leadership_append_follower/rougail/00-base.yml +++ b/tests/results/40_1leadership_append_follower/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: [] # the leader 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 5bfbc58..f9150db 100644 --- a/tests/results/40_2leadership_calculation_index/rougail/00-base.yml +++ b/tests/results/40_2leadership_calculation_index/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - a diff --git a/tests/results/40_2leadership_calculation_index_2/rougail/00-base.yml b/tests/results/40_2leadership_calculation_index_2/rougail/00-base.yml index 5bfbc58..f9150db 100644 --- a/tests/results/40_2leadership_calculation_index_2/rougail/00-base.yml +++ b/tests/results/40_2leadership_calculation_index_2/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - a diff --git a/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml b/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml index c18b4bd..af84c8c 100644 --- a/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml +++ b/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: leadership - type: leadership + type: sequence leader: # a leader - a diff --git a/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml b/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml index 1d1b6a0..ffd7b48 100644 --- a/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml +++ b/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/40_6leadership_follower_multi/rougail/00-base.yml b/tests/results/40_6leadership_follower_multi/rougail/00-base.yml index 9121010..c2bf1fc 100644 --- a/tests/results/40_6leadership_follower_multi/rougail/00-base.yml +++ b/tests/results/40_6leadership_follower_multi/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership: description: A leadership - type: leadership + type: sequence leader: [] # The leader diff --git a/tests/results/40_6leadership_follower_multi_no_mandatory/rougail/00-base.yml b/tests/results/40_6leadership_follower_multi_no_mandatory/rougail/00-base.yml index c6e1353..b9e474a 100644 --- a/tests/results/40_6leadership_follower_multi_no_mandatory/rougail/00-base.yml +++ b/tests/results/40_6leadership_follower_multi_no_mandatory/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership: description: A leadership - type: leadership + type: sequence leader: description: The leader diff --git a/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml b/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml index 9fee0cd..4d20e34 100644 --- a/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml +++ b/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml index c4a0d1b..ea3aada 100644 --- a/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml index 5a80d6f..84bba74 100644 --- a/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml index dba335e..5e244de 100644 --- a/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml @@ -3,7 +3,7 @@ version: 1.1 leader: - type: leadership + type: sequence leader: - a diff --git a/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml index a6426d9..ef9d702 100644 --- a/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml index 0ca2242..7901496 100644 --- a/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml index 59f4224..852bdfb 100644 --- a/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml index 5b380d0..dda3370 100644 --- a/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml b/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml index ba6100b..84e5932 100644 --- a/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml @@ -8,7 +8,7 @@ calculate: # a calculated variable leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml b/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml index 6c88432..df63cf2 100644 --- a/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership_1: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 @@ -14,7 +14,7 @@ leadership_1: leadership_2: description: a second leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml b/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml index 53fac7b..433528a 100644 --- a/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership_1: description: a leadership - type: leadership + type: sequence leader: # a leader - value1 @@ -14,7 +14,7 @@ leadership_1: leadership_2: description: a second leadership - type: leadership + type: sequence leader: # a leader - value1 diff --git a/tests/results/41_0choice_leader/rougail/00-base.yml b/tests/results/41_0choice_leader/rougail/00-base.yml index 0ad89f2..7844b0d 100644 --- a/tests/results/41_0choice_leader/rougail/00-base.yml +++ b/tests/results/41_0choice_leader/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: The leadership - type: leadership + type: sequence leader: description: The leader diff --git a/tests/results/44_0leadership_hidden/rougail/00-base.yml b/tests/results/44_0leadership_hidden/rougail/00-base.yml index 69fd9ff..32cb91c 100644 --- a/tests/results/44_0leadership_hidden/rougail/00-base.yml +++ b/tests/results/44_0leadership_hidden/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence hidden: true leader: diff --git a/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml b/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml index 477783d..11f65e9 100644 --- a/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml +++ b/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml b/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml index 2f9c85d..95e7c8c 100644 --- a/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml +++ b/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml b/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml index 4294fcc..3992a4d 100644 --- a/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml +++ b/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml @@ -6,7 +6,7 @@ condition: true # a condition leader: description: a leadership - type: leadership + type: sequence leader: # aleader - a diff --git a/tests/results/44_4disabled_calcultion_follower_index/rougail/00-base.yml b/tests/results/44_4disabled_calcultion_follower_index/rougail/00-base.yml index a426bbe..3715dcb 100644 --- a/tests/results/44_4disabled_calcultion_follower_index/rougail/00-base.yml +++ b/tests/results/44_4disabled_calcultion_follower_index/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leadership: description: a leadership - type: leadership + type: sequence leader: # aleader - a diff --git a/tests/results/44_4leadership_mandatory/rougail/00-base.yml b/tests/results/44_4leadership_mandatory/rougail/00-base.yml index e292d46..b727ca2 100644 --- a/tests/results/44_4leadership_mandatory/rougail/00-base.yml +++ b/tests/results/44_4leadership_mandatory/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: [] # a leader diff --git a/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml b/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml index 7c85d5e..0a382eb 100644 --- a/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml +++ b/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml b/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml index 0510e61..f369f25 100644 --- a/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml +++ b/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml @@ -6,7 +6,7 @@ condition: no # a condition leader: description: a leadership - type: leadership + type: sequence leader: description: a leader diff --git a/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml b/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml index 415e5b4..990803d 100644 --- a/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml +++ b/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml @@ -6,7 +6,7 @@ condition: yes # a condition leader: description: a leadership - type: leadership + type: sequence leader: [] # a leader diff --git a/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml b/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml index 60614df..21c2b9d 100644 --- a/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml +++ b/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: leader - type: leadership + type: sequence leader: # a leader - a diff --git a/tests/results/60_5family_dynamic_calc_identifier/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_identifier/rougail/00-base.yml index 5990218..383b3ca 100644 --- a/tests/results/60_5family_dynamic_calc_identifier/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_identifier/rougail/00-base.yml @@ -6,7 +6,10 @@ var1: # A suffix variable - val1 - val2 -var2: val1 # A suffix variable2 +var2: + description: A suffix variable2 + default: val1 + hidden: true dyn{{ identifier }}: dynamic: diff --git a/tests/results/60_5family_dynamic_calc_identifier_multi/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_identifier_multi/rougail/00-base.yml index 83fae25..5997772 100644 --- a/tests/results/60_5family_dynamic_calc_identifier_multi/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_identifier_multi/rougail/00-base.yml @@ -6,7 +6,10 @@ var1: # A suffix variable - val1 - val2 -var2: val1 # A suffix variable2 +var2: + description: A suffix variable2 + default: val1 + hidden: true dyn{{ identifier }}: dynamic: diff --git a/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml index 1e9ef27..988109d 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml @@ -24,4 +24,5 @@ var2: default: variable: _.dynval1.var propertyerror: false + mandatory: false ... diff --git a/tests/results/60_5family_dynamic_calc_suffix_disabled3/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_disabled3/rougail/00-base.yml index c9ec105..a189375 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_disabled3/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_disabled3/rougail/00-base.yml @@ -22,5 +22,7 @@ var2: description: A variable calculated default: variable: _.dynval1.var + propertyerror: false optional: true + mandatory: false ... diff --git a/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml b/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml index 982f531..8d40521 100644 --- a/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml @@ -13,7 +13,7 @@ dyn{{ identifier }}: leadership: description: a leadership - type: leadership + type: sequence leader: [] # a leader diff --git a/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml b/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml index c195831..573b064 100644 --- a/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml @@ -17,7 +17,7 @@ dyn{{ identifier }}: leadership: description: a leadership - type: leadership + type: sequence leader: [] # a leader diff --git a/tests/results/68_0family_leadership_mode/rougail/00-base.yml b/tests/results/68_0family_leadership_mode/rougail/00-base.yml index a67fd70..cf70f43 100644 --- a/tests/results/68_0family_leadership_mode/rougail/00-base.yml +++ b/tests/results/68_0family_leadership_mode/rougail/00-base.yml @@ -4,7 +4,7 @@ version: 1.1 leader: description: A leadership - type: leadership + type: sequence leader: description: A leader