diff --git a/locale/fr/LC_MESSAGES/rougail_output_doc.po b/locale/fr/LC_MESSAGES/rougail_output_doc.po index 9c429f72f..057741b4c 100644 --- a/locale/fr/LC_MESSAGES/rougail_output_doc.po +++ b/locale/fr/LC_MESSAGES/rougail_output_doc.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2025-05-05 10:06+0200\n" -"PO-Revision-Date: 2025-05-05 10:08+0200\n" +"POT-Creation-Date: 2025-09-22 09:40+0200\n" +"PO-Revision-Date: 2025-09-22 09:42+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -14,21 +14,21 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -"X-Generator: Poedit 3.5\n" +"X-Generator: Poedit 3.7\n" -#: src/rougail/output_doc/annotator.py:313 +#: src/rougail/output_doc/annotator.py:298 msgid "the value of the information \"{0}\" of the variable \"{1}\"" msgstr "la valeur de l'information \"{0}\" de la variable \"{1}\"" -#: src/rougail/output_doc/annotator.py:316 +#: src/rougail/output_doc/annotator.py:301 msgid "the value of the global information \"{0}\"" msgstr "la valeur de l'information globale \"{0}\"" -#: src/rougail/output_doc/annotator.py:323 +#: src/rougail/output_doc/annotator.py:308 msgid "when the identifier is \"{0}\"" msgstr "lorsque l'identifiant est \"{0}\"" -#: src/rougail/output_doc/annotator.py:325 +#: src/rougail/output_doc/annotator.py:310 msgid "when the identifier is not \"{0}\"" msgstr "lorsque l'identifiant n'est pas \"{0}\"" @@ -65,98 +65,126 @@ msgid "verify if disable modes already exists" msgstr "vérifier le mode existe déjà" #: src/rougail/output_doc/config.py:113 +msgid "Modify values to document leaderships and dynamics families" +msgstr "Valeurs modifiées pour documenter les familles leader ou dynamique" + +#: src/rougail/output_doc/config.py:117 msgid "Generate document in format" msgstr "Générer le document au format" -#: src/rougail/output_doc/doc.py:90 +#: src/rougail/output_doc/doc.py:89 msgid "mandatory" msgstr "obligatoire" -#: src/rougail/output_doc/doc.py:91 +#: src/rougail/output_doc/doc.py:90 msgid "hidden" msgstr "cachée" -#: src/rougail/output_doc/doc.py:92 +#: src/rougail/output_doc/doc.py:91 msgid "disabled" msgstr "désactivé" -#: src/rougail/output_doc/doc.py:93 +#: src/rougail/output_doc/doc.py:92 msgid "unique" msgstr "unique" -#: src/rougail/output_doc/doc.py:94 +#: src/rougail/output_doc/doc.py:93 msgid "auto modified" msgstr "auto modifiée" -#: src/rougail/output_doc/doc.py:309 +#: src/rougail/output_doc/doc.py:325 msgid "This family contains lists of variable blocks." msgstr "Cette famille contient des listes de bloc de variable." -#: src/rougail/output_doc/doc.py:317 +#: src/rougail/output_doc/doc.py:333 msgid "This family builds families dynamically." msgstr "Cette famille construit des familles dynamiquement." #: src/rougail/output_doc/doc.py:347 +msgid "Default" +msgstr "Défaut" + +#: src/rougail/output_doc/doc.py:365 msgid "multiple" msgstr "multiple" -#: src/rougail/output_doc/doc.py:368 +#: src/rougail/output_doc/doc.py:373 +msgid "Example" +msgstr "Exemple" + +#: src/rougail/output_doc/doc.py:375 +msgid "Examples" +msgstr "Exemples" + +#: src/rougail/output_doc/doc.py:391 msgid "No attribute \"description\" for \"{0}\" in {1}" msgstr "Aucun attribut \"description\" pour \"{0}\" dans {1}" -#: src/rougail/output_doc/doc.py:482 -msgid "(default)" -msgstr "(défaut)" - -#: src/rougail/output_doc/doc.py:489 +#: src/rougail/output_doc/doc.py:512 msgid "text based with regular expressions \"{0}\"" msgstr "texte avec expression rationnelle \"{0}\"" -#: src/rougail/output_doc/doc.py:583 +#: src/rougail/output_doc/doc.py:518 +msgid "Validator" +msgstr "Validateur" + +#: src/rougail/output_doc/doc.py:521 +msgid "Validators" +msgstr "Validateurs" + +#: src/rougail/output_doc/doc.py:534 +msgid "(default)" +msgstr "(défaut)" + +#: src/rougail/output_doc/doc.py:539 +msgid "Choices" +msgstr "Choix" + +#: src/rougail/output_doc/doc.py:630 msgid "depends on a calculation" msgstr "dépend d'un calcul" -#: src/rougail/output_doc/doc.py:584 +#: src/rougail/output_doc/doc.py:632 msgid "\"{0}\" is a calculation for {1} but has no description in {2}" msgstr "\"{0}\" est un calcul pour {1} mais n'a pas de description dans {2}" -#: src/rougail/output_doc/doc.py:605 src/rougail/output_doc/doc.py:681 +#: src/rougail/output_doc/doc.py:655 src/rougail/output_doc/doc.py:745 msgid "depends on an undocumented variable" msgstr "dépends d'une variable non documentée" -#: src/rougail/output_doc/doc.py:607 +#: src/rougail/output_doc/doc.py:657 msgid "when the variable \"{0}\" hasn't the value \"{1}\"" msgstr "lorsque la variable \"{0}\" n'a pas la valeur \"{1}\"" -#: src/rougail/output_doc/doc.py:609 +#: src/rougail/output_doc/doc.py:659 msgid "when the variable \"{0}\" has the value \"{1}\"" msgstr "lorsque la variable \"{0}\" a la valeur \"{1}\"" -#: src/rougail/output_doc/doc.py:624 +#: src/rougail/output_doc/doc.py:674 msgid "the value of the variable \"{0}\"" msgstr "la valeur de la variable \"{0}\"" -#: src/rougail/output_doc/doc.py:625 +#: src/rougail/output_doc/doc.py:675 msgid "the value of an undocumented variable" msgstr "la valeur d'une variable non documentée" -#: src/rougail/output_doc/doc.py:656 +#: src/rougail/output_doc/doc.py:714 msgid "the values of undocumented variables" msgstr "les valeurs de variables non documentées" -#: src/rougail/output_doc/doc.py:675 +#: src/rougail/output_doc/doc.py:735 msgid "(from an undocumented variable){0}" msgstr "(issue d'une variable non documentée){0}" -#: src/rougail/output_doc/doc.py:679 +#: src/rougail/output_doc/doc.py:741 msgid "{0} (from an undocumented variable)" msgstr "{0} (issue d'une variable non documentée)" -#: src/rougail/output_doc/doc.py:690 +#: src/rougail/output_doc/doc.py:754 msgid "the value of the identifier" msgstr "la valeur de l'identifiant" -#: src/rougail/output_doc/doc.py:694 +#: src/rougail/output_doc/doc.py:758 msgid "the value of the {0}" msgstr "la valeur de l'{0}" @@ -168,13 +196,13 @@ msgstr "Exemple avec des variables obligatoire non renseignée" msgid "Example with all variables modifiable" msgstr "Exemple avec toutes les variables modifiable" -#: src/rougail/output_doc/output/console.py:142 -#: src/rougail/output_doc/utils.py:373 +#: src/rougail/output_doc/output/console.py:145 +#: src/rougail/output_doc/utils.py:379 msgid "Variable" msgstr "Variable" -#: src/rougail/output_doc/output/console.py:143 -#: src/rougail/output_doc/utils.py:373 +#: src/rougail/output_doc/output/console.py:146 +#: src/rougail/output_doc/utils.py:379 msgid "Description" msgstr "Description" @@ -278,35 +306,11 @@ msgstr "type de fichier autorisé : {0}" msgid "Variables for \"{0}\"" msgstr "Variables pour \"{0}\"" -#: src/rougail/output_doc/utils.py:256 +#: src/rougail/output_doc/utils.py:257 msgid "Identifiers" msgstr "Identifiants" -#: src/rougail/output_doc/utils.py:321 -msgid "Validator" -msgstr "Validateur" - -#: src/rougail/output_doc/utils.py:323 -msgid "Validators" -msgstr "Validateurs" - -#: src/rougail/output_doc/utils.py:325 -msgid "Choices" -msgstr "Choix" - -#: src/rougail/output_doc/utils.py:327 -msgid "Default" -msgstr "Défaut" - -#: src/rougail/output_doc/utils.py:331 -msgid "Example" -msgstr "Exemple" - -#: src/rougail/output_doc/utils.py:333 -msgid "Examples" -msgstr "Exemples" - -#: src/rougail/output_doc/utils.py:394 +#: src/rougail/output_doc/utils.py:400 msgid "{0}: {1}" msgstr "{0} : {1}" diff --git a/locale/rougail_output_doc.pot b/locale/rougail_output_doc.pot index 5ea563f7f..ef35b4b90 100644 --- a/locale/rougail_output_doc.pot +++ b/locale/rougail_output_doc.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-05-12 08:39+0200\n" +"POT-Creation-Date: 2025-09-22 09:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,19 +15,19 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: src/rougail/output_doc/annotator.py:313 +#: src/rougail/output_doc/annotator.py:298 msgid "the value of the information \"{0}\" of the variable \"{1}\"" msgstr "" -#: src/rougail/output_doc/annotator.py:316 +#: src/rougail/output_doc/annotator.py:301 msgid "the value of the global information \"{0}\"" msgstr "" -#: src/rougail/output_doc/annotator.py:323 +#: src/rougail/output_doc/annotator.py:308 msgid "when the identifier is \"{0}\"" msgstr "" -#: src/rougail/output_doc/annotator.py:325 +#: src/rougail/output_doc/annotator.py:310 msgid "when the identifier is not \"{0}\"" msgstr "" @@ -64,98 +64,126 @@ msgid "verify if disable modes already exists" msgstr "" #: src/rougail/output_doc/config.py:113 +msgid "Modify values to document leaderships and dynamics families" +msgstr "" + +#: src/rougail/output_doc/config.py:117 msgid "Generate document in format" msgstr "" -#: src/rougail/output_doc/doc.py:90 +#: src/rougail/output_doc/doc.py:89 msgid "mandatory" msgstr "" -#: src/rougail/output_doc/doc.py:91 +#: src/rougail/output_doc/doc.py:90 msgid "hidden" msgstr "" -#: src/rougail/output_doc/doc.py:92 +#: src/rougail/output_doc/doc.py:91 msgid "disabled" msgstr "" -#: src/rougail/output_doc/doc.py:93 +#: src/rougail/output_doc/doc.py:92 msgid "unique" msgstr "" -#: src/rougail/output_doc/doc.py:94 +#: src/rougail/output_doc/doc.py:93 msgid "auto modified" msgstr "" -#: src/rougail/output_doc/doc.py:321 +#: src/rougail/output_doc/doc.py:325 msgid "This family contains lists of variable blocks." msgstr "" -#: src/rougail/output_doc/doc.py:329 +#: src/rougail/output_doc/doc.py:333 msgid "This family builds families dynamically." msgstr "" -#: src/rougail/output_doc/doc.py:361 +#: src/rougail/output_doc/doc.py:347 +msgid "Default" +msgstr "" + +#: src/rougail/output_doc/doc.py:365 msgid "multiple" msgstr "" -#: src/rougail/output_doc/doc.py:383 -msgid "No attribute \"description\" for \"{0}\" in {1}" +#: src/rougail/output_doc/doc.py:373 +msgid "Example" msgstr "" -#: src/rougail/output_doc/doc.py:504 -msgid "(default)" +#: src/rougail/output_doc/doc.py:375 +msgid "Examples" +msgstr "" + +#: src/rougail/output_doc/doc.py:391 +msgid "No attribute \"description\" for \"{0}\" in {1}" msgstr "" #: src/rougail/output_doc/doc.py:512 msgid "text based with regular expressions \"{0}\"" msgstr "" -#: src/rougail/output_doc/doc.py:606 +#: src/rougail/output_doc/doc.py:518 +msgid "Validator" +msgstr "" + +#: src/rougail/output_doc/doc.py:521 +msgid "Validators" +msgstr "" + +#: src/rougail/output_doc/doc.py:534 +msgid "(default)" +msgstr "" + +#: src/rougail/output_doc/doc.py:539 +msgid "Choices" +msgstr "" + +#: src/rougail/output_doc/doc.py:630 msgid "depends on a calculation" msgstr "" -#: src/rougail/output_doc/doc.py:607 +#: src/rougail/output_doc/doc.py:632 msgid "\"{0}\" is a calculation for {1} but has no description in {2}" msgstr "" -#: src/rougail/output_doc/doc.py:630 src/rougail/output_doc/doc.py:720 +#: src/rougail/output_doc/doc.py:655 src/rougail/output_doc/doc.py:745 msgid "depends on an undocumented variable" msgstr "" -#: src/rougail/output_doc/doc.py:632 +#: src/rougail/output_doc/doc.py:657 msgid "when the variable \"{0}\" hasn't the value \"{1}\"" msgstr "" -#: src/rougail/output_doc/doc.py:634 +#: src/rougail/output_doc/doc.py:659 msgid "when the variable \"{0}\" has the value \"{1}\"" msgstr "" -#: src/rougail/output_doc/doc.py:649 +#: src/rougail/output_doc/doc.py:674 msgid "the value of the variable \"{0}\"" msgstr "" -#: src/rougail/output_doc/doc.py:650 +#: src/rougail/output_doc/doc.py:675 msgid "the value of an undocumented variable" msgstr "" -#: src/rougail/output_doc/doc.py:689 +#: src/rougail/output_doc/doc.py:714 msgid "the values of undocumented variables" msgstr "" -#: src/rougail/output_doc/doc.py:710 +#: src/rougail/output_doc/doc.py:735 msgid "(from an undocumented variable){0}" msgstr "" -#: src/rougail/output_doc/doc.py:716 +#: src/rougail/output_doc/doc.py:741 msgid "{0} (from an undocumented variable)" msgstr "" -#: src/rougail/output_doc/doc.py:729 +#: src/rougail/output_doc/doc.py:754 msgid "the value of the identifier" msgstr "" -#: src/rougail/output_doc/doc.py:733 +#: src/rougail/output_doc/doc.py:758 msgid "the value of the {0}" msgstr "" @@ -168,12 +196,12 @@ msgid "Example with all variables modifiable" msgstr "" #: src/rougail/output_doc/output/console.py:145 -#: src/rougail/output_doc/utils.py:375 +#: src/rougail/output_doc/utils.py:379 msgid "Variable" msgstr "" #: src/rougail/output_doc/output/console.py:146 -#: src/rougail/output_doc/utils.py:375 +#: src/rougail/output_doc/utils.py:379 msgid "Description" msgstr "" @@ -281,31 +309,7 @@ msgstr "" msgid "Identifiers" msgstr "" -#: src/rougail/output_doc/utils.py:323 -msgid "Validator" -msgstr "" - -#: src/rougail/output_doc/utils.py:325 -msgid "Validators" -msgstr "" - -#: src/rougail/output_doc/utils.py:327 -msgid "Choices" -msgstr "" - -#: src/rougail/output_doc/utils.py:329 -msgid "Default" -msgstr "" - -#: src/rougail/output_doc/utils.py:333 -msgid "Example" -msgstr "" - -#: src/rougail/output_doc/utils.py:335 -msgid "Examples" -msgstr "" - -#: src/rougail/output_doc/utils.py:396 +#: src/rougail/output_doc/utils.py:400 msgid "{0}: {1}" msgstr "" diff --git a/pyproject.toml b/pyproject.toml index 580016dba..6f04ddbd3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] dependencies = [ - "rougail > 1.1,<2", + "rougail-base > 1.1,<2", "tabulate ~= 0.9.0", "rich ~= 13.9.3", ] diff --git a/src/rougail/output_doc/annotator.py b/src/rougail/output_doc/annotator.py index 0869c2096..97817d652 100644 --- a/src/rougail/output_doc/annotator.py +++ b/src/rougail/output_doc/annotator.py @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from typing import Union -from rougail.utils import undefined +from rougail.utils import undefined, PROPERTY_ATTRIBUTE from rougail.annotator.variable import Walk from rougail.output_doc.i18n import _ @@ -36,7 +36,6 @@ from rougail.convert.object_model import ( IndexCalculation, NamespaceCalculation, CONVERT_OPTION, - PROPERTY_ATTRIBUTE, ) @@ -53,7 +52,9 @@ class Annotator(Walk): if not objectspace.paths: return self.objectspace = objectspace - self.change_default_value = self.objectspace.rougailconfig["doc.change_default_value"] + self.change_default_value = self.objectspace.rougailconfig[ + "doc.change_default_value" + ] self.populate_family() self.populate_variable() @@ -70,7 +71,9 @@ class Annotator(Walk): self.force_default_value_in_suffix_variable(family, family.dynamic) else: for value in family.dynamic: - self.force_default_value_in_suffix_variable(family, value, return_a_list=False) + self.force_default_value_in_suffix_variable( + family, value, return_a_list=False + ) self.calculation_to_information( family.path, "dynamic", @@ -149,7 +152,11 @@ class Annotator(Walk): variable.validators, variable.version, ) - if self.change_default_value and variable.path in self.objectspace.leaders and not default: + if ( + self.change_default_value + and variable.path in self.objectspace.leaders + and not default + ): self.add_examples_values(variable) self.convert_property(variable) diff --git a/src/rougail/output_doc/doc.py b/src/rougail/output_doc/doc.py index eee3de8c9..4050a8f7c 100644 --- a/src/rougail/output_doc/doc.py +++ b/src/rougail/output_doc/doc.py @@ -24,8 +24,7 @@ from re import compile from tiramisu import Calculation, groups from tiramisu.error import ConfigError, display_list, PropertiesOptionError from rougail.tiramisu import display_xmlfiles, normalize_family -from rougail.convert.object_model import PROPERTY_ATTRIBUTE -from rougail.utils import undefined +from rougail.utils import undefined, PROPERTY_ATTRIBUTE from .config import OutPuts from .i18n import _ @@ -153,7 +152,7 @@ class RougailOutputDoc(Examples): name = child.name(uncalculated=True) path = child.path(uncalculated=True) if not child.isoptiondescription(): - leader = self._parse_variable(child, leader, name, path, informations) + leader = self.parse_variable(child, leader, name, path, informations) else: self._parse_family(child, informations, name, path) return informations @@ -213,20 +212,27 @@ class RougailOutputDoc(Examples): else: informations.update(sub_informations) - def _parse_variable( - self, variable, leader: dict, name: str, path: str, informations: dict + def parse_variable( + self, + variable, + leader: dict, + name: str, + path: str, + informations: dict, + *, + only_one=False, ) -> Optional[dict]: potential_leader = None if variable.isdynamic(): # information is already set potential_leader = self._parse_variable_dynamic( - variable, leader, name, path, informations - ) - elif variable.isfollower() and variable.index(): - self._parse_variable_follower_with_index( - variable, leader, path, informations + variable, leader, name, path, informations, only_one ) else: + if variable.isfollower() and variable.index(): + self._parse_variable_follower_with_index( + variable, leader, path, informations + ) potential_leader = self._parse_variable_normal( variable, leader, name, path, informations ) @@ -239,6 +245,8 @@ class RougailOutputDoc(Examples): ) -> Optional[dict]: if variable.isdynamic(): sub_informations = self.dynamic_paths[path] + elif variable.isfollower() and variable.index(): + sub_informations = informations[path] else: sub_informations = {} self._populate_variable( @@ -262,10 +270,12 @@ class RougailOutputDoc(Examples): ) def _parse_variable_dynamic( - self, variable, leader, name, path, informations + self, variable, leader, name, path, informations, only_one ) -> None: + if path not in self.dynamic_paths: + self._populate_dynamic_variable(variable, path) dynamic_variable = self.dynamic_paths[path] - if "type" in dynamic_variable: + if (not only_one or path in informations) and "type" in dynamic_variable: if self.example: dynamic_variable["example"].append( self._get_example(variable, dynamic_variable, leader) @@ -280,7 +290,8 @@ class RougailOutputDoc(Examples): ) if variable.isleader(): return dynamic_variable - return None + if not only_one: + return None return self._parse_variable_normal(variable, leader, name, path, informations) def _get_family_type(self, family) -> str: @@ -340,7 +351,7 @@ class RougailOutputDoc(Examples): variable, ) if default is not None: - informations["default"] = default + informations["default"] = {"name": _("Default"), "values": default} self._parse_type( variable, informations, @@ -365,7 +376,13 @@ class RougailOutputDoc(Examples): if examples is None: examples = variable.information.get("test", None) if examples is not None: - informations["examples"] = list(examples) + if len(examples) == 1: + informations["examples"] = {"name": _("Example"), "values": examples[0]} + else: + informations["examples"] = { + "name": _("Examples"), + "values": list(examples), + } def _populate( self, @@ -380,11 +397,12 @@ class RougailOutputDoc(Examples): not obj.isoptiondescription() or (self.support_namespace and obj.group_type() is not groups.namespace) ): - warning = _('No attribute "description" for "{0}" in {1}').format( - obj.path(uncalculated=True), - display_xmlfiles(obj.information.get("ymlfiles")), - ) - warn(warning) + if obj.isoptiondescription() or not obj.isfollower() or not obj.index(): + warning = _('No attribute "description" for "{0}" in {1}').format( + obj.path(uncalculated=True), + display_xmlfiles(obj.information.get("ymlfiles")), + ) + warn(warning) else: informations["description"] = self._convert_description(description, obj) help_ = obj.information.get("help", None) @@ -403,8 +421,9 @@ class RougailOutputDoc(Examples): return description def _add_examples(self, variable, informations: dict, leader) -> None: - example = self._get_example(variable, informations, leader) - informations["example"] = [example] + if not variable.index(): + example = self._get_example(variable, informations, leader) + informations["example"] = [example] informations["mandatory_without_value"] = "mandatory" in variable.property.get( uncalculated=True ) and ( @@ -413,18 +432,21 @@ class RougailOutputDoc(Examples): ) def _get_example(self, variable, informations: dict, leader): - example = informations.get("examples") + example = informations.get("examples", {}).get("values") if example is not None: if isinstance(example, tuple): example = list(example) for prop in informations["properties"]: if prop["type"] == "multiple": - multi = True + if not isinstance(example, list): + example = [example] break else: - multi = False - if not multi: - example = example[0] + if isinstance(example, list): + index = variable.index() + if index is None or len(example) - 1 >= index: + index = 0 + example = example[index] else: if variable.information.get("fake_default", False): default = None @@ -436,24 +458,29 @@ class RougailOutputDoc(Examples): if default not in [None, []]: example = default else: - example = self.convert_option.get( - variable.information.get("type"), {} - ).get("example", None) - if example is None: - example = "xxx" - for prop in informations["properties"]: - if prop["type"] == "multiple": - multi = True - break - else: - multi = False - if multi: - example = [example] + example = self.get_type_default_value( + variable, informations["properties"] + ) if leader is not None and variable.isfollower(): - # len of leader is known, add "undefined" example, it will be modify latter with true value example = [example] + [undefined] * (len(leader["example"][-1]) - 1) return example + def get_type_default_value(self, variable, properties): + example = self.convert_option.get(variable.information.get("type"), {}).get( + "example", None + ) + if example is None: + example = "xxx" + for prop in properties: + if prop["type"] == "multiple": + multi = True + break + else: + multi = False + if multi: + example = [example] + return example + def _parse_type( self, variable, @@ -469,6 +496,7 @@ class RougailOutputDoc(Examples): ] # extra parameters for types option = variable.get() + validators = [] for param, msg in doc_type["params"].items(): value = option.impl_get_extra(f"_{param}") if value is None: @@ -478,41 +506,49 @@ class RougailOutputDoc(Examples): value = list(value) if isinstance(value, list): value = display_list(value, add_quote=True) - informations.setdefault("validators", []).append(msg.format(value)) + validators.append(msg.format(value)) + # get validation information from annotator for name in variable.information.list(): if not name.startswith("validators_calculation"): continue - informations.setdefault("validators", []).extend( + validators.extend( self._to_string( variable, "validators", ) ) break + if variable.information.get("type") == "regexp": + validators.append( + _('text based with regular expressions "{0}"').format( + variable.pattern() + ) + ) + if validators: + if len(validators) == 1: + key = _("Validator") + validators = validators[0] + else: + key = _("Validators") + informations["validators"] = {"name": key, "values": validators} if variable.information.get("type") == "choice": choices = self._to_string(variable, "choice", do_not_raise=True) if choices is None: choices = variable.value.list() for idx, val in enumerate(choices): if not isinstance(val, Calculation): - default = informations.get("default") + default = informations.get("default", {}).get("values") if default is not None and val == default: choices[idx] = ( str(val) + " " + self.formater.bold("← " + _("(default)")) ) - informations["display_default"] = False + informations["default_is_already_set"] = True continue choices[idx] = self._to_string(variable, "choice", f"_{idx}") - informations["choices"] = choices - if variable.information.get("type") == "regexp": - informations.setdefault("validators", []).append( - _('text based with regular expressions "{0}"').format( - variable.pattern() - ) - ) + informations["choices"] = {"name": _("Choices"), "values": choices} def _parse_properties( self, @@ -604,14 +640,19 @@ class RougailOutputDoc(Examples): values = calculation["value"] else: values = _("depends on a calculation") - warning = _( - '"{0}" is a calculation for {1} but has no description in {2}' - ).format( - prop, - child.path(), - display_xmlfiles(child.information.get("ymlfiles")), - ) - warn(warning) + if ( + child.isoptiondescription() + or not child.isfollower() + or not child.index() + ): + warning = _( + '"{0}" is a calculation for {1} but has no description in {2}' + ).format( + prop, + child.path(), + display_xmlfiles(child.information.get("ymlfiles")), + ) + warn(warning) elif calculation["type"] == "variable": if prop in PROPERTY_ATTRIBUTE: variable_path, value, condition = calculation["value"] diff --git a/src/rougail/output_doc/locale/fr/LC_MESSAGES/rougail_output_doc.mo b/src/rougail/output_doc/locale/fr/LC_MESSAGES/rougail_output_doc.mo index af8f593b6..a68c25d3c 100644 Binary files a/src/rougail/output_doc/locale/fr/LC_MESSAGES/rougail_output_doc.mo and b/src/rougail/output_doc/locale/fr/LC_MESSAGES/rougail_output_doc.mo differ diff --git a/src/rougail/output_doc/utils.py b/src/rougail/output_doc/utils.py index b59b4835c..b08965e22 100644 --- a/src/rougail/output_doc/utils.py +++ b/src/rougail/output_doc/utils.py @@ -319,20 +319,27 @@ class CommonFormater: second_col.append(self.stripped(help_)) if "validators" in informations: validators = informations["validators"] - if len(validators) == 1: - second_col.append(self.section(_("Validator"), validators[0])) + if isinstance(validators["values"], list): + values = self.list(validators["values"]) else: - second_col.append(self.section(_("Validators"), self.list(validators))) + values = validators["values"] + second_col.append(self.section(validators["name"], values)) if "choices" in informations: - second_col.append(self.section(_("Choices"), informations["choices"])) - if "default" in informations and informations.get("display_default", True): - second_col.append(self.section(_("Default"), informations["default"])) + choices = informations["choices"] + second_col.append(self.section(choices["name"], choices["values"])) + if ( + "default" in informations + and informations.get("default_is_already_set", False) is False + ): + default = informations["default"] + second_col.append(self.section(default["name"], default["values"])) if "examples" in informations: examples = informations["examples"] - if len(examples) == 1: - second_col.append(self.section(_("Example"), examples[0])) + if isinstance(examples["values"], list): + values = self.list(examples["values"]) else: - second_col.append(self.section(_("Examples"), examples)) + values = examples["values"] + second_col.append(self.section(examples["name"], values)) second_col.extend(calculated_properties) self.columns(second_col) return second_col diff --git a/tests/results/test/00_2default_calculated.json b/tests/results/test/00_2default_calculated.json index be1700a94..8ea743b75 100644 --- a/tests/results/test/00_2default_calculated.json +++ b/tests/results/test/00_2default_calculated.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": "the value of var1.", + "default": { + "name": "Default", + "values": "the value of var1." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_2default_calculated_multi.json b/tests/results/test/00_2default_calculated_multi.json index 704e424c1..ea345ba6b 100644 --- a/tests/results/test/00_2default_calculated_multi.json +++ b/tests/results/test/00_2default_calculated_multi.json @@ -1,11 +1,14 @@ { "var1": { "type": "variable", - "default": [ - "no", - "yes", - "maybe" - ], + "default": { + "name": "Default", + "values": [ + "no", + "yes", + "maybe" + ] + }, "properties": [ { "type": "type", @@ -40,7 +43,10 @@ }, "var2": { "type": "variable", - "default": "the value of _.var1.", + "default": { + "name": "Default", + "values": "the value of _.var1." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_2default_calculated_params_permissive.json b/tests/results/test/00_2default_calculated_params_permissive.json index e4800f361..6c105ddc0 100644 --- a/tests/results/test/00_2default_calculated_params_permissive.json +++ b/tests/results/test/00_2default_calculated_params_permissive.json @@ -1,7 +1,10 @@ { "var2": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_2default_calculated_variable_description.json b/tests/results/test/00_2default_calculated_variable_description.json index 7966630a2..75c44cf7a 100644 --- a/tests/results/test/00_2default_calculated_variable_description.json +++ b/tests/results/test/00_2default_calculated_variable_description.json @@ -27,7 +27,10 @@ }, "var2": { "type": "variable", - "default": "value of a variable!.", + "default": { + "name": "Default", + "values": "value of a variable!." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_2default_calculated_variable_description_multi_line.json b/tests/results/test/00_2default_calculated_variable_description_multi_line.json index 57e73ba14..d68f9ee7a 100644 --- a/tests/results/test/00_2default_calculated_variable_description_multi_line.json +++ b/tests/results/test/00_2default_calculated_variable_description_multi_line.json @@ -27,7 +27,10 @@ }, "var2": { "type": "variable", - "default": "value\nof\na\nvariable!.", + "default": { + "name": "Default", + "values": "value\nof\na\nvariable!." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_2default_calculated_variable_transitive.json b/tests/results/test/00_2default_calculated_variable_transitive.json index 681715d0a..da9f44e79 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.json +++ b/tests/results/test/00_2default_calculated_variable_transitive.json @@ -23,9 +23,10 @@ "name": "multiple" } ], - "validators": [ - "the domain name can be an IP" - ], + "validators": { + "name": "Validator", + "values": "the domain name can be an IP" + }, "paths": [ "var1" ], @@ -38,7 +39,10 @@ }, "var2": { "type": "variable", - "default": "the value of the variable \"var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"var1\"." + }, "properties": [ { "type": "type", @@ -61,9 +65,10 @@ "name": "multiple" } ], - "validators": [ - "the domain name can be an IP" - ], + "validators": { + "name": "Validator", + "values": "the domain name can be an IP" + }, "paths": [ "var2" ], diff --git a/tests/results/test/00_5load_notype.json b/tests/results/test/00_5load_notype.json index 3eb412520..b749199f6 100644 --- a/tests/results/test/00_5load_notype.json +++ b/tests/results/test/00_5load_notype.json @@ -1,7 +1,10 @@ { "without_type": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6boolean.json b/tests/results/test/00_6boolean.json index 4b37430d1..e2d9f2346 100644 --- a/tests/results/test/00_6boolean.json +++ b/tests/results/test/00_6boolean.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ }, "var3": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -82,7 +91,10 @@ }, "var4": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -109,7 +121,10 @@ }, "var5": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -136,7 +151,10 @@ }, "var6": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6boolean_no_mandatory.json b/tests/results/test/00_6boolean_no_mandatory.json index 1df82fe05..9356c03b3 100644 --- a/tests/results/test/00_6boolean_no_mandatory.json +++ b/tests/results/test/00_6boolean_no_mandatory.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6choice.json b/tests/results/test/00_6choice.json index 913f499bf..f7324e3e8 100644 --- a/tests/results/test/00_6choice.json +++ b/tests/results/test/00_6choice.json @@ -15,11 +15,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "var1" ], @@ -46,11 +49,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "var2" ], @@ -73,12 +79,15 @@ "name": "standard" } ], - "choices": [ - "a", - "b", - "c", - null - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c", + null + ] + }, "paths": [ "var3" ], @@ -101,11 +110,14 @@ "name": "standard" } ], - "choices": [ - null, - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + null, + "b", + "c" + ] + }, "paths": [ "var4" ], @@ -118,7 +130,10 @@ }, "var5": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -133,12 +148,15 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "a ← (default)", - "b", - "c" - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "a ← (default)", + "b", + "c" + ] + }, "paths": [ "var5" ], @@ -151,7 +169,10 @@ }, "var6": { "type": "variable", - "default": 1, + "default": { + "name": "Default", + "values": 1 + }, "properties": [ { "type": "type", @@ -166,12 +187,15 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "1 ← (default)", - 2, - 3 - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "1 ← (default)", + 2, + 3 + ] + }, "paths": [ "var6" ], diff --git a/tests/results/test/00_6choice_calculation.json b/tests/results/test/00_6choice_calculation.json index 42fbf79d1..eed1074f1 100644 --- a/tests/results/test/00_6choice_calculation.json +++ b/tests/results/test/00_6choice_calculation.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": 9, + "default": { + "name": "Default", + "values": 9 + }, "properties": [ { "type": "type", @@ -16,7 +19,10 @@ "name": "mandatory" } ], - "choices": "choices is 0 to 9.", + "choices": { + "name": "Choices", + "values": "choices is 0 to 9." + }, "paths": [ "var" ], diff --git a/tests/results/test/00_6choice_link.json b/tests/results/test/00_6choice_link.json index 1615bb7d0..f974294d3 100644 --- a/tests/results/test/00_6choice_link.json +++ b/tests/results/test/00_6choice_link.json @@ -15,11 +15,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "var1" ], @@ -32,7 +35,10 @@ }, "var2": { "type": "variable", - "default": "the value of the variable \"var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"var1\"." + }, "properties": [ { "type": "type", @@ -47,11 +53,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "var2" ], diff --git a/tests/results/test/00_6choice_variable.json b/tests/results/test/00_6choice_variable.json index baacfc433..4e3d33d30 100644 --- a/tests/results/test/00_6choice_variable.json +++ b/tests/results/test/00_6choice_variable.json @@ -1,11 +1,14 @@ { "var1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -40,7 +43,10 @@ }, "var2": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"var1\"." + }, "paths": [ "var2" ], diff --git a/tests/results/test/00_6choice_variable_link.json b/tests/results/test/00_6choice_variable_link.json index 7910ce9b4..410bafac6 100644 --- a/tests/results/test/00_6choice_variable_link.json +++ b/tests/results/test/00_6choice_variable_link.json @@ -1,11 +1,14 @@ { "var1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -40,7 +43,10 @@ }, "var2": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"var1\"." + }, "paths": [ "var2" ], @@ -68,7 +77,10 @@ }, "var3": { "type": "variable", - "default": "the value of the variable \"var2\".", + "default": { + "name": "Default", + "values": "the value of the variable \"var2\"." + }, "properties": [ { "type": "type", @@ -83,7 +95,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"var1\"." + }, "paths": [ "var3" ], diff --git a/tests/results/test/00_6choice_variable_link2.json b/tests/results/test/00_6choice_variable_link2.json index 9fa755051..ec8d07070 100644 --- a/tests/results/test/00_6choice_variable_link2.json +++ b/tests/results/test/00_6choice_variable_link2.json @@ -1,11 +1,14 @@ { "var1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -40,7 +43,10 @@ }, "var2": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"var1\"." + }, "paths": [ "var2" ], @@ -85,7 +94,10 @@ "children": { "family.var3": { "type": "variable", - "default": "the value of the variable \"var2\".", + "default": { + "name": "Default", + "values": "the value of the variable \"var2\"." + }, "properties": [ { "type": "type", @@ -100,7 +112,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"family.var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"family.var1\"." + }, "paths": [ "family.var3" ], diff --git a/tests/results/test/00_6custom.json b/tests/results/test/00_6custom.json index 294d54765..5a8c86e33 100644 --- a/tests/results/test/00_6custom.json +++ b/tests/results/test/00_6custom.json @@ -27,7 +27,10 @@ }, "custom2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6domainname.json b/tests/results/test/00_6domainname.json index d68b54501..b975efa3d 100644 --- a/tests/results/test/00_6domainname.json +++ b/tests/results/test/00_6domainname.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "my.domain.name", + "default": { + "name": "Default", + "values": "my.domain.name" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6domainname_params.json b/tests/results/test/00_6domainname_params.json index c0b22bcd9..09feaed72 100644 --- a/tests/results/test/00_6domainname_params.json +++ b/tests/results/test/00_6domainname_params.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "my.domain.name", + "default": { + "name": "Default", + "values": "my.domain.name" + }, "properties": [ { "type": "type", @@ -16,9 +19,10 @@ "name": "mandatory" } ], - "validators": [ - "the domain name can be an IP" - ], + "validators": { + "name": "Validator", + "values": "the domain name can be an IP" + }, "paths": [ "variable" ], diff --git a/tests/results/test/00_6float.json b/tests/results/test/00_6float.json index 4769b3fd2..f32b907ce 100644 --- a/tests/results/test/00_6float.json +++ b/tests/results/test/00_6float.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": 0.0, + "default": { + "name": "Default", + "values": 0.0 + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": 0.0, + "default": { + "name": "Default", + "values": 0.0 + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ }, "var3": { "type": "variable", - "default": 0.0, + "default": { + "name": "Default", + "values": 0.0 + }, "properties": [ { "type": "type", @@ -82,7 +91,10 @@ }, "var4": { "type": "variable", - "default": 10.1, + "default": { + "name": "Default", + "values": 10.1 + }, "properties": [ { "type": "type", @@ -109,7 +121,10 @@ }, "var5": { "type": "variable", - "default": 10.1, + "default": { + "name": "Default", + "values": 10.1 + }, "properties": [ { "type": "type", @@ -136,7 +151,10 @@ }, "var6": { "type": "variable", - "default": 10.1, + "default": { + "name": "Default", + "values": 10.1 + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6number.json b/tests/results/test/00_6number.json index 2217f8b7a..ffa96c9ee 100644 --- a/tests/results/test/00_6number.json +++ b/tests/results/test/00_6number.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": 0, + "default": { + "name": "Default", + "values": 0 + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": 0, + "default": { + "name": "Default", + "values": 0 + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ }, "var3": { "type": "variable", - "default": 0, + "default": { + "name": "Default", + "values": 0 + }, "properties": [ { "type": "type", @@ -82,7 +91,10 @@ }, "var4": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", @@ -109,7 +121,10 @@ }, "var5": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", @@ -136,7 +151,10 @@ }, "var6": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6port.json b/tests/results/test/00_6port.json index eb92fc7bc..e079531ff 100644 --- a/tests/results/test/00_6port.json +++ b/tests/results/test/00_6port.json @@ -15,11 +15,14 @@ "name": "mandatory" } ], - "validators": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ], + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + }, "paths": [ "variable1" ], @@ -32,7 +35,10 @@ }, "variable2": { "type": "variable", - "default": "8080", + "default": { + "name": "Default", + "values": "8080" + }, "properties": [ { "type": "type", @@ -47,11 +53,14 @@ "name": "mandatory" } ], - "validators": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ], + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + }, "paths": [ "variable2" ], @@ -64,7 +73,10 @@ }, "variable3": { "type": "variable", - "default": "8080", + "default": { + "name": "Default", + "values": "8080" + }, "properties": [ { "type": "type", @@ -79,11 +91,14 @@ "name": "mandatory" } ], - "validators": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ], + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + }, "paths": [ "variable3" ], diff --git a/tests/results/test/00_6regexp.json b/tests/results/test/00_6regexp.json index 7075f5c52..d37be169c 100644 --- a/tests/results/test/00_6regexp.json +++ b/tests/results/test/00_6regexp.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": "#a1a1a1", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, "properties": [ { "type": "type", @@ -16,9 +19,10 @@ "name": "mandatory" } ], - "validators": [ - "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - ], + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "paths": [ "var" ], @@ -28,9 +32,12 @@ "descriptions": [ "A first variable." ], - "examples": [ - "#b1b1b1", - "#b2b2b2" - ] + "examples": { + "name": "Examples", + "values": [ + "#b1b1b1", + "#b2b2b2" + ] + } } } \ No newline at end of file diff --git a/tests/results/test/00_6regexp_link.json b/tests/results/test/00_6regexp_link.json index 52dc6ff46..83feb96a2 100644 --- a/tests/results/test/00_6regexp_link.json +++ b/tests/results/test/00_6regexp_link.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "#a1a1a1", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, "properties": [ { "type": "type", @@ -16,9 +19,10 @@ "name": "mandatory" } ], - "validators": [ - "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - ], + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "paths": [ "var1" ], @@ -28,14 +32,20 @@ "descriptions": [ "A first variable." ], - "examples": [ - "#b1b1b1", - "#b2b2b2" - ] + "examples": { + "name": "Examples", + "values": [ + "#b1b1b1", + "#b2b2b2" + ] + } }, "var2": { "type": "variable", - "default": "the value of the variable \"var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"var1\"." + }, "properties": [ { "type": "type", @@ -50,9 +60,10 @@ "name": "mandatory" } ], - "validators": [ - "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - ], + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "paths": [ "var2" ], @@ -62,9 +73,12 @@ "descriptions": [ "A second variable." ], - "examples": [ - "#b2b1b1", - "#b3b2b2" - ] + "examples": { + "name": "Examples", + "values": [ + "#b2b1b1", + "#b3b2b2" + ] + } } } \ No newline at end of file diff --git a/tests/results/test/00_6secret.json b/tests/results/test/00_6secret.json index ebbd306de..e604eeb58 100644 --- a/tests/results/test/00_6secret.json +++ b/tests/results/test/00_6secret.json @@ -27,7 +27,10 @@ }, "secret2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_6secret_param.json b/tests/results/test/00_6secret_param.json index 8a56b9c1d..a7b4e49d4 100644 --- a/tests/results/test/00_6secret_param.json +++ b/tests/results/test/00_6secret_param.json @@ -15,9 +15,10 @@ "name": "mandatory" } ], - "validators": [ - "minimum length for the secret is 10 characters" - ], + "validators": { + "name": "Validator", + "values": "minimum length for the secret is 10 characters" + }, "paths": [ "secret1" ], @@ -30,7 +31,10 @@ }, "secret2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -45,10 +49,13 @@ "name": "mandatory" } ], - "validators": [ - "maximum length for the secret is 10 characters", - "forbidden characters: \"$\" and \"^\"" - ], + "validators": { + "name": "Validators", + "values": [ + "maximum length for the secret is 10 characters", + "forbidden characters: \"$\" and \"^\"" + ] + }, "paths": [ "secret2" ], @@ -61,7 +68,10 @@ }, "secret3": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -76,10 +86,13 @@ "name": "mandatory" } ], - "validators": [ - "maximum length for the secret is 10 characters", - "forbidden characters: \"$\"" - ], + "validators": { + "name": "Validators", + "values": [ + "maximum length for the secret is 10 characters", + "forbidden characters: \"$\"" + ] + }, "paths": [ "secret3" ], diff --git a/tests/results/test/00_6string.json b/tests/results/test/00_6string.json index fab3b26cc..dc986d530 100644 --- a/tests/results/test/00_6string.json +++ b/tests/results/test/00_6string.json @@ -79,7 +79,10 @@ }, "var4": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -106,7 +109,10 @@ }, "var5": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -133,7 +139,10 @@ }, "var6": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_7choice_quote.json b/tests/results/test/00_7choice_quote.json index 8639a11b4..f14755427 100644 --- a/tests/results/test/00_7choice_quote.json +++ b/tests/results/test/00_7choice_quote.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": "quote'", + "default": { + "name": "Default", + "values": "quote'" + }, "properties": [ { "type": "type", @@ -16,12 +19,15 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "quote' ← (default)", - "quote\"", - "quote\"'" - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "quote' ← (default)", + "quote\"", + "quote\"'" + ] + }, "paths": [ "var" ], diff --git a/tests/results/test/00_7value_doublequote.json b/tests/results/test/00_7value_doublequote.json index 13727ad54..a55e46a15 100644 --- a/tests/results/test/00_7value_doublequote.json +++ b/tests/results/test/00_7value_doublequote.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "quote\"", + "default": { + "name": "Default", + "values": "quote\"" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_7value_doublequote2.json b/tests/results/test/00_7value_doublequote2.json index 1de200c54..0e7f91e7d 100644 --- a/tests/results/test/00_7value_doublequote2.json +++ b/tests/results/test/00_7value_doublequote2.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "quote'\"", + "default": { + "name": "Default", + "values": "quote'\"" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_7value_doublequote3.json b/tests/results/test/00_7value_doublequote3.json index a3c8eda11..604c97381 100644 --- a/tests/results/test/00_7value_doublequote3.json +++ b/tests/results/test/00_7value_doublequote3.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "quote\\\"\\'", + "default": { + "name": "Default", + "values": "quote\\\"\\'" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_7value_quote.json b/tests/results/test/00_7value_quote.json index 1a2376f92..3510c8e97 100644 --- a/tests/results/test/00_7value_quote.json +++ b/tests/results/test/00_7value_quote.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "quote'", + "default": { + "name": "Default", + "values": "quote'" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_8calculation_information.json b/tests/results/test/00_8calculation_information.json index 517f8c862..60e720e90 100644 --- a/tests/results/test/00_8calculation_information.json +++ b/tests/results/test/00_8calculation_information.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "get information test_information.", + "default": { + "name": "Default", + "values": "get information test_information." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_8test.json b/tests/results/test/00_8test.json index 31fb39267..96215a21e 100644 --- a/tests/results/test/00_8test.json +++ b/tests/results/test/00_8test.json @@ -24,13 +24,17 @@ "descriptions": [ "The first variable." ], - "examples": [ - "test" - ] + "examples": { + "name": "Example", + "values": "test" + } }, "var2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -54,9 +58,10 @@ "descriptions": [ "The second variable." ], - "examples": [ - "test" - ] + "examples": { + "name": "Example", + "values": "test" + } }, "var3": { "type": "variable", @@ -83,10 +88,13 @@ "descriptions": [ "The third variable." ], - "examples": [ - "test1", - "test2" - ] + "examples": { + "name": "Examples", + "values": [ + "test1", + "test2" + ] + } }, "var4": { "type": "variable", @@ -109,15 +117,21 @@ "descriptions": [ "The forth variable." ], - "examples": [ - null, - "test1", - "test2" - ] + "examples": { + "name": "Examples", + "values": [ + null, + "test1", + "test2" + ] + } }, "var5": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -141,9 +155,10 @@ "descriptions": [ "The fifth variable." ], - "examples": [ - false - ] + "examples": { + "name": "Example", + "values": false + } }, "var6": { "type": "variable", @@ -178,9 +193,12 @@ "descriptions": [ "The sixth variable." ], - "examples": [ - "test1", - "test2" - ] + "examples": { + "name": "Examples", + "values": [ + "test1", + "test2" + ] + } } } \ No newline at end of file diff --git a/tests/results/test/00_9choice_variable_multi.json b/tests/results/test/00_9choice_variable_multi.json index 149a75e6d..c5dce0177 100644 --- a/tests/results/test/00_9choice_variable_multi.json +++ b/tests/results/test/00_9choice_variable_multi.json @@ -23,10 +23,13 @@ "name": "multiple" } ], - "choices": [ - "val1", - "val2" - ], + "choices": { + "name": "Choices", + "values": [ + "val1", + "val2" + ] + }, "paths": [ "variable1" ], @@ -57,10 +60,13 @@ "name": "multiple" } ], - "choices": [ - "val1", - "val2" - ], + "choices": { + "name": "Choices", + "values": [ + "val1", + "val2" + ] + }, "paths": [ "variable2" ], diff --git a/tests/results/test/00_9choice_variables.json b/tests/results/test/00_9choice_variables.json index a04579547..c8ae4ce58 100644 --- a/tests/results/test/00_9choice_variables.json +++ b/tests/results/test/00_9choice_variables.json @@ -1,7 +1,10 @@ { "source_variable_1": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "source_variable_2": { "type": "variable", - "default": "val2", + "default": { + "name": "Default", + "values": "val2" + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ }, "my_variable": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -70,10 +79,13 @@ "name": "mandatory" } ], - "choices": [ - "the value of the variable \"source_variable_1\".", - "the value of the variable \"source_variable_2\"." - ], + "choices": { + "name": "Choices", + "values": [ + "the value of the variable \"source_variable_1\".", + "the value of the variable \"source_variable_2\"." + ] + }, "paths": [ "my_variable" ], diff --git a/tests/results/test/00_9default_calculation.json b/tests/results/test/00_9default_calculation.json index 1b2d95f27..f5edb6f72 100644 --- a/tests/results/test/00_9default_calculation.json +++ b/tests/results/test/00_9default_calculation.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "concat all parameters.", + "default": { + "name": "Default", + "values": "concat all parameters." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_calculation_information.json b/tests/results/test/00_9default_calculation_information.json index c610ed0cc..e948d4eb4 100644 --- a/tests/results/test/00_9default_calculation_information.json +++ b/tests/results/test/00_9default_calculation_information.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": "returns the information.", + "default": { + "name": "Default", + "values": "returns the information." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_calculation_information_other_variable.json b/tests/results/test/00_9default_calculation_information_other_variable.json index b9736f1a4..c1c9ba3fb 100644 --- a/tests/results/test/00_9default_calculation_information_other_variable.json +++ b/tests/results/test/00_9default_calculation_information_other_variable.json @@ -27,7 +27,10 @@ }, "var2": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_calculation_multi_optional.json b/tests/results/test/00_9default_calculation_multi_optional.json index b0a88920c..4161896b1 100644 --- a/tests/results/test/00_9default_calculation_multi_optional.json +++ b/tests/results/test/00_9default_calculation_multi_optional.json @@ -1,7 +1,10 @@ { "my_variable": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -25,9 +28,12 @@ }, "my_calculated_variable": { "type": "variable", - "default": [ - "the value of the variable \"my_variable\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"my_variable\"." + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_calculation_multi_optional2.json b/tests/results/test/00_9default_calculation_multi_optional2.json index b0a88920c..4161896b1 100644 --- a/tests/results/test/00_9default_calculation_multi_optional2.json +++ b/tests/results/test/00_9default_calculation_multi_optional2.json @@ -1,7 +1,10 @@ { "my_variable": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -25,9 +28,12 @@ }, "my_calculated_variable": { "type": "variable", - "default": [ - "the value of the variable \"my_variable\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"my_variable\"." + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_calculation_optional_exists.json b/tests/results/test/00_9default_calculation_optional_exists.json index 692085ee6..0936102ae 100644 --- a/tests/results/test/00_9default_calculation_optional_exists.json +++ b/tests/results/test/00_9default_calculation_optional_exists.json @@ -1,10 +1,13 @@ { "my_variable": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -36,7 +39,10 @@ }, "my_calculated_variable": { "type": "variable", - "default": "the value of the variable \"my_variable\".", + "default": { + "name": "Default", + "values": "the value of the variable \"my_variable\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_calculation_param_optional.json b/tests/results/test/00_9default_calculation_param_optional.json index acd9cbfea..568a2a5d4 100644 --- a/tests/results/test/00_9default_calculation_param_optional.json +++ b/tests/results/test/00_9default_calculation_param_optional.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "returns a value.", + "default": { + "name": "Default", + "values": "returns a value." + }, "properties": [ { "type": "type", @@ -24,7 +27,10 @@ }, "var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_information_other_variable.json b/tests/results/test/00_9default_information_other_variable.json index a27cda0d3..b317e9769 100644 --- a/tests/results/test/00_9default_information_other_variable.json +++ b/tests/results/test/00_9default_information_other_variable.json @@ -27,7 +27,10 @@ }, "var2": { "type": "variable", - "default": "the value of the information \"test_information\" of the variable \"var1\".", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_information_other_variable2.json b/tests/results/test/00_9default_information_other_variable2.json index a27cda0d3..b317e9769 100644 --- a/tests/results/test/00_9default_information_other_variable2.json +++ b/tests/results/test/00_9default_information_other_variable2.json @@ -27,7 +27,10 @@ }, "var2": { "type": "variable", - "default": "the value of the information \"test_information\" of the variable \"var1\".", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/00_9default_integer.json b/tests/results/test/00_9default_integer.json index d4ed05701..8c8d2a6cc 100644 --- a/tests/results/test/00_9default_integer.json +++ b/tests/results/test/00_9default_integer.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": 9, + "default": { + "name": "Default", + "values": 9 + }, "properties": [ { "type": "type", @@ -16,7 +19,10 @@ "name": "mandatory" } ], - "choices": "choice for 0 to 9.", + "choices": { + "name": "Choices", + "values": "choice for 0 to 9." + }, "paths": [ "var" ], diff --git a/tests/results/test/01_6boolean_multi.json b/tests/results/test/01_6boolean_multi.json index 0615f5a27..ca600e77f 100644 --- a/tests/results/test/01_6boolean_multi.json +++ b/tests/results/test/01_6boolean_multi.json @@ -1,9 +1,12 @@ { "var1": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -38,9 +41,12 @@ }, "var2": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -75,9 +81,12 @@ }, "var3": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -112,9 +121,12 @@ }, "var4": { "type": "variable", - "default": [ - false - ], + "default": { + "name": "Default", + "values": [ + false + ] + }, "properties": [ { "type": "type", @@ -149,9 +161,12 @@ }, "var5": { "type": "variable", - "default": [ - false - ], + "default": { + "name": "Default", + "values": [ + false + ] + }, "properties": [ { "type": "type", @@ -186,9 +201,12 @@ }, "var6": { "type": "variable", - "default": [ - false - ], + "default": { + "name": "Default", + "values": [ + false + ] + }, "properties": [ { "type": "type", @@ -223,9 +241,12 @@ }, "var7": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -260,9 +281,12 @@ }, "var8": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_6custom_multi.json b/tests/results/test/01_6custom_multi.json index 65aa324ea..b26a52e6d 100644 --- a/tests/results/test/01_6custom_multi.json +++ b/tests/results/test/01_6custom_multi.json @@ -35,9 +35,12 @@ }, "custom2": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_6float_multi.json b/tests/results/test/01_6float_multi.json index c5ac81a62..eb2f72fd6 100644 --- a/tests/results/test/01_6float_multi.json +++ b/tests/results/test/01_6float_multi.json @@ -1,9 +1,12 @@ { "var1": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -38,9 +41,12 @@ }, "var2": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -75,9 +81,12 @@ }, "var3": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -112,9 +121,12 @@ }, "var4": { "type": "variable", - "default": [ - 10.1 - ], + "default": { + "name": "Default", + "values": [ + 10.1 + ] + }, "properties": [ { "type": "type", @@ -149,9 +161,12 @@ }, "var5": { "type": "variable", - "default": [ - 10.1 - ], + "default": { + "name": "Default", + "values": [ + 10.1 + ] + }, "properties": [ { "type": "type", @@ -186,9 +201,12 @@ }, "var6": { "type": "variable", - "default": [ - 10.1 - ], + "default": { + "name": "Default", + "values": [ + 10.1 + ] + }, "properties": [ { "type": "type", @@ -223,9 +241,12 @@ }, "var7": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -260,9 +281,12 @@ }, "var8": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_6number_multi.json b/tests/results/test/01_6number_multi.json index c83495b00..e569e39b0 100644 --- a/tests/results/test/01_6number_multi.json +++ b/tests/results/test/01_6number_multi.json @@ -1,9 +1,12 @@ { "var1": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -38,9 +41,12 @@ }, "var2": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -75,9 +81,12 @@ }, "var3": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -112,9 +121,12 @@ }, "var4": { "type": "variable", - "default": [ - 10 - ], + "default": { + "name": "Default", + "values": [ + 10 + ] + }, "properties": [ { "type": "type", @@ -149,9 +161,12 @@ }, "var5": { "type": "variable", - "default": [ - 10 - ], + "default": { + "name": "Default", + "values": [ + 10 + ] + }, "properties": [ { "type": "type", @@ -186,9 +201,12 @@ }, "var6": { "type": "variable", - "default": [ - 10 - ], + "default": { + "name": "Default", + "values": [ + 10 + ] + }, "properties": [ { "type": "type", @@ -223,9 +241,12 @@ }, "var7": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -260,9 +281,12 @@ }, "var8": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_6string_empty.json b/tests/results/test/01_6string_empty.json index 9fd9df50c..a373bbf72 100644 --- a/tests/results/test/01_6string_empty.json +++ b/tests/results/test/01_6string_empty.json @@ -1,10 +1,13 @@ { "var1": { "type": "variable", - "default": [ - "value", - null - ], + "default": { + "name": "Default", + "values": [ + "value", + null + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_6string_multi.json b/tests/results/test/01_6string_multi.json index 23a45c475..dc26c185d 100644 --- a/tests/results/test/01_6string_multi.json +++ b/tests/results/test/01_6string_multi.json @@ -103,9 +103,12 @@ }, "var4": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -140,9 +143,12 @@ }, "var5": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -177,9 +183,12 @@ }, "var6": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -214,9 +223,12 @@ }, "var7": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -251,9 +263,12 @@ }, "var8": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_7value_multi_doublequote.json b/tests/results/test/01_7value_multi_doublequote.json index b15e2762c..ab1fea8f0 100644 --- a/tests/results/test/01_7value_multi_doublequote.json +++ b/tests/results/test/01_7value_multi_doublequote.json @@ -1,9 +1,12 @@ { "variable": { "type": "variable", - "default": [ - "quote\"" - ], + "default": { + "name": "Default", + "values": [ + "quote\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_7value_multi_doublequote2.json b/tests/results/test/01_7value_multi_doublequote2.json index 0374c78a7..639fc97bd 100644 --- a/tests/results/test/01_7value_multi_doublequote2.json +++ b/tests/results/test/01_7value_multi_doublequote2.json @@ -1,9 +1,12 @@ { "variable": { "type": "variable", - "default": [ - "quote'\"" - ], + "default": { + "name": "Default", + "values": [ + "quote'\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_7value_multi_quote.json b/tests/results/test/01_7value_multi_quote.json index c212b1ae1..a1f5cf0af 100644 --- a/tests/results/test/01_7value_multi_quote.json +++ b/tests/results/test/01_7value_multi_quote.json @@ -1,9 +1,12 @@ { "variable": { "type": "variable", - "default": [ - "quote'" - ], + "default": { + "name": "Default", + "values": [ + "quote'" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_8calculation_information_multi.json b/tests/results/test/01_8calculation_information_multi.json index 9520c6e11..98a1ce4d5 100644 --- a/tests/results/test/01_8calculation_information_multi.json +++ b/tests/results/test/01_8calculation_information_multi.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "get information test_information.", + "default": { + "name": "Default", + "values": "get information test_information." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/01_9choice_variable_multi.json b/tests/results/test/01_9choice_variable_multi.json index 73e02fb44..29e88f3d5 100644 --- a/tests/results/test/01_9choice_variable_multi.json +++ b/tests/results/test/01_9choice_variable_multi.json @@ -1,11 +1,14 @@ { "variable1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -54,7 +57,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"variable1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"variable1\"." + }, "paths": [ "variable2" ], diff --git a/tests/results/test/04_0type_param.json b/tests/results/test/04_0type_param.json index 3fd841761..392e0ddc5 100644 --- a/tests/results/test/04_0type_param.json +++ b/tests/results/test/04_0type_param.json @@ -1,7 +1,10 @@ { "int": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", @@ -16,10 +19,13 @@ "name": "mandatory" } ], - "validators": [ - "the minimum value is 0", - "the maximum value is 100" - ], + "validators": { + "name": "Validators", + "values": [ + "the minimum value is 0", + "the maximum value is 100" + ] + }, "paths": [ "int" ], diff --git a/tests/results/test/04_1auto_save.json b/tests/results/test/04_1auto_save.json index 5974cd356..bf184f18f 100644 --- a/tests/results/test/04_1auto_save.json +++ b/tests/results/test/04_1auto_save.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1auto_save_and_calculated.json b/tests/results/test/04_1auto_save_and_calculated.json index 028fffa07..37c8053dc 100644 --- a/tests/results/test/04_1auto_save_and_calculated.json +++ b/tests/results/test/04_1auto_save_and_calculated.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": "the value of the variable \"var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1auto_save_and_calculated_hidden.json b/tests/results/test/04_1auto_save_and_calculated_hidden.json index 1dd4710cb..230cbfeff 100644 --- a/tests/results/test/04_1auto_save_and_calculated_hidden.json +++ b/tests/results/test/04_1auto_save_and_calculated_hidden.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": "the value is always yes.", + "default": { + "name": "Default", + "values": "the value is always yes." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1default_calculation_hidden.json b/tests/results/test/04_1default_calculation_hidden.json index 5239d3348..66067ac31 100644 --- a/tests/results/test/04_1default_calculation_hidden.json +++ b/tests/results/test/04_1default_calculation_hidden.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -59,7 +62,10 @@ }, "var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1default_calculation_hidden_2.json b/tests/results/test/04_1default_calculation_hidden_2.json index 5239d3348..66067ac31 100644 --- a/tests/results/test/04_1default_calculation_hidden_2.json +++ b/tests/results/test/04_1default_calculation_hidden_2.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -59,7 +62,10 @@ }, "var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1default_calculation_hidden_3.json b/tests/results/test/04_1default_calculation_hidden_3.json index ca1be1f52..d1301960d 100644 --- a/tests/results/test/04_1default_calculation_hidden_3.json +++ b/tests/results/test/04_1default_calculation_hidden_3.json @@ -1,7 +1,10 @@ { "var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1default_calculation_hidden_4.json b/tests/results/test/04_1default_calculation_hidden_4.json index 47cd980fa..c6b858fe7 100644 --- a/tests/results/test/04_1default_calculation_hidden_4.json +++ b/tests/results/test/04_1default_calculation_hidden_4.json @@ -27,7 +27,10 @@ }, "var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1default_calculation_hidden_5.json b/tests/results/test/04_1default_calculation_hidden_5.json index ac08b08a9..892bb9c56 100644 --- a/tests/results/test/04_1default_calculation_hidden_5.json +++ b/tests/results/test/04_1default_calculation_hidden_5.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_1default_calculation_hidden_6.json b/tests/results/test/04_1default_calculation_hidden_6.json index ac08b08a9..892bb9c56 100644 --- a/tests/results/test/04_1default_calculation_hidden_6.json +++ b/tests/results/test/04_1default_calculation_hidden_6.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5disabled_calculation_optional.json b/tests/results/test/04_5disabled_calculation_optional.json index 45b0dd809..0725549c8 100644 --- a/tests/results/test/04_5disabled_calculation_optional.json +++ b/tests/results/test/04_5disabled_calculation_optional.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5disabled_calculation_variable.json b/tests/results/test/04_5disabled_calculation_variable.json index ea2c4a99a..0a19da78f 100644 --- a/tests/results/test/04_5disabled_calculation_variable.json +++ b/tests/results/test/04_5disabled_calculation_variable.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5disabled_calculation_variable2.json b/tests/results/test/04_5disabled_calculation_variable2.json index 621e6034c..4e174ccca 100644 --- a/tests/results/test/04_5disabled_calculation_variable2.json +++ b/tests/results/test/04_5disabled_calculation_variable2.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5disabled_calculation_variable3.json b/tests/results/test/04_5disabled_calculation_variable3.json index 5ce302d36..533ac5cd5 100644 --- a/tests/results/test/04_5disabled_calculation_variable3.json +++ b/tests/results/test/04_5disabled_calculation_variable3.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5disabled_calculation_variable4.json b/tests/results/test/04_5disabled_calculation_variable4.json index 4700f00b6..223b10041 100644 --- a/tests/results/test/04_5disabled_calculation_variable4.json +++ b/tests/results/test/04_5disabled_calculation_variable4.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5disabled_calculation_variable_multi.json b/tests/results/test/04_5disabled_calculation_variable_multi.json index b6eea307e..217771c8c 100644 --- a/tests/results/test/04_5disabled_calculation_variable_multi.json +++ b/tests/results/test/04_5disabled_calculation_variable_multi.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5validators.json b/tests/results/test/04_5validators.json index 16b140804..5202783f1 100644 --- a/tests/results/test/04_5validators.json +++ b/tests/results/test/04_5validators.json @@ -15,9 +15,10 @@ "name": "mandatory" } ], - "validators": [ - "the max value is 100." - ], + "validators": { + "name": "Validator", + "values": "the max value is 100." + }, "paths": [ "int" ], diff --git a/tests/results/test/04_5validators_differ.json b/tests/results/test/04_5validators_differ.json index ae0ddbdcd..11c3ac4dd 100644 --- a/tests/results/test/04_5validators_differ.json +++ b/tests/results/test/04_5validators_differ.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "oui", + "default": { + "name": "Default", + "values": "oui" + }, "properties": [ { "type": "type", @@ -16,9 +19,10 @@ "name": "mandatory" } ], - "validators": [ - "var1 must be different than var2." - ], + "validators": { + "name": "Validator", + "values": "var1 must be different than var2." + }, "paths": [ "var1" ], @@ -28,13 +32,17 @@ "descriptions": [ "A first variable." ], - "examples": [ - "another_value" - ] + "examples": { + "name": "Example", + "values": "another_value" + } }, "var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/04_5validators_multi.json b/tests/results/test/04_5validators_multi.json index 6a0dba157..6badf5944 100644 --- a/tests/results/test/04_5validators_multi.json +++ b/tests/results/test/04_5validators_multi.json @@ -1,10 +1,13 @@ { "var1": { "type": "variable", - "default": [ - "no", - "yes" - ], + "default": { + "name": "Default", + "values": [ + "no", + "yes" + ] + }, "properties": [ { "type": "type", @@ -27,9 +30,10 @@ "name": "multiple" } ], - "validators": [ - "check length is less than 10." - ], + "validators": { + "name": "Validator", + "values": "check length is less than 10." + }, "paths": [ "var1" ], diff --git a/tests/results/test/04_5validators_multi2.json b/tests/results/test/04_5validators_multi2.json index 4aed54422..a6557305e 100644 --- a/tests/results/test/04_5validators_multi2.json +++ b/tests/results/test/04_5validators_multi2.json @@ -1,10 +1,13 @@ { "var1": { "type": "variable", - "default": [ - "no", - "yes" - ], + "default": { + "name": "Default", + "values": [ + "no", + "yes" + ] + }, "properties": [ { "type": "type", @@ -27,9 +30,10 @@ "name": "multiple" } ], - "validators": [ - "check length is less than 3." - ], + "validators": { + "name": "Validator", + "values": "check length is less than 3." + }, "paths": [ "var1" ], @@ -39,9 +43,12 @@ "descriptions": [ "A second variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } } } \ No newline at end of file diff --git a/tests/results/test/04_5validators_multi3.json b/tests/results/test/04_5validators_multi3.json index 93c507445..12094d4ce 100644 --- a/tests/results/test/04_5validators_multi3.json +++ b/tests/results/test/04_5validators_multi3.json @@ -1,11 +1,14 @@ { "var1": { "type": "variable", - "default": [ - 0, - 1, - 2 - ], + "default": { + "name": "Default", + "values": [ + 0, + 1, + 2 + ] + }, "properties": [ { "type": "type", @@ -28,9 +31,10 @@ "name": "multiple" } ], - "validators": [ - "value must be equal to index." - ], + "validators": { + "name": "Validator", + "values": "value must be equal to index." + }, "paths": [ "var1" ], @@ -40,8 +44,9 @@ "descriptions": [ "A second variable." ], - "examples": [ - 0 - ] + "examples": { + "name": "Example", + "values": 0 + } } } \ No newline at end of file diff --git a/tests/results/test/05_0multi_not_uniq.json b/tests/results/test/05_0multi_not_uniq.json index 45f791320..9f2f63568 100644 --- a/tests/results/test/05_0multi_not_uniq.json +++ b/tests/results/test/05_0multi_not_uniq.json @@ -1,9 +1,12 @@ { "var1": { "type": "variable", - "default": [ - "non" - ], + "default": { + "name": "Default", + "values": [ + "non" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/05_0multi_uniq.json b/tests/results/test/05_0multi_uniq.json index dc1f2f4c0..036801eb3 100644 --- a/tests/results/test/05_0multi_uniq.json +++ b/tests/results/test/05_0multi_uniq.json @@ -1,9 +1,12 @@ { "variable": { "type": "variable", - "default": [ - "non" - ], + "default": { + "name": "Default", + "values": [ + "non" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/12_1auto_save_expert.json b/tests/results/test/12_1auto_save_expert.json index 7c1eadf79..4528d96da 100644 --- a/tests/results/test/12_1auto_save_expert.json +++ b/tests/results/test/12_1auto_save_expert.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/16_5exists_nonexists.json b/tests/results/test/16_5exists_nonexists.json index 7bf738af7..aa178672d 100644 --- a/tests/results/test/16_5exists_nonexists.json +++ b/tests/results/test/16_5exists_nonexists.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/16_5redefine_calculation.json b/tests/results/test/16_5redefine_calculation.json index 4f6b7329d..5dd28f93c 100644 --- a/tests/results/test/16_5redefine_calculation.json +++ b/tests/results/test/16_5redefine_calculation.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "returns yes.", + "default": { + "name": "Default", + "values": "returns yes." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/16_5redefine_choice.json b/tests/results/test/16_5redefine_choice.json index 3b5a7d6ea..a745e95cf 100644 --- a/tests/results/test/16_5redefine_choice.json +++ b/tests/results/test/16_5redefine_choice.json @@ -15,10 +15,13 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b" + ] + }, "paths": [ "variable" ], diff --git a/tests/results/test/16_5redefine_default.json b/tests/results/test/16_5redefine_default.json index 4e1d34315..c665fda93 100644 --- a/tests/results/test/16_5redefine_default.json +++ b/tests/results/test/16_5redefine_default.json @@ -1,7 +1,10 @@ { "variable": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/16_5redefine_multi.json b/tests/results/test/16_5redefine_multi.json index dc1f2f4c0..036801eb3 100644 --- a/tests/results/test/16_5redefine_multi.json +++ b/tests/results/test/16_5redefine_multi.json @@ -1,9 +1,12 @@ { "variable": { "type": "variable", - "default": [ - "non" - ], + "default": { + "name": "Default", + "values": [ + "non" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/16_5redefine_remove_disable_calculation.json b/tests/results/test/16_5redefine_remove_disable_calculation.json index d20159ba4..cfced86c9 100644 --- a/tests/results/test/16_5redefine_remove_disable_calculation.json +++ b/tests/results/test/16_5redefine_remove_disable_calculation.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/16_5test_redefine.json b/tests/results/test/16_5test_redefine.json index 34b6b2ed1..0ee327bcc 100644 --- a/tests/results/test/16_5test_redefine.json +++ b/tests/results/test/16_5test_redefine.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -25,13 +28,17 @@ "descriptions": [ "A first variable." ], - "examples": [ - "test1" - ] + "examples": { + "name": "Example", + "values": "test1" + } }, "var2": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", @@ -55,9 +62,10 @@ "descriptions": [ "A second variable." ], - "examples": [ - "test1" - ] + "examples": { + "name": "Example", + "values": "test1" + } }, "var3": { "type": "variable", diff --git a/tests/results/test/16_6choice_redefine.json b/tests/results/test/16_6choice_redefine.json index c3dcb40b4..e919c1885 100644 --- a/tests/results/test/16_6choice_redefine.json +++ b/tests/results/test/16_6choice_redefine.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": "c", + "default": { + "name": "Default", + "values": "c" + }, "properties": [ { "type": "type", @@ -16,11 +19,14 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "a", - "c ← (default)" - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "a", + "c ← (default)" + ] + }, "paths": [ "var" ], diff --git a/tests/results/test/20_0validators_differ_redefine.json b/tests/results/test/20_0validators_differ_redefine.json index 1f80740b0..608523918 100644 --- a/tests/results/test/20_0validators_differ_redefine.json +++ b/tests/results/test/20_0validators_differ_redefine.json @@ -1,7 +1,10 @@ { "var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -55,7 +61,10 @@ }, "var3": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", @@ -70,9 +79,10 @@ "name": "mandatory" } ], - "validators": [ - "var3 must be different than var2." - ], + "validators": { + "name": "Validator", + "values": "var3 must be different than var2." + }, "paths": [ "var3" ], @@ -82,8 +92,9 @@ "descriptions": [ "A third variable." ], - "examples": [ - "yes" - ] + "examples": { + "name": "Example", + "values": "yes" + } } } \ No newline at end of file diff --git a/tests/results/test/20_9default_information_parent.json b/tests/results/test/20_9default_information_parent.json index 9e898bf65..6fb7d5c42 100644 --- a/tests/results/test/20_9default_information_parent.json +++ b/tests/results/test/20_9default_information_parent.json @@ -44,7 +44,10 @@ }, "family.var2": { "type": "variable", - "default": "the value of the information \"test_information\" of the variable \"family\".", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"family\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/20_9family_absolute.json b/tests/results/test/20_9family_absolute.json index 41b3fd657..77577606f 100644 --- a/tests/results/test/20_9family_absolute.json +++ b/tests/results/test/20_9family_absolute.json @@ -68,9 +68,10 @@ "descriptions": [ "A second variable." ], - "examples": [ - "string6" - ] + "examples": { + "name": "Example", + "values": "string6" + } }, "subfamily": { "type": "family", @@ -92,10 +93,13 @@ "children": { "family.subfamily.variable": { "type": "variable", - "default": [ - "the value of the variable \"var1\".", - "the value of the variable \"family.var2\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"var1\".", + "the value of the variable \"family.var2\"." + ] + }, "properties": [ { "type": "type", @@ -152,7 +156,10 @@ "children": { "family2.var2": { "type": "variable", - "default": "the value of the variable \"family.var2\".", + "default": { + "name": "Default", + "values": "the value of the variable \"family.var2\"." + }, "properties": [ { "type": "type", @@ -179,7 +186,10 @@ }, "family2.var3": { "type": "variable", - "default": "string4", + "default": { + "name": "Default", + "values": "string4" + }, "properties": [ { "type": "type", @@ -200,9 +210,10 @@ "names": [ "var3" ], - "examples": [ - "string5" - ] + "examples": { + "name": "Example", + "values": "string5" + } }, "subfamily": { "type": "family", @@ -224,11 +235,14 @@ "children": { "family2.subfamily.variable": { "type": "variable", - "default": [ - "the value of the variable \"var1\".", - "the value of the variable \"family.var2\".", - "the value of the variable \"family2.var3\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"var1\".", + "the value of the variable \"family.var2\".", + "the value of the variable \"family2.var3\"." + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/24_0family_hidden_condition_sub_family.json b/tests/results/test/24_0family_hidden_condition_sub_family.json index bb5b74174..b9e8306a3 100644 --- a/tests/results/test/24_0family_hidden_condition_sub_family.json +++ b/tests/results/test/24_0family_hidden_condition_sub_family.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/24_0family_hidden_condition_variable_sub_family.json b/tests/results/test/24_0family_hidden_condition_variable_sub_family.json index 94553909e..79216fa80 100644 --- a/tests/results/test/24_0family_hidden_condition_variable_sub_family.json +++ b/tests/results/test/24_0family_hidden_condition_variable_sub_family.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test/24_0family_hidden_param_condition_sub_family.json b/tests/results/test/24_0family_hidden_param_condition_sub_family.json index ff6f0163a..cf2bfdb5c 100644 --- a/tests/results/test/24_0family_hidden_param_condition_sub_family.json +++ b/tests/results/test/24_0family_hidden_param_condition_sub_family.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/24_0family_mandatory_condition.json b/tests/results/test/24_0family_mandatory_condition.json index 06cb41af2..5093de32e 100644 --- a/tests/results/test/24_0family_mandatory_condition.json +++ b/tests/results/test/24_0family_mandatory_condition.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/24_0family_mandatory_condition_variable.json b/tests/results/test/24_0family_mandatory_condition_variable.json index eb6451aa3..df0eb6034 100644 --- a/tests/results/test/24_0family_mandatory_condition_variable.json +++ b/tests/results/test/24_0family_mandatory_condition_variable.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test/24_7validators_variable_optional.json b/tests/results/test/24_7validators_variable_optional.json index f5b1bc47d..d5f9b1617 100644 --- a/tests/results/test/24_7validators_variable_optional.json +++ b/tests/results/test/24_7validators_variable_optional.json @@ -33,10 +33,13 @@ "name": "mandatory" } ], - "validators": [ - "int and int2 must be different.", - "int and int3 must be different." - ], + "validators": { + "name": "Validators", + "values": [ + "int and int2 must be different.", + "int and int3 must be different." + ] + }, "paths": [ "general.int" ], @@ -46,13 +49,17 @@ "descriptions": [ "A first number." ], - "examples": [ - 5 - ] + "examples": { + "name": "Example", + "values": 5 + } }, "general.int2": { "type": "variable", - "default": 1, + "default": { + "name": "Default", + "values": 1 + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_0leadership_follower_default_calculation.json b/tests/results/test/40_0leadership_follower_default_calculation.json index eaf2c473c..16b983350 100644 --- a/tests/results/test/40_0leadership_follower_default_calculation.json +++ b/tests/results/test/40_0leadership_follower_default_calculation.json @@ -56,7 +56,10 @@ }, "leader.follower1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -83,7 +86,10 @@ }, "leader.follower2": { "type": "variable", - "default": "returns follower1 value.", + "default": { + "name": "Default", + "values": "returns follower1 value." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_0leadership_follower_default_value.json b/tests/results/test/40_0leadership_follower_default_value.json index c73cd63bd..156a4769c 100644 --- a/tests/results/test/40_0leadership_follower_default_value.json +++ b/tests/results/test/40_0leadership_follower_default_value.json @@ -52,7 +52,10 @@ }, "leader.follower1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_0leadership_leader_follower.json b/tests/results/test/40_0leadership_leader_follower.json index 79a0ebb71..3082483d6 100644 --- a/tests/results/test/40_0leadership_leader_follower.json +++ b/tests/results/test/40_0leadership_leader_follower.json @@ -22,10 +22,13 @@ "children": { "leadership.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ }, "leadership.follower": { "type": "variable", - "default": "the value of the variable \"leadership.leader\".", + "default": { + "name": "Default", + "values": "the value of the variable \"leadership.leader\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_0leadership_leader_not_multi.json b/tests/results/test/40_0leadership_leader_not_multi.json index a4b6718c1..2d70c7bf1 100644 --- a/tests/results/test/40_0leadership_leader_not_multi.json +++ b/tests/results/test/40_0leadership_leader_not_multi.json @@ -18,7 +18,10 @@ "children": { "general.mode_conteneur_actif": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_0leadership_reduce.json b/tests/results/test/40_0leadership_reduce.json index 7069d217c..894f75ddb 100644 --- a/tests/results/test/40_0leadership_reduce.json +++ b/tests/results/test/40_0leadership_reduce.json @@ -22,11 +22,14 @@ "children": { "leadership.leader": { "type": "variable", - "default": [ - "value_1", - "value_2", - "value_3" - ], + "default": { + "name": "Default", + "values": [ + "value_1", + "value_2", + "value_3" + ] + }, "properties": [ { "type": "type", @@ -58,10 +61,13 @@ "descriptions": [ "A leader." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "leadership.follower": { "type": "variable", diff --git a/tests/results/test/40_6leadership_follower_multi.json b/tests/results/test/40_6leadership_follower_multi.json index dc54733d5..0c98629a2 100644 --- a/tests/results/test/40_6leadership_follower_multi.json +++ b/tests/results/test/40_6leadership_follower_multi.json @@ -86,9 +86,12 @@ }, "leadership.follower2": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test/40_6leadership_follower_multi_no_mandatory.json index 651440c45..87e868eca 100644 --- a/tests/results/test/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test/40_6leadership_follower_multi_no_mandatory.json @@ -82,9 +82,12 @@ }, "leadership.follower2": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_8calculation_boolean.json b/tests/results/test/40_8calculation_boolean.json index ac2a02097..c42dd2eb0 100644 --- a/tests/results/test/40_8calculation_boolean.json +++ b/tests/results/test/40_8calculation_boolean.json @@ -1,7 +1,10 @@ { "bool": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -28,7 +31,10 @@ }, "multi1": { "type": "variable", - "default": "a calculation.", + "default": { + "name": "Default", + "values": "a calculation." + }, "properties": [ { "type": "type", @@ -63,7 +69,10 @@ }, "multi2": { "type": "variable", - "default": "a calculation.", + "default": { + "name": "Default", + "values": "a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_8calculation_multi_variable.json b/tests/results/test/40_8calculation_multi_variable.json index 7b4c84162..08d427823 100644 --- a/tests/results/test/40_8calculation_multi_variable.json +++ b/tests/results/test/40_8calculation_multi_variable.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "the value of the variable \"var2\".", - "the value of the variable \"var3\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"var2\".", + "the value of the variable \"var3\"." + ] + }, "properties": [ { "type": "type", @@ -39,7 +42,10 @@ }, "var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -66,7 +72,10 @@ }, "var3": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_8calculation_multi_variable_parent.json b/tests/results/test/40_8calculation_multi_variable_parent.json index 72081e5b6..5fc33e06c 100644 --- a/tests/results/test/40_8calculation_multi_variable_parent.json +++ b/tests/results/test/40_8calculation_multi_variable_parent.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ "children": { "fam1.var": { "type": "variable", - "default": "the value of the variable \"var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_8calculation_multi_variable_parent2.json b/tests/results/test/40_8calculation_multi_variable_parent2.json index 4f09a36f7..28d2a9bc6 100644 --- a/tests/results/test/40_8calculation_multi_variable_parent2.json +++ b/tests/results/test/40_8calculation_multi_variable_parent2.json @@ -19,7 +19,10 @@ "children": { "fam1.var": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -66,7 +69,10 @@ "children": { "fam2.var": { "type": "variable", - "default": "the value of the variable \"fam1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"fam1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json index 9dc5a2c41..dfd4c4c2a 100644 --- a/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json @@ -22,10 +22,13 @@ "children": { "leadership.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,9 +63,12 @@ }, "leadership.follower": { "type": "variable", - "default": [ - "the value of the variable \"leadership.leader\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"leadership.leader\"." + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower-first.json b/tests/results/test/40_9leadership-calculation-outside-follower-first.json index b3277a825..4c3740768 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-first.json @@ -22,10 +22,13 @@ "children": { "leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ }, "leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -87,7 +93,10 @@ }, "leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -116,7 +125,10 @@ }, "calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower-last.json b/tests/results/test/40_9leadership-calculation-outside-follower-last.json index b3277a825..4c3740768 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-last.json @@ -22,10 +22,13 @@ "children": { "leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ }, "leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -87,7 +93,10 @@ }, "leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -116,7 +125,10 @@ }, "calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json index aa30bebc1..eb19a65b8 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -21,10 +21,13 @@ "children": { "leader.leader": { "type": "variable", - "default": [ - "a", - "b" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b" + ] + }, "properties": [ { "type": "type", @@ -77,7 +80,10 @@ }, "variable": { "type": "variable", - "default": "the value of the variable \"leader.follower\".", + "default": { + "name": "Default", + "values": "the value of the variable \"leader.follower\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower.json b/tests/results/test/40_9leadership-calculation-outside-follower.json index 3bbb8a375..dbafcadca 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower.json @@ -22,10 +22,13 @@ "children": { "leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ }, "leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -87,7 +93,10 @@ }, "leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -116,7 +125,10 @@ }, "calculate": { "type": "variable", - "default": "the value of the variable \"leader.follower1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"leader.follower1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-outside-leader-first.json b/tests/results/test/40_9leadership-calculation-outside-leader-first.json index d959489a4..caf1b9173 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader-first.json @@ -22,10 +22,13 @@ "children": { "leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ }, "leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -87,7 +93,10 @@ }, "leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -116,7 +125,10 @@ }, "calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-outside-leader-last.json b/tests/results/test/40_9leadership-calculation-outside-leader-last.json index d959489a4..caf1b9173 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader-last.json @@ -22,10 +22,13 @@ "children": { "leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ }, "leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -87,7 +93,10 @@ }, "leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -116,7 +125,10 @@ }, "calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-outside-leader.json b/tests/results/test/40_9leadership-calculation-outside-leader.json index 444fcc7e3..b9527846d 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader.json @@ -22,10 +22,13 @@ "children": { "leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ }, "leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -87,7 +93,10 @@ }, "leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -116,7 +125,10 @@ }, "calculate": { "type": "variable", - "default": "the value of the variable \"leader.leader\".", + "default": { + "name": "Default", + "values": "the value of the variable \"leader.leader\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-variable.json b/tests/results/test/40_9leadership-calculation-variable.json index 46bdd5fd3..521988364 100644 --- a/tests/results/test/40_9leadership-calculation-variable.json +++ b/tests/results/test/40_9leadership-calculation-variable.json @@ -1,10 +1,13 @@ { "calculate": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -60,7 +63,10 @@ "children": { "leader.leader": { "type": "variable", - "default": "the value of the variable \"calculate\".", + "default": { + "name": "Default", + "values": "the value of the variable \"calculate\"." + }, "properties": [ { "type": "type", @@ -95,7 +101,10 @@ }, "leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -122,7 +131,10 @@ }, "leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test/40_9leadership-calculation-variable_leader_follower.json index 07386d8a0..5a1047e46 100644 --- a/tests/results/test/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test/40_9leadership-calculation-variable_leader_follower.json @@ -22,10 +22,13 @@ "children": { "leadership_1.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -109,7 +112,10 @@ "children": { "leadership_2.leader": { "type": "variable", - "default": "the value of the variable \"leadership_1.follower\".", + "default": { + "name": "Default", + "values": "the value of the variable \"leadership_1.follower\"." + }, "properties": [ { "type": "type", @@ -144,7 +150,10 @@ }, "leadership_2.follower": { "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json index 4e12a78b4..8c5424168 100644 --- a/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -22,10 +22,13 @@ "children": { "leadership_1.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -109,10 +112,13 @@ "children": { "leadership_2.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -147,7 +153,10 @@ }, "leadership_2.follower": { "type": "variable", - "default": "the value of the variable \"leadership_1.leader\".", + "default": { + "name": "Default", + "values": "the value of the variable \"leadership_1.leader\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/41_0choice_leader.json b/tests/results/test/41_0choice_leader.json index 33aa94b3e..9b08b6121 100644 --- a/tests/results/test/41_0choice_leader.json +++ b/tests/results/test/41_0choice_leader.json @@ -66,11 +66,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "leader.follower1" ], diff --git a/tests/results/test/44_4disabled_calcultion_follower_index.adoc b/tests/results/test/44_4disabled_calcultion_follower_index.adoc new file mode 100644 index 000000000..4b822a7ff --- /dev/null +++ b/tests/results/test/44_4disabled_calcultion_follower_index.adoc @@ -0,0 +1,27 @@ +== a leadership + +`standard` + +This family contains lists of variable blocks. + +[cols="1a,1a"] +|==== +| Variable | Description +| + +**leadership.leader** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | +Aleader. + +**Default**: + +* a +* b +| + +**leadership.follower** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `__disabled__` | +A follower. + +**Default**: value + +**Disabled**: depends on a calculation. +|==== + diff --git a/tests/results/test/44_4disabled_calcultion_follower_index.json b/tests/results/test/44_4disabled_calcultion_follower_index.json new file mode 100644 index 000000000..d3fd0c44b --- /dev/null +++ b/tests/results/test/44_4disabled_calcultion_follower_index.json @@ -0,0 +1,101 @@ +{ + "leadership": { + "type": "leadership", + "informations": { + "paths": [ + "leadership" + ], + "names": [ + "leadership" + ], + "description": "a leadership", + "properties": [ + { + "type": "mode", + "name": "standard" + } + ], + "help": [ + "This family contains lists of variable blocks." + ] + }, + "children": { + "leadership.leader": { + "type": "variable", + "default": { + "name": "Default", + "values": [ + "a", + "b" + ] + }, + "properties": [ + { + "type": "type", + "name": "string" + }, + { + "type": "mode", + "name": "standard" + }, + { + "type": "property", + "name": "mandatory" + }, + { + "type": "property", + "name": "unique" + }, + { + "type": "multiple", + "name": "multiple" + } + ], + "paths": [ + "leadership.leader" + ], + "names": [ + "leader" + ], + "descriptions": [ + "Aleader." + ] + }, + "leadership.follower": { + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "properties": [ + { + "type": "type", + "name": "string" + }, + { + "type": "mode", + "name": "standard" + }, + { + "type": "property", + "name": "mandatory" + }, + { + "type": "property", + "name": "disabled", + "annotation": "depends on a calculation." + } + ], + "paths": [ + "leadership.follower" + ], + "names": [ + "follower" + ], + "descriptions": [ + "A follower." + ] + } + } + } +} \ No newline at end of file diff --git a/tests/results/test/44_4disabled_calcultion_follower_index.md b/tests/results/test/44_4disabled_calcultion_follower_index.md new file mode 100644 index 000000000..d5c94d719 --- /dev/null +++ b/tests/results/test/44_4disabled_calcultion_follower_index.md @@ -0,0 +1,11 @@ +# a leadership + +`standard` + +This family contains lists of variable blocks. + +| Variable                                                                                                                       | Description                                                                                                                    | +|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **leadership.leader**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | Aleader.
**Default**:
- a
- b | +| **leadership.follower**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
**Default**: value
**Disabled**: depends on a calculation. | + diff --git a/tests/results/test/44_4disabled_calcultion_follower_index.sh b/tests/results/test/44_4disabled_calcultion_follower_index.sh new file mode 100644 index 000000000..d0adf8838 --- /dev/null +++ b/tests/results/test/44_4disabled_calcultion_follower_index.sh @@ -0,0 +1,23 @@ + + +a leadership + + + standard  + + +This family contains lists of variable blocks. + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ leadership.leader │ Aleader. │ +│  string   standard   mandatory    │ Default: │ +│ unique   multiple  │ - a │ +│ │ - b │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ leadership.follower │ A follower. │ +│  string   standard   mandatory    │ Default: value │ +│ disabled  │ Disabled: depends on a calculation. │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test/44_5leadership_leader_hidden_calculation.json b/tests/results/test/44_5leadership_leader_hidden_calculation.json index 07a48e768..11cfbd1d8 100644 --- a/tests/results/test/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test/44_5leadership_leader_hidden_calculation.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/44_6leadership_follower_disabled_calculation.json b/tests/results/test/44_6leadership_follower_disabled_calculation.json index 56e006eb4..a870b28fe 100644 --- a/tests/results/test/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test/44_6leadership_follower_disabled_calculation.json @@ -1,7 +1,10 @@ { "condition": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic.json b/tests/results/test/60_0family_dynamic.json index 2b5618050..0c6e4efac 100644 --- a/tests/results/test/60_0family_dynamic.json +++ b/tests/results/test/60_0family_dynamic.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic_1_1.json b/tests/results/test/60_0family_dynamic_1_1.json index 06a43e7c8..6e3977cdd 100644 --- a/tests/results/test/60_0family_dynamic_1_1.json +++ b/tests/results/test/60_0family_dynamic_1_1.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic_1_1_empty.json b/tests/results/test/60_0family_dynamic_1_1_empty.json index af898af43..2a918b0f1 100644 --- a/tests/results/test/60_0family_dynamic_1_1_empty.json +++ b/tests/results/test/60_0family_dynamic_1_1_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test/60_0family_dynamic_forbidden_char.json b/tests/results/test/60_0family_dynamic_forbidden_char.json index 92d279472..824870290 100644 --- a/tests/results/test/60_0family_dynamic_forbidden_char.json +++ b/tests/results/test/60_0family_dynamic_forbidden_char.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val.1", - "val.2" - ], + "default": { + "name": "Default", + "values": [ + "val.1", + "val.2" + ] + }, "properties": [ { "type": "type", @@ -71,7 +74,10 @@ "var1" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -100,7 +106,10 @@ "var2" ], "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic_no_description.json b/tests/results/test/60_0family_dynamic_no_description.json index b46aec377..07988b4a4 100644 --- a/tests/results/test/60_0family_dynamic_no_description.json +++ b/tests/results/test/60_0family_dynamic_no_description.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic_no_description_empty.json b/tests/results/test/60_0family_dynamic_no_description_empty.json index bd9f47521..c5d9278a4 100644 --- a/tests/results/test/60_0family_dynamic_no_description_empty.json +++ b/tests/results/test/60_0family_dynamic_no_description_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test/60_0family_dynamic_test.json b/tests/results/test/60_0family_dynamic_test.json index 6b910b3d9..0c894daf1 100644 --- a/tests/results/test/60_0family_dynamic_test.json +++ b/tests/results/test/60_0family_dynamic_test.json @@ -32,10 +32,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test/60_0family_dynamic_upper_char.json b/tests/results/test/60_0family_dynamic_upper_char.json index 4e4c11229..a10a6120f 100644 --- a/tests/results/test/60_0family_dynamic_upper_char.json +++ b/tests/results/test/60_0family_dynamic_upper_char.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "Val1", - "VAL2" - ], + "default": { + "name": "Default", + "values": [ + "Val1", + "VAL2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic_variable_empty.json b/tests/results/test/60_0family_dynamic_variable_empty.json index 2771b125a..2f903f733 100644 --- a/tests/results/test/60_0family_dynamic_variable_empty.json +++ b/tests/results/test/60_0family_dynamic_variable_empty.json @@ -63,7 +63,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic_variable_suffix.json b/tests/results/test/60_0family_dynamic_variable_suffix.json index bbe4c5594..5f476c277 100644 --- a/tests/results/test/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test/60_0family_dynamic_variable_suffix.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -71,7 +74,10 @@ "var" ], "type": "variable", - "default": "a value", + "default": { + "name": "Default", + "values": "a value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_dynamic_variable_suffix_empty.json b/tests/results/test/60_0family_dynamic_variable_suffix_empty.json index 17e6a92a5..f3569824f 100644 --- a/tests/results/test/60_0family_dynamic_variable_suffix_empty.json +++ b/tests/results/test/60_0family_dynamic_variable_suffix_empty.json @@ -32,10 +32,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -71,7 +74,10 @@ "var" ], "type": "variable", - "default": "a value", + "default": { + "name": "Default", + "values": "a value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_0family_mode.json b/tests/results/test/60_0family_mode.json index 9b062c04d..e95f84f3d 100644 --- a/tests/results/test/60_0family_mode.json +++ b/tests/results/test/60_0family_mode.json @@ -19,7 +19,10 @@ "children": { "family.var": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_1family_dynamic_jinja.json b/tests/results/test/60_1family_dynamic_jinja.json index 339bb204b..3c557738f 100644 --- a/tests/results/test/60_1family_dynamic_jinja.json +++ b/tests/results/test/60_1family_dynamic_jinja.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -71,7 +74,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json index 819df68df..a51caab71 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,10 +1,13 @@ { "var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -115,7 +118,10 @@ }, "var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json index 477c32870..b02d4f264 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -91,7 +94,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -116,7 +122,10 @@ }, "var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2_empty.json b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2_empty.json index 1b889e6a6..7634332b3 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2_empty.json +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A identifier variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -87,7 +90,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -112,7 +118,10 @@ }, "var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_empty.json b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_empty.json index 7d1a750a2..e9a2eacc6 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_empty.json +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -111,7 +114,10 @@ }, "var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_2family_dynamic_outside_calc.json b/tests/results/test/60_2family_dynamic_outside_calc.json index 19b7b8822..9ee03d434 100644 --- a/tests/results/test/60_2family_dynamic_outside_calc.json +++ b/tests/results/test/60_2family_dynamic_outside_calc.json @@ -1,10 +1,13 @@ { "var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -71,7 +74,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", @@ -94,7 +100,10 @@ }, "newvar": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_2family_dynamic_outside_calc_empty.json b/tests/results/test/60_2family_dynamic_outside_calc_empty.json index 926adebc5..9d23a0806 100644 --- a/tests/results/test/60_2family_dynamic_outside_calc_empty.json +++ b/tests/results/test/60_2family_dynamic_outside_calc_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A suffx variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -67,7 +70,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", @@ -90,7 +96,10 @@ }, "newvar": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_calc_suffix2.json b/tests/results/test/60_5family_dynamic_calc_suffix2.json index 9afc3143b..f9b348e1b 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix2.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -71,7 +74,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_calc_suffix2_empty.json b/tests/results/test/60_5family_dynamic_calc_suffix2_empty.json index 8d35ac094..ee05c4546 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix2_empty.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix2_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -67,7 +70,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_calc_suffix_param.json b/tests/results/test/60_5family_dynamic_calc_suffix_param.json index 93a7e7149..c656aa16f 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix_param.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -71,7 +74,10 @@ "var" ], "type": "variable", - "default": "from suffix.", + "default": { + "name": "Default", + "values": "from suffix." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_calc_suffix_param_empty.json b/tests/results/test/60_5family_dynamic_calc_suffix_param_empty.json index a47bbac1a..d7409c5c6 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix_param_empty.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix_param_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A identifier variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -67,7 +70,10 @@ "var" ], "type": "variable", - "default": "from suffix.", + "default": { + "name": "Default", + "values": "from suffix." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_calc_variable.json b/tests/results/test/60_5family_dynamic_calc_variable.json index ac3b7d7ae..8d94d25b3 100644 --- a/tests/results/test/60_5family_dynamic_calc_variable.json +++ b/tests/results/test/60_5family_dynamic_calc_variable.json @@ -1,10 +1,13 @@ { "var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -92,7 +95,10 @@ }, "var2": { "type": "variable", - "default": "the value of the variable \"dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"dynval1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_calc_variable_empty.json b/tests/results/test/60_5family_dynamic_calc_variable_empty.json index d0a8ccd7a..c3a776ae7 100644 --- a/tests/results/test/60_5family_dynamic_calc_variable_empty.json +++ b/tests/results/test/60_5family_dynamic_calc_variable_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -88,7 +91,10 @@ }, "var2": { "type": "variable", - "default": "the value of the variable \"dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"dynval1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test/60_5family_dynamic_variable_outside_suffix.json index 9e7e96631..08f2e6088 100644 --- a/tests/results/test/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test/60_5family_dynamic_variable_outside_suffix.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -71,7 +74,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -94,7 +100,10 @@ }, "var2": { "type": "variable", - "default": "the value of the variable \"dyn_val1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"dyn_val1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_5family_dynamic_variable_outside_suffix_empty.json b/tests/results/test/60_5family_dynamic_variable_outside_suffix_empty.json index 65850a2e7..c0ce1ea35 100644 --- a/tests/results/test/60_5family_dynamic_variable_outside_suffix_empty.json +++ b/tests/results/test/60_5family_dynamic_variable_outside_suffix_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "Asuffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn_{{ identifier }}": { "type": "dynamic", @@ -67,7 +70,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -90,7 +96,10 @@ }, "var2": { "type": "variable", - "default": "the value of the variable \"dyn_val1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"dyn_val1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_6family_dynamic_leadership.json b/tests/results/test/60_6family_dynamic_leadership.json index 3d3ed8d64..f88e1e352 100644 --- a/tests/results/test/60_6family_dynamic_leadership.json +++ b/tests/results/test/60_6family_dynamic_leadership.json @@ -1,10 +1,13 @@ { "var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test/60_6family_dynamic_leadership_empty.json b/tests/results/test/60_6family_dynamic_leadership_empty.json index f7e662dc8..5d0427b11 100644 --- a/tests/results/test/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test/60_6family_dynamic_leadership_empty.json @@ -28,10 +28,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test/60_9family_dynamic_calc_both.json b/tests/results/test/60_9family_dynamic_calc_both.json index c2c5fe627..8620fe1ce 100644 --- a/tests/results/test/60_9family_dynamic_calc_both.json +++ b/tests/results/test/60_9family_dynamic_calc_both.json @@ -1,7 +1,10 @@ { "var": { "type": "variable", - "default": "val2", + "default": { + "name": "Default", + "values": "val2" + }, "properties": [ { "type": "type", diff --git a/tests/results/test/warnings_44_4disabled_calcultion_follower_index b/tests/results/test/warnings_44_4disabled_calcultion_follower_index new file mode 100644 index 000000000..51275cf93 --- /dev/null +++ b/tests/results/test/warnings_44_4disabled_calcultion_follower_index @@ -0,0 +1 @@ +["\"disabled\" is a calculation for leadership.follower but has no description in \"../../rougail-tests/structures/44_4disabled_calcultion_follower_index/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples/44_4disabled_calcultion_follower_index.md b/tests/results/test_examples/44_4disabled_calcultion_follower_index.md new file mode 100644 index 000000000..41cf49e67 --- /dev/null +++ b/tests/results/test_examples/44_4disabled_calcultion_follower_index.md @@ -0,0 +1,10 @@ +# Example with all variables modifiable + +```yaml +--- +leadership: + - leader: a + follower: value + - leader: b + follower: value +``` diff --git a/tests/results/test_examples/warnings_44_4disabled_calcultion_follower_index b/tests/results/test_examples/warnings_44_4disabled_calcultion_follower_index new file mode 100644 index 000000000..51275cf93 --- /dev/null +++ b/tests/results/test_examples/warnings_44_4disabled_calcultion_follower_index @@ -0,0 +1 @@ +["\"disabled\" is a calculation for leadership.follower but has no description in \"../../rougail-tests/structures/44_4disabled_calcultion_follower_index/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace/00_2default_calculated.json b/tests/results/test_namespace/00_2default_calculated.json index 839917674..c48a6fd7e 100644 --- a/tests/results/test_namespace/00_2default_calculated.json +++ b/tests/results/test_namespace/00_2default_calculated.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of var1.", + "default": { + "name": "Default", + "values": "the value of var1." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_2default_calculated_multi.json b/tests/results/test_namespace/00_2default_calculated_multi.json index 53d2d6758..ddffad1f4 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.json +++ b/tests/results/test_namespace/00_2default_calculated_multi.json @@ -19,11 +19,14 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "no", - "yes", - "maybe" - ], + "default": { + "name": "Default", + "values": [ + "no", + "yes", + "maybe" + ] + }, "properties": [ { "type": "type", @@ -58,7 +61,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of _.var1.", + "default": { + "name": "Default", + "values": "the value of _.var1." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_2default_calculated_params_permissive.json b/tests/results/test_namespace/00_2default_calculated_params_permissive.json index 108ceb231..532144707 100644 --- a/tests/results/test_namespace/00_2default_calculated_params_permissive.json +++ b/tests/results/test_namespace/00_2default_calculated_params_permissive.json @@ -19,7 +19,10 @@ "children": { "rougail.var2": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_2default_calculated_variable_description.json b/tests/results/test_namespace/00_2default_calculated_variable_description.json index 55194774b..fdedafeda 100644 --- a/tests/results/test_namespace/00_2default_calculated_variable_description.json +++ b/tests/results/test_namespace/00_2default_calculated_variable_description.json @@ -45,7 +45,10 @@ }, "rougail.var2": { "type": "variable", - "default": "value of a variable!.", + "default": { + "name": "Default", + "values": "value of a variable!." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_2default_calculated_variable_description_multi_line.json b/tests/results/test_namespace/00_2default_calculated_variable_description_multi_line.json index 8d32597b3..1c508f2be 100644 --- a/tests/results/test_namespace/00_2default_calculated_variable_description_multi_line.json +++ b/tests/results/test_namespace/00_2default_calculated_variable_description_multi_line.json @@ -45,7 +45,10 @@ }, "rougail.var2": { "type": "variable", - "default": "value\nof\na\nvariable!.", + "default": { + "name": "Default", + "values": "value\nof\na\nvariable!." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_2default_calculated_variable_transitive.json b/tests/results/test_namespace/00_2default_calculated_variable_transitive.json index c3a3a0206..d564fe53c 100644 --- a/tests/results/test_namespace/00_2default_calculated_variable_transitive.json +++ b/tests/results/test_namespace/00_2default_calculated_variable_transitive.json @@ -41,9 +41,10 @@ "name": "multiple" } ], - "validators": [ - "the domain name can be an IP" - ], + "validators": { + "name": "Validator", + "values": "the domain name can be an IP" + }, "paths": [ "rougail.var1" ], @@ -56,7 +57,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.var1\"." + }, "properties": [ { "type": "type", @@ -79,9 +83,10 @@ "name": "multiple" } ], - "validators": [ - "the domain name can be an IP" - ], + "validators": { + "name": "Validator", + "values": "the domain name can be an IP" + }, "paths": [ "rougail.var2" ], diff --git a/tests/results/test_namespace/00_5load_notype.json b/tests/results/test_namespace/00_5load_notype.json index 5c944fbb8..5f61528f7 100644 --- a/tests/results/test_namespace/00_5load_notype.json +++ b/tests/results/test_namespace/00_5load_notype.json @@ -19,7 +19,10 @@ "children": { "rougail.without_type": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6boolean.json b/tests/results/test_namespace/00_6boolean.json index a4c50a5e5..fffe3187b 100644 --- a/tests/results/test_namespace/00_6boolean.json +++ b/tests/results/test_namespace/00_6boolean.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ }, "rougail.var3": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -100,7 +109,10 @@ }, "rougail.var4": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -127,7 +139,10 @@ }, "rougail.var5": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -154,7 +169,10 @@ }, "rougail.var6": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6boolean_no_mandatory.json b/tests/results/test_namespace/00_6boolean_no_mandatory.json index 793ae5514..e7cf71c6f 100644 --- a/tests/results/test_namespace/00_6boolean_no_mandatory.json +++ b/tests/results/test_namespace/00_6boolean_no_mandatory.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6choice.json b/tests/results/test_namespace/00_6choice.json index 136169bb3..0b37b0618 100644 --- a/tests/results/test_namespace/00_6choice.json +++ b/tests/results/test_namespace/00_6choice.json @@ -33,11 +33,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "rougail.var1" ], @@ -64,11 +67,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "rougail.var2" ], @@ -91,12 +97,15 @@ "name": "standard" } ], - "choices": [ - "a", - "b", - "c", - null - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c", + null + ] + }, "paths": [ "rougail.var3" ], @@ -119,11 +128,14 @@ "name": "standard" } ], - "choices": [ - null, - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + null, + "b", + "c" + ] + }, "paths": [ "rougail.var4" ], @@ -136,7 +148,10 @@ }, "rougail.var5": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -151,12 +166,15 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "a ← (default)", - "b", - "c" - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "a ← (default)", + "b", + "c" + ] + }, "paths": [ "rougail.var5" ], @@ -169,7 +187,10 @@ }, "rougail.var6": { "type": "variable", - "default": 1, + "default": { + "name": "Default", + "values": 1 + }, "properties": [ { "type": "type", @@ -184,12 +205,15 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "1 ← (default)", - 2, - 3 - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "1 ← (default)", + 2, + 3 + ] + }, "paths": [ "rougail.var6" ], diff --git a/tests/results/test_namespace/00_6choice_calculation.json b/tests/results/test_namespace/00_6choice_calculation.json index 9ee67061a..270a30e4d 100644 --- a/tests/results/test_namespace/00_6choice_calculation.json +++ b/tests/results/test_namespace/00_6choice_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": 9, + "default": { + "name": "Default", + "values": 9 + }, "properties": [ { "type": "type", @@ -34,7 +37,10 @@ "name": "mandatory" } ], - "choices": "choices is 0 to 9.", + "choices": { + "name": "Choices", + "values": "choices is 0 to 9." + }, "paths": [ "rougail.var" ], diff --git a/tests/results/test_namespace/00_6choice_link.json b/tests/results/test_namespace/00_6choice_link.json index ef2996572..448fea4fd 100644 --- a/tests/results/test_namespace/00_6choice_link.json +++ b/tests/results/test_namespace/00_6choice_link.json @@ -33,11 +33,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "rougail.var1" ], @@ -50,7 +53,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.var1\"." + }, "properties": [ { "type": "type", @@ -65,11 +71,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "rougail.var2" ], diff --git a/tests/results/test_namespace/00_6choice_variable.json b/tests/results/test_namespace/00_6choice_variable.json index 76ccc73f7..c97f39007 100644 --- a/tests/results/test_namespace/00_6choice_variable.json +++ b/tests/results/test_namespace/00_6choice_variable.json @@ -19,11 +19,14 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -58,7 +61,10 @@ }, "rougail.var2": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"rougail.var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"rougail.var1\"." + }, "paths": [ "rougail.var2" ], diff --git a/tests/results/test_namespace/00_6choice_variable_link.json b/tests/results/test_namespace/00_6choice_variable_link.json index e58875406..06580be52 100644 --- a/tests/results/test_namespace/00_6choice_variable_link.json +++ b/tests/results/test_namespace/00_6choice_variable_link.json @@ -19,11 +19,14 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -58,7 +61,10 @@ }, "rougail.var2": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"rougail.var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"rougail.var1\"." + }, "paths": [ "rougail.var2" ], @@ -86,7 +95,10 @@ }, "rougail.var3": { "type": "variable", - "default": "the value of the variable \"rougail.var2\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.var2\"." + }, "properties": [ { "type": "type", @@ -101,7 +113,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"rougail.var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"rougail.var1\"." + }, "paths": [ "rougail.var3" ], diff --git a/tests/results/test_namespace/00_6choice_variable_link2.json b/tests/results/test_namespace/00_6choice_variable_link2.json index a2d9e34bc..6d5b1116d 100644 --- a/tests/results/test_namespace/00_6choice_variable_link2.json +++ b/tests/results/test_namespace/00_6choice_variable_link2.json @@ -19,11 +19,14 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -58,7 +61,10 @@ }, "rougail.var2": { "type": "variable", - "default": "a", + "default": { + "name": "Default", + "values": "a" + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"rougail.var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"rougail.var1\"." + }, "paths": [ "rougail.var2" ], @@ -103,7 +112,10 @@ "children": { "rougail.family.var3": { "type": "variable", - "default": "the value of the variable \"rougail.var2\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.var2\"." + }, "properties": [ { "type": "type", @@ -118,7 +130,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"rougail.family.var1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"rougail.family.var1\"." + }, "paths": [ "rougail.family.var3" ], diff --git a/tests/results/test_namespace/00_6custom.json b/tests/results/test_namespace/00_6custom.json index 08aa6f1c1..278e298dc 100644 --- a/tests/results/test_namespace/00_6custom.json +++ b/tests/results/test_namespace/00_6custom.json @@ -45,7 +45,10 @@ }, "rougail.custom2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6domainname.json b/tests/results/test_namespace/00_6domainname.json index aa81d7ae3..dd88c1eb1 100644 --- a/tests/results/test_namespace/00_6domainname.json +++ b/tests/results/test_namespace/00_6domainname.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "my.domain.name", + "default": { + "name": "Default", + "values": "my.domain.name" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6domainname_params.json b/tests/results/test_namespace/00_6domainname_params.json index f31913bf8..6e86adcdb 100644 --- a/tests/results/test_namespace/00_6domainname_params.json +++ b/tests/results/test_namespace/00_6domainname_params.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "my.domain.name", + "default": { + "name": "Default", + "values": "my.domain.name" + }, "properties": [ { "type": "type", @@ -34,9 +37,10 @@ "name": "mandatory" } ], - "validators": [ - "the domain name can be an IP" - ], + "validators": { + "name": "Validator", + "values": "the domain name can be an IP" + }, "paths": [ "rougail.variable" ], diff --git a/tests/results/test_namespace/00_6float.json b/tests/results/test_namespace/00_6float.json index a16a9fe8a..3d3f8bb60 100644 --- a/tests/results/test_namespace/00_6float.json +++ b/tests/results/test_namespace/00_6float.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": 0.0, + "default": { + "name": "Default", + "values": 0.0 + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": 0.0, + "default": { + "name": "Default", + "values": 0.0 + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ }, "rougail.var3": { "type": "variable", - "default": 0.0, + "default": { + "name": "Default", + "values": 0.0 + }, "properties": [ { "type": "type", @@ -100,7 +109,10 @@ }, "rougail.var4": { "type": "variable", - "default": 10.1, + "default": { + "name": "Default", + "values": 10.1 + }, "properties": [ { "type": "type", @@ -127,7 +139,10 @@ }, "rougail.var5": { "type": "variable", - "default": 10.1, + "default": { + "name": "Default", + "values": 10.1 + }, "properties": [ { "type": "type", @@ -154,7 +169,10 @@ }, "rougail.var6": { "type": "variable", - "default": 10.1, + "default": { + "name": "Default", + "values": 10.1 + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6number.json b/tests/results/test_namespace/00_6number.json index 3f195aad5..fc66bffcd 100644 --- a/tests/results/test_namespace/00_6number.json +++ b/tests/results/test_namespace/00_6number.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": 0, + "default": { + "name": "Default", + "values": 0 + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": 0, + "default": { + "name": "Default", + "values": 0 + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ }, "rougail.var3": { "type": "variable", - "default": 0, + "default": { + "name": "Default", + "values": 0 + }, "properties": [ { "type": "type", @@ -100,7 +109,10 @@ }, "rougail.var4": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", @@ -127,7 +139,10 @@ }, "rougail.var5": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", @@ -154,7 +169,10 @@ }, "rougail.var6": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6port.json b/tests/results/test_namespace/00_6port.json index 722a13d3d..791e147c6 100644 --- a/tests/results/test_namespace/00_6port.json +++ b/tests/results/test_namespace/00_6port.json @@ -33,11 +33,14 @@ "name": "mandatory" } ], - "validators": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ], + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + }, "paths": [ "rougail.variable1" ], @@ -50,7 +53,10 @@ }, "rougail.variable2": { "type": "variable", - "default": "8080", + "default": { + "name": "Default", + "values": "8080" + }, "properties": [ { "type": "type", @@ -65,11 +71,14 @@ "name": "mandatory" } ], - "validators": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ], + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + }, "paths": [ "rougail.variable2" ], @@ -82,7 +91,10 @@ }, "rougail.variable3": { "type": "variable", - "default": "8080", + "default": { + "name": "Default", + "values": "8080" + }, "properties": [ { "type": "type", @@ -97,11 +109,14 @@ "name": "mandatory" } ], - "validators": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ], + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "private ports (greater than 49152) are allowed" + ] + }, "paths": [ "rougail.variable3" ], diff --git a/tests/results/test_namespace/00_6regexp.json b/tests/results/test_namespace/00_6regexp.json index 131b63fff..62ccfc4fb 100644 --- a/tests/results/test_namespace/00_6regexp.json +++ b/tests/results/test_namespace/00_6regexp.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": "#a1a1a1", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, "properties": [ { "type": "type", @@ -34,9 +37,10 @@ "name": "mandatory" } ], - "validators": [ - "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - ], + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "paths": [ "rougail.var" ], @@ -46,10 +50,13 @@ "descriptions": [ "A first variable." ], - "examples": [ - "#b1b1b1", - "#b2b2b2" - ] + "examples": { + "name": "Examples", + "values": [ + "#b1b1b1", + "#b2b2b2" + ] + } } } } diff --git a/tests/results/test_namespace/00_6regexp_link.json b/tests/results/test_namespace/00_6regexp_link.json index 3f1dc2d56..7b81b8047 100644 --- a/tests/results/test_namespace/00_6regexp_link.json +++ b/tests/results/test_namespace/00_6regexp_link.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "#a1a1a1", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, "properties": [ { "type": "type", @@ -34,9 +37,10 @@ "name": "mandatory" } ], - "validators": [ - "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - ], + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "paths": [ "rougail.var1" ], @@ -46,14 +50,20 @@ "descriptions": [ "A first variable." ], - "examples": [ - "#b1b1b1", - "#b2b2b2" - ] + "examples": { + "name": "Examples", + "values": [ + "#b1b1b1", + "#b2b2b2" + ] + } }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.var1\"." + }, "properties": [ { "type": "type", @@ -68,9 +78,10 @@ "name": "mandatory" } ], - "validators": [ - "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - ], + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "paths": [ "rougail.var2" ], @@ -80,10 +91,13 @@ "descriptions": [ "A second variable." ], - "examples": [ - "#b2b1b1", - "#b3b2b2" - ] + "examples": { + "name": "Examples", + "values": [ + "#b2b1b1", + "#b3b2b2" + ] + } } } } diff --git a/tests/results/test_namespace/00_6secret.json b/tests/results/test_namespace/00_6secret.json index a4fc7ad94..adf7f1023 100644 --- a/tests/results/test_namespace/00_6secret.json +++ b/tests/results/test_namespace/00_6secret.json @@ -45,7 +45,10 @@ }, "rougail.secret2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_6secret_param.json b/tests/results/test_namespace/00_6secret_param.json index abc6ab1c4..25fce7f01 100644 --- a/tests/results/test_namespace/00_6secret_param.json +++ b/tests/results/test_namespace/00_6secret_param.json @@ -33,9 +33,10 @@ "name": "mandatory" } ], - "validators": [ - "minimum length for the secret is 10 characters" - ], + "validators": { + "name": "Validator", + "values": "minimum length for the secret is 10 characters" + }, "paths": [ "rougail.secret1" ], @@ -48,7 +49,10 @@ }, "rougail.secret2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -63,10 +67,13 @@ "name": "mandatory" } ], - "validators": [ - "maximum length for the secret is 10 characters", - "forbidden characters: \"$\" and \"^\"" - ], + "validators": { + "name": "Validators", + "values": [ + "maximum length for the secret is 10 characters", + "forbidden characters: \"$\" and \"^\"" + ] + }, "paths": [ "rougail.secret2" ], @@ -79,7 +86,10 @@ }, "rougail.secret3": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -94,10 +104,13 @@ "name": "mandatory" } ], - "validators": [ - "maximum length for the secret is 10 characters", - "forbidden characters: \"$\"" - ], + "validators": { + "name": "Validators", + "values": [ + "maximum length for the secret is 10 characters", + "forbidden characters: \"$\"" + ] + }, "paths": [ "rougail.secret3" ], diff --git a/tests/results/test_namespace/00_6string.json b/tests/results/test_namespace/00_6string.json index a072747ee..4654d23ab 100644 --- a/tests/results/test_namespace/00_6string.json +++ b/tests/results/test_namespace/00_6string.json @@ -97,7 +97,10 @@ }, "rougail.var4": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -124,7 +127,10 @@ }, "rougail.var5": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -151,7 +157,10 @@ }, "rougail.var6": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_7choice_quote.json b/tests/results/test_namespace/00_7choice_quote.json index c63800417..cf37e4739 100644 --- a/tests/results/test_namespace/00_7choice_quote.json +++ b/tests/results/test_namespace/00_7choice_quote.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": "quote'", + "default": { + "name": "Default", + "values": "quote'" + }, "properties": [ { "type": "type", @@ -34,12 +37,15 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "quote' ← (default)", - "quote\"", - "quote\"'" - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "quote' ← (default)", + "quote\"", + "quote\"'" + ] + }, "paths": [ "rougail.var" ], diff --git a/tests/results/test_namespace/00_7value_doublequote.json b/tests/results/test_namespace/00_7value_doublequote.json index c45ca8cae..d7182c84c 100644 --- a/tests/results/test_namespace/00_7value_doublequote.json +++ b/tests/results/test_namespace/00_7value_doublequote.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "quote\"", + "default": { + "name": "Default", + "values": "quote\"" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_7value_doublequote2.json b/tests/results/test_namespace/00_7value_doublequote2.json index af0d7d0a1..ecea52b2b 100644 --- a/tests/results/test_namespace/00_7value_doublequote2.json +++ b/tests/results/test_namespace/00_7value_doublequote2.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "quote'\"", + "default": { + "name": "Default", + "values": "quote'\"" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_7value_doublequote3.json b/tests/results/test_namespace/00_7value_doublequote3.json index 60d9e16a6..534dc846a 100644 --- a/tests/results/test_namespace/00_7value_doublequote3.json +++ b/tests/results/test_namespace/00_7value_doublequote3.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "quote\\\"\\'", + "default": { + "name": "Default", + "values": "quote\\\"\\'" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_7value_quote.json b/tests/results/test_namespace/00_7value_quote.json index 980250341..a012b58a1 100644 --- a/tests/results/test_namespace/00_7value_quote.json +++ b/tests/results/test_namespace/00_7value_quote.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "quote'", + "default": { + "name": "Default", + "values": "quote'" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_8calculation_information.json b/tests/results/test_namespace/00_8calculation_information.json index 24bae45ea..2e8c9b2df 100644 --- a/tests/results/test_namespace/00_8calculation_information.json +++ b/tests/results/test_namespace/00_8calculation_information.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "get information test_information.", + "default": { + "name": "Default", + "values": "get information test_information." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_8calculation_namespace.json b/tests/results/test_namespace/00_8calculation_namespace.json index e29c9a1f4..27719ce1b 100644 --- a/tests/results/test_namespace/00_8calculation_namespace.json +++ b/tests/results/test_namespace/00_8calculation_namespace.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "the value of the namespace.", + "default": { + "name": "Default", + "values": "the value of the namespace." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_8calculation_param_namespace.json b/tests/results/test_namespace/00_8calculation_param_namespace.json index ebf4aebe8..9fc3a3a66 100644 --- a/tests/results/test_namespace/00_8calculation_param_namespace.json +++ b/tests/results/test_namespace/00_8calculation_param_namespace.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_8test.json b/tests/results/test_namespace/00_8test.json index 307d4d617..5e884b4d0 100644 --- a/tests/results/test_namespace/00_8test.json +++ b/tests/results/test_namespace/00_8test.json @@ -42,13 +42,17 @@ "descriptions": [ "The first variable." ], - "examples": [ - "test" - ] + "examples": { + "name": "Example", + "values": "test" + } }, "rougail.var2": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -72,9 +76,10 @@ "descriptions": [ "The second variable." ], - "examples": [ - "test" - ] + "examples": { + "name": "Example", + "values": "test" + } }, "rougail.var3": { "type": "variable", @@ -101,10 +106,13 @@ "descriptions": [ "The third variable." ], - "examples": [ - "test1", - "test2" - ] + "examples": { + "name": "Examples", + "values": [ + "test1", + "test2" + ] + } }, "rougail.var4": { "type": "variable", @@ -127,15 +135,21 @@ "descriptions": [ "The forth variable." ], - "examples": [ - null, - "test1", - "test2" - ] + "examples": { + "name": "Examples", + "values": [ + null, + "test1", + "test2" + ] + } }, "rougail.var5": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -159,9 +173,10 @@ "descriptions": [ "The fifth variable." ], - "examples": [ - false - ] + "examples": { + "name": "Example", + "values": false + } }, "rougail.var6": { "type": "variable", @@ -196,10 +211,13 @@ "descriptions": [ "The sixth variable." ], - "examples": [ - "test1", - "test2" - ] + "examples": { + "name": "Examples", + "values": [ + "test1", + "test2" + ] + } } } } diff --git a/tests/results/test_namespace/00_9choice_variable_multi.json b/tests/results/test_namespace/00_9choice_variable_multi.json index a0662dd62..58562dc78 100644 --- a/tests/results/test_namespace/00_9choice_variable_multi.json +++ b/tests/results/test_namespace/00_9choice_variable_multi.json @@ -41,10 +41,13 @@ "name": "multiple" } ], - "choices": [ - "val1", - "val2" - ], + "choices": { + "name": "Choices", + "values": [ + "val1", + "val2" + ] + }, "paths": [ "rougail.variable1" ], @@ -75,10 +78,13 @@ "name": "multiple" } ], - "choices": [ - "val1", - "val2" - ], + "choices": { + "name": "Choices", + "values": [ + "val1", + "val2" + ] + }, "paths": [ "rougail.variable2" ], diff --git a/tests/results/test_namespace/00_9choice_variables.json b/tests/results/test_namespace/00_9choice_variables.json index b18c0121e..674aab031 100644 --- a/tests/results/test_namespace/00_9choice_variables.json +++ b/tests/results/test_namespace/00_9choice_variables.json @@ -19,7 +19,10 @@ "children": { "rougail.source_variable_1": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.source_variable_2": { "type": "variable", - "default": "val2", + "default": { + "name": "Default", + "values": "val2" + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ }, "rougail.my_variable": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -88,10 +97,13 @@ "name": "mandatory" } ], - "choices": [ - "the value of the variable \"rougail.source_variable_1\".", - "the value of the variable \"rougail.source_variable_2\"." - ], + "choices": { + "name": "Choices", + "values": [ + "the value of the variable \"rougail.source_variable_1\".", + "the value of the variable \"rougail.source_variable_2\"." + ] + }, "paths": [ "rougail.my_variable" ], diff --git a/tests/results/test_namespace/00_9default_calculation.json b/tests/results/test_namespace/00_9default_calculation.json index d9f5201da..cda029d85 100644 --- a/tests/results/test_namespace/00_9default_calculation.json +++ b/tests/results/test_namespace/00_9default_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "concat all parameters.", + "default": { + "name": "Default", + "values": "concat all parameters." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_calculation_information.json b/tests/results/test_namespace/00_9default_calculation_information.json index 7d084f2fe..f51607465 100644 --- a/tests/results/test_namespace/00_9default_calculation_information.json +++ b/tests/results/test_namespace/00_9default_calculation_information.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": "returns the information.", + "default": { + "name": "Default", + "values": "returns the information." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_calculation_information_other_variable.json b/tests/results/test_namespace/00_9default_calculation_information_other_variable.json index 4b52da627..e234d896e 100644 --- a/tests/results/test_namespace/00_9default_calculation_information_other_variable.json +++ b/tests/results/test_namespace/00_9default_calculation_information_other_variable.json @@ -45,7 +45,10 @@ }, "rougail.var2": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_calculation_multi_optional.json b/tests/results/test_namespace/00_9default_calculation_multi_optional.json index 98e2d81e4..5dd3bf1f0 100644 --- a/tests/results/test_namespace/00_9default_calculation_multi_optional.json +++ b/tests/results/test_namespace/00_9default_calculation_multi_optional.json @@ -19,7 +19,10 @@ "children": { "rougail.my_variable": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -43,9 +46,12 @@ }, "rougail.my_calculated_variable": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_variable\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_variable\"." + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_calculation_multi_optional2.json b/tests/results/test_namespace/00_9default_calculation_multi_optional2.json index 98e2d81e4..5dd3bf1f0 100644 --- a/tests/results/test_namespace/00_9default_calculation_multi_optional2.json +++ b/tests/results/test_namespace/00_9default_calculation_multi_optional2.json @@ -19,7 +19,10 @@ "children": { "rougail.my_variable": { "type": "variable", - "default": "val1", + "default": { + "name": "Default", + "values": "val1" + }, "properties": [ { "type": "type", @@ -43,9 +46,12 @@ }, "rougail.my_calculated_variable": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_variable\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_variable\"." + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_calculation_optional_exists.json b/tests/results/test_namespace/00_9default_calculation_optional_exists.json index ec055cd85..e93798c79 100644 --- a/tests/results/test_namespace/00_9default_calculation_optional_exists.json +++ b/tests/results/test_namespace/00_9default_calculation_optional_exists.json @@ -19,10 +19,13 @@ "children": { "rougail.my_variable": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -54,7 +57,10 @@ }, "rougail.my_calculated_variable": { "type": "variable", - "default": "the value of the variable \"rougail.my_variable\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.my_variable\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_calculation_param_optional.json b/tests/results/test_namespace/00_9default_calculation_param_optional.json index dc994156e..ad2417ae6 100644 --- a/tests/results/test_namespace/00_9default_calculation_param_optional.json +++ b/tests/results/test_namespace/00_9default_calculation_param_optional.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "returns a value.", + "default": { + "name": "Default", + "values": "returns a value." + }, "properties": [ { "type": "type", @@ -42,7 +45,10 @@ }, "rougail.var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_information_other_variable.json b/tests/results/test_namespace/00_9default_information_other_variable.json index 5e4f90c74..81fe31c49 100644 --- a/tests/results/test_namespace/00_9default_information_other_variable.json +++ b/tests/results/test_namespace/00_9default_information_other_variable.json @@ -45,7 +45,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the information \"test_information\" of the variable \"rougail.var1\".", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"rougail.var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_information_other_variable2.json b/tests/results/test_namespace/00_9default_information_other_variable2.json index 5e4f90c74..81fe31c49 100644 --- a/tests/results/test_namespace/00_9default_information_other_variable2.json +++ b/tests/results/test_namespace/00_9default_information_other_variable2.json @@ -45,7 +45,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the information \"test_information\" of the variable \"rougail.var1\".", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"rougail.var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9default_integer.json b/tests/results/test_namespace/00_9default_integer.json index 979fa3a54..188a97ba6 100644 --- a/tests/results/test_namespace/00_9default_integer.json +++ b/tests/results/test_namespace/00_9default_integer.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": 9, + "default": { + "name": "Default", + "values": 9 + }, "properties": [ { "type": "type", @@ -34,7 +37,10 @@ "name": "mandatory" } ], - "choices": "choice for 0 to 9.", + "choices": { + "name": "Choices", + "values": "choice for 0 to 9." + }, "paths": [ "rougail.var" ], diff --git a/tests/results/test_namespace/00_9extra.json b/tests/results/test_namespace/00_9extra.json index 277c8ecec..f18e30b8a 100644 --- a/tests/results/test_namespace/00_9extra.json +++ b/tests/results/test_namespace/00_9extra.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "rougail", + "default": { + "name": "Default", + "values": "rougail" + }, "properties": [ { "type": "type", @@ -66,7 +69,10 @@ "children": { "extra.variable": { "type": "variable", - "default": "return no.", + "default": { + "name": "Default", + "values": "return no." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9extra_calculation.json b/tests/results/test_namespace/00_9extra_calculation.json index 1b46b2908..866a4ded7 100644 --- a/tests/results/test_namespace/00_9extra_calculation.json +++ b/tests/results/test_namespace/00_9extra_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -66,7 +69,10 @@ "children": { "extra.variable1": { "type": "variable", - "default": "the value of the variable \"rougail.variable\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.variable\"." + }, "properties": [ { "type": "type", @@ -93,7 +99,10 @@ }, "extra.variable2": { "type": "variable", - "default": "copy the value of rougail.variable.", + "default": { + "name": "Default", + "values": "copy the value of rougail.variable." + }, "properties": [ { "type": "type", @@ -120,7 +129,10 @@ }, "extra.variable3": { "type": "variable", - "default": "copy the value of rougail.variable.", + "default": { + "name": "Default", + "values": "copy the value of rougail.variable." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/00_9extra_ouside.json b/tests/results/test_namespace/00_9extra_ouside.json index 645b593fc..51230a6d6 100644 --- a/tests/results/test_namespace/00_9extra_ouside.json +++ b/tests/results/test_namespace/00_9extra_ouside.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "the value of the variable \"extra.variable\".", + "default": { + "name": "Default", + "values": "the value of the variable \"extra.variable\"." + }, "properties": [ { "type": "type", @@ -66,7 +69,10 @@ "children": { "extra.variable": { "type": "variable", - "default": "value in extra", + "default": { + "name": "Default", + "values": "value in extra" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_6boolean_multi.json b/tests/results/test_namespace/01_6boolean_multi.json index 380e0dbad..1a92a768d 100644 --- a/tests/results/test_namespace/01_6boolean_multi.json +++ b/tests/results/test_namespace/01_6boolean_multi.json @@ -19,9 +19,12 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -56,9 +59,12 @@ }, "rougail.var2": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -93,9 +99,12 @@ }, "rougail.var3": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -130,9 +139,12 @@ }, "rougail.var4": { "type": "variable", - "default": [ - false - ], + "default": { + "name": "Default", + "values": [ + false + ] + }, "properties": [ { "type": "type", @@ -167,9 +179,12 @@ }, "rougail.var5": { "type": "variable", - "default": [ - false - ], + "default": { + "name": "Default", + "values": [ + false + ] + }, "properties": [ { "type": "type", @@ -204,9 +219,12 @@ }, "rougail.var6": { "type": "variable", - "default": [ - false - ], + "default": { + "name": "Default", + "values": [ + false + ] + }, "properties": [ { "type": "type", @@ -241,9 +259,12 @@ }, "rougail.var7": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", @@ -278,9 +299,12 @@ }, "rougail.var8": { "type": "variable", - "default": [ - true - ], + "default": { + "name": "Default", + "values": [ + true + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_6custom_multi.json b/tests/results/test_namespace/01_6custom_multi.json index af79b665d..ddbe03333 100644 --- a/tests/results/test_namespace/01_6custom_multi.json +++ b/tests/results/test_namespace/01_6custom_multi.json @@ -53,9 +53,12 @@ }, "rougail.custom2": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_6float_multi.json b/tests/results/test_namespace/01_6float_multi.json index 59903e533..65bb2d4a9 100644 --- a/tests/results/test_namespace/01_6float_multi.json +++ b/tests/results/test_namespace/01_6float_multi.json @@ -19,9 +19,12 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -56,9 +59,12 @@ }, "rougail.var2": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -93,9 +99,12 @@ }, "rougail.var3": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -130,9 +139,12 @@ }, "rougail.var4": { "type": "variable", - "default": [ - 10.1 - ], + "default": { + "name": "Default", + "values": [ + 10.1 + ] + }, "properties": [ { "type": "type", @@ -167,9 +179,12 @@ }, "rougail.var5": { "type": "variable", - "default": [ - 10.1 - ], + "default": { + "name": "Default", + "values": [ + 10.1 + ] + }, "properties": [ { "type": "type", @@ -204,9 +219,12 @@ }, "rougail.var6": { "type": "variable", - "default": [ - 10.1 - ], + "default": { + "name": "Default", + "values": [ + 10.1 + ] + }, "properties": [ { "type": "type", @@ -241,9 +259,12 @@ }, "rougail.var7": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", @@ -278,9 +299,12 @@ }, "rougail.var8": { "type": "variable", - "default": [ - 0.0 - ], + "default": { + "name": "Default", + "values": [ + 0.0 + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_6number_multi.json b/tests/results/test_namespace/01_6number_multi.json index 5461ba6b4..1bd6dd056 100644 --- a/tests/results/test_namespace/01_6number_multi.json +++ b/tests/results/test_namespace/01_6number_multi.json @@ -19,9 +19,12 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -56,9 +59,12 @@ }, "rougail.var2": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -93,9 +99,12 @@ }, "rougail.var3": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -130,9 +139,12 @@ }, "rougail.var4": { "type": "variable", - "default": [ - 10 - ], + "default": { + "name": "Default", + "values": [ + 10 + ] + }, "properties": [ { "type": "type", @@ -167,9 +179,12 @@ }, "rougail.var5": { "type": "variable", - "default": [ - 10 - ], + "default": { + "name": "Default", + "values": [ + 10 + ] + }, "properties": [ { "type": "type", @@ -204,9 +219,12 @@ }, "rougail.var6": { "type": "variable", - "default": [ - 10 - ], + "default": { + "name": "Default", + "values": [ + 10 + ] + }, "properties": [ { "type": "type", @@ -241,9 +259,12 @@ }, "rougail.var7": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", @@ -278,9 +299,12 @@ }, "rougail.var8": { "type": "variable", - "default": [ - 0 - ], + "default": { + "name": "Default", + "values": [ + 0 + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_6string_empty.json b/tests/results/test_namespace/01_6string_empty.json index 66e414e4c..abc1b1f2d 100644 --- a/tests/results/test_namespace/01_6string_empty.json +++ b/tests/results/test_namespace/01_6string_empty.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "value", - null - ], + "default": { + "name": "Default", + "values": [ + "value", + null + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_6string_multi.json b/tests/results/test_namespace/01_6string_multi.json index 6d74137dc..dda8aa1b5 100644 --- a/tests/results/test_namespace/01_6string_multi.json +++ b/tests/results/test_namespace/01_6string_multi.json @@ -121,9 +121,12 @@ }, "rougail.var4": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -158,9 +161,12 @@ }, "rougail.var5": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -195,9 +201,12 @@ }, "rougail.var6": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -232,9 +241,12 @@ }, "rougail.var7": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -269,9 +281,12 @@ }, "rougail.var8": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_7value_multi_doublequote.json b/tests/results/test_namespace/01_7value_multi_doublequote.json index 77167b642..766108a36 100644 --- a/tests/results/test_namespace/01_7value_multi_doublequote.json +++ b/tests/results/test_namespace/01_7value_multi_doublequote.json @@ -19,9 +19,12 @@ "children": { "rougail.variable": { "type": "variable", - "default": [ - "quote\"" - ], + "default": { + "name": "Default", + "values": [ + "quote\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_7value_multi_doublequote2.json b/tests/results/test_namespace/01_7value_multi_doublequote2.json index 54e1e55fa..8634d3116 100644 --- a/tests/results/test_namespace/01_7value_multi_doublequote2.json +++ b/tests/results/test_namespace/01_7value_multi_doublequote2.json @@ -19,9 +19,12 @@ "children": { "rougail.variable": { "type": "variable", - "default": [ - "quote'\"" - ], + "default": { + "name": "Default", + "values": [ + "quote'\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_7value_multi_quote.json b/tests/results/test_namespace/01_7value_multi_quote.json index c53558a5b..f50eb6cd9 100644 --- a/tests/results/test_namespace/01_7value_multi_quote.json +++ b/tests/results/test_namespace/01_7value_multi_quote.json @@ -19,9 +19,12 @@ "children": { "rougail.variable": { "type": "variable", - "default": [ - "quote'" - ], + "default": { + "name": "Default", + "values": [ + "quote'" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_8calculation_information_multi.json b/tests/results/test_namespace/01_8calculation_information_multi.json index 6756b7013..0d8563561 100644 --- a/tests/results/test_namespace/01_8calculation_information_multi.json +++ b/tests/results/test_namespace/01_8calculation_information_multi.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "get information test_information.", + "default": { + "name": "Default", + "values": "get information test_information." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/01_9choice_variable_multi.json b/tests/results/test_namespace/01_9choice_variable_multi.json index adfccdd5e..73adaf71b 100644 --- a/tests/results/test_namespace/01_9choice_variable_multi.json +++ b/tests/results/test_namespace/01_9choice_variable_multi.json @@ -19,11 +19,14 @@ "children": { "rougail.variable1": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -72,7 +75,10 @@ "name": "mandatory" } ], - "choices": "the value of the variable \"rougail.variable1\".", + "choices": { + "name": "Choices", + "values": "the value of the variable \"rougail.variable1\"." + }, "paths": [ "rougail.variable2" ], diff --git a/tests/results/test_namespace/04_0type_param.json b/tests/results/test_namespace/04_0type_param.json index d517c9ffc..add799033 100644 --- a/tests/results/test_namespace/04_0type_param.json +++ b/tests/results/test_namespace/04_0type_param.json @@ -19,7 +19,10 @@ "children": { "rougail.int": { "type": "variable", - "default": 10, + "default": { + "name": "Default", + "values": 10 + }, "properties": [ { "type": "type", @@ -34,10 +37,13 @@ "name": "mandatory" } ], - "validators": [ - "the minimum value is 0", - "the maximum value is 100" - ], + "validators": { + "name": "Validators", + "values": [ + "the minimum value is 0", + "the maximum value is 100" + ] + }, "paths": [ "rougail.int" ], diff --git a/tests/results/test_namespace/04_1auto_save.json b/tests/results/test_namespace/04_1auto_save.json index 71e142915..d1b70fc52 100644 --- a/tests/results/test_namespace/04_1auto_save.json +++ b/tests/results/test_namespace/04_1auto_save.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1auto_save_and_calculated.json b/tests/results/test_namespace/04_1auto_save_and_calculated.json index 6e0412f80..f49f4c7a8 100644 --- a/tests/results/test_namespace/04_1auto_save_and_calculated.json +++ b/tests/results/test_namespace/04_1auto_save_and_calculated.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json b/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json index 2a64ff6e9..a09c124d7 100644 --- a/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json +++ b/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value is always yes.", + "default": { + "name": "Default", + "values": "the value is always yes." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1default_calculation_hidden.json b/tests/results/test_namespace/04_1default_calculation_hidden.json index 47647bc81..919871ef9 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -77,7 +80,10 @@ }, "rougail.var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1default_calculation_hidden_2.json b/tests/results/test_namespace/04_1default_calculation_hidden_2.json index 47647bc81..919871ef9 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden_2.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden_2.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -77,7 +80,10 @@ }, "rougail.var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1default_calculation_hidden_3.json b/tests/results/test_namespace/04_1default_calculation_hidden_3.json index 46227174c..790410247 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden_3.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden_3.json @@ -19,7 +19,10 @@ "children": { "rougail.var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1default_calculation_hidden_4.json b/tests/results/test_namespace/04_1default_calculation_hidden_4.json index c28666ac0..133f857b3 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden_4.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden_4.json @@ -45,7 +45,10 @@ }, "rougail.var3": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1default_calculation_hidden_5.json b/tests/results/test_namespace/04_1default_calculation_hidden_5.json index e6202f27b..d11f7b6eb 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden_5.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden_5.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_1default_calculation_hidden_6.json b/tests/results/test_namespace/04_1default_calculation_hidden_6.json index e6202f27b..d11f7b6eb 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden_6.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden_6.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation.json b/tests/results/test_namespace/04_5disabled_calculation.json index cf9318e1b..83909451a 100644 --- a/tests/results/test_namespace/04_5disabled_calculation.json +++ b/tests/results/test_namespace/04_5disabled_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_default.json b/tests/results/test_namespace/04_5disabled_calculation_default.json index 2a85c2409..f109ff3de 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_default.json +++ b/tests/results/test_namespace/04_5disabled_calculation_default.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var1": { "type": "variable", - "default": "the value of condition.", + "default": { + "name": "Default", + "values": "the value of condition." + }, "properties": [ { "type": "type", @@ -78,7 +84,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of condition.", + "default": { + "name": "Default", + "values": "the value of condition." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_multi.json b/tests/results/test_namespace/04_5disabled_calculation_multi.json index 566492998..5c3a7370e 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_multi.json +++ b/tests/results/test_namespace/04_5disabled_calculation_multi.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_optional.json b/tests/results/test_namespace/04_5disabled_calculation_optional.json index 7946f7492..11aa1afb9 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_optional.json +++ b/tests/results/test_namespace/04_5disabled_calculation_optional.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable.json b/tests/results/test_namespace/04_5disabled_calculation_variable.json index 18206fa00..4f62ceff7 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable2.json b/tests/results/test_namespace/04_5disabled_calculation_variable2.json index cca8bc77f..784c69459 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable2.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable2.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable3.json b/tests/results/test_namespace/04_5disabled_calculation_variable3.json index 3bc62b2ff..8030b4728 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable3.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable3.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable4.json b/tests/results/test_namespace/04_5disabled_calculation_variable4.json index 0a89e8bda..f8abf73b4 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable4.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable4.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json b/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json index e48e40f01..db56051b6 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5hidden_calculation.json b/tests/results/test_namespace/04_5hidden_calculation.json index e09f4797b..33fad9562 100644 --- a/tests/results/test_namespace/04_5hidden_calculation.json +++ b/tests/results/test_namespace/04_5hidden_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -78,7 +84,10 @@ }, "rougail.var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5hidden_calculation2.json b/tests/results/test_namespace/04_5hidden_calculation2.json index 57ddc8362..3c3894469 100644 --- a/tests/results/test_namespace/04_5hidden_calculation2.json +++ b/tests/results/test_namespace/04_5hidden_calculation2.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var1": { "type": "variable", - "default": "the value of condition.", + "default": { + "name": "Default", + "values": "the value of condition." + }, "properties": [ { "type": "type", @@ -78,7 +84,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of condition.", + "default": { + "name": "Default", + "values": "the value of condition." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json b/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json index 8b29ec4dc..b8bc195ac 100644 --- a/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json +++ b/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var1": { "type": "variable", - "default": "returns the condition value.", + "default": { + "name": "Default", + "values": "returns the condition value." + }, "properties": [ { "type": "type", @@ -78,7 +84,10 @@ }, "rougail.var2": { "type": "variable", - "default": "returns the condition value.", + "default": { + "name": "Default", + "values": "returns the condition value." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5validators.json b/tests/results/test_namespace/04_5validators.json index 0707c115b..2b38d6de8 100644 --- a/tests/results/test_namespace/04_5validators.json +++ b/tests/results/test_namespace/04_5validators.json @@ -33,9 +33,10 @@ "name": "mandatory" } ], - "validators": [ - "the max value is 100." - ], + "validators": { + "name": "Validator", + "values": "the max value is 100." + }, "paths": [ "rougail.int" ], diff --git a/tests/results/test_namespace/04_5validators_differ.json b/tests/results/test_namespace/04_5validators_differ.json index f15d8aaba..b9c3d3891 100644 --- a/tests/results/test_namespace/04_5validators_differ.json +++ b/tests/results/test_namespace/04_5validators_differ.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "oui", + "default": { + "name": "Default", + "values": "oui" + }, "properties": [ { "type": "type", @@ -34,9 +37,10 @@ "name": "mandatory" } ], - "validators": [ - "var1 must be different than var2." - ], + "validators": { + "name": "Validator", + "values": "var1 must be different than var2." + }, "paths": [ "rougail.var1" ], @@ -46,13 +50,17 @@ "descriptions": [ "A first variable." ], - "examples": [ - "another_value" - ] + "examples": { + "name": "Example", + "values": "another_value" + } }, "rougail.var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/04_5validators_multi.json b/tests/results/test_namespace/04_5validators_multi.json index 192c85d95..1176207de 100644 --- a/tests/results/test_namespace/04_5validators_multi.json +++ b/tests/results/test_namespace/04_5validators_multi.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "no", - "yes" - ], + "default": { + "name": "Default", + "values": [ + "no", + "yes" + ] + }, "properties": [ { "type": "type", @@ -45,9 +48,10 @@ "name": "multiple" } ], - "validators": [ - "check length is less than 10." - ], + "validators": { + "name": "Validator", + "values": "check length is less than 10." + }, "paths": [ "rougail.var1" ], diff --git a/tests/results/test_namespace/04_5validators_multi2.json b/tests/results/test_namespace/04_5validators_multi2.json index 20ee05d04..ce44cdffc 100644 --- a/tests/results/test_namespace/04_5validators_multi2.json +++ b/tests/results/test_namespace/04_5validators_multi2.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "no", - "yes" - ], + "default": { + "name": "Default", + "values": [ + "no", + "yes" + ] + }, "properties": [ { "type": "type", @@ -45,9 +48,10 @@ "name": "multiple" } ], - "validators": [ - "check length is less than 3." - ], + "validators": { + "name": "Validator", + "values": "check length is less than 3." + }, "paths": [ "rougail.var1" ], @@ -57,10 +61,13 @@ "descriptions": [ "A second variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } } } } diff --git a/tests/results/test_namespace/04_5validators_multi3.json b/tests/results/test_namespace/04_5validators_multi3.json index 5c42e7af6..cdae6e0f5 100644 --- a/tests/results/test_namespace/04_5validators_multi3.json +++ b/tests/results/test_namespace/04_5validators_multi3.json @@ -19,11 +19,14 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - 0, - 1, - 2 - ], + "default": { + "name": "Default", + "values": [ + 0, + 1, + 2 + ] + }, "properties": [ { "type": "type", @@ -46,9 +49,10 @@ "name": "multiple" } ], - "validators": [ - "value must be equal to index." - ], + "validators": { + "name": "Validator", + "values": "value must be equal to index." + }, "paths": [ "rougail.var1" ], @@ -58,9 +62,10 @@ "descriptions": [ "A second variable." ], - "examples": [ - 0 - ] + "examples": { + "name": "Example", + "values": 0 + } } } } diff --git a/tests/results/test_namespace/05_0multi_not_uniq.json b/tests/results/test_namespace/05_0multi_not_uniq.json index a91161c10..4ae11e152 100644 --- a/tests/results/test_namespace/05_0multi_not_uniq.json +++ b/tests/results/test_namespace/05_0multi_not_uniq.json @@ -19,9 +19,12 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "non" - ], + "default": { + "name": "Default", + "values": [ + "non" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/05_0multi_uniq.json b/tests/results/test_namespace/05_0multi_uniq.json index 317ff04db..dc7d745cf 100644 --- a/tests/results/test_namespace/05_0multi_uniq.json +++ b/tests/results/test_namespace/05_0multi_uniq.json @@ -19,9 +19,12 @@ "children": { "rougail.variable": { "type": "variable", - "default": [ - "non" - ], + "default": { + "name": "Default", + "values": [ + "non" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/12_1auto_save_expert.json b/tests/results/test_namespace/12_1auto_save_expert.json index b7fc4fd79..977b28be5 100644 --- a/tests/results/test_namespace/12_1auto_save_expert.json +++ b/tests/results/test_namespace/12_1auto_save_expert.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/16_5exists_nonexists.json b/tests/results/test_namespace/16_5exists_nonexists.json index 242a0c949..02eeecb57 100644 --- a/tests/results/test_namespace/16_5exists_nonexists.json +++ b/tests/results/test_namespace/16_5exists_nonexists.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/16_5redefine_calculation.json b/tests/results/test_namespace/16_5redefine_calculation.json index 2e86ce411..a475fa9b0 100644 --- a/tests/results/test_namespace/16_5redefine_calculation.json +++ b/tests/results/test_namespace/16_5redefine_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "returns yes.", + "default": { + "name": "Default", + "values": "returns yes." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/16_5redefine_choice.json b/tests/results/test_namespace/16_5redefine_choice.json index ee1e1d434..dc05c5236 100644 --- a/tests/results/test_namespace/16_5redefine_choice.json +++ b/tests/results/test_namespace/16_5redefine_choice.json @@ -33,10 +33,13 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b" + ] + }, "paths": [ "rougail.variable" ], diff --git a/tests/results/test_namespace/16_5redefine_default.json b/tests/results/test_namespace/16_5redefine_default.json index 3f89424f6..06101261a 100644 --- a/tests/results/test_namespace/16_5redefine_default.json +++ b/tests/results/test_namespace/16_5redefine_default.json @@ -19,7 +19,10 @@ "children": { "rougail.variable": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/16_5redefine_multi.json b/tests/results/test_namespace/16_5redefine_multi.json index 317ff04db..dc7d745cf 100644 --- a/tests/results/test_namespace/16_5redefine_multi.json +++ b/tests/results/test_namespace/16_5redefine_multi.json @@ -19,9 +19,12 @@ "children": { "rougail.variable": { "type": "variable", - "default": [ - "non" - ], + "default": { + "name": "Default", + "values": [ + "non" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json b/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json index 7b2f909d3..d28051f8c 100644 --- a/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json +++ b/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/16_5test_redefine.json b/tests/results/test_namespace/16_5test_redefine.json index 1ee9a0e4c..d4b56c01c 100644 --- a/tests/results/test_namespace/16_5test_redefine.json +++ b/tests/results/test_namespace/16_5test_redefine.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -43,13 +46,17 @@ "descriptions": [ "A first variable." ], - "examples": [ - "test1" - ] + "examples": { + "name": "Example", + "values": "test1" + } }, "rougail.var2": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", @@ -73,9 +80,10 @@ "descriptions": [ "A second variable." ], - "examples": [ - "test1" - ] + "examples": { + "name": "Example", + "values": "test1" + } }, "rougail.var3": { "type": "variable", diff --git a/tests/results/test_namespace/16_6choice_redefine.json b/tests/results/test_namespace/16_6choice_redefine.json index 17ef96b48..555dbebf1 100644 --- a/tests/results/test_namespace/16_6choice_redefine.json +++ b/tests/results/test_namespace/16_6choice_redefine.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": "c", + "default": { + "name": "Default", + "values": "c" + }, "properties": [ { "type": "type", @@ -34,11 +37,14 @@ "name": "mandatory" } ], - "display_default": false, - "choices": [ - "a", - "c ← (default)" - ], + "default_is_already_set": true, + "choices": { + "name": "Choices", + "values": [ + "a", + "c ← (default)" + ] + }, "paths": [ "rougail.var" ], diff --git a/tests/results/test_namespace/20_0validators_differ_redefine.json b/tests/results/test_namespace/20_0validators_differ_redefine.json index cd7396720..c6eeb1103 100644 --- a/tests/results/test_namespace/20_0validators_differ_redefine.json +++ b/tests/results/test_namespace/20_0validators_differ_redefine.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ }, "rougail.var3": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", @@ -88,9 +97,10 @@ "name": "mandatory" } ], - "validators": [ - "var3 must be different than var2." - ], + "validators": { + "name": "Validator", + "values": "var3 must be different than var2." + }, "paths": [ "rougail.var3" ], @@ -100,9 +110,10 @@ "descriptions": [ "A third variable." ], - "examples": [ - "yes" - ] + "examples": { + "name": "Example", + "values": "yes" + } } } } diff --git a/tests/results/test_namespace/20_9default_information_parent.json b/tests/results/test_namespace/20_9default_information_parent.json index 1e7af3a8f..ef4f703c7 100644 --- a/tests/results/test_namespace/20_9default_information_parent.json +++ b/tests/results/test_namespace/20_9default_information_parent.json @@ -62,7 +62,10 @@ }, "rougail.family.var2": { "type": "variable", - "default": "the value of the information \"test_information\" of the variable \"rougail.family\".", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"rougail.family\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_hidden_condition.json b/tests/results/test_namespace/24_0family_hidden_condition.json index b03caac4a..cec0537d1 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition.json +++ b/tests/results/test_namespace/24_0family_hidden_condition.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_hidden_condition_boolean.json b/tests/results/test_namespace/24_0family_hidden_condition_boolean.json index 3ebf0b36a..cdaadc905 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_boolean.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_boolean.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json b/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json index 38c67b344..9b83be8a7 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_hidden_condition_variable_sub_family.json b/tests/results/test_namespace/24_0family_hidden_condition_variable_sub_family.json index fe79c560a..2f9b4c621 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_variable_sub_family.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_variable_sub_family.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json b/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json index afddc8ee7..cd666b1d3 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json @@ -19,7 +19,10 @@ "children": { "rougail.condition1": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.condition2": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json b/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json index 1b69ec3af..7229174aa 100644 --- a/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json +++ b/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_mandatory_condition.json b/tests/results/test_namespace/24_0family_mandatory_condition.json index bb920621d..bf0474380 100644 --- a/tests/results/test_namespace/24_0family_mandatory_condition.json +++ b/tests/results/test_namespace/24_0family_mandatory_condition.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_0family_mandatory_condition_variable.json b/tests/results/test_namespace/24_0family_mandatory_condition_variable.json index 3c5f01fc1..260a7f43c 100644 --- a/tests/results/test_namespace/24_0family_mandatory_condition_variable.json +++ b/tests/results/test_namespace/24_0family_mandatory_condition_variable.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/24_7validators_variable_optional.json b/tests/results/test_namespace/24_7validators_variable_optional.json index aacf07503..79b0859ed 100644 --- a/tests/results/test_namespace/24_7validators_variable_optional.json +++ b/tests/results/test_namespace/24_7validators_variable_optional.json @@ -51,10 +51,13 @@ "name": "mandatory" } ], - "validators": [ - "int and int2 must be different.", - "int and int3 must be different." - ], + "validators": { + "name": "Validators", + "values": [ + "int and int2 must be different.", + "int and int3 must be different." + ] + }, "paths": [ "rougail.general.int" ], @@ -64,13 +67,17 @@ "descriptions": [ "A first number." ], - "examples": [ - 5 - ] + "examples": { + "name": "Example", + "values": 5 + } }, "rougail.general.int2": { "type": "variable", - "default": 1, + "default": { + "name": "Default", + "values": 1 + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json index 5d5e24d31..e89381786 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json @@ -74,7 +74,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", @@ -101,7 +104,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "returns follower1 value.", + "default": { + "name": "Default", + "values": "returns follower1 value." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_submulti.json b/tests/results/test_namespace/40_0leadership_follower_default_submulti.json index e7743c026..bbb67ecd3 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_submulti.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_submulti.json @@ -40,9 +40,12 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "leader" - ], + "default": { + "name": "Default", + "values": [ + "leader" + ] + }, "properties": [ { "type": "type", @@ -77,9 +80,12 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -110,10 +116,13 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json b/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json index fa9c0021c..13ace3026 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json @@ -40,9 +40,12 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "leader" - ], + "default": { + "name": "Default", + "values": [ + "leader" + ] + }, "properties": [ { "type": "type", @@ -77,9 +80,12 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", @@ -110,7 +116,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "the value of the variable \"rougail.leader.follower1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leader.follower1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_value.json b/tests/results/test_namespace/40_0leadership_follower_default_value.json index 874bf242f..768c0d6b2 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_value.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_value.json @@ -70,7 +70,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "value", + "default": { + "name": "Default", + "values": "value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_0leadership_leader_follower.json b/tests/results/test_namespace/40_0leadership_leader_follower.json index 5a6fa706c..9fcb9920c 100644 --- a/tests/results/test_namespace/40_0leadership_leader_follower.json +++ b/tests/results/test_namespace/40_0leadership_leader_follower.json @@ -40,10 +40,13 @@ "children": { "rougail.leadership.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ }, "rougail.leadership.follower": { "type": "variable", - "default": "the value of the variable \"rougail.leadership.leader\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leadership.leader\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_0leadership_leader_not_multi.json b/tests/results/test_namespace/40_0leadership_leader_not_multi.json index 722514318..48ee90a95 100644 --- a/tests/results/test_namespace/40_0leadership_leader_not_multi.json +++ b/tests/results/test_namespace/40_0leadership_leader_not_multi.json @@ -36,7 +36,10 @@ "children": { "rougail.general.mode_conteneur_actif": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_0leadership_reduce.json b/tests/results/test_namespace/40_0leadership_reduce.json index 4de699a3a..62d7bbe35 100644 --- a/tests/results/test_namespace/40_0leadership_reduce.json +++ b/tests/results/test_namespace/40_0leadership_reduce.json @@ -40,11 +40,14 @@ "children": { "rougail.leadership.leader": { "type": "variable", - "default": [ - "value_1", - "value_2", - "value_3" - ], + "default": { + "name": "Default", + "values": [ + "value_1", + "value_2", + "value_3" + ] + }, "properties": [ { "type": "type", @@ -76,10 +79,13 @@ "descriptions": [ "A leader." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "rougail.leadership.follower": { "type": "variable", diff --git a/tests/results/test_namespace/40_2leadership_calculation_index.json b/tests/results/test_namespace/40_2leadership_calculation_index.json index 5259f2906..f9b5dbf6f 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_index.json +++ b/tests/results/test_namespace/40_2leadership_calculation_index.json @@ -40,11 +40,14 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -79,7 +82,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "the value of the index.", + "default": { + "name": "Default", + "values": "the value of the index." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_2leadership_calculation_param_index.json b/tests/results/test_namespace/40_2leadership_calculation_param_index.json index 75a3ba206..06711b42b 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_param_index.json +++ b/tests/results/test_namespace/40_2leadership_calculation_param_index.json @@ -40,11 +40,14 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "a", - "b", - "c" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b", + "c" + ] + }, "properties": [ { "type": "type", @@ -79,7 +82,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "returns index.", + "default": { + "name": "Default", + "values": "returns index." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_2leadership_leader_calculation.json b/tests/results/test_namespace/40_2leadership_leader_calculation.json index 1644dbcda..c1be72f12 100644 --- a/tests/results/test_namespace/40_2leadership_leader_calculation.json +++ b/tests/results/test_namespace/40_2leadership_leader_calculation.json @@ -40,7 +40,10 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": "returns val1 and val2.", + "default": { + "name": "Default", + "values": "returns val1 and val2." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_6leadership_follower_multi.json b/tests/results/test_namespace/40_6leadership_follower_multi.json index a6cd258f2..c23dbbcaf 100644 --- a/tests/results/test_namespace/40_6leadership_follower_multi.json +++ b/tests/results/test_namespace/40_6leadership_follower_multi.json @@ -104,9 +104,12 @@ }, "rougail.leadership.follower2": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json index 9ccfa9b4d..b63135d42 100644 --- a/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json @@ -100,9 +100,12 @@ }, "rougail.leadership.follower2": { "type": "variable", - "default": [ - "value" - ], + "default": { + "name": "Default", + "values": [ + "value" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_8calculation_boolean.json b/tests/results/test_namespace/40_8calculation_boolean.json index 4800d4586..bc825b0e5 100644 --- a/tests/results/test_namespace/40_8calculation_boolean.json +++ b/tests/results/test_namespace/40_8calculation_boolean.json @@ -19,7 +19,10 @@ "children": { "rougail.bool": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.multi1": { "type": "variable", - "default": "a calculation.", + "default": { + "name": "Default", + "values": "a calculation." + }, "properties": [ { "type": "type", @@ -81,7 +87,10 @@ }, "rougail.multi2": { "type": "variable", - "default": "a calculation.", + "default": { + "name": "Default", + "values": "a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_8calculation_boolean_return_none.json b/tests/results/test_namespace/40_8calculation_boolean_return_none.json index f389d5d58..dae6419b9 100644 --- a/tests/results/test_namespace/40_8calculation_boolean_return_none.json +++ b/tests/results/test_namespace/40_8calculation_boolean_return_none.json @@ -19,7 +19,10 @@ "children": { "rougail.var1": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.var2": { "type": "variable", - "default": "return false if the value of var1 is \"no\".", + "default": { + "name": "Default", + "values": "return false if the value of var1 is \"no\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_8calculation_integer.json b/tests/results/test_namespace/40_8calculation_integer.json index 2dc182402..b121071bb 100644 --- a/tests/results/test_namespace/40_8calculation_integer.json +++ b/tests/results/test_namespace/40_8calculation_integer.json @@ -19,7 +19,10 @@ "children": { "rougail.bool": { "type": "variable", - "default": false, + "default": { + "name": "Default", + "values": false + }, "properties": [ { "type": "type", @@ -46,7 +49,10 @@ }, "rougail.int1": { "type": "variable", - "default": "if bool returns 1 otherwise return 2.", + "default": { + "name": "Default", + "values": "if bool returns 1 otherwise return 2." + }, "properties": [ { "type": "type", @@ -73,7 +79,10 @@ }, "rougail.int2": { "type": "variable", - "default": "if bool returns 3 otherwise return 4.", + "default": { + "name": "Default", + "values": "if bool returns 3 otherwise return 4." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_8calculation_multi_variable.json b/tests/results/test_namespace/40_8calculation_multi_variable.json index e19696fd4..7e96c13c9 100644 --- a/tests/results/test_namespace/40_8calculation_multi_variable.json +++ b/tests/results/test_namespace/40_8calculation_multi_variable.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "the value of the variable \"rougail.var2\".", - "the value of the variable \"rougail.var3\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.var2\".", + "the value of the variable \"rougail.var3\"." + ] + }, "properties": [ { "type": "type", @@ -57,7 +60,10 @@ }, "rougail.var2": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -84,7 +90,10 @@ }, "rougail.var3": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_8calculation_multi_variable_parent.json b/tests/results/test_namespace/40_8calculation_multi_variable_parent.json index 7cdb1fa56..d37670ed4 100644 --- a/tests/results/test_namespace/40_8calculation_multi_variable_parent.json +++ b/tests/results/test_namespace/40_8calculation_multi_variable_parent.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -64,7 +67,10 @@ "children": { "rougail.fam1.var": { "type": "variable", - "default": "the value of the variable \"rougail.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json b/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json index d0a7042b3..fd344da86 100644 --- a/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json +++ b/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json @@ -37,7 +37,10 @@ "children": { "rougail.fam1.var": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", @@ -84,7 +87,10 @@ "children": { "rougail.fam2.var": { "type": "variable", - "default": "the value of the variable \"rougail.fam1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.fam1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json index b6d4bedd9..22aee72f5 100644 --- a/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json @@ -40,10 +40,13 @@ "children": { "rougail.leadership.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,9 +81,12 @@ }, "rougail.leadership.follower": { "type": "variable", - "default": [ - "the value of the variable \"rougail.leadership.leader\"." - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.leadership.leader\"." + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json index 84269b985..dc6112e1e 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json @@ -40,10 +40,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -105,7 +111,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -134,7 +143,10 @@ }, "rougail.calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json index 84269b985..dc6112e1e 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json @@ -40,10 +40,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -105,7 +111,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -134,7 +143,10 @@ }, "rougail.calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json index 790705031..9ba95615d 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -39,10 +39,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "a", - "b" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b" + ] + }, "properties": [ { "type": "type", @@ -95,7 +98,10 @@ }, "rougail.variable": { "type": "variable", - "default": "the value of the variable \"rougail.leader.follower\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leader.follower\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json index 5e56bd6e0..38e32ba16 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json @@ -40,10 +40,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -105,7 +111,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -134,7 +143,10 @@ }, "rougail.calculate": { "type": "variable", - "default": "the value of the variable \"rougail.leader.follower1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leader.follower1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json index a60d39214..9e0fd7628 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json @@ -40,10 +40,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -105,7 +111,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -134,7 +143,10 @@ }, "rougail.calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json index a60d39214..9e0fd7628 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json @@ -40,10 +40,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -105,7 +111,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -134,7 +143,10 @@ }, "rougail.calculate": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json index 5dd899b59..92eac78dc 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json @@ -40,10 +40,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -105,7 +111,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", @@ -134,7 +143,10 @@ }, "rougail.calculate": { "type": "variable", - "default": "the value of the variable \"rougail.leader.leader\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leader.leader\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable.json b/tests/results/test_namespace/40_9leadership-calculation-variable.json index e61ac964f..a95846524 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-variable.json +++ b/tests/results/test_namespace/40_9leadership-calculation-variable.json @@ -19,10 +19,13 @@ "children": { "rougail.calculate": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -78,7 +81,10 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": "the value of the variable \"rougail.calculate\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.calculate\"." + }, "properties": [ { "type": "type", @@ -113,7 +119,10 @@ }, "rougail.leader.follower1": { "type": "variable", - "default": "val11", + "default": { + "name": "Default", + "values": "val11" + }, "properties": [ { "type": "type", @@ -140,7 +149,10 @@ }, "rougail.leader.follower2": { "type": "variable", - "default": "val21", + "default": { + "name": "Default", + "values": "val21" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json index be21b50fe..f31c17a56 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json @@ -40,10 +40,13 @@ "children": { "rougail.leadership_1.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -127,7 +130,10 @@ "children": { "rougail.leadership_2.leader": { "type": "variable", - "default": "the value of the variable \"rougail.leadership_1.follower\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leadership_1.follower\"." + }, "properties": [ { "type": "type", @@ -162,7 +168,10 @@ }, "rougail.leadership_2.follower": { "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json index d7575fbd9..fe2891157 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -40,10 +40,13 @@ "children": { "rougail.leadership_1.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -127,10 +130,13 @@ "children": { "rougail.leadership_2.leader": { "type": "variable", - "default": [ - "value1", - "value2" - ], + "default": { + "name": "Default", + "values": [ + "value1", + "value2" + ] + }, "properties": [ { "type": "type", @@ -165,7 +171,10 @@ }, "rougail.leadership_2.follower": { "type": "variable", - "default": "the value of the variable \"rougail.leadership_1.leader\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leadership_1.leader\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/41_0choice_leader.json b/tests/results/test_namespace/41_0choice_leader.json index 685425121..ab2d6c047 100644 --- a/tests/results/test_namespace/41_0choice_leader.json +++ b/tests/results/test_namespace/41_0choice_leader.json @@ -84,11 +84,14 @@ "name": "mandatory" } ], - "choices": [ - "a", - "b", - "c" - ], + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + }, "paths": [ "rougail.leader.follower1" ], diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower.json b/tests/results/test_namespace/44_4disabled_calcultion_follower.json index 498a31b5b..d2e230dd7 100644 --- a/tests/results/test_namespace/44_4disabled_calcultion_follower.json +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": true, + "default": { + "name": "Default", + "values": true + }, "properties": [ { "type": "type", @@ -67,9 +70,12 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "a" - ], + "default": { + "name": "Default", + "values": [ + "a" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.adoc b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.adoc new file mode 100644 index 000000000..5039ff9d7 --- /dev/null +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.adoc @@ -0,0 +1,29 @@ +== Variables for "Rougail" + +=== a leadership + +`standard` + +This family contains lists of variable blocks. + +[cols="1a,1a"] +|==== +| Variable | Description +| + +**rougail.leadership.leader** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | +Aleader. + +**Default**: + +* a +* b +| + +**rougail.leadership.follower** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `__disabled__` | +A follower. + +**Default**: value + +**Disabled**: depends on a calculation. +|==== + diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json new file mode 100644 index 000000000..e1d5a1db5 --- /dev/null +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json @@ -0,0 +1,121 @@ +{ + "rougail": { + "type": "namespace", + "informations": { + "paths": [ + "rougail" + ], + "names": [ + "rougail" + ], + "description": "Rougail", + "properties": [ + { + "type": "mode", + "name": "standard" + } + ] + }, + "children": { + "leadership": { + "type": "leadership", + "informations": { + "paths": [ + "rougail.leadership" + ], + "names": [ + "leadership" + ], + "description": "a leadership", + "properties": [ + { + "type": "mode", + "name": "standard" + } + ], + "help": [ + "This family contains lists of variable blocks." + ] + }, + "children": { + "rougail.leadership.leader": { + "type": "variable", + "default": { + "name": "Default", + "values": [ + "a", + "b" + ] + }, + "properties": [ + { + "type": "type", + "name": "string" + }, + { + "type": "mode", + "name": "standard" + }, + { + "type": "property", + "name": "mandatory" + }, + { + "type": "property", + "name": "unique" + }, + { + "type": "multiple", + "name": "multiple" + } + ], + "paths": [ + "rougail.leadership.leader" + ], + "names": [ + "leader" + ], + "descriptions": [ + "Aleader." + ] + }, + "rougail.leadership.follower": { + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "properties": [ + { + "type": "type", + "name": "string" + }, + { + "type": "mode", + "name": "standard" + }, + { + "type": "property", + "name": "mandatory" + }, + { + "type": "property", + "name": "disabled", + "annotation": "depends on a calculation." + } + ], + "paths": [ + "rougail.leadership.follower" + ], + "names": [ + "follower" + ], + "descriptions": [ + "A follower." + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.md b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.md new file mode 100644 index 000000000..8cd965f7d --- /dev/null +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.md @@ -0,0 +1,13 @@ +# Variables for "Rougail" + +## a leadership + +`standard` + +This family contains lists of variable blocks. + +| Variable                                                                                                                       | Description                                                                                                                    | +|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **rougail.leadership.leader**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | Aleader.
**Default**:
- a
- b | +| **rougail.leadership.follower**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
**Default**: value
**Disabled**: depends on a calculation. | + diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.sh b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.sh new file mode 100644 index 000000000..04580bcd1 --- /dev/null +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.sh @@ -0,0 +1,28 @@ + + +Variables for "Rougail" + + + + + a leadership + + + standard  + + +This family contains lists of variable blocks. + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ rougail.leadership.leader │ Aleader. │ +│  string   standard   mandatory    │ Default: │ +│ unique   multiple  │ - a │ +│ │ - b │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ rougail.leadership.follower │ A follower. │ +│  string   standard   mandatory    │ Default: value │ +│ disabled  │ Disabled: depends on a calculation. │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json index b807b8a28..bcf7ab425 100644 --- a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "no", + "default": { + "name": "Default", + "values": "no" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json index 6afe01de5..0997341ab 100644 --- a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json @@ -19,7 +19,10 @@ "children": { "rougail.condition": { "type": "variable", - "default": "yes", + "default": { + "name": "Default", + "values": "yes" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json index e9762f780..cfc17b3c6 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json @@ -39,10 +39,13 @@ "children": { "rougail.leader.leader": { "type": "variable", - "default": [ - "a", - "b" - ], + "default": { + "name": "Default", + "values": [ + "a", + "b" + ] + }, "properties": [ { "type": "type", @@ -77,7 +80,10 @@ }, "rougail.leader.follower": { "type": "variable", - "default": "the value of the variable \"rougail.leader.leader\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.leader.leader\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic.json b/tests/results/test_namespace/60_0family_dynamic.json index 6a731eedb..a8120e616 100644 --- a/tests/results/test_namespace/60_0family_dynamic.json +++ b/tests/results/test_namespace/60_0family_dynamic.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0.json b/tests/results/test_namespace/60_0family_dynamic_1_0.json index 4f0c4897b..a027c01ed 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json b/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json index 51222b0d7..8a1c38415 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0_type.json b/tests/results/test_namespace/60_0family_dynamic_1_0_type.json index 114d33741..d94f16dba 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0_type.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0_type.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json b/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json index 3351611b5..0dc9113e2 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test_namespace/60_0family_dynamic_1_1.json b/tests/results/test_namespace/60_0family_dynamic_1_1.json index 93af13c66..e9ce3ebcc 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_1.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_1.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json b/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json index 64e2341d0..68a92369e 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json b/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json index 8a4543b62..aad15d9ce 100644 --- a/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json +++ b/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val.1", - "val.2" - ], + "default": { + "name": "Default", + "values": [ + "val.1", + "val.2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var1" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -118,7 +124,10 @@ "var2" ], "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json index 8cc9b19c7..fb6de3d53 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - 1, - 2 - ], + "default": { + "name": "Default", + "values": [ + 1, + 2 + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", @@ -112,7 +118,10 @@ }, "rougail.var2": { "type": "variable", - "default": "get the value of rougail.dyn1.var.", + "default": { + "name": "Default", + "values": "get the value of rougail.dyn1.var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json b/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json index 20a0b4c92..bc63b612f 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - 1, - 2 - ] + "examples": { + "name": "Examples", + "values": [ + 1, + 2 + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", @@ -108,7 +114,10 @@ }, "rougail.var2": { "type": "variable", - "default": "get the value of rougail.dyn1.var.", + "default": { + "name": "Default", + "values": "get the value of rougail.dyn1.var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_no_description.json b/tests/results/test_namespace/60_0family_dynamic_no_description.json index 8e2cdd89a..f621530c4 100644 --- a/tests/results/test_namespace/60_0family_dynamic_no_description.json +++ b/tests/results/test_namespace/60_0family_dynamic_no_description.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json b/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json index db128289e..17960ed83 100644 --- a/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test_namespace/60_0family_dynamic_test.json b/tests/results/test_namespace/60_0family_dynamic_test.json index d3d460a57..42898274b 100644 --- a/tests/results/test_namespace/60_0family_dynamic_test.json +++ b/tests/results/test_namespace/60_0family_dynamic_test.json @@ -50,10 +50,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test_namespace/60_0family_dynamic_upper_char.json b/tests/results/test_namespace/60_0family_dynamic_upper_char.json index c6be7c028..8e71bce34 100644 --- a/tests/results/test_namespace/60_0family_dynamic_upper_char.json +++ b/tests/results/test_namespace/60_0family_dynamic_upper_char.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "Val1", - "VAL2" - ], + "default": { + "name": "Default", + "values": [ + "Val1", + "VAL2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_empty.json b/tests/results/test_namespace/60_0family_dynamic_variable_empty.json index 8565fdc74..e70fd284b 100644 --- a/tests/results/test_namespace/60_0family_dynamic_variable_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_variable_empty.json @@ -81,7 +81,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json b/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json index 76b928872..b085c693b 100644 --- a/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "a value", + "default": { + "name": "Default", + "values": "a value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json b/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json index 2829cacc0..39976ed9e 100644 --- a/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json @@ -50,10 +50,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "a value", + "default": { + "name": "Default", + "values": "a value" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_0family_mode.json b/tests/results/test_namespace/60_0family_mode.json index b63db0997..cfef431ab 100644 --- a/tests/results/test_namespace/60_0family_mode.json +++ b/tests/results/test_namespace/60_0family_mode.json @@ -37,7 +37,10 @@ "children": { "rougail.family.var": { "type": "variable", - "default": "non", + "default": { + "name": "Default", + "values": "non" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_1family_dynamic_jinja.json b/tests/results/test_namespace/60_1family_dynamic_jinja.json index 6927589a9..4e30685e3 100644 --- a/tests/results/test_namespace/60_1family_dynamic_jinja.json +++ b/tests/results/test_namespace/60_1family_dynamic_jinja.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json index df44cad15..2bddf7944 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -133,7 +136,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json index 083169e52..5ad84f503 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -109,7 +112,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -134,7 +140,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json index a2d3c9350..f78ad5976 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A identifier variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -105,7 +108,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -130,7 +136,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json index 9c2578b62..91bbe0be4 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -129,7 +132,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json index 2618a404f..8fbb5f6ff 100644 --- a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", @@ -112,7 +118,10 @@ }, "rougail.newvar": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json b/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json index a5ae36c99..f6af61fd2 100644 --- a/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json +++ b/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffx variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", @@ -108,7 +114,10 @@ }, "rougail.newvar": { "type": "variable", - "default": "the value of var.", + "default": { + "name": "Default", + "values": "the value of var." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc2.json b/tests/results/test_namespace/60_5family_dynamic_calc2.json index bfb446900..0d24d34b7 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc2.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -120,7 +123,10 @@ "vardyn" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json index 1d8688213..6039cc334 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "rougail.var2": { "type": "variable", @@ -116,7 +119,10 @@ "vardyn" ], "type": "variable", - "default": "val", + "default": { + "name": "Default", + "values": "val" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json index bddd85364..ba20721db 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -110,7 +113,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dynval1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json index 8c2d4110f..dfbc60477 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json index 6c98c72b1..a265a00d3 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.json index 4ad4e1ebd..b061a5a0d 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "rougail.var2": { "type": "variable", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json index 24eab3a5f..7e0e4334d 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -106,7 +109,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dynval1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json index dfc5174f2..069e9297b 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json @@ -46,9 +46,10 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1" - ] + "examples": { + "name": "Example", + "values": "val1" + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -101,7 +102,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dynval1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json index e28b5f792..d114f59fc 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json @@ -19,7 +19,10 @@ "children": { "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dynval1.var\"." + }, "properties": [ { "type": "type", @@ -73,10 +76,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden.json index 425371b6a..b31508192 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -53,7 +56,10 @@ }, "rougail.var2": { "type": "variable", - "default": "a value (from an undocumented variable).", + "default": { + "name": "Default", + "values": "a value (from an undocumented variable)." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_boolean.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_boolean.json index 6f66247f8..4a19e48c2 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_boolean.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_boolean.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -53,7 +56,10 @@ }, "rougail.var2": { "type": "variable", - "default": "true (from an undocumented variable).", + "default": { + "name": "Default", + "values": "true (from an undocumented variable)." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_multi.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_multi.json index 8473d8afa..1cb046872 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_multi.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_hidden_multi.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -53,7 +56,10 @@ }, "rougail.var2": { "type": "variable", - "default": "(from an undocumented variable)['a value', 'a second value'].", + "default": { + "name": "Default", + "values": "(from an undocumented variable)['a value', 'a second value']." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json index d1ad10803..764787c14 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "from suffix.", + "default": { + "name": "Default", + "values": "from suffix." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json index 44b72529c..600ea1f85 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A identifier variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "from suffix.", + "default": { + "name": "Default", + "values": "from suffix." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_variable.json b/tests/results/test_namespace/60_5family_dynamic_calc_variable.json index bddd85364..ba20721db 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_variable.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -110,7 +113,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dynval1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json index 24eab3a5f..7e0e4334d 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -106,7 +109,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dynval1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dynval1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json index 10337d9a8..017684375 100644 --- a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json @@ -46,12 +46,15 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2", - "val3", - "val4" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2", + "val3", + "val4" + ] + } }, "{{ identifier }}_dyn": { "type": "dynamic", @@ -95,7 +98,10 @@ "var1" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -128,12 +134,15 @@ "var2" ], "type": "variable", - "default": [ - "the value of the variable \"rougail.val1_dyn.var1\"", - "the value of the variable \"rougail.val2_dyn.var1\"", - "the value of the variable \"rougail.val3_dyn.var1\"", - "the value of the variable \"rougail.val4_dyn.var1\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.val1_dyn.var1\"", + "the value of the variable \"rougail.val2_dyn.var1\"", + "the value of the variable \"rougail.val3_dyn.var1\"", + "the value of the variable \"rougail.val4_dyn.var1\"" + ] + }, "properties": [ { "type": "type", @@ -166,12 +175,15 @@ "var3" ], "type": "variable", - "default": [ - "the value of the variable \"rougail.val1_dyn.var1\"", - "the value of the variable \"rougail.val2_dyn.var1\"", - "the value of the variable \"rougail.val3_dyn.var1\"", - "the value of the variable \"rougail.val4_dyn.var1\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.val1_dyn.var1\"", + "the value of the variable \"rougail.val2_dyn.var1\"", + "the value of the variable \"rougail.val3_dyn.var1\"", + "the value of the variable \"rougail.val4_dyn.var1\"" + ] + }, "properties": [ { "type": "type", @@ -204,7 +216,10 @@ "var4" ], "type": "variable", - "default": "the value of the variable \"rougail.val4_dyn.var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.val4_dyn.var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside.json index 2f46fb84a..ae8eae49c 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -108,10 +114,13 @@ }, "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_dyn_family_val1.var\"", - "the value of the variable \"rougail.my_dyn_family_val2.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_dyn_family_val1.var\"", + "the value of the variable \"rougail.my_dyn_family_val2.var\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json index 466bad52b..7780a788a 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json @@ -19,10 +19,13 @@ "children": { "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_dyn_family_val1.var\"", - "the value of the variable \"rougail.my_dyn_family_val2.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_dyn_family_val1.var\"", + "the value of the variable \"rougail.my_dyn_family_val2.var\"" + ] + }, "properties": [ { "type": "type", @@ -57,10 +60,13 @@ }, "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -127,7 +133,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json index edee82b92..2bf826446 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json @@ -19,10 +19,13 @@ "children": { "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_dyn_family_val1.var\"", - "the value of the variable \"rougail.my_dyn_family_val2.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_dyn_family_val1.var\"", + "the value of the variable \"rougail.my_dyn_family_val2.var\"" + ] + }, "properties": [ { "type": "type", @@ -84,10 +87,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", @@ -123,7 +129,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json index 2f46fb84a..ae8eae49c 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -108,10 +114,13 @@ }, "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_dyn_family_val1.var\"", - "the value of the variable \"rougail.my_dyn_family_val2.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_dyn_family_val1.var\"", + "the value of the variable \"rougail.my_dyn_family_val2.var\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json index 39f96b0fd..01b884221 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -104,10 +110,13 @@ }, "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_dyn_family_val1.var\"", - "the value of the variable \"rougail.my_dyn_family_val2.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_dyn_family_val1.var\"", + "the value of the variable \"rougail.my_dyn_family_val2.var\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json index 66af1b1a4..b49e95c5e 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -108,7 +114,10 @@ }, "rougail.var2": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json index 3483bb34a..fe4320ae0 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -104,7 +110,10 @@ }, "rougail.var2": { "type": "variable", - "default": "depends on a calculation.", + "default": { + "name": "Default", + "values": "depends on a calculation." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json index 732ca4eb7..38d58c804 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", @@ -117,7 +120,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -142,10 +148,13 @@ }, "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.my_dyn_family_val1.subdyn_val1.var\"", - "the value of the variable \"rougail.my_dyn_family_val1.subdyn_val2.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.my_dyn_family_val1.subdyn_val1.var\"", + "the value of the variable \"rougail.my_dyn_family_val1.subdyn_val2.var\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json index 66d722d42..722ddedb8 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -112,7 +118,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dyn_val1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dyn_val1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json index 3ccf942de..838174a85 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "Asuffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn_{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -108,7 +114,10 @@ }, "rougail.var2": { "type": "variable", - "default": "the value of the variable \"rougail.dyn_val1.var\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.dyn_val1.var\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_inside.json b/tests/results/test_namespace/60_6family_dynamic_inside.json index fb311e3b6..a3ca556af 100644 --- a/tests/results/test_namespace/60_6family_dynamic_inside.json +++ b/tests/results/test_namespace/60_6family_dynamic_inside.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var1" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -118,10 +124,13 @@ "var2" ], "type": "variable", - "default": [ - "the value of the variable \"rougail.val1_dyn.var1\"", - "the value of the variable \"rougail.val2_dyn.var1\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.val1_dyn.var1\"", + "the value of the variable \"rougail.val2_dyn.var1\"" + ] + }, "properties": [ { "type": "type", @@ -150,10 +159,13 @@ "var3" ], "type": "variable", - "default": [ - "the value of the variable \"rougail.val1_dyn.var1\"", - "the value of the variable \"rougail.val2_dyn.var1\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.val1_dyn.var1\"", + "the value of the variable \"rougail.val2_dyn.var1\"" + ] + }, "properties": [ { "type": "type", @@ -182,7 +194,10 @@ "var4" ], "type": "variable", - "default": "the value of the variable \"rougail.val1_dyn.var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.val1_dyn.var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_inside_empty.json b/tests/results/test_namespace/60_6family_dynamic_inside_empty.json index cc7c50e31..3a0e41bf5 100644 --- a/tests/results/test_namespace/60_6family_dynamic_inside_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_inside_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "{{ identifier }}_dyn": { "type": "dynamic", @@ -85,7 +88,10 @@ "var1" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -114,10 +120,13 @@ "var2" ], "type": "variable", - "default": [ - "the value of the variable \"rougail.val1_dyn.var1\"", - "the value of the variable \"rougail.val2_dyn.var1\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.val1_dyn.var1\"", + "the value of the variable \"rougail.val2_dyn.var1\"" + ] + }, "properties": [ { "type": "type", @@ -146,10 +155,13 @@ "var3" ], "type": "variable", - "default": [ - "the value of the variable \"rougail.val1_dyn.var1\"", - "the value of the variable \"rougail.val2_dyn.var1\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.val1_dyn.var1\"", + "the value of the variable \"rougail.val2_dyn.var1\"" + ] + }, "properties": [ { "type": "type", @@ -178,7 +190,10 @@ "var4" ], "type": "variable", - "default": "the value of the variable \"rougail.val1_dyn.var1\".", + "default": { + "name": "Default", + "values": "the value of the variable \"rougail.val1_dyn.var1\"." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership.json b/tests/results/test_namespace/60_6family_dynamic_leadership.json index 97249e558..78d683e11 100644 --- a/tests/results/test_namespace/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace/60_6family_dynamic_leadership.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json b/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json index e49dd0974..ded15e1e1 100644 --- a/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A suffix variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json index ce5f92531..a35ffe5f7 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "add 't' to each var value.", + "default": { + "name": "Default", + "values": "add 't' to each var value." + }, "properties": [ { "type": "type", @@ -161,7 +167,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -194,7 +203,10 @@ "var_identifier" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -227,7 +239,10 @@ "var_identifiers" ], "type": "variable", - "default": "join identifier 1 et identifier 2.", + "default": { + "name": "Default", + "values": "join identifier 1 et identifier 2." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json index ce5f92531..a35ffe5f7 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -89,7 +92,10 @@ "var" ], "type": "variable", - "default": "add 't' to each var value.", + "default": { + "name": "Default", + "values": "add 't' to each var value." + }, "properties": [ { "type": "type", @@ -161,7 +167,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -194,7 +203,10 @@ "var_identifier" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -227,7 +239,10 @@ "var_identifiers" ], "type": "variable", - "default": "join identifier 1 et identifier 2.", + "default": { + "name": "Default", + "values": "join identifier 1 et identifier 2." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0_2.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0_2.json index a5f8a4c51..b4ff1a248 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0_2.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0_2.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json index 3b1f3f132..b2e79c6fa 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json @@ -46,10 +46,13 @@ "descriptions": [ "A identifier variable." ], - "examples": [ - "val1", - "val2" - ] + "examples": { + "name": "Examples", + "values": [ + "val1", + "val2" + ] + } }, "dyn{{ identifier }}": { "type": "dynamic", @@ -85,7 +88,10 @@ "var" ], "type": "variable", - "default": "add 't' to each var value.", + "default": { + "name": "Default", + "values": "add 't' to each var value." + }, "properties": [ { "type": "type", @@ -157,7 +163,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -190,7 +199,10 @@ "var_identifier" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -223,7 +235,10 @@ "var_identifiers" ], "type": "variable", - "default": "join identifier 1 et identifier 2.", + "default": { + "name": "Default", + "values": "join identifier 1 et identifier 2." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json index c622d2f90..91edeebfa 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json @@ -19,10 +19,13 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -144,7 +147,10 @@ "var" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -173,7 +179,10 @@ "var_identifier" ], "type": "variable", - "default": "the value of the identifier.", + "default": { + "name": "Default", + "values": "the value of the identifier." + }, "properties": [ { "type": "type", @@ -202,7 +211,10 @@ "var_identifiers" ], "type": "variable", - "default": "join identifier 1 et identifier 2.", + "default": { + "name": "Default", + "values": "join identifier 1 et identifier 2." + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi.json b/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi.json index 1c889b063..5bde35a93 100644 --- a/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi.json +++ b/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -143,10 +146,13 @@ }, "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.dynval1.dynval1.var\"", - "the value of the variable \"rougail.dynval2.dynval1.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.dynval1.dynval1.var\"", + "the value of the variable \"rougail.dynval2.dynval1.var\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi2.json b/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi2.json index c1eabe590..6652ffe08 100644 --- a/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi2.json +++ b/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi2.json @@ -19,10 +19,13 @@ "children": { "rougail.var1": { "type": "variable", - "default": [ - "val1", - "val2" - ], + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, "properties": [ { "type": "type", @@ -143,10 +146,13 @@ }, "rougail.var2": { "type": "variable", - "default": [ - "the value of the variable \"rougail.dynval1.dynval1.var\"", - "the value of the variable \"rougail.dynval1.dynval2.var\"" - ], + "default": { + "name": "Default", + "values": [ + "the value of the variable \"rougail.dynval1.dynval1.var\"", + "the value of the variable \"rougail.dynval1.dynval2.var\"" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_9extra_dynamic.json b/tests/results/test_namespace/60_9extra_dynamic.json index e6505140c..2d4e76cb4 100644 --- a/tests/results/test_namespace/60_9extra_dynamic.json +++ b/tests/results/test_namespace/60_9extra_dynamic.json @@ -19,9 +19,12 @@ "children": { "rougail.var": { "type": "variable", - "default": [ - "a" - ], + "default": { + "name": "Default", + "values": [ + "a" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_9extra_dynamic_extra.json b/tests/results/test_namespace/60_9extra_dynamic_extra.json index 8a68a5b70..5347605f2 100644 --- a/tests/results/test_namespace/60_9extra_dynamic_extra.json +++ b/tests/results/test_namespace/60_9extra_dynamic_extra.json @@ -37,9 +37,12 @@ "children": { "rougail.general.varname": { "type": "variable", - "default": [ - "a" - ], + "default": { + "name": "Default", + "values": [ + "a" + ] + }, "properties": [ { "type": "type", @@ -96,9 +99,12 @@ "children": { "extra.var": { "type": "variable", - "default": [ - "a" - ], + "default": { + "name": "Default", + "values": [ + "a" + ] + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/60_9family_dynamic_calc_both.json b/tests/results/test_namespace/60_9family_dynamic_calc_both.json index d73c4cc28..830316297 100644 --- a/tests/results/test_namespace/60_9family_dynamic_calc_both.json +++ b/tests/results/test_namespace/60_9family_dynamic_calc_both.json @@ -19,7 +19,10 @@ "children": { "rougail.var": { "type": "variable", - "default": "val2", + "default": { + "name": "Default", + "values": "val2" + }, "properties": [ { "type": "type", diff --git a/tests/results/test_namespace/warnings_44_4disabled_calcultion_follower_index b/tests/results/test_namespace/warnings_44_4disabled_calcultion_follower_index new file mode 100644 index 000000000..70e8a61b8 --- /dev/null +++ b/tests/results/test_namespace/warnings_44_4disabled_calcultion_follower_index @@ -0,0 +1 @@ +["\"disabled\" is a calculation for rougail.leadership.follower but has no description in \"../../rougail-tests/structures/44_4disabled_calcultion_follower_index/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.md b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.md new file mode 100644 index 000000000..560e105c3 --- /dev/null +++ b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.md @@ -0,0 +1,11 @@ +# Example with all variables modifiable + +```yaml +--- +rougail: + leadership: + - leader: a + follower: value + - leader: b + follower: value +``` diff --git a/tests/results/test_namespace_examples/warnings_44_4disabled_calcultion_follower_index b/tests/results/test_namespace_examples/warnings_44_4disabled_calcultion_follower_index new file mode 100644 index 000000000..70e8a61b8 --- /dev/null +++ b/tests/results/test_namespace_examples/warnings_44_4disabled_calcultion_follower_index @@ -0,0 +1 @@ +["\"disabled\" is a calculation for rougail.leadership.follower but has no description in \"../../rougail-tests/structures/44_4disabled_calcultion_follower_index/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 4dc98e96e..0ef359841 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -12,7 +12,7 @@ def test_force_optional(): ## rougailconfig['tiramisu_cache'] = 'p.py' # dirs = [str(test_dir / 'cmdline')] # rougailconfig['plugins'] = ["structural_commandline"] -# rougailconfig['main_dictionaries'] = dirs +# rougailconfig['main_structural_directories'] = dirs # rougailconfig['doc.output_format'] = 'asciidoc' # rougail = Rougail(rougailconfig) # config = rougail.run() diff --git a/tests/test_force_optional.py b/tests/test_force_optional.py index 22b2d3dbb..c2316bede 100644 --- a/tests/test_force_optional.py +++ b/tests/test_force_optional.py @@ -11,7 +11,7 @@ def test_force_optional(): rougailconfig['force_optional'] = True # rougailconfig['tiramisu_cache'] = 'p.py' dirs = [str(test_dir / 'force_optional')] - rougailconfig['main_dictionaries'] = dirs + rougailconfig['main_structural_directories'] = dirs rougailconfig['doc.output_format'] = 'asciidoc' rougailconfig['doc.change_default_value'] = True rougail = Rougail(rougailconfig) diff --git a/tests/test_load.py b/tests/test_load.py index ce9c41780..a1cddcb9f 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -20,7 +20,7 @@ excludes = [ ] test_ok = get_structures_list(excludes) -# test_ok = [HERE.parent.parent / "rougail-tests" / "structures" / "40_0leadership_reduce"] +# test_ok = [HERE.parent.parent / "rougail-tests" / "structures" / "40_0leadership_leader_follower"] os.environ['COLUMNS'] = '80' @@ -34,7 +34,7 @@ def test_dir(request): return request.param -def _test_dictionaries(test_dir, namespace, ext, *, examples=False): +def _test_structural_files(test_dir, namespace, ext, *, examples=False): with chdir(HERE): rougailconfig = get_rougail_config(test_dir, namespace, relative_to=HERE) if not rougailconfig: @@ -85,41 +85,41 @@ def _test_dictionaries(test_dir, namespace, ext, *, examples=False): assert warns == attented_output, f'filename {output_file}' -def test_dictionaries_json(test_dir): - _test_dictionaries(test_dir, True, 'json') +def test_structural_files_json(test_dir): + _test_structural_files(test_dir, True, 'json') -def test_dictionaries_console(test_dir): - _test_dictionaries(test_dir, True, 'console') +def test_structural_files_console(test_dir): + _test_structural_files(test_dir, True, 'console') -def test_dictionaries_github(test_dir): - _test_dictionaries(test_dir, True, 'github') +def test_structural_files_github(test_dir): + _test_structural_files(test_dir, True, 'github') -def test_dictionaries_asciidoc(test_dir): - _test_dictionaries(test_dir, True, 'asciidoc') +def test_structural_files_asciidoc(test_dir): + _test_structural_files(test_dir, True, 'asciidoc') ################ -def test_dictionaries_examples(test_dir): - _test_dictionaries(test_dir, True, 'github', examples=True) +def test_structural_files_examples(test_dir): + _test_structural_files(test_dir, True, 'github', examples=True) ################ -def test_dictionaries_json_no_namespace(test_dir): - _test_dictionaries(test_dir, False, 'json') +def test_structural_files_json_no_namespace(test_dir): + _test_structural_files(test_dir, False, 'json') -def test_dictionaries_console_no_namespace(test_dir): - _test_dictionaries(test_dir, False, 'console') +def test_structural_files_console_no_namespace(test_dir): + _test_structural_files(test_dir, False, 'console') -def test_dictionaries_github_no_namespace(test_dir): - _test_dictionaries(test_dir, False, 'github') +def test_structural_files_github_no_namespace(test_dir): + _test_structural_files(test_dir, False, 'github') -def test_dictionaries_asciidoc_no_namespace(test_dir): - _test_dictionaries(test_dir, False, 'asciidoc') +def test_structural_files_asciidoc_no_namespace(test_dir): + _test_structural_files(test_dir, False, 'asciidoc') ################ -def test_dictionaries_examples_no_namespace(test_dir): - _test_dictionaries(test_dir, False, 'github', examples=True) +def test_structural_files_examples_no_namespace(test_dir): + _test_structural_files(test_dir, False, 'github', examples=True) diff --git a/tests/test_mode.py b/tests/test_mode.py index 5f68f1369..0659ea1d8 100644 --- a/tests/test_mode.py +++ b/tests/test_mode.py @@ -11,7 +11,7 @@ def _test(modes): # rougailconfig['tiramisu_cache'] = 'p.py' dirs = [str(test_dir / 'mode')] rougailconfig['modes_level'] = ['basic', 'standard', 'advanced'] - rougailconfig['main_dictionaries'] = dirs + rougailconfig['main_structural_directories'] = dirs rougailconfig['doc.output_format'] = 'asciidoc' rougailconfig['doc.disabled_modes'] = modes rougail = Rougail(rougailconfig)