diff --git a/README.fr.md b/README.fr.md index f473c8393..4167730a5 100644 --- a/README.fr.md +++ b/README.fr.md @@ -11,7 +11,7 @@ include_toc: true > Les fichiers de structure contiennent toutes les informations relatif aux variables. Cette sortie génère la documentation pour tout ou partie de ces variables.\ > **Chemin** : doc\ > *`désactivé`*\ -> **Désactivé** : si doc n'est pas spécifié dans "[Sélection pour sortie](#step.output)" +> **Désactivé** : si "[Sélection pour sortie](#step.output)" n'est pas doc | Variable | Description | Valeur par défaut | Type | Contrôle des accès | Validateur | |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|-------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------| diff --git a/README.md b/README.md index e1ebb7f0a..ae5608603 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ include_toc: true > The structural files contain all the information related to the variables. This output generates the documentation for all or some of these variables.\ > **Path**: doc\ > *`disabled`*\ -> **Disabled**: if doc is not set in "[Select for output](#step.output)" +> **Disabled**: if "[Select for output](#step.output)" is not doc | Variable | Description | Default value | Type | Access control | Validator | |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------|-----------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------| diff --git a/locale/fr/LC_MESSAGES/rougail_output_doc.po b/locale/fr/LC_MESSAGES/rougail_output_doc.po index 0cefb71cc..21a9ea734 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: 2026-01-29 08:31+0100\n" -"PO-Revision-Date: 2026-01-29 08:33+0100\n" +"POT-Creation-Date: 2026-03-29 10:57+0200\n" +"PO-Revision-Date: 2026-03-29 10:58+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -16,38 +16,175 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "X-Generator: Poedit 3.8\n" -#: src/rougail/output_doc/annotator.py:371 -msgid "when the identifier is \"{0}\"" -msgstr "lorsque l'identifiant est \"{0}\"" - -#: src/rougail/output_doc/annotator.py:373 -msgid "when the identifier is not \"{0}\"" -msgstr "lorsque l'identifiant n'est pas \"{0}\"" - -#: src/rougail/output_doc/changelog.py:137 +#: src/rougail/output_doc/changelog.py:153 msgid "New variable" msgstr "Nouvelle variable" -#: src/rougail/output_doc/changelog.py:139 +#: src/rougail/output_doc/changelog.py:155 msgid "New variables" msgstr "Nouvelles variables" -#: src/rougail/output_doc/changelog.py:153 +#: src/rougail/output_doc/changelog.py:169 msgid "Modified variable" msgstr "Variable modifiée" -#: src/rougail/output_doc/changelog.py:155 +#: src/rougail/output_doc/changelog.py:171 msgid "Modified variables" msgstr "Variables modifiées" -#: src/rougail/output_doc/changelog.py:169 +#: src/rougail/output_doc/changelog.py:185 msgid "Deleted variable" msgstr "Variable supprimée" -#: src/rougail/output_doc/changelog.py:171 +#: src/rougail/output_doc/changelog.py:187 msgid "Deleted variables" msgstr "Variables supprimées" +#: src/rougail/output_doc/collect.py:52 +msgid "" +"cannot find \"{0}_calculation\" information, do you have annotate this " +"configuration?" +msgstr "" +"ne peut trouver l'information \"{0}_calculation\", avez-vous annoté cette " +"configuration ?" + +#: src/rougail/output_doc/collect.py:93 +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/collect.py:97 +msgid "the value of the global information \"{0}\"" +msgstr "la valeur de l'information globale \"{0}\"" + +#: src/rougail/output_doc/collect.py:101 +msgid "the value of the {0}" +msgstr "la valeur de l'{0}" + +#: src/rougail/output_doc/collect.py:108 +msgid "depends on a calculation" +msgstr "dépend d'un calcul" + +#: src/rougail/output_doc/collect.py:109 +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/collect.py:172 +msgid "depends on an undocumented variable" +msgstr "dépends d'une variable non documentée" + +#: src/rougail/output_doc/collect.py:190 +msgid "is \"{0}\"" +msgstr "est \"{0}\"" + +#: src/rougail/output_doc/collect.py:195 +msgid "is accessible" +msgstr "est accessible" + +#: src/rougail/output_doc/collect.py:197 +msgid "is defined" +msgstr "est définie" + +#: src/rougail/output_doc/collect.py:202 +msgid "hasn't the value \"{0}\"" +msgstr "n'a pas la valeur \"{0}\"" + +#: src/rougail/output_doc/collect.py:204 +msgid "has the value \"{0}\"" +msgstr "a la valeur \"{0}\"" + +#: src/rougail/output_doc/collect.py:208 +msgid "is {0}" +msgstr "est {0}" + +#: src/rougail/output_doc/collect.py:210 +msgid "when the variable \"{{0}}\" {0}" +msgstr "lorsque la variable \"{{0}}\" {0}" + +#: src/rougail/output_doc/collect.py:237 +msgid "the value of the variable \"{0}\" if it is defined" +msgstr "la valeur de la variable \"{0}\" si elle est définie" + +#: src/rougail/output_doc/collect.py:239 +msgid "the value of the variable \"{0}\"" +msgstr "la valeur de la variable \"{0}\"" + +#: src/rougail/output_doc/collect.py:255 +msgid "(from an undocumented variable)" +msgstr "(issue d'une variable non documentée)" + +#: src/rougail/output_doc/collect.py:261 +msgid "{0} (from an undocumented variable)" +msgstr "{0} (issue d'une variable non documentée)" + +#: src/rougail/output_doc/collect.py:265 +msgid "the value of an undocumented variable" +msgstr "la valeur d'une variable non documentée" + +#: src/rougail/output_doc/collect.py:302 +msgid "when the identifier is \"{0}\"" +msgstr "lorsque l'identifiant est \"{0}\"" + +#: src/rougail/output_doc/collect.py:304 +msgid "when the identifier is not \"{0}\"" +msgstr "lorsque l'identifiant n'est pas \"{0}\"" + +#: src/rougail/output_doc/collect.py:309 +msgid "the value of the identifier" +msgstr "la valeur de l'identifiant" + +#: src/rougail/output_doc/collect.py:396 +msgid "This family contains lists of variable blocks" +msgstr "Cette famille contient des listes de bloc de variable" + +#: src/rougail/output_doc/collect.py:400 +msgid "This family builds families dynamically" +msgstr "Cette famille construit des familles dynamiquement" + +#: src/rougail/output_doc/collect.py:410 +msgid "This family is a namespace" +msgstr "Cette famille est un espace de nom" + +#: src/rougail/output_doc/collect.py:461 +msgid "Example" +msgstr "Exemple" + +#: src/rougail/output_doc/collect.py:464 +msgid "Examples" +msgstr "Exemples" + +#: src/rougail/output_doc/collect.py:470 +msgid "Tag" +msgstr "Étiquette" + +#: src/rougail/output_doc/collect.py:473 +msgid "Tags" +msgstr "Étiquettes" + +#: src/rougail/output_doc/collect.py:567 +msgid "text based with regular expressions \"{0}\"" +msgstr "texte avec expression rationnelle \"{0}\"" + +#: src/rougail/output_doc/collect.py:571 +#: src/rougail/output_doc/tabular/six_columns.py:83 +msgid "Validator" +msgstr "Validateur" + +#: src/rougail/output_doc/collect.py:574 +msgid "Validators" +msgstr "Validateurs" + +#: src/rougail/output_doc/collect.py:583 +msgid "Choices" +msgstr "Choix" + +#: src/rougail/output_doc/collect.py:633 +msgid "Default" +msgstr "Défaut" + +#: src/rougail/output_doc/collect.py:643 +msgid "No attribute \"description\" for \"{0}\" in {1}" +msgstr "Aucun attribut \"description\" pour \"{0}\" dans {1}" + #: src/rougail/output_doc/config.py:54 msgid "duplicated level rougail-output-doc for {0} \"{1}\": {2} and {3}" msgstr "niveau dupliqué pour rougail-doc pour {0} \"{1}\": {2} et {3}" @@ -56,15 +193,15 @@ msgstr "niveau dupliqué pour rougail-doc pour {0} \"{1}\": {2} et {3}" msgid "duplicated name \"{0}\" in rougail-output-doc" msgstr "nom dupliqué \"{0}\" dans rougail-output-doc" -#: src/rougail/output_doc/config.py:118 +#: src/rougail/output_doc/config.py:116 msgid "is true if doc is activate" msgstr "est true si doc est activé" -#: src/rougail/output_doc/config.py:121 +#: src/rougail/output_doc/config.py:119 msgid "Generate documentation from structural files" msgstr "Générer la documentation depuis les fichiers de structure" -#: src/rougail/output_doc/config.py:122 +#: src/rougail/output_doc/config.py:120 msgid "" "The structural files contain all the information related to the variables. " "This output generates the documentation for all or some of these variables." @@ -73,19 +210,19 @@ msgstr "" "variables. Cette sortie génère la documentation pour tout ou partie de ces " "variables." -#: src/rougail/output_doc/config.py:127 -msgid "if doc is not set in \"step.output\"" -msgstr "si doc n'est pas spécifié dans \"step.output\"" +#: src/rougail/output_doc/config.py:125 +msgid "if \"step.output\" is not doc" +msgstr "si \"step.output\" n'est pas doc" -#: src/rougail/output_doc/config.py:130 +#: src/rougail/output_doc/config.py:128 msgid "The output format of the generated documentation" msgstr "Le format de sortie de la documentation générée" -#: src/rougail/output_doc/config.py:139 +#: src/rougail/output_doc/config.py:137 msgid "Generate document with this tabular model" msgstr "Génère la documentation avec ce modèle de tableau" -#: src/rougail/output_doc/config.py:140 +#: src/rougail/output_doc/config.py:138 msgid "" "The variables are documented with a tabular view. A template selection " "allows you to choose the content of each column." @@ -93,15 +230,15 @@ msgstr "" "Les variables sont documentées avec une vue tableau. Une sélection de modèle " "vous permet de choisir le contenu de chaque colonne." -#: src/rougail/output_doc/config.py:148 +#: src/rougail/output_doc/config.py:146 msgid "\"_.output_format\" in json is not compatible with this variable" msgstr "\"_.output_format\" en json n\\'est pas compatible avec cette variable" -#: src/rougail/output_doc/config.py:155 +#: src/rougail/output_doc/config.py:153 msgid "Generated content" msgstr "Contenu généré" -#: src/rougail/output_doc/config.py:156 +#: src/rougail/output_doc/config.py:154 msgid "" "You can generate three type of document. All variables (\"variables\"), an " "example file in YAML format (\"example\") or change log (\"changelog\")." @@ -110,7 +247,7 @@ msgstr "" "(\"variables\"), un exemple de fichier au format YAML (\"example\") ou le " "journal des changements (\"changelog\")." -#: src/rougail/output_doc/config.py:169 +#: src/rougail/output_doc/config.py:167 msgid "" "\"_.output_format\" in json is not compatible with changelog or example " "\"_.contents\"" @@ -118,15 +255,15 @@ msgstr "" "\"_.output_format\" en json n'est pas compatible avec \"_.contents\" " "changelog or example" -#: src/rougail/output_doc/config.py:172 +#: src/rougail/output_doc/config.py:170 msgid "Starting title level" msgstr "Niveau de titre de départ" -#: src/rougail/output_doc/config.py:177 +#: src/rougail/output_doc/config.py:175 msgid "Modify values to document all variables" msgstr "Modifier les valeurs pour documenter toutes les variables" -#: src/rougail/output_doc/config.py:178 +#: src/rougail/output_doc/config.py:176 msgid "" "To document leadership or dynamic family variables, it is sometimes " "necessary to generate values, which can change the values in the " @@ -137,17 +274,17 @@ msgstr "" "valeurs de la configuration. Soyez vigilent si vous réutilisez cette " "configuration." -#: src/rougail/output_doc/config.py:182 +#: src/rougail/output_doc/config.py:180 msgid "Display documentation in console always with true color terminal" msgstr "" "Afficher la documentation dans la console en permanence avec un terminal en " "couleurs réelles" -#: src/rougail/output_doc/config.py:189 +#: src/rougail/output_doc/config.py:187 msgid "The variables in this family are documented in another file" msgstr "Les variables pour cette famille sont documentés dans un autre fichier" -#: src/rougail/output_doc/config.py:190 +#: src/rougail/output_doc/config.py:188 msgid "" "If you separate the variables into different files, the links between the " "variables will break. Therefore, you must define different filenames for the " @@ -157,23 +294,23 @@ msgstr "" "variables va être cassé. Dans ce cas, vous devez définit différents nom de " "fichiers pour les fichiers contenant ces variables." -#: src/rougail/output_doc/config.py:194 +#: src/rougail/output_doc/config.py:192 msgid "This file contains child variables of the family" msgstr "Ce fichier contient les variables enfants de la famille" -#: src/rougail/output_doc/config.py:198 +#: src/rougail/output_doc/config.py:196 msgid "Name of the file" msgstr "Nom du fichier" -#: src/rougail/output_doc/config.py:206 +#: src/rougail/output_doc/config.py:204 msgid "Documentation a structural type" msgstr "Documenter type de structure" -#: src/rougail/output_doc/config.py:210 +#: src/rougail/output_doc/config.py:208 msgid "Variables and changelog documentation" msgstr "Documentation des variables et journal de changements" -#: src/rougail/output_doc/config.py:215 +#: src/rougail/output_doc/config.py:213 msgid "" "if \"_.output_format\" is json or \"_.contents\" hasn't variables or " "changelog" @@ -181,45 +318,45 @@ msgstr "" "si \"_.output_format\" en json ou si \"_.contents\" n'est pas variables ou " "changelog" -#: src/rougail/output_doc/config.py:218 +#: src/rougail/output_doc/config.py:216 msgid "Do not add families in documentation" msgstr "Ne pas ajouter les familles dans la documentation" -#: src/rougail/output_doc/config.py:223 +#: src/rougail/output_doc/config.py:221 msgid "Add command line informations in documentation" msgstr "Ajoute les informations de la ligne de commande dans la documentation" -#: src/rougail/output_doc/config.py:228 +#: src/rougail/output_doc/config.py:226 msgid "Add environment variable informations in documentation" msgstr "" "Ajoute les informations de variable d'environnement dans la documentation" -#: src/rougail/output_doc/config.py:233 +#: src/rougail/output_doc/config.py:231 msgid "Environment variables prefix name" msgstr "Préfixe du nom des variables d'environnement" -#: src/rougail/output_doc/config.py:240 +#: src/rougail/output_doc/config.py:238 msgid "should only use uppercase characters" msgstr "doit seulement utilise des caractères en majuscule" -#: src/rougail/output_doc/config.py:245 +#: src/rougail/output_doc/config.py:243 msgid "if \"main_namespace\" is not set or \"_.with_environment\" is false" msgstr "" "si \"main_namespace\" n'est pas défini ou \"_.with_environment\" est false" -#: src/rougail/output_doc/config.py:248 +#: src/rougail/output_doc/config.py:246 msgid "Changelog documentation" msgstr "Documentation du journal des changements" -#: src/rougail/output_doc/config.py:253 +#: src/rougail/output_doc/config.py:251 msgid "if changelog in not in \"_.contents\"" msgstr "changelog n'est pas défini dans \"_.contents\"" -#: src/rougail/output_doc/config.py:256 +#: src/rougail/output_doc/config.py:254 msgid "Previous description file in JSON format" msgstr "Précédent fichier de description au format JSON" -#: src/rougail/output_doc/config.py:257 +#: src/rougail/output_doc/config.py:255 msgid "" "To generate the changelog, you need to compare the old list of variables (in " "json format) with the current variables." @@ -227,217 +364,94 @@ msgstr "" "Pour générer le journal des changements, vous devez comparer l'ancienne " "liste des variables (au format json) avec les variables courantes." -#: src/rougail/output_doc/config.py:261 +#: src/rougail/output_doc/config.py:259 msgid "Examples configuration" msgstr "Configuration des exemples" -#: src/rougail/output_doc/config.py:266 +#: src/rougail/output_doc/config.py:264 msgid "if example is not in \"_.contents\"" msgstr "si example n'est pas défini dans \"_.contents\"" -#: src/rougail/output_doc/config.py:269 +#: src/rougail/output_doc/config.py:267 msgid "Add description of variables and families when generate examples" msgstr "" "Ajouter la description des variables et des familles lorsqu'on génère des " "exemples" -#: src/rougail/output_doc/config.py:274 +#: src/rougail/output_doc/config.py:272 msgid "Comment in examples starts at column" msgstr "Commentaire dans les exemples commence à la colonne" -#: src/rougail/output_doc/doc.py:70 +#: src/rougail/output_doc/doc.py:58 msgid "{0} is not set as step.output" msgstr "{0} n'est pas défini dans step.output" -#: src/rougail/output_doc/doc.py:363 -msgid "This family contains lists of variable blocks" -msgstr "Cette famille contient des listes de bloc de variable" - -#: src/rougail/output_doc/doc.py:373 -msgid "This family builds families dynamically" -msgstr "Cette famille construit des familles dynamiquement" - -#: src/rougail/output_doc/doc.py:387 -msgid "Default" -msgstr "Défaut" - -#: src/rougail/output_doc/doc.py:405 -msgid "Example" -msgstr "Exemple" - -#: src/rougail/output_doc/doc.py:408 -msgid "Examples" -msgstr "Exemples" - -#: src/rougail/output_doc/doc.py:417 -msgid "Tag" -msgstr "Étiquette" - -#: src/rougail/output_doc/doc.py:420 -msgid "Tags" -msgstr "Étiquettes" - -#: src/rougail/output_doc/doc.py:452 -msgid "No attribute \"description\" for \"{0}\" in {1}" -msgstr "Aucun attribut \"description\" pour \"{0}\" dans {1}" - -#: src/rougail/output_doc/doc.py:587 -msgid "text based with regular expressions \"{0}\"" -msgstr "texte avec expression rationnelle \"{0}\"" - -#: src/rougail/output_doc/doc.py:591 -#: src/rougail/output_doc/tabular/six_columns.py:65 -msgid "Validator" -msgstr "Validateur" - -#: src/rougail/output_doc/doc.py:594 -msgid "Validators" -msgstr "Validateurs" - -#: src/rougail/output_doc/doc.py:603 -msgid "Choices" -msgstr "Choix" - -#: src/rougail/output_doc/doc.py:707 -msgid "the value of the identifier" -msgstr "la valeur de l'identifiant" - -#: src/rougail/output_doc/doc.py:711 -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/doc.py:715 -msgid "the value of the global information \"{0}\"" -msgstr "la valeur de l'information globale \"{0}\"" - -#: src/rougail/output_doc/doc.py:717 -msgid "the value of the {0}" -msgstr "la valeur de l'{0}" - -#: src/rougail/output_doc/doc.py:724 -msgid "depends on a calculation" -msgstr "dépend d'un calcul" - -#: src/rougail/output_doc/doc.py:730 -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:786 src/rougail/output_doc/doc.py:913 -msgid "depends on an undocumented variable" -msgstr "dépends d'une variable non documentée" - -#: src/rougail/output_doc/doc.py:804 -msgid "is \"{0}\"" -msgstr "est \"{0}\"" - -#: src/rougail/output_doc/doc.py:809 -msgid "is accessible" -msgstr "est accessible" - -#: src/rougail/output_doc/doc.py:811 -msgid "is defined" -msgstr "est définie" - -#: src/rougail/output_doc/doc.py:816 -msgid "hasn't the value \"{0}\"" -msgstr "n'a pas la valeur \"{0}\"" - -#: src/rougail/output_doc/doc.py:820 -msgid "has the value \"{0}\"" -msgstr "a la valeur \"{0}\"" - -#: src/rougail/output_doc/doc.py:825 -msgid "is {0}" -msgstr "est {0}" - -#: src/rougail/output_doc/doc.py:826 -msgid "when the variable \"{{0}}\" {0}" -msgstr "lorsque la variable \"{{0}}\" {0}" - -#: src/rougail/output_doc/doc.py:853 -msgid "the value of the variable \"{0}\" if it is defined" -msgstr "la valeur de la variable \"{0}\" si elle est définie" - -#: src/rougail/output_doc/doc.py:855 -msgid "the value of the variable \"{0}\"" -msgstr "la valeur de la variable \"{0}\"" - -#: src/rougail/output_doc/doc.py:875 -msgid "the value of an undocumented variable" -msgstr "la valeur d'une variable non documentée" - -#: src/rougail/output_doc/doc.py:878 -msgid "the values of undocumented variables" -msgstr "les valeurs de variables non documentées" - -#: src/rougail/output_doc/doc.py:901 -msgid "(from an undocumented variable)" -msgstr "(issue d'une variable non documentée)" - -#: src/rougail/output_doc/doc.py:909 -msgid "{0} (from an undocumented variable)" -msgstr "{0} (issue d'une variable non documentée)" - -#: src/rougail/output_doc/example.py:70 +#: src/rougail/output_doc/example.py:96 msgid "Example with mandatory variables not filled in" msgstr "Exemple avec des variables obligatoire non renseignée" -#: src/rougail/output_doc/example.py:85 +#: src/rougail/output_doc/example.py:98 msgid "Example with all variables modifiable" msgstr "Exemple avec toutes les variables modifiable" #: src/rougail/output_doc/output/asciidoc.py:156 -#: src/rougail/output_doc/output/console.py:199 +#: src/rougail/output_doc/output/console.py:201 #: src/rougail/output_doc/output/gitlab.py:44 msgid "Informations" msgstr "Informations" -#: src/rougail/output_doc/tabular/five_columns.py:59 +#: src/rougail/output_doc/tabular/five_columns.py:72 msgid "Access control" msgstr "Contrôle des accès" -#: src/rougail/output_doc/tabular/four_columns.py:53 +#: src/rougail/output_doc/tabular/four_columns.py:64 msgid "Type" msgstr "Type" -#: src/rougail/output_doc/tabular/three_columns.py:46 +#: src/rougail/output_doc/tabular/three_columns.py:54 msgid "Default value" msgstr "Valeur par défaut" -#: src/rougail/output_doc/tabular/two_columns.py:45 +#: src/rougail/output_doc/tabular/two_columns.py:56 msgid "Variable" msgstr "Variable" -#: src/rougail/output_doc/tabular/two_columns.py:47 +#: src/rougail/output_doc/tabular/two_columns.py:58 msgid "Description" msgstr "Description" -#: src/rougail/output_doc/utils.py:152 +#: src/rougail/output_doc/utils.py:198 msgid "Command line" msgstr "Ligne de commande" -#: src/rougail/output_doc/utils.py:159 +#: src/rougail/output_doc/utils.py:216 msgid "Environment variable" msgstr "Variable d'environnement" -#: src/rougail/output_doc/utils.py:438 +#: src/rougail/output_doc/utils.py:526 msgid "Path" msgstr "Chemin" -#: src/rougail/output_doc/utils.py:448 +#: src/rougail/output_doc/utils.py:536 msgid "Identifiers" msgstr "Identifiants" -#: src/rougail/output_doc/utils.py:668 src/rougail/output_doc/utils.py:677 -#: src/rougail/output_doc/utils.py:683 src/rougail/output_doc/utils.py:689 -#: src/rougail/output_doc/utils.py:693 +#: src/rougail/output_doc/utils.py:790 src/rougail/output_doc/utils.py:799 +#: src/rougail/output_doc/utils.py:805 src/rougail/output_doc/utils.py:811 +#: src/rougail/output_doc/utils.py:815 msgid "(default)" msgstr "(défaut)" -#: src/rougail/output_doc/utils.py:945 +#: src/rougail/output_doc/utils.py:1123 msgid "{0}: {1}" msgstr "{0} : {1}" +#~ msgid "if doc is not set in \"step.output\"" +#~ msgstr "si doc n'est pas spécifié dans \"step.output\"" + +#~ msgid "the values of undocumented variables" +#~ msgstr "les valeurs de variables non documentées" + #~ msgid "" #~ "when the variable \"{{0}}\" is defined, accessible and hasn't the value " #~ "\"{0}\"" diff --git a/locale/rougail_output_doc.pot b/locale/rougail_output_doc.pot index d03e5eb2e..bbb55785b 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: 2026-01-29 08:33+0100\n" +"POT-Creation-Date: 2026-03-29 10:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,38 +15,171 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: src/rougail/output_doc/annotator.py:371 -msgid "when the identifier is \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/annotator.py:373 -msgid "when the identifier is not \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/changelog.py:137 +#: src/rougail/output_doc/changelog.py:153 msgid "New variable" msgstr "" -#: src/rougail/output_doc/changelog.py:139 +#: src/rougail/output_doc/changelog.py:155 msgid "New variables" msgstr "" -#: src/rougail/output_doc/changelog.py:153 +#: src/rougail/output_doc/changelog.py:169 msgid "Modified variable" msgstr "" -#: src/rougail/output_doc/changelog.py:155 +#: src/rougail/output_doc/changelog.py:171 msgid "Modified variables" msgstr "" -#: src/rougail/output_doc/changelog.py:169 +#: src/rougail/output_doc/changelog.py:185 msgid "Deleted variable" msgstr "" -#: src/rougail/output_doc/changelog.py:171 +#: src/rougail/output_doc/changelog.py:187 msgid "Deleted variables" msgstr "" +#: src/rougail/output_doc/collect.py:52 +msgid "cannot find \"{0}_calculation\" information, do you have annotate this configuration?" +msgstr "" + +#: src/rougail/output_doc/collect.py:93 +msgid "the value of the information \"{0}\" of the variable \"{1}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:97 +msgid "the value of the global information \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:101 +msgid "the value of the {0}" +msgstr "" + +#: src/rougail/output_doc/collect.py:108 +msgid "depends on a calculation" +msgstr "" + +#: src/rougail/output_doc/collect.py:109 +msgid "\"{0}\" is a calculation for {1} but has no description in {2}" +msgstr "" + +#: src/rougail/output_doc/collect.py:172 +msgid "depends on an undocumented variable" +msgstr "" + +#: src/rougail/output_doc/collect.py:190 +msgid "is \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:195 +msgid "is accessible" +msgstr "" + +#: src/rougail/output_doc/collect.py:197 +msgid "is defined" +msgstr "" + +#: src/rougail/output_doc/collect.py:202 +msgid "hasn't the value \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:204 +msgid "has the value \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:208 +msgid "is {0}" +msgstr "" + +#: src/rougail/output_doc/collect.py:210 +msgid "when the variable \"{{0}}\" {0}" +msgstr "" + +#: src/rougail/output_doc/collect.py:237 +msgid "the value of the variable \"{0}\" if it is defined" +msgstr "" + +#: src/rougail/output_doc/collect.py:239 +msgid "the value of the variable \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:255 +msgid "(from an undocumented variable)" +msgstr "" + +#: src/rougail/output_doc/collect.py:261 +msgid "{0} (from an undocumented variable)" +msgstr "" + +#: src/rougail/output_doc/collect.py:265 +msgid "the value of an undocumented variable" +msgstr "" + +#: src/rougail/output_doc/collect.py:302 +msgid "when the identifier is \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:304 +msgid "when the identifier is not \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:309 +msgid "the value of the identifier" +msgstr "" + +#: src/rougail/output_doc/collect.py:396 +msgid "This family contains lists of variable blocks" +msgstr "" + +#: src/rougail/output_doc/collect.py:400 +msgid "This family builds families dynamically" +msgstr "" + +#: src/rougail/output_doc/collect.py:410 +msgid "This family is a namespace" +msgstr "" + +#: src/rougail/output_doc/collect.py:461 +msgid "Example" +msgstr "" + +#: src/rougail/output_doc/collect.py:464 +msgid "Examples" +msgstr "" + +#: src/rougail/output_doc/collect.py:470 +msgid "Tag" +msgstr "" + +#: src/rougail/output_doc/collect.py:473 +msgid "Tags" +msgstr "" + +#: src/rougail/output_doc/collect.py:567 +msgid "text based with regular expressions \"{0}\"" +msgstr "" + +#: src/rougail/output_doc/collect.py:571 +#: src/rougail/output_doc/tabular/six_columns.py:83 +msgid "Validator" +msgstr "" + +#: src/rougail/output_doc/collect.py:574 +msgid "Validators" +msgstr "" + +#: src/rougail/output_doc/collect.py:583 +msgid "Choices" +msgstr "" + +#: src/rougail/output_doc/collect.py:633 +msgid "Default" +msgstr "" + +#: src/rougail/output_doc/collect.py:643 +msgid "No attribute \"description\" for \"{0}\" in {1}" +msgstr "" + #: src/rougail/output_doc/config.py:54 msgid "duplicated level rougail-output-doc for {0} \"{1}\": {2} and {3}" msgstr "" @@ -55,340 +188,211 @@ msgstr "" msgid "duplicated name \"{0}\" in rougail-output-doc" msgstr "" -#: src/rougail/output_doc/config.py:118 +#: src/rougail/output_doc/config.py:116 msgid "is true if doc is activate" msgstr "" -#: src/rougail/output_doc/config.py:121 +#: src/rougail/output_doc/config.py:119 msgid "Generate documentation from structural files" msgstr "" -#: src/rougail/output_doc/config.py:122 +#: src/rougail/output_doc/config.py:120 msgid "The structural files contain all the information related to the variables. This output generates the documentation for all or some of these variables." msgstr "" -#: src/rougail/output_doc/config.py:127 -msgid "if doc is not set in \"step.output\"" +#: src/rougail/output_doc/config.py:125 +msgid "if \"step.output\" is not doc" msgstr "" -#: src/rougail/output_doc/config.py:130 +#: src/rougail/output_doc/config.py:128 msgid "The output format of the generated documentation" msgstr "" -#: src/rougail/output_doc/config.py:139 +#: src/rougail/output_doc/config.py:137 msgid "Generate document with this tabular model" msgstr "" -#: src/rougail/output_doc/config.py:140 +#: src/rougail/output_doc/config.py:138 msgid "The variables are documented with a tabular view. A template selection allows you to choose the content of each column." msgstr "" -#: src/rougail/output_doc/config.py:148 +#: src/rougail/output_doc/config.py:146 msgid "\"_.output_format\" in json is not compatible with this variable" msgstr "" -#: src/rougail/output_doc/config.py:155 +#: src/rougail/output_doc/config.py:153 msgid "Generated content" msgstr "" -#: src/rougail/output_doc/config.py:156 +#: src/rougail/output_doc/config.py:154 msgid "You can generate three type of document. All variables (\"variables\"), an example file in YAML format (\"example\") or change log (\"changelog\")." msgstr "" -#: src/rougail/output_doc/config.py:169 +#: src/rougail/output_doc/config.py:167 msgid "\"_.output_format\" in json is not compatible with changelog or example \"_.contents\"" msgstr "" -#: src/rougail/output_doc/config.py:172 +#: src/rougail/output_doc/config.py:170 msgid "Starting title level" msgstr "" -#: src/rougail/output_doc/config.py:177 +#: src/rougail/output_doc/config.py:175 msgid "Modify values to document all variables" msgstr "" -#: src/rougail/output_doc/config.py:178 +#: src/rougail/output_doc/config.py:176 msgid "To document leadership or dynamic family variables, it is sometimes necessary to generate values, which can change the values in the configuration. Be careful if you reuse this configuration." msgstr "" -#: src/rougail/output_doc/config.py:182 +#: src/rougail/output_doc/config.py:180 msgid "Display documentation in console always with true color terminal" msgstr "" -#: src/rougail/output_doc/config.py:189 +#: src/rougail/output_doc/config.py:187 msgid "The variables in this family are documented in another file" msgstr "" -#: src/rougail/output_doc/config.py:190 +#: src/rougail/output_doc/config.py:188 msgid "If you separate the variables into different files, the links between the variables will break. Therefore, you must define different filenames for the files containing these variables." msgstr "" -#: src/rougail/output_doc/config.py:194 +#: src/rougail/output_doc/config.py:192 msgid "This file contains child variables of the family" msgstr "" -#: src/rougail/output_doc/config.py:198 +#: src/rougail/output_doc/config.py:196 msgid "Name of the file" msgstr "" -#: src/rougail/output_doc/config.py:206 +#: src/rougail/output_doc/config.py:204 msgid "Documentation a structural type" msgstr "" -#: src/rougail/output_doc/config.py:210 +#: src/rougail/output_doc/config.py:208 msgid "Variables and changelog documentation" msgstr "" -#: src/rougail/output_doc/config.py:215 +#: src/rougail/output_doc/config.py:213 msgid "if \"_.output_format\" is json or \"_.contents\" hasn't variables or changelog" msgstr "" -#: src/rougail/output_doc/config.py:218 +#: src/rougail/output_doc/config.py:216 msgid "Do not add families in documentation" msgstr "" -#: src/rougail/output_doc/config.py:223 +#: src/rougail/output_doc/config.py:221 msgid "Add command line informations in documentation" msgstr "" -#: src/rougail/output_doc/config.py:228 +#: src/rougail/output_doc/config.py:226 msgid "Add environment variable informations in documentation" msgstr "" -#: src/rougail/output_doc/config.py:233 +#: src/rougail/output_doc/config.py:231 msgid "Environment variables prefix name" msgstr "" -#: src/rougail/output_doc/config.py:240 +#: src/rougail/output_doc/config.py:238 msgid "should only use uppercase characters" msgstr "" -#: src/rougail/output_doc/config.py:245 +#: src/rougail/output_doc/config.py:243 msgid "if \"main_namespace\" is not set or \"_.with_environment\" is false" msgstr "" -#: src/rougail/output_doc/config.py:248 +#: src/rougail/output_doc/config.py:246 msgid "Changelog documentation" msgstr "" -#: src/rougail/output_doc/config.py:253 +#: src/rougail/output_doc/config.py:251 msgid "if changelog in not in \"_.contents\"" msgstr "" -#: src/rougail/output_doc/config.py:256 +#: src/rougail/output_doc/config.py:254 msgid "Previous description file in JSON format" msgstr "" -#: src/rougail/output_doc/config.py:257 +#: src/rougail/output_doc/config.py:255 msgid "To generate the changelog, you need to compare the old list of variables (in json format) with the current variables." msgstr "" -#: src/rougail/output_doc/config.py:261 +#: src/rougail/output_doc/config.py:259 msgid "Examples configuration" msgstr "" -#: src/rougail/output_doc/config.py:266 +#: src/rougail/output_doc/config.py:264 msgid "if example is not in \"_.contents\"" msgstr "" -#: src/rougail/output_doc/config.py:269 +#: src/rougail/output_doc/config.py:267 msgid "Add description of variables and families when generate examples" msgstr "" -#: src/rougail/output_doc/config.py:274 +#: src/rougail/output_doc/config.py:272 msgid "Comment in examples starts at column" msgstr "" -#: src/rougail/output_doc/doc.py:70 +#: src/rougail/output_doc/doc.py:58 msgid "{0} is not set as step.output" msgstr "" -#: src/rougail/output_doc/doc.py:363 -msgid "This family contains lists of variable blocks" -msgstr "" - -#: src/rougail/output_doc/doc.py:373 -msgid "This family builds families dynamically" -msgstr "" - -#: src/rougail/output_doc/doc.py:387 -msgid "Default" -msgstr "" - -#: src/rougail/output_doc/doc.py:405 -msgid "Example" -msgstr "" - -#: src/rougail/output_doc/doc.py:408 -msgid "Examples" -msgstr "" - -#: src/rougail/output_doc/doc.py:417 -msgid "Tag" -msgstr "" - -#: src/rougail/output_doc/doc.py:420 -msgid "Tags" -msgstr "" - -#: src/rougail/output_doc/doc.py:452 -msgid "No attribute \"description\" for \"{0}\" in {1}" -msgstr "" - -#: src/rougail/output_doc/doc.py:587 -msgid "text based with regular expressions \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/doc.py:591 -#: src/rougail/output_doc/tabular/six_columns.py:65 -msgid "Validator" -msgstr "" - -#: src/rougail/output_doc/doc.py:594 -msgid "Validators" -msgstr "" - -#: src/rougail/output_doc/doc.py:603 -msgid "Choices" -msgstr "" - -#: src/rougail/output_doc/doc.py:707 -msgid "the value of the identifier" -msgstr "" - -#: src/rougail/output_doc/doc.py:711 -msgid "the value of the information \"{0}\" of the variable \"{1}\"" -msgstr "" - -#: src/rougail/output_doc/doc.py:715 -msgid "the value of the global information \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/doc.py:717 -msgid "the value of the {0}" -msgstr "" - -#: src/rougail/output_doc/doc.py:724 -msgid "depends on a calculation" -msgstr "" - -#: src/rougail/output_doc/doc.py:730 -msgid "\"{0}\" is a calculation for {1} but has no description in {2}" -msgstr "" - -#: src/rougail/output_doc/doc.py:786 src/rougail/output_doc/doc.py:913 -msgid "depends on an undocumented variable" -msgstr "" - -#: src/rougail/output_doc/doc.py:804 -msgid "is \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/doc.py:809 -msgid "is accessible" -msgstr "" - -#: src/rougail/output_doc/doc.py:811 -msgid "is defined" -msgstr "" - -#: src/rougail/output_doc/doc.py:816 -msgid "hasn't the value \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/doc.py:820 -msgid "has the value \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/doc.py:825 -msgid "is {0}" -msgstr "" - -#: src/rougail/output_doc/doc.py:826 -msgid "when the variable \"{{0}}\" {0}" -msgstr "" - -#: src/rougail/output_doc/doc.py:853 -msgid "the value of the variable \"{0}\" if it is defined" -msgstr "" - -#: src/rougail/output_doc/doc.py:855 -msgid "the value of the variable \"{0}\"" -msgstr "" - -#: src/rougail/output_doc/doc.py:875 -msgid "the value of an undocumented variable" -msgstr "" - -#: src/rougail/output_doc/doc.py:878 -msgid "the values of undocumented variables" -msgstr "" - -#: src/rougail/output_doc/doc.py:901 -msgid "(from an undocumented variable)" -msgstr "" - -#: src/rougail/output_doc/doc.py:909 -msgid "{0} (from an undocumented variable)" -msgstr "" - -#: src/rougail/output_doc/example.py:70 +#: src/rougail/output_doc/example.py:96 msgid "Example with mandatory variables not filled in" msgstr "" -#: src/rougail/output_doc/example.py:85 +#: src/rougail/output_doc/example.py:98 msgid "Example with all variables modifiable" msgstr "" #: src/rougail/output_doc/output/asciidoc.py:156 -#: src/rougail/output_doc/output/console.py:199 +#: src/rougail/output_doc/output/console.py:201 #: src/rougail/output_doc/output/gitlab.py:44 msgid "Informations" msgstr "" -#: src/rougail/output_doc/tabular/five_columns.py:59 +#: src/rougail/output_doc/tabular/five_columns.py:72 msgid "Access control" msgstr "" -#: src/rougail/output_doc/tabular/four_columns.py:53 +#: src/rougail/output_doc/tabular/four_columns.py:64 msgid "Type" msgstr "" -#: src/rougail/output_doc/tabular/three_columns.py:46 +#: src/rougail/output_doc/tabular/three_columns.py:54 msgid "Default value" msgstr "" -#: src/rougail/output_doc/tabular/two_columns.py:45 +#: src/rougail/output_doc/tabular/two_columns.py:56 msgid "Variable" msgstr "" -#: src/rougail/output_doc/tabular/two_columns.py:47 +#: src/rougail/output_doc/tabular/two_columns.py:58 msgid "Description" msgstr "" -#: src/rougail/output_doc/utils.py:152 +#: src/rougail/output_doc/utils.py:198 msgid "Command line" msgstr "" -#: src/rougail/output_doc/utils.py:159 +#: src/rougail/output_doc/utils.py:216 msgid "Environment variable" msgstr "" -#: src/rougail/output_doc/utils.py:438 +#: src/rougail/output_doc/utils.py:526 msgid "Path" msgstr "" -#: src/rougail/output_doc/utils.py:448 +#: src/rougail/output_doc/utils.py:536 msgid "Identifiers" msgstr "" -#: src/rougail/output_doc/utils.py:668 src/rougail/output_doc/utils.py:677 -#: src/rougail/output_doc/utils.py:683 src/rougail/output_doc/utils.py:689 -#: src/rougail/output_doc/utils.py:693 +#: src/rougail/output_doc/utils.py:790 src/rougail/output_doc/utils.py:799 +#: src/rougail/output_doc/utils.py:805 src/rougail/output_doc/utils.py:811 +#: src/rougail/output_doc/utils.py:815 msgid "(default)" msgstr "" -#: src/rougail/output_doc/utils.py:945 +#: src/rougail/output_doc/utils.py:1123 msgid "{0}: {1}" msgstr "" diff --git a/src/rougail/output_doc/annotator.py b/src/rougail/output_doc/annotator.py index 84db3df77..0280b15c0 100644 --- a/src/rougail/output_doc/annotator.py +++ b/src/rougail/output_doc/annotator.py @@ -38,6 +38,7 @@ from rougail.convert.object_model import ( NamespaceCalculation, CONVERT_OPTION, ) + try: from rougail.user_data_risotto.utils import RisottoCalculation except ImportError as err: @@ -61,9 +62,7 @@ class Annotator(Walk): if "force_default_value" in kwargs: self.default_values = kwargs["force_default_value"] else: - self.default_values = self.objectspace.rougailconfig[ - "doc.default_values" - ] + self.default_values = self.objectspace.rougailconfig["doc.default_values"] self.regexp_description_get_paths = None self.populate_family() self.populate_variable() @@ -156,6 +155,7 @@ class Annotator(Walk): variable.choices, variable.version, ) + self.manage_test(variable) default = variable.default if default is None and path in self.objectspace.default_multi: default = self.objectspace.default_multi[path] @@ -171,12 +171,6 @@ class Annotator(Walk): variable.validators, variable.version, ) - if ( - self.default_values - and path in self.objectspace.leaders - and not default - ): - self.add_examples_values(variable) self.add_informations_from_properties(variable) if path in self.objectspace.forced_descriptions: self.objectspace.informations.add( @@ -185,6 +179,15 @@ class Annotator(Walk): True, ) + def manage_test(self, variable): + # for version 1.0 and 1.1 + values = self.objectspace.informations.get(variable.path).get("examples", None) + if values: + return + values = self.objectspace.informations.get(variable.path).get("test", None) + if values: + self.objectspace.informations.add(variable.path, "examples", values) + def add_informations_from_properties( self, variable: dict, @@ -291,9 +294,7 @@ class Annotator(Walk): "propertyerror": values.propertyerror, } if isinstance(values, InformationCalculation): - return self.calculation_to_information_information( - values, version, path - ) + return self.calculation_to_information_information(values, version, path) if isinstance(values, IdentifierPropertyCalculation): ret = {} self.when_to_condition(values, ret) @@ -314,9 +315,9 @@ class Annotator(Walk): if RisottoCalculation and isinstance(values, RisottoCalculation): # FIXME return { - "type": "risotto", - "value": True, - } + "type": "risotto", + "value": True, + } raise Exception(f'unknown calculation {type(values)} "{values}"') def calculation_to_information_variable( @@ -329,14 +330,15 @@ class Annotator(Walk): values.namespace, values.xmlfiles, ) - if not variable or (isinstance(values, VariableCalculation) and values.optional and not variable): + if not variable or ( + isinstance(values, VariableCalculation) and values.optional and not variable + ): return None values_calculation = {"path": variable.path} if identifiers: values_calculation["identifiers"] = identifiers if prop in PROPERTY_ATTRIBUTE: # get comparative value -# values_calculation["transitive"] = values.propertyerror == "transitive" self.when_to_condition(values, values_calculation) else: values_calculation["type"] = "variable" @@ -361,9 +363,10 @@ class Annotator(Walk): def calculation_to_information_information( self, values, version: str, path: str ) -> Union[str, bool]: - values_calculation = {"type": "information", - "information": values.information, - } + values_calculation = { + "type": "information", + "information": values.information, + } if values.variable: variable = self.objectspace.paths.get_with_dynamic( values.variable, diff --git a/src/rougail/output_doc/changelog.py b/src/rougail/output_doc/changelog.py index 0f9ccb42c..96b7c00d1 100644 --- a/src/rougail/output_doc/changelog.py +++ b/src/rougail/output_doc/changelog.py @@ -58,18 +58,34 @@ class Changelog: # pylint: disable=no-member,too-few-public-methods if previous["type"] == "variable": if "identifiers" in previous: for identifiers in previous["identifiers"]: - self._removed_variables.append(calc_path(previous["path"], self.formatter, identifiers)) + self._removed_variables.append( + calc_path( + previous["path"], + formatter=self.formatter, + identifiers=identifiers, + ) + ) else: - self._removed_variables.append(calc_path(previous["path"], self.formatter)) + self._removed_variables.append( + calc_path(previous["path"], formatter=self.formatter) + ) else: self.parser(previous["children"], {}) elif previous["type"] != new["type"]: if previous["type"] == "variable": if "identifiers" in previous: for identifiers in previous["identifiers"]: - self._removed_variables.append(calc_path(previous["path"], self.formatter, identifiers)) + self._removed_variables.append( + calc_path( + previous["path"], + formatter=self.formatter, + identifiers=identifiers, + ) + ) else: - self._removed_variables.append(calc_path(previous["path"], self.formatter)) + self._removed_variables.append( + calc_path(previous["path"], formatter=self.formatter) + ) self.parser({}, new["children"]) else: self._added_variables.append(new) @@ -143,7 +159,7 @@ class Changelog: # pylint: disable=no-member,too-few-public-methods [ self.formatter.title(title, self.level), self.formatter.tabular(), - self.formatter.end_family(self.level) + self.formatter.end_family(self.level), ], self.level, dico_is_already_treated=True, @@ -159,7 +175,7 @@ class Changelog: # pylint: disable=no-member,too-few-public-methods [ self.formatter.title(title, self.level), self.formatter.tabular(), - self.formatter.end_family(self.level) + self.formatter.end_family(self.level), ], self.level, dico_is_already_treated=True, @@ -173,7 +189,7 @@ class Changelog: # pylint: disable=no-member,too-few-public-methods [ self.formatter.title(title, self.level), self.formatter.list(self._removed_variables, inside_tabular=False), - self.formatter.end_family(self.level) + self.formatter.end_family(self.level), ], self.level, dico_is_already_treated=True, diff --git a/src/rougail/output_doc/collect.py b/src/rougail/output_doc/collect.py new file mode 100644 index 000000000..b207f9bd9 --- /dev/null +++ b/src/rougail/output_doc/collect.py @@ -0,0 +1,739 @@ +""" +Silique (https://www.silique.fr) +Copyright (C) 2024-2026 + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as published by the +Free Software Foundation, either version 3 of the License, or (at your +option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. + +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see . +""" + +from warnings import warn +from typing import Optional + +from tiramisu import Calculation, groups +from tiramisu.error import display_list, PropertiesOptionError +from rougail.tiramisu import display_xmlfiles +from rougail.utils import PROPERTY_ATTRIBUTE +from rougail.error import VariableCalculationDependencyError, RougailWarning, ExtensionError + +from .utils import dump, to_phrase, calc_path +from .i18n import _ + + +HIDDEN_PROPERTIES = [ + "hidden", + "disabled", +] + +DISABLED_PROPERTIES = ["disabled"] + + +class _ToString: + def _to_string( + self, + child, + prop, + do_not_raise=False, + ): + calculation = child.information.get(f"{prop}_calculation", None) + if not calculation: + if do_not_raise: + return None + raise ExtensionError( + _( + 'cannot find "{0}_calculation" information, ' + "do you have annotate this configuration?" + ).format(prop) + ) + if isinstance(calculation, list): + values = [] + for cal in calculation: + value = self._calculation_to_string(child, cal, prop) + if value is not None: + values.append(value) + return values + ret = self._calculation_to_string(child, calculation, prop) + if isinstance(ret, list) and len(ret) == 1: + return ret[0] + return ret + + def _calculation_to_string(self, child, calculation, attribute_type): + if "description" in calculation: + values = calculation + if self.document_a_type and "variables" in values: + for variable in list(values["variables"]): + variable["path"] = self.doc_path(variable["path"]) + + elif "type" not in calculation: + values = calculation["value"] + elif calculation["type"] == "jinja": + values = self._calculation_jinja_to_string( + child, calculation, attribute_type + ) + elif calculation["type"] == "variable": + values = self._calculation_variable_to_string( + child, calculation, attribute_type + ) + elif calculation["type"] == "identifier": + values = self._calculation_identifier_to_string( + child, calculation, attribute_type + ) + elif calculation["type"] == "information": + if "path" in calculation: + variable_path = self.doc_path(calculation["path"]) + values = _( + 'the value of the information "{0}" of the variable "{1}"' + ).format(calculation["information"], variable_path) + else: + values = _('the value of the global information "{0}"').format( + calculation["information"] + ) + else: + values = _("the value of the {0}").format(calculation["type"]) + return values + + def _calculation_jinja_to_string(self, child, calculation, attribute_type): + if calculation["value"] is not True: + values = calculation["value"] + else: + values = _("depends on a calculation") + warning = _( + '"{0}" is a calculation for {1} but has no description in {2}' + ).format( + attribute_type, + self.doc_path(child.path(uncalculated=True)), + display_xmlfiles(child.information.get("ymlfiles")), + ) + warn( + warning, + RougailWarning, + ) + return values + + def _calculation_variable_to_string(self, child, calculation, attribute_type): + if attribute_type in PROPERTY_ATTRIBUTE: + func = self._calculation_variable_to_string_known_property + else: + func = self._calculation_variable_to_string_not_properties + return func(child, calculation, attribute_type) + + def _calculation_variable_to_string_known_property(self, child, informations, prop): + condition = informations["value"] + variable_path = condition["path"] + values = [] + option = self.true_config.option(variable_path) + if option.isdynamic(): + variables = self._get_annotation_variable( + option, condition.get("identifiers") + ) + else: + option = self.true_config.option(variable_path) + try: + is_inaccessible = self.is_inaccessible_user_data(option) + except AttributeError as err: + if err.code != "option-not-found": + raise err from err + is_inaccessible = True + if is_inaccessible: + variables = [[None, None, None]] + else: + description = self._convert_description( + option.description(uncalculated=True), + "description", + its_a_path=False, + ) + variables = [[variable_path, description, None]] + for cpath, description, identifiers in variables: + if not cpath: + # we cannot access to this variable, so try with permissive + if condition["type"] == "transitive": + value = None + else: + value = condition["value"] + option = self.true_config.forcepermissive.option(variable_path) + try: + variable_value = self._get_unmodified_default_value(option) + except PropertiesOptionError as err: + if informations["propertyerror"] is True: + raise err from err + if informations["propertyerror"] == "transitive": + return True + return False + except VariableCalculationDependencyError: + values.append(_("depends on an undocumented variable")) + continue + except AttributeError as err: + return informations.get("default", False) + if condition["type"] == "transitive": + return True + if prop in HIDDEN_PROPERTIES: + condition_type = condition["condition"] + if ( + condition_type == "when" + and value == variable_value + or condition_type == "when_not" + and value != variable_value + ): + # always "prop" + return True + return False + if condition["type"] == "transitive": + submsg = _('is "{0}"').format(prop) + else: + condition_type = condition["condition"] + conditions = [] + if not informations["propertyerror"]: + conditions.append(_("is accessible")) + if informations["optional"]: + conditions.append(_("is defined")) + value = condition["value"] + if not isinstance(value, str): + value = dump(value) + if condition_type == "when_not": + conditions.append(_('hasn\'t the value "{0}"').format(value)) + else: + conditions.append(_('has the value "{0}"').format(value)) + submsg = display_list(conditions, sort=False) + if informations["propertyerror"] == "transitive": + submsg = display_list( + [_("is {0}").format(prop), submsg], separator="or", sort=False + ) + msg = _('when the variable "{{0}}" {0}').format(submsg) + path_obj = { + "path": self.doc_path(variable_path), + } + if identifiers: + path_obj["identifiers"] = identifiers + + values.append( + { + "message": msg, + "path": path_obj, + "description": description, + } + ) + if len(values) == 1: + return values[0] + return values + + def _calculation_variable_to_string_not_properties( + self, child, calculation, attribute_type + ): + variable = self.true_config.unrestraint.option(calculation["value"]["path"]) + if calculation["optional"]: + try: + variable.get() + except AttributeError: + return None + true_msg = _('the value of the variable "{0}" if it is defined') + else: + true_msg = _('the value of the variable "{0}"') + if not variable.isdynamic(): + func = self._calculation_normal_variable_to_string_not_properties + else: + func = self._calculation_dynamic_variable_to_string_not_properties + return func(variable, calculation["value"], true_msg) + + def _calculation_normal_variable_to_string_not_properties( + self, child, obj, true_msg + ): + isfollower = child.isfollower() + if not isfollower and self.is_inaccessible_user_data(child): + uncalculated = child.value.default(uncalculated=True) + if uncalculated and not isinstance(uncalculated, Calculation): + if isinstance(uncalculated, list): + return { + "submessage": _("(from an undocumented variable)"), + "values": uncalculated, + } + else: + if not isinstance(uncalculated, str): + uncalculated = dump(uncalculated) + true_msg = _("{0} (from an undocumented variable)").format( + uncalculated + ) + else: + true_msg = _("the value of an undocumented variable") + try: + description = self._convert_description( + child.description(uncalculated=True), "description", its_a_path=False + ) + except AttributeError: + description = path + return { + "message": true_msg, + "path": obj, + "description": description, + } + + def _calculation_dynamic_variable_to_string_not_properties( + self, child, obj, true_msg + ): + values = [] + for path, description, identifiers in self._get_annotation_variable( + child, obj.get("identifiers") + ): + cpath = calc_path(path, identifiers=identifiers) + variable = self.true_config.option(cpath) + path_obj = { + "path": self.doc_path(path), + } + if identifiers: + path_obj["identifiers"] = identifiers + values.append( + self._calculation_normal_variable_to_string_not_properties( + variable, path_obj, true_msg + ) + ) + return values + + def _calculation_identifier_to_string(self, child, calculation, attribute_type): + if attribute_type in PROPERTY_ATTRIBUTE: + if calculation["condition"] == "when": + return _('when the identifier is "{0}"').format(calculation["value"]) + if calculation["condition"] == "when_not": + return _('when the identifier is not "{0}"').format( + calculation["value"] + ) + return True + else: + return _("the value of the identifier") + + def doc_path(self, path): + if self.document_a_type: + if not "." in path: + return None + return path.split(".", 1)[-1] + return path + + def _get_annotation_variable(self, child, ori_identifiers): + path = child.path(uncalculated=True) + if ori_identifiers: + if None in ori_identifiers: + all_identifiers = self.true_config.option( + calc_path(path, identifiers=ori_identifiers) + ).identifiers() + else: + all_identifiers = [ori_identifiers] + else: + all_identifiers = child.identifiers() + for identifiers in all_identifiers: + cpath = calc_path(path, identifiers=identifiers) + description = self._convert_description( + child.description(uncalculated=True), "description", its_a_path=False + ) + if child.isdynamic(): + yield path, description, identifiers.copy() + else: + yield path, description, None + + +class Collect(_ToString): + def collect_families(self, family) -> dict: + informations = {} + for child in family.list(uncalculated=True): + if child.type(only_self=True) == "symlink" or ( + not child.isdynamic() and self.is_inaccessible_user_data(child) + ): + # do not document symlink option or inacesssible variable + # (dynamic variable could be accessible only in one context) + continue + if child.isoptiondescription(): + func = self.collect_family + else: + func = self.collect_variable + func(child, informations) + return informations + + def collect_family(self, family, informations: dict) -> None: + family_type = self._get_family_type(family) + family_informations = self._collect_family(family, family_type) + if family_informations is False: + return + sub_informations = self.collect_families(family) + if not sub_informations: + # a family without subfamily/subvariable + return + name = family.name(uncalculated=True) + informations[name] = { + "type": family_type, + "informations": family_informations, + "children": sub_informations, + } + + def _get_family_type(self, family) -> str: + if self.support_namespace and family.group_type() is groups.namespace: + return "namespace" + if family.isleadership(): + return "leadership" + if family.isdynamic(only_self=True): + return "dynamic" + return "family" + + def _collect_family( + self, + family, + family_type, + *, + with_identifier: bool = True, + current_identifier_only: bool = False, + ) -> dict: + path = family.path(uncalculated=True) + informations = {} + if not self._collect(family, informations, family_type=family_type): + return False, [] + if family_type == "leadership": + informations.setdefault("help", []).append( + _("This family contains lists of variable blocks") + ) + elif family_type == "dynamic": + informations.setdefault("help", []).append( + _("This family builds families dynamically") + ) + if with_identifier: + identifier = self._to_string(family, "dynamic", do_not_raise=True) + if identifier is None: + identifier = family.identifiers(only_self=True) + if not isinstance(identifier, list): + identifier = [identifier] + informations["identifier"] = identifier + elif family_type == "namespace": + informations.setdefault("help", []).append(_("This family is a namespace")) + return informations + + def collect_variable( + self, + child, + informations: dict, + *, + only_one=False, + ) -> Optional[dict]: + name = child.name(uncalculated=True) + sub_informations = {} + if not self._collect_variable( + child, + sub_informations, + ): + return None + informations[name] = sub_informations + if child.isleader(): + # if not self.default_values: + # child.value.set(sub_informations["gen_examples"][0]) + return sub_informations + return None + + def _collect_variable( + self, + child, + informations: dict, + ): + if not self._collect(child, informations): + return False + informations["type"] = "variable" + default = self._set_default( + child, + informations, + ) + self._parse_type( + child, + informations, + ) + if child.ismulti(): + multi = not child.isfollower() or child.issubmulti() + else: + multi = False + if multi: + informations["multiple"] = True + examples = child.information.get("examples", None) + if examples is None: + examples = child.information.get("test", None) + if examples is not None: + if len(examples) == 1: + name = _("Example") + values = examples[0] + else: + name = _("Examples") + values = list(examples) + informations["examples"] = {"name": name, "values": values} + tags = child.information.get("tags", None) + if tags: + if len(tags) == 1: + name = _("Tag") + values = tags[0] + else: + name = _("Tags") + values = list(tags) + informations["tags"] = { + "name": name, + "values": values, + } + alternative_name = child.information.get("alternative_name", None) + if alternative_name: + informations["alternative_name"] = alternative_name + return True + + def _collect( + self, + child, + informations: dict, + *, + family_type: str = None, + ): + display, properties = self._get_properties(child, informations) + if not display: + return False + informations["path"] = self.doc_path(child.path(uncalculated=True)) + informations["name"] = child.name(uncalculated=True) + description = self._get_description(child, family_type) + if description is not None: + informations["description"] = description + help_ = child.information.get("help", None) + if help_: + informations["help"] = [to_phrase(help_)] + if "properties" in informations: + informations["properties"].extend(properties) + else: + informations["properties"] = properties + properties = child.property.get(uncalculated=True) + for mode in self.modes_level: + if mode not in properties: + continue + informations["mode"] = mode + break + if child.isdynamic(): + informations["identifiers"] = [] + path = child.path(uncalculated=True) + if child.has_identifiers(): + identifiers = child.identifiers() + else: + identifiers = [child.identifiers()] + for identifier in identifiers: + cpath = calc_path(path, identifiers=identifier) + child_identifier = self.true_config.option(cpath) + if not self.is_inaccessible_user_data(child_identifier): + informations["identifiers"].append(identifier) + if not informations["identifiers"]: + informations["identifiers"] = [["example"]] + return True + + def _parse_type( + self, + child, + informations, + ): + variable_type = child.information.get("type") + doc_type = self.convert_option.get(variable_type, {"params": {}}) + informations["variable_type"] = doc_type.get("msg", variable_type) + # extra parameters for types + option = child.get() + validators = [] + if "params" in doc_type: + for param, msg in doc_type["params"].items(): + value = option.impl_get_extra(f"_{param}") + if value is None: + value = option.impl_get_extra(param) + if value is not None and value is not False: + if isinstance(value, set): + value = list(value) + if isinstance(value, list): + value = display_list(value, add_quote=True) + if "doc" in msg: + validators.append(msg["doc"].format(value)) + else: + validators.append(msg["description"].format(value)) + + # get validation information from annotator + for name in child.information.list(): + if not name.startswith("validators_calculation"): + continue + validators.extend( + self._to_string( + child, + "validators", + ) + ) + break + if variable_type == "regexp": + validators.append( + _('text based with regular expressions "{0}"').format(child.pattern()) + ) + if validators: + if len(validators) == 1: + key = _("Validator") + validators = validators[0] + else: + key = _("Validators") + informations["validators"] = {"name": key, "values": validators} + if variable_type == "choice": + choices = self._to_string(child, "choice", do_not_raise=True) + if choices is None: + choices = child.value.list(uncalculated=True) + for idx, val in enumerate(choices): + if isinstance(val, Calculation): + choices[idx] = self._to_string(child, "choice", f"_{idx}") + informations["choices"] = {"name": _("Choices"), "values": choices} + + def _get_properties( + self, + child, + child_informations, + ): + informations = [] + properties = child.property.get(uncalculated=True) + if "not_for_commandline" in properties: + child_informations["not_for_commandline"] = True + for prop, translated_prop in self.property_to_string: + annotation = False + if child.information.get(f"{prop}_calculation", False): + annotation = self._to_string(child, prop) + if annotation is None and prop in HIDDEN_PROPERTIES: + return False, [] + if annotation is True and prop in DISABLED_PROPERTIES: + return False, [] + if not annotation: + continue + elif prop not in properties: + # this property is not in the variable so, do not comment it + continue + elif prop in HIDDEN_PROPERTIES: + return False, [] + prop_obj = { + "type": "property", + "name": translated_prop, + "ori_name": prop, + "access_control": prop in HIDDEN_PROPERTIES, + } + if annotation: + prop_obj["annotation"] = annotation + informations.append(prop_obj) + return True, informations + + def _set_default( + self, + child, + informations, + ): + default = self._to_string(child, "default", do_not_raise=True) + if default is None and child.information.get("default_value_makes_sense", True): + default_ = child.value.default(uncalculated=True) + if not isinstance(default_, Calculation): + default = default_ + if default == []: + default = None + if default is not None: + informations["default"] = {"name": _("Default"), "values": default} + + def _get_description(self, child, family_type): + if child.information.get("forced_description", False): + if ( + child.isoptiondescription() + or not child.isfollower() + or not child.index() + ): + # all variables must have description but display error only for first slave + msg = _('No attribute "description" for "{0}" in {1}').format( + child.path(uncalculated=True), + display_xmlfiles(child.information.get("ymlfiles")), + ) + warn( + msg, + RougailWarning, + ) + if family_type is not None: + # it's a vaariable + return self._convert_description( + child.description(uncalculated=True), "family", its_a_path=True + ) + return None + var_type = "variable" if family_type is None else "family" + return self._convert_description( + child.description(uncalculated=True), var_type, its_a_path=False + ) + + def _convert_description(self, description, type_, its_a_path=False): + if not its_a_path: + description = to_phrase(description, type_) + return description + + def is_inaccessible_user_data(self, child, *, only_disabled=False): + """If family is not accessible in read_write mode (to load user_data), + do not comment this family + """ + properties = child.property.get(uncalculated=True) + if only_disabled: + hidden_properties = DISABLED_PROPERTIES + else: + hidden_properties = HIDDEN_PROPERTIES + for hidden_property in hidden_properties: + if hidden_property in properties: + return True + + calculation = child.information.get(f"{hidden_property}_calculation", None) + if calculation: + calculation_type = calculation.get("type") + if ( + calculation_type == "variable" + and calculation["value"]["type"] == "condition" + ): + condition = calculation["value"] + variable = self.true_config.forcepermissive.option( + condition["path"] + ) + try: + variable.value.get() + except AttributeError: + variable = None + if variable and self.is_inaccessible_user_data( + variable, only_disabled=only_disabled + ): + try: + variable_value = self._get_unmodified_default_value( + variable + ) + except VariableCalculationDependencyError: + pass + else: + condition_type = condition["condition"] + value = condition["value"] + if self.calc_condition_when( + condition_type, value, variable_value + ): + return True + elif calculation_type == "identifier": + if self.calc_condition_when( + calculation["condition"], + calculation["value"], + child.identifiers()[-1], + ): + return True + if not child.isoptiondescription(): + for hidden_property in self.disabled_modes: + if hidden_property in properties: + return True + return False + + def calc_condition_when(self, condition, value, current_value): + return (condition == "when" and value == current_value) or ( + condition == "when_not" and value != current_value + ) + + def _get_unmodified_default_value(self, child): + calculation = child.information.get(f"default_calculation", None) + if not calculation: + return child.value.get() + if calculation["type"] == "variable": + variable = self.true_config.forcepermissive.option( + calculation["value"]["path"] + ) + if variable and self.is_inaccessible_user_data(variable): + return self._get_unmodified_default_value(variable) + raise VariableCalculationDependencyError() diff --git a/src/rougail/output_doc/config.py b/src/rougail/output_doc/config.py index c607c9324..1f098d14b 100644 --- a/src/rougail/output_doc/config.py +++ b/src/rougail/output_doc/config.py @@ -51,15 +51,13 @@ def get_outputs_or_tabulars(type_) -> None: level = obj_class.level if level in outputs: raise ImportError( - _('duplicated level rougail-output-doc for {0} "{1}": {2} and {3}').format( - type_, level, obj_class.name, outputs[level].name - ) + _( + 'duplicated level rougail-output-doc for {0} "{1}": {2} and {3}' + ).format(type_, level, obj_class.name, outputs[level].name) ) if obj_class.name in names: raise ImportError( - _('duplicated name "{0}" in rougail-output-doc').format( - obj_class.name - ) + _('duplicated name "{0}" in rougail-output-doc').format(obj_class.name) ) names.append(obj_class.name) outputs[level] = obj_class @@ -114,7 +112,7 @@ cli: type: boolean default: jinja: |- - {{{{ __.step.output is not propertyerror and "doc" in __.step.output }}}} + {{{{ step.output is not propertyerror and step.output != "doc" }}}} description: {_('is true if doc is activate')} doc: @@ -124,7 +122,7 @@ doc: jinja: |- {{{{ step.output is propertyerror or step.output != 'doc' }}}} return_type: boolean - description: {_('if doc is not set in "step.output"')} + description: {_('if "step.output" is not doc')} output_format: description: {_('The output format of the generated documentation')} @@ -210,7 +208,7 @@ doc: description: {_('Variables and changelog documentation')} disabled: jinja: |- - {{{{ step.output is propertyerror or "doc" not in step.output or _.output_format == "json" or ("variables" not in _.contents and "changelog" not in _.contents) }}}} + {{{{ step.output is propertyerror or step.output != "doc" or _.output_format == "json" or ("variables" not in _.contents and "changelog" not in _.contents) }}}} return_type: boolean description: {_('if "_.output_format" is json or "_.contents" hasn\'t variables or changelog')} @@ -248,7 +246,7 @@ doc: description: {_('Changelog documentation')} disabled: jinja: |- - {{{{ step.output is propertyerror or "doc" not in step.output or _.output_format == "json" or "changelog" not in _.contents }}}} + {{{{ step.output is propertyerror or step.output != "doc" or _.output_format == "json" or "changelog" not in _.contents }}}} return_type: boolean description: {_('if changelog in not in "_.contents"')} @@ -261,7 +259,7 @@ doc: description: {_('Examples configuration')} disabled: jinja: |- - {{{{ step.output is propertyerror or "doc" not in step.output or "example" not in _.contents }}}} + {{{{ step.output is propertyerror or step.output != "doc" or "example" not in _.contents }}}} return_type: boolean description: {_('if example is not in "_.contents"')} @@ -285,4 +283,5 @@ doc: "level": 50, } + __all__ = ("OutPuts", "get_rougail_config") diff --git a/src/rougail/output_doc/doc.py b/src/rougail/output_doc/doc.py index f153f58ef..081fddf43 100644 --- a/src/rougail/output_doc/doc.py +++ b/src/rougail/output_doc/doc.py @@ -16,36 +16,23 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . """ -from warnings import warn -from typing import Optional, Union -from itertools import chain -from re import compile +from typing import Union -from tiramisu import Calculation, groups -from tiramisu.error import ConfigError, display_list, PropertiesOptionError -from rougail.tiramisu import display_xmlfiles, normalize_family -from rougail.utils import undefined, get_properties_to_string, PROPERTY_ATTRIBUTE -from rougail.error import VariableCalculationDependencyError, RougailWarning +from tiramisu import groups +from rougail.utils import get_properties_to_string from .config import OutPuts from .i18n import _ -from .utils import dump, to_phrase, calc_path -from .example import Examples +from .collect import Collect from .changelog import Changelog +from .example import Examples -HIDDEN_PROPERTIES = [ - "hidden", - "disabled", -] - -DISABLED_PROPERTIES = ["disabled"] - - -class RougailOutputDoc(Examples, Changelog): +class RougailOutputDoc(Collect, Examples, Changelog): """Rougail Output Doc: Generate documentation from rougail description files """ + output_name = "doc" def __init__( @@ -54,6 +41,7 @@ class RougailOutputDoc(Examples, Changelog): *, rougailconfig: "RougailConfig" = None, true_config: "Config" = None, + root_config: "Config" = None, **kwargs, ): # Import here to avoid circular import @@ -73,6 +61,10 @@ class RougailOutputDoc(Examples, Changelog): self.true_config = config else: self.true_config = true_config + if root_config is None: + self.root_config = self.true_config + else: + self.root_config = root_config self.rougailconfig = rougailconfig self.informations = None self.formatter = None @@ -94,7 +86,9 @@ class RougailOutputDoc(Examples, Changelog): def load_formatter(self) -> str: output_format = self.rougailconfig["doc.output_format"] - self.formatter = self.outputs[output_format](self.rougailconfig, support_namespace=self.support_namespace) + self.formatter = self.outputs[output_format]( + self.rougailconfig, support_namespace=self.support_namespace + ) def print(self) -> None: ret, data = self.run() @@ -104,6 +98,7 @@ class RougailOutputDoc(Examples, Changelog): def load(self): self.document_a_type = self.rougailconfig["doc.document_a_type"] self.modes_level = self.rougailconfig["modes_level"] + self.default_values = self.rougailconfig["doc.default_values"] self.disabled_modes = [] if self.modes_level: for mode in self.modes_level: @@ -119,866 +114,46 @@ class RougailOutputDoc(Examples, Changelog): self.property_to_string = get_properties_to_string() self.outputs = OutPuts().get() self.dynamic_paths = {} - if self.config.type() in ['config', 'metaconfig', 'groupconfig', 'mixconfig']: - self.populate_dynamics(config=self.true_config.unrestraint) + if self.config.isoptiondescription(): + informations = self.collect_families(self.config.unrestraint) else: - family = self.true_config - one_is_dynamic = False - for path in self.config.path().split('.'): - family = family.option(path) - if family.isdynamic(): - self.populate_dynamic(family, False, False) - one_is_dynamic = True - if family.isoptiondescription() and one_is_dynamic: - self.populate_dynamics(config=family) - if not self.config.isoptiondescription(): informations = {} - self.parse_variable(self.config.unrestraint, None, informations) - else: - informations = self.parse_families(self.config.unrestraint) + self.collect_variable(self.config, informations) if informations is None: informations = {} - elif self.config.type() not in ['config', 'metaconfig', 'groupconfig', 'mixconfig']: + if self.true_config != self.config: + # build cache for dyn family root_informations = {} infos = root_informations - family = self.true_config - for path in self.config.path().split('.'): + family = self.root_config + for path in self.config.path().split("."): family = family.option(path) name = family.name(uncalculated=True) if family.isoptiondescription(): - infos[name] = self.get_root_family(family, with_identifier=False) + infos[name] = self.get_root_family(family) infos = infos[name]["children"] - infos.update(informations) + else: + if name not in informations: + informations = {} + else: + infos[name] = informations[name] + break + else: + infos.update(informations) informations = root_informations self.informations = informations - def get_root_family(self, family, with_identifier=True): - family_informations = self._populate_family( - family, with_identifier=with_identifier + def get_root_family(self, family): + family_type = self._get_family_type(family) + family_informations = self._collect_family( + family, + family_type, + with_identifier=False, + current_identifier_only=False, ) if family_informations is not False: return { - "type": self._get_family_type(family), + "type": family_type, "informations": family_informations, "children": {}, } - - def populate_dynamics(self, *, config=None, reload=False): - # "reload" is used in rougail-user-data-html - if config is None: - config = self.config.unrestraint - self._populate_dynamics(config, reload) - - def _populate_dynamics(self, family, reload, uncalculated=False) -> None: - def populate(child, uncalculated): - if child.isdynamic(): - self.populate_dynamic(child, reload, uncalculated) - if child.isoptiondescription(): - self._populate_dynamics(child, reload, uncalculated) - for child in family.list(uncalculated=uncalculated): - populate(child, uncalculated) - if not uncalculated: - for child in family.list(uncalculated=True): - if child.isdynamic() and child.path(uncalculated=True) not in self.dynamic_paths: - populate(family, uncalculated=True) - - def populate_dynamic(self, obj, reload, uncalculated) -> None: - path = obj.path(uncalculated=True) - if path not in self.dynamic_paths: - new_name = True - description = obj.description(uncalculated=True) - name = obj.name(uncalculated=True) - self.dynamic_paths[path] = { - "names": [], - "identifiers": [], - "path": self.doc_path(path), - } - if obj.isoptiondescription(): - type_ = "family" - else: - type_ = "variable" - if not obj.information.get("forced_description", False): - self.dynamic_paths[path]["description"] = self._convert_description( - description, type_, its_a_path=False - ) - elif obj.isoptiondescription(): - self.dynamic_paths[path]["description"] = self._convert_description( - description, type_, its_a_path=True - ) - if uncalculated: - return - dynamic_obj = self.dynamic_paths[path] - if reload and obj.identifiers() in dynamic_obj["identifiers"]: - return - dynamic_obj["names"].append(obj.name()) - dynamic_obj["identifiers"].append(obj.identifiers()) - - def parse_families(self, family) -> dict: - informations = {} - leader = None - for child in family.list(): - if self.is_inaccessible_user_data(child): - continue - if child.type(only_self=True) == "symlink": - continue - if not child.isoptiondescription(): - leader = self.parse_variable(child, leader, informations) - else: - self.parse_family(child, informations) - return informations - - def is_inaccessible_user_data(self, child): - """If family is not accessible in read_write mode (to load user_data), - do not comment this family - """ - properties = child.property.get(uncalculated=True) - for hidden_property in HIDDEN_PROPERTIES: - if hidden_property in properties: - return True - - calculation = child.information.get(f"{hidden_property}_calculation", None) - if calculation and calculation.get("type") == "variable" and calculation["value"]["type"] == "condition": - condition = calculation["value"] - variable = self.true_config.forcepermissive.option(condition["path"]) - try: - variable.value.get() - except AttributeError: - variable = None - if variable and self.is_inaccessible_user_data(variable): - try: - variable_value = self._get_unmodified_default_value(variable) - except VariableCalculationDependencyError: - pass - else: - condition_type = condition["condition"] - value = condition["value"] - if (condition_type == "when" and value == variable_value) or (condition_type == "when_not" and value != variable_value): - return True - if not child.isoptiondescription(): - for hidden_property in self.disabled_modes: - if hidden_property in properties: - return True - return False - - def parse_family(self, family, informations: dict, *, force_injection=False) -> None: - sub_informations = self.parse_families(family) - if not force_injection and not sub_informations: - return - # if self.with_family: - family_informations = self._populate_family( - family, - ) - if family_informations is not False: - name = family.name(uncalculated=True) - informations[name] = { - "type": self._get_family_type(family), - "informations": family_informations, - "children": sub_informations, - } - - def parse_variable( - self, - variable, - leader: dict, - informations: dict, - *, - only_one=False, - ) -> Optional[dict]: - path = variable.path(uncalculated=True) - name = variable.name(uncalculated=True) - potential_leader = None - if variable.isdynamic(): - # information is already set - potential_leader = self._parse_variable_dynamic( - variable, leader, name, path, informations, only_one - ) - elif variable.isfollower() and variable.index(): - self._parse_variable_follower_with_index( - variable, leader, name, informations - ) - else: - potential_leader = self.parse_variable_normal( - variable, leader, name, path, informations - ) - if potential_leader: - leader = potential_leader - return leader - - def parse_variable_normal( - self, variable, leader, name: str, path: str, informations: dict - ) -> Optional[dict]: - if variable.isdynamic(): - sub_informations = self.dynamic_paths[path] - elif variable.isfollower() and path in informations: # variable.index(): - sub_informations = informations[name] - else: - sub_informations = {} - if not self._populate_variable( - variable, - sub_informations, - ): - return None - self._add_examples(variable, sub_informations, leader) - informations[name] = sub_informations - if variable.isleader(): - return sub_informations - return None - - def _parse_variable_follower_with_index( - self, variable, leader: dict, name: str, informations: dict - ) -> None: - if (variable.index() + 1) > len(leader["gen_examples"][-1]): - return - informations[name]["gen_examples"][-1][variable.index()] = self._get_example( - variable, informations[name], None - ) - - def _parse_variable_dynamic( - self, variable, leader, name, path, informations, only_one - ) -> None: - dynamic_variable = self.dynamic_paths[path] - if (not only_one or path in informations) and "type" in dynamic_variable: - dynamic_variable["gen_examples"].append( - self._get_example(variable, dynamic_variable, leader) - ) - if variable.isleader(): - return dynamic_variable - if not only_one: - return None - return self.parse_variable_normal(variable, leader, name, path, informations) - - def _get_family_type(self, family) -> str: - if self.support_namespace and family.group_type() is groups.namespace: - return "namespace" - if family.isleadership(): - return "leadership" - if family.isdynamic(only_self=True): - return "dynamic" - return "family" - - def _populate_family( - self, - family, - *, - with_identifier: bool=True, - ) -> dict: - path = family.path(uncalculated=True) - if family.isdynamic(): - informations = self.dynamic_paths[path] - else: - informations = {} - if not self._populate(family, informations, "family"): - return False - if family.isleadership(): - informations.setdefault("help", []).append( - _("This family contains lists of variable blocks") - ) - if family.isdynamic(only_self=True): - if with_identifier: - identifiers = self._to_string(family, "dynamic", do_not_raise=True) - if identifiers is None: - identifiers = family.identifiers(only_self=True) - if not isinstance(identifiers, list): - identifiers = [identifiers] - informations["identifier"] = identifiers - informations.setdefault("help", []).append( - _("This family builds families dynamically") - ) - return informations - - def _populate_variable( - self, - variable, - informations: dict, - ): - informations["type"] = "variable" - default = self._get_default( - variable, - ) - if default is not None: - informations["default"] = {"name": _("Default"), "values": default} - self._parse_type( - variable, - informations, - ) - if not self._populate(variable, informations, "variable"): - return False - if variable.ismulti(): - multi = not variable.isfollower() or variable.issubmulti() - else: - multi = False - if multi: - informations["multiple"] = True - examples = variable.information.get("examples", None) - if examples is None: - examples = variable.information.get("test", None) - if examples is not None: - if len(examples) == 1: - name = _("Example") - values = examples[0] - else: - name = _("Examples") - values = list(examples) - informations["examples"] = { - "name": name, - "values": values - } - tags = variable.information.get("tags", None) - if tags: - if len(tags) == 1: - name = _("Tag") - values = tags[0] - else: - name = _("Tags") - values = list(tags) - informations["tags"] = { - "name": name, - "values": values, - } - alternative_name = variable.information.get("alternative_name", None) - if alternative_name: - informations["alternative_name"] = alternative_name - return True - - def _populate( - self, - child, - informations: dict, - type_: str, - ): - need_disabled, properties = self._parse_properties(child, informations) - if not need_disabled: - return False - name = child.name(uncalculated=True) - if child.information.get("forced_description", False): - if ( - not child.isoptiondescription() - or not self.support_namespace - or child.group_type() is not groups.namespace - ): - if ( - child.isoptiondescription() - or not child.isfollower() - or not child.index() - ): - warning = _('No attribute "description" for "{0}" in {1}').format( - child.path(uncalculated=True), - display_xmlfiles(child.information.get("ymlfiles")), - ) - warn( - warning, - RougailWarning, - ) - if child.isoptiondescription(): - description = self._convert_description( - child.description(uncalculated=True), type_, its_a_path=True - ) - else: - description = None - else: - description = self._convert_description( - child.description(uncalculated=True), type_, its_a_path=False - ) - if not child.isdynamic(): - informations["path"] = self.doc_path(child.path(uncalculated=True)) - informations["names"] = [child.name()] - if description is not None: - informations["description"] = description - help_ = child.information.get("help", None) - if help_: - informations["help"] = [to_phrase(help_)] - if "properties" in informations: - informations["properties"].extend(properties) - else: - informations["properties"] = properties - properties = child.property.get(uncalculated=True) - for mode in self.modes_level: - if mode not in properties: - continue - informations["mode"] = mode - break - return True - - def _convert_description(self, description, type_, its_a_path=False): - if not its_a_path: - description = to_phrase(description, type_) - return description - - def _add_examples(self, variable, informations: dict, leader) -> None: - if not variable.index(): - example = self._get_example(variable, informations, leader) - informations["gen_examples"] = [example] - informations["mandatory_without_value"] = "mandatory" in variable.property.get( - uncalculated=True - ) and ( - not variable.information.get("default_value_makes_sense", True) - or variable.value.get(uncalculated=True) in [None, []] - ) - - def _get_example(self, variable, informations: dict, leader): - example = informations.get("examples", {}).get("values") - if example is not None: - if isinstance(example, tuple): - example = list(example) - if informations.get("multiple"): - if not isinstance(example, list): - example = [example] - else: - 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 - else: - try: - default = variable.value.get() - except ConfigError: - default = None - if default not in [None, []]: - example = default - else: - example = self.get_type_default_value( - variable, informations - ) - if leader is not None and variable.isfollower(): - example = [example] + [undefined] * (len(leader["gen_examples"][-1]) - 1) - return example - - def get_type_default_value(self, variable, informations): - example = self.convert_option.get(variable.information.get("type"), {}).get( - "example", None - ) - if example is None: - example = "xxx" - if informations.get("multiple"): - example = [example] - return example - - def _parse_type( - self, - child, - informations, - ): - variable_type = child.information.get("type") - doc_type = self.convert_option.get(variable_type, {"params": {}}) - informations["variable_type"] = doc_type.get("msg", variable_type) - # extra parameters for types - option = child.get() - validators = [] - if "params" in doc_type: - for param, msg in doc_type["params"].items(): - value = option.impl_get_extra(f"_{param}") - if value is None: - value = option.impl_get_extra(param) - if value is not None and value is not False: - if isinstance(value, set): - value = list(value) - if isinstance(value, list): - value = display_list(value, add_quote=True) - if "doc" in msg: - validators.append(msg['doc'].format(value)) - else: - validators.append(msg['description'].format(value)) - - # get validation information from annotator - for name in child.information.list(): - if not name.startswith("validators_calculation"): - continue - validators.extend( - self._to_string( - child, - "validators", - ) - ) - break - if variable_type == "regexp": - validators.append( - _('text based with regular expressions "{0}"').format(child.pattern()) - ) - if validators: - if len(validators) == 1: - key = _("Validator") - validators = validators[0] - else: - key = _("Validators") - informations["validators"] = {"name": key, "values": validators} - if variable_type == "choice": - choices = self._to_string(child, "choice", do_not_raise=True) - if choices is None: - choices = child.value.list() - for idx, val in enumerate(choices): - if isinstance(val, Calculation): - choices[idx] = self._to_string(child, "choice", f"_{idx}") - informations["choices"] = {"name": _("Choices"), "values": choices} - - def _parse_properties( - self, - child, - child_informations, - ): - informations = [] - properties = child.property.get(uncalculated=True) - for prop, translated_prop in self.property_to_string: - if "not_for_commandline" in properties: - child_informations["not_for_commandline"] = True - continue - if prop in properties: - prop_obj = { - "type": "property", - "name": translated_prop, - "ori_name": prop, - "access_control": prop in HIDDEN_PROPERTIES, - } - elif child.information.get(f"{prop}_calculation", False): - annotation = self._to_string(child, prop) - if annotation is None or isinstance(annotation, bool): - if (annotation is None and prop in HIDDEN_PROPERTIES) or (annotation is True and prop in DISABLED_PROPERTIES): - return False, {} - if not annotation or prop in DISABLED_PROPERTIES: - continue - prop_obj = { - "type": "property", - "name": translated_prop, - "ori_name": prop, - "access_control": prop in HIDDEN_PROPERTIES, - } - else: - prop_obj = { - "type": "property", - "name": translated_prop, - "ori_name": prop, - "access_control": prop in HIDDEN_PROPERTIES, - "annotation": annotation, - } - else: - # this property is not in the variable so, do not comment it - continue - informations.append(prop_obj) - return True, informations - - def _get_default( - self, - variable, - ): - default = self._to_string(variable, "default", do_not_raise=True) - if default is not None: - if default == []: - default = None - return default - if variable.information.get("default_value_makes_sense", True): - default_ = variable.value.get(uncalculated=True) - if not isinstance(default_, Calculation): - default = default_ - if default == []: - default = None - return default - - def _to_string( - self, - child, - prop, - do_not_raise=False, - ): - calculation = child.information.get(f"{prop}_calculation", None) - if not calculation: - if do_not_raise: - return None - raise Exception( - f'cannot find "{prop}_calculation" information, ' - "do you have declare doc has a plugins?" - ) - if isinstance(calculation, list): - values = [] - for cal in calculation: - value = self._calculation_to_string(child, cal, prop) - if value is not None: - values.append(value) - return values - return self._calculation_to_string(child, calculation, prop) - - def _calculation_to_string(self, child, calculation, attribute_type): - if "description" in calculation: - values = calculation - if self.document_a_type and "variables" in values: - for variable in list(values["variables"]): - variable["path"] = self.doc_path(variable["path"]) - - elif "type" not in calculation: - values = calculation["value"] - elif calculation["type"] == "jinja": - values = self._calculation_jinja_to_string(child, calculation, attribute_type) - elif calculation["type"] == "variable": - values = self._calculation_variable_to_string(child, calculation, attribute_type) - elif calculation["type"] == "identifier": - if attribute_type in PROPERTY_ATTRIBUTE: - values = calculation["value"] - else: - values = _("the value of the identifier") - elif calculation["type"] == "information": - if "path" in calculation: - variable_path = self.doc_path(calculation["path"]) - values = _('the value of the information "{0}" of the variable "{1}"').format( - calculation["information"], variable_path - ) - else: - values = _('the value of the global information "{0}"').format(calculation["information"]) - else: - values = _("the value of the {0}").format(calculation["type"]) - return values - - def _calculation_jinja_to_string(self, child, calculation, attribute_type): - if calculation["value"] is not True: - values = calculation["value"] - else: - values = _("depends on a calculation") - 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( - attribute_type, - self.doc_path(child.path()), - display_xmlfiles(child.information.get("ymlfiles")), - ) - warn( - warning, - RougailWarning, - ) - return values - - def _calculation_variable_to_string(self, child, calculation, attribute_type): - if attribute_type in PROPERTY_ATTRIBUTE: - func = self._calculation_variable_to_string_known_property - else: - func = self._calculation_variable_to_string_not_properties - return func(child, calculation, attribute_type) - - def _calculation_variable_to_string_known_property(self, child, calculation, prop): - condition = calculation["value"] - variable_path = condition["path"] - values = [] - if "{{ identifier }}" in calculation["ori_path"] or "{{ identifier }}" in variable_path: - variables = self.get_annotation_variable(variable_path, calculation["ori_path"]) - else: - option = self.true_config.option(variable_path) - try: - is_inaccessible = self.is_inaccessible_user_data(option) - except AttributeError as err: - if err.code != "option-not-found": - raise err from err - is_inaccessible = True - if is_inaccessible: - variables = [[None, None, None]] - else: - description = self._convert_description(option.description(uncalculated=True), "description", its_a_path=False) - variables = [[variable_path, description, None]] - for cpath, description, identifiers in variables: - if not cpath: - # we cannot access to this variable, so try with permissive - if condition["type"] == "transitive": - value = None - else: - value = condition["value"] - option = self.true_config.forcepermissive.option(variable_path) - try: - variable_value = self._get_unmodified_default_value(option) - except PropertiesOptionError as err: - if calculation["propertyerror"] is True: - raise err from err - if calculation["propertyerror"] == "transitive": - return True - return False - except VariableCalculationDependencyError: - values.append(_("depends on an undocumented variable")) - continue - except AttributeError as err: - return calculation.get("default", False) - if condition["type"] == "transitive": - return True - if prop in HIDDEN_PROPERTIES: - condition_type = condition["condition"] - if ( - condition_type == "when" - and value == variable_value - or condition_type == "when_not" - and value != variable_value - ): - # always "prop" - return True - return False - if condition["type"] == "transitive": - submsg = _('is "{0}"').format(prop) - else: - condition_type = condition["condition"] - conditions = [] - if not calculation["propertyerror"]: - conditions.append(_("is accessible")) - if calculation["optional"]: - conditions.append(_("is defined")) - value = condition["value"] - if not isinstance(value, str): - value = dump(value) - if condition_type == "when_not": - conditions.append(_( - 'hasn\'t the value "{0}"' - ).format(value)) - else: - conditions.append(_( - 'has the value "{0}"' - ).format(value)) - submsg = display_list(conditions, sort=False) - if calculation["propertyerror"] == "transitive": - submsg = display_list([_("is {0}").format(prop), submsg], separator="or", sort=False) - msg = _('when the variable "{{0}}" {0}').format(submsg) - path_obj = { - "path": self.doc_path(variable_path), - } - if identifiers: - path_obj["identifiers"] = identifiers - - values.append({ - "message": msg, - "path": path_obj, - "description": description, - }) - if len(values) == 1: - return values[0] - return values - - def _calculation_variable_to_string_not_properties(self, child, calculation, attribute_type): - if calculation["optional"]: - path = calculation["value"]["path"] - if "{{ identifier }}" in path: - if path not in self.dynamic_paths: - return None - else: - try: - self.true_config.forcepermissive.option(path).get() - except AttributeError: - return None - true_msg = _('the value of the variable "{0}" if it is defined') - else: - true_msg = _('the value of the variable "{0}"') - if "{{ identifier }}" in calculation["ori_path"]: - values = [] - all_is_undocumented = False - for cpath, description, identifiers in self.get_annotation_variable(calculation["value"]["path"], calculation["ori_path"]): - if cpath: - all_is_undocumented = False - path_obj = { - "path": self.doc_path(cpath), - } - if identifiers: - path_obj["identifiers"] = identifiers - values.append({ - "message": true_msg, - "path": path_obj, - "description": description, - }) - else: - if all_is_undocumented is None: - all_is_undocumented = True - values.append(_("the value of an undocumented variable")) - if all_is_undocumented: - if len(values) > 1: - values = _("the values of undocumented variables") - else: - values = values[0] - else: - # FIXME A MUTUALISER AUSSI - variable_path = calculation["ori_path"] - variable = self.true_config.unrestraint.option(variable_path) - try: - isfollower = variable.isfollower() - except AttributeError: - pass - else: - if not isfollower and self.is_inaccessible_user_data(variable): - try: - uncalculated = variable.value.get(uncalculated=True) - except PropertiesOptionError: - true_msg = None - else: - if uncalculated and not isinstance( - uncalculated, Calculation - ): - if isinstance(uncalculated, list): - true_msg = { - "submessage": _( - "(from an undocumented variable)" - ), - "values": uncalculated, - } - else: - if not isinstance(uncalculated, str): - uncalculated = dump(uncalculated) - true_msg = _( - "{0} (from an undocumented variable)" - ).format(uncalculated) - else: - true_msg = _("depends on an undocumented variable") - if true_msg: - if isinstance(true_msg, dict): - values = true_msg - else: - try: - description = self._convert_description(self.true_config.option(calculation["ori_path"]).description(uncalculated=True), "description", its_a_path=False) - except AttributeError: - description = calculation["ori_path"] - values = { - "message": true_msg, - "path": { - "path": self.doc_path(calculation["ori_path"]), - }, - "description": description, - } - else: - values = None - return values - - def get_annotation_variable(self, current_path, ori_path): - if current_path == ori_path: - regexp = None - else: - regexp = compile( - "^" - + ori_path.replace("{{ identifier }}", "(.*)") - + "$" - ) - information = self.dynamic_paths[current_path] - path = current_path - for identifiers in information["identifiers"]: - cpath = calc_path(path, identifiers=identifiers) - if regexp and not regexp.search(cpath): - continue - if self.is_inaccessible_user_data(self.true_config.option(cpath)): - yield None, None, None - else: - description = self._convert_description(self.true_config.option(path).description(uncalculated=True), "description", its_a_path=False) - if "{{ identifier }}" in path: - yield path, description, identifiers.copy() - else: - yield path, description, None - - def _get_unmodified_default_value(self, child): - calculation = child.information.get(f"default_calculation", None) - if not calculation: - return child.value.get() - if calculation["type"] == "variable": - variable = self.true_config.forcepermissive.option(calculation["value"]["path"]) - if variable and self.is_inaccessible_user_data(variable): - return self._get_unmodified_default_value(variable) - raise VariableCalculationDependencyError() - - def doc_path(self, path): - if self.document_a_type: - if not '.' in path: - return None - return path.split('.', 1)[-1] - return path diff --git a/src/rougail/output_doc/example.py b/src/rougail/output_doc/example.py index d05cbf178..244dc50bd 100644 --- a/src/rougail/output_doc/example.py +++ b/src/rougail/output_doc/example.py @@ -16,20 +16,23 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . """ -from typing import Optional from ruamel.yaml import CommentedMap from ruamel.yaml.representer import RoundTripRepresenter - -from .utils import _, calc_path, dump +from tiramisu import Calculation, owners -# XXX explicit null (see rougail-output-formatter -def represent_none(self, data): +from .utils import _, dump, to_phrase + + +# XXX explicit null (see rougail-output-formatter # pylint: disable=W0511 +def represent_none( + self, data +): # pylint: disable=missing-function-docstring,unused-argument return self.represent_scalar("tag:yaml.org,2002:null", "null") -def represent_str(self, data): +def represent_str(self, data): # pylint: disable=missing-function-docstring if data == "": return self.represent_scalar("tag:yaml.org,2002:null", "") return self.represent_scalar("tag:yaml.org,2002:str", data) @@ -37,217 +40,201 @@ def represent_str(self, data): RoundTripRepresenter.add_representer(type(None), represent_none) RoundTripRepresenter.add_representer(str, represent_str) -# XXX +# XXX # pylint: disable=W0511 class Examples: # pylint: disable=no-member,too-few-public-methods """Build examples""" def __init__(self): - self.examples = None - self.examples_mandatories = None + self.comment_examples = None + self.level = None + self.comment_examples_column = None def gen_doc_examples(self): """Return examples""" self.comment_examples = self.rougailconfig["doc.examples.comment"] self.level = self.rougailconfig["doc.title_level"] if self.comment_examples: - self.comment_examples_column = self.rougailconfig["doc.examples.comment_column"] - self._build_examples() - return_string = "" + self.comment_examples_column = self.rougailconfig[ + "doc.examples.comment_column" + ] + config = self.true_config.config.copy() + config.information.set("description_type", "description") + config.property.read_write() + self._set_mandatories(config) datas = [] - if self.examples_mandatories: - if self.document_a_type: - col = list(self.examples_mandatories) - if len(col) == 1: - examples_mandatories = self.examples_mandatories[col[0]] - else: - examples_mandatories = self.examples_mandatories + for only_modified in [True, False]: + if not only_modified: + self._set_examples(config) + results = CommentedMap() + true_results = results + if self.true_config == self.config: + root_config = config else: - examples_mandatories = self.examples_mandatories - datas.extend([ - self.formatter.title( - _("Example with mandatory variables not filled in"), self.level - ), - self.formatter.yaml(dump(examples_mandatories)), - self.formatter.end_family(self.level), - ]) - if self.examples: - if self.document_a_type: - col = list(self.examples) - if len(col) == 1: - examples = self.examples[col[0]] - else: - examples = self.examples + root_config = config.option(self.config.path()) + current_option = self.true_config + subpaths = self.config.path().split(".") + if not self.config.isoptiondescription(): + subpaths = subpaths[:-1] + for subpath in subpaths: + current_option = current_option.option(subpath) + name = current_option.name() + results[name] = CommentedMap() + self._set_description(results, name, current_option) + results = results[name] + if root_config.isoptiondescription(): + self._example_parse_family( + root_config.value.get(), results, only_modified + ) else: - examples = self.examples - datas.extend([self.formatter.title( - _("Example with all variables modifiable"), self.level - ), - self.formatter.yaml(dump(examples)), - self.formatter.end_family(self.level), - ]) + self._set_example_value( + results, root_config, root_config.value.get(), only_modified + ) + if results: + if only_modified: + title = _("Example with mandatory variables not filled in") + else: + title = _("Example with all variables modifiable") + datas.extend( + [ + self.formatter.title(title, self.level), + self.formatter.yaml(dump(true_results)), + self.formatter.end_family(self.level), + ] + ) return self.formatter.compute(datas) - def _build_examples(self): - examples, examples_mandatories = self._parse_examples( - self.informations - ) - self.examples = examples - self.examples_mandatories = examples_mandatories + def _set_mandatories(self, config): + for calculated_too in [False, True]: + for option in config.value.mandatory(): + if not calculated_too: + uncalculated = option.value.default(uncalculated=True) + if isinstance(uncalculated, Calculation): + continue + self._set_value_example(option, self._get_an_example(option)) - def _parse_examples(self, dico, dyn_parent: Optional[str] = None) -> tuple: - if self.comment_examples: - examples = CommentedMap() - examples_mandatories = CommentedMap() - else: - examples = {} - examples_mandatories = {} - for value in dico.values(): - if value["type"] == "variable": - parse = self._parse_examples_variable + def _get_an_example(self, option): + value = self._get_value_from_example(option) + if value is None: + variable_type = option.information.get("type") + if variable_type == "choice": + value = option.value.list() + if not self._is_multi(option) and value: + if value[0] is not None: + value = value[0] + elif len(value) > 1: + value = value[1] else: - parse = self._parse_examples_family - parse( - value, dyn_parent, examples, examples_mandatories - ) - return examples, examples_mandatories + value = self.convert_option.get(option.information.get("type"), {}).get( + "example" + ) + if value is None: + value = "example" + if self._is_multi(option): + value = [value] + if option.isfollower() and option.index() and variable_type == "string": + value += str(option.index()) + return value - def _parse_examples_variable( - self, - variable, - dyn_parent: Optional[str], - examples: dict, - examples_mandatories: dict, - ) -> None: - paths = [] - ori_path = variable["path"] - if "identifiers" in variable: - for idx, identifiers in enumerate(variable["identifiers"]): - paths.append(calc_path(ori_path, identifiers=identifiers)) - else: - paths.append(ori_path) - for idx, path in enumerate(paths): - path = calc_path(path) - if dyn_parent is not None and not path.startswith(dyn_parent): - continue - if len(variable["names"]) == 1: - name = variable["names"][0] - else: - name = variable["names"][idx] - value = variable["gen_examples"][idx] - examples[name] = value - if self.comment_examples and "description" in variable: - description = variable["description"] - if description.endswith('.'): - description = description[:-1] - examples.yaml_add_eol_comment(description, name, column=self.comment_examples_column) - if variable["mandatory_without_value"]: - examples_mandatories[name] = value - if self.comment_examples and "description" in variable: - description = variable["description"] - if description.endswith('.'): - description = description[:-1] - examples_mandatories.yaml_add_eol_comment(description, name, column=self.comment_examples_column) - break - - def _parse_examples_family( - self, - family, - dyn_parent: Optional[str], - examples: dict, - examples_mandatories: dict, - ) -> None: - def _set_example(idx, identifiers): - path = calc_path(ori_path, identifiers=identifiers) - if dyn_parent is not None and not path.startswith(dyn_parent): - return - if len(family["informations"]["names"]) == 1: - name = family["informations"]["names"][0] - else: - name = family["informations"]["names"][idx] - if family["type"] == "leadership": - func = self._parse_examples_leadership - else: - func = self._parse_examples - ret_e, ret_m = func( - family["children"], - path + "." if family["type"] == "dynamic" else dyn_parent, - ) - if ret_m: - examples_mandatories[name] = ret_m - if self.comment_examples and "description" in family["informations"]: - description = family["informations"]["description"] - if description.endswith('.'): - description = description[:-1] - examples_mandatories.yaml_add_eol_comment(description, name, column=self.comment_examples_column) - if ret_e: - examples[name] = ret_e - if self.comment_examples and "description" in family["informations"]: - description = family["informations"]["description"] - if description.endswith('.'): - description = description[:-1] - examples.yaml_add_eol_comment(description, name, column=self.comment_examples_column) - - ori_path = family["informations"]["path"] - if "identifiers" in family["informations"]: - for idx, identifiers in enumerate(family["informations"]["identifiers"]): - _set_example(idx, identifiers) - else: - _set_example(0, None) - - def _parse_examples_leadership( - self, leadership, dyn_parent: Optional[str] = None - ) -> tuple: - examples = [] - examples_mandatories = [] - leader = next(iter(leadership.values())) - paths = [] - ori_path = leader["path"] - if "identifiers" in leader: - for idx, identifiers in enumerate(leader["identifiers"]): - paths.append(calc_path(ori_path, identifiers=identifiers)) - else: - paths.append(ori_path) - for path_idx, path in enumerate(paths): - path = calc_path(path) - if dyn_parent is not None and not path.startswith(dyn_parent): - continue - for leader_idx in range(len(leader["gen_examples"][path_idx])): - if self.comment_examples: - followers = CommentedMap() + def _set_examples(self, config): + def _set_example(subconfig): + for option in subconfig: + if option.isoptiondescription(): + _set_example(option) else: - followers = {} - for follower in leadership.values(): - if len(follower["names"]) == 1: - name = follower["names"][0] - else: - name = follower["names"][path_idx] - followers[name] = follower["gen_examples"][path_idx][leader_idx] - if self.comment_examples and "description" in follower: - description = follower["description"] - if description.endswith('.'): - description = description[:-1] - followers.yaml_add_eol_comment(description, name, column=self.comment_examples_column) - examples.append(followers) - if leader["mandatory_without_value"]: - if self.comment_examples: - followers = CommentedMap() - else: - followers = {} - for follower in leadership.values(): - if not follower["mandatory_without_value"]: - continue - if len(follower["names"]) == 1: - name = follower["names"][0] - else: - name = follower["names"][path_idx] - followers[name] = follower["gen_examples"][path_idx][leader_idx] - if self.comment_examples and "description" in follower: - description = follower["description"] - if description.endswith('.'): - description = description[:-1] - followers.yaml_add_eol_comment(description, name, column=self.comment_examples_column) - examples_mandatories.append(followers) - break - return examples, examples_mandatories + # force examples value + do not let empty value + examples = self._get_value_from_example(option) + if examples is None: + if self._is_multi(option): + if not option.value.get(): + examples = self._get_an_example(option) + elif option.value.get() is None: + examples = self._get_an_example(option) + if examples is None: + continue + self._set_value_example(option, examples) + + _set_example(config) + self._set_mandatories(config) + + def _set_value_example(self, option, value): + if option.isleader(): + ori_len = option.value.len() + current_len = len(value) + if ori_len > current_len: + for idx in reversed(range(current_len, ori_len)): + option.value.pop(idx) + option.value.set(value) + + def _get_value_from_example(self, option): + examples = option.information.get("examples", None) + if examples is None: + return None + if self._is_multi(option): + examples = list(examples) + else: + examples = examples[0] + return examples + + def _is_multi(self, option): + if option.isfollower(): + return option.issubmulti() + return option.ismulti() + + def _example_parse_family(self, config, results, only_modified): + for option, values in config.items(): + if option.isoptiondescription(): + if option.isleadership(): + subresults = self._example_parse_leadership(values, only_modified) + if subresults: + name = option.name() + results[name] = subresults + self._set_description(results, name, option) + else: + subresults = CommentedMap() + self._example_parse_family(values, subresults, only_modified) + if subresults: + name = option.name() + results[name] = subresults + self._set_description(results, name, option) + else: + self._set_example_value(results, option, values, only_modified) + + def _set_example_value(self, results, option, values, only_modified): + if self._is_valid_owner(option, only_modified): + name = option.name() + results[name] = values + self._set_description(results, name, option) + + def _is_valid_owner(self, option, only_modified): + return ( + option.type(only_self=True, translation=False) != "symlink" + and not only_modified + or (not option.owner.isdefault() and option.owner.get() != owners.forced) + ) + + def _example_parse_leadership(self, values, only_modified): + leadership_iter = iter(values.items()) + leader, leader_values = next(leadership_iter) + if not self._is_valid_owner(leader, only_modified): + return None + leadership = [CommentedMap() for idx in range(len(leader_values))] + for idx, value in enumerate(leader_values): + self._set_example_value(leadership[idx], leader, value, only_modified) + for option, value in leadership_iter: + idx = option.index() + self._set_example_value(leadership[idx], option, value, only_modified) + return leadership + + def _set_description(self, results, name, option): + if not self.comment_examples or option.information.get( + "forced_description", False + ): + return + description = to_phrase(option.description()) + if description.endswith("."): + description = description[:-1] + results.yaml_add_eol_comment( + description, name, column=self.comment_examples_column + ) 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 e58f56d05..c68249399 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/output/asciidoc.py b/src/rougail/output_doc/output/asciidoc.py index 56c5b20ca..3379f2dbe 100644 --- a/src/rougail/output_doc/output/asciidoc.py +++ b/src/rougail/output_doc/output/asciidoc.py @@ -94,8 +94,8 @@ class Formatter(CommonFormatter): self, choices: list, *, - inside_tabular: bool=True, - type_: str="variable", + inside_tabular: bool = True, + type_: str = "variable", with_enter: bool = True, ) -> str: """Display a liste of element""" diff --git a/src/rougail/output_doc/output/console.py b/src/rougail/output_doc/output/console.py index cf6ece822..8d6fb4330 100644 --- a/src/rougail/output_doc/output/console.py +++ b/src/rougail/output_doc/output/console.py @@ -56,10 +56,12 @@ class Formatter(CommonFormatter): def compute(self, dico): if self.rougailconfig["doc.true_color"]: - force_terminal = 'xterm-256color' + force_terminal = "xterm-256color" else: force_terminal = None - console = self.rich_console(theme=self.custom_theme, force_terminal=force_terminal) + console = self.rich_console( + theme=self.custom_theme, force_terminal=force_terminal + ) with console.capture() as capture: for data in dico: console.print(data) @@ -120,8 +122,8 @@ class Formatter(CommonFormatter): self, choices: list, *, - inside_tabular: bool=True, - type_: str="variable", + inside_tabular: bool = True, + type_: str = "variable", with_enter: bool = True, ) -> str: """Display a liste of element""" @@ -164,7 +166,7 @@ class Formatter(CommonFormatter): def yaml(self, _dump): """Dump yaml part of documentation""" - return self.rich_syntaxt(f'---\n{_dump}', 'yaml') + return self.rich_syntaxt(f"---\n{_dump}", "yaml") def link( self, diff --git a/src/rougail/output_doc/output/github.py b/src/rougail/output_doc/output/github.py index 9cae5f717..667f1c02e 100644 --- a/src/rougail/output_doc/output/github.py +++ b/src/rougail/output_doc/output/github.py @@ -25,7 +25,7 @@ from ..i18n import _ def to_id(path): # https://www.w3.org/TR/html4/types.html#type-name - return ''.join(e if e in ["-", "_", ":", "."] or e.isalnum() else ":" for e in path ) + return "".join(e if e in ["-", "_", ":", "."] or e.isalnum() else ":" for e in path) class Formatter(CommonFormatter): @@ -55,7 +55,9 @@ class Formatter(CommonFormatter): lst: List[str], ) -> str: """Display line in tabular from a list""" - return self.enter_tabular.join([l.replace("\n", self.enter_tabular) for l in lst]) + return self.enter_tabular.join( + [l.replace("\n", self.enter_tabular) for l in lst] + ) def bold( self, @@ -96,12 +98,12 @@ class Formatter(CommonFormatter): self, choices: list, *, - inside_tabular: bool=True, - type_: str="variable", + inside_tabular: bool = True, + type_: str = "variable", with_enter: bool = True, ): """Display a liste of element""" - if type_ == 'variable': + if type_ == "variable": if inside_tabular: if with_enter: char = first_char = f"{self.enter_tabular}• " @@ -149,23 +151,25 @@ class Formatter(CommonFormatter): """Dump yaml part of documentation""" return f"```yaml\n---\n{_dump}\n```\n" - def link_variable(self, - path: str, - true_path: str, - description: str, - filename: Optional[str], - ) -> str: + def link_variable( + self, + path: str, + true_path: str, + description: str, + filename: Optional[str], + ) -> str: name = to_id(true_path) if filename: - link = f'{filename}#{name}' + link = f"{filename}#{name}" else: - link = f'#{name}' + link = f"#{name}" return f"[{description}]({link})" - def anchor(self, - path: str, - true_path: str, - ) -> str: + def anchor( + self, + path: str, + true_path: str, + ) -> str: name = to_id(true_path) return f'{path}' @@ -201,6 +205,8 @@ class Formatter(CommonFormatter): def family_informations_ends_line(self) -> str: return "\\\n" + + # # def family_to_string(self, *args, **kwargs) -> List[str]: # lst = super().family_to_string(*args, **kwargs) diff --git a/src/rougail/output_doc/output/html.py b/src/rougail/output_doc/output/html.py index 6bd4896cd..9648ad623 100644 --- a/src/rougail/output_doc/output/html.py +++ b/src/rougail/output_doc/output/html.py @@ -93,8 +93,8 @@ class Formatter(CommonFormatter): self, choices: list, *, - inside_tabular: bool=True, - type_: str="variable", + inside_tabular: bool = True, + type_: str = "variable", with_enter: bool = True, ) -> str: """Display a liste of element""" diff --git a/src/rougail/output_doc/output/ojson.py b/src/rougail/output_doc/output/ojson.py index 9a55affc8..e0718de12 100644 --- a/src/rougail/output_doc/output/ojson.py +++ b/src/rougail/output_doc/output/ojson.py @@ -31,9 +31,9 @@ class Formatter: def run(self, informations: dict, *args) -> str: # pylint: disable=unused-argument """Transform to string""" -# if root: -# current = informations -# for path in root.split('.'): -# current = current[path]["children"] -# informations = current + # if root: + # current = informations + # for path in root.split('.'): + # current = current[path]["children"] + # informations = current return dumps(informations, ensure_ascii=False, indent=2) diff --git a/src/rougail/output_doc/tabular/five_columns.py b/src/rougail/output_doc/tabular/five_columns.py index 41b185c75..811ee8217 100644 --- a/src/rougail/output_doc/tabular/five_columns.py +++ b/src/rougail/output_doc/tabular/five_columns.py @@ -33,20 +33,33 @@ class Tabular(FourTabular): def _add(self) -> tuple: first_column = self.add_first_column() - second_column = self.get_column(self.description, self.help_, self.validators, self.choices, self.examples, self.tags) + second_column = self.get_column( + self.description, + self.help_, + self.validators, + self.choices, + self.examples, + self.tags, + ) if second_column: self.second_column = True third_column = self.get_column(self.default) if third_column: self.third_column = True types = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["type"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["type"], ) four_column = self.get_column(types) if four_column: self.four_column = True mode = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["mode", "access_control"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["mode", "access_control"], ) five_column = self.get_column(mode, *self.calculated_properties) if five_column: @@ -74,5 +87,8 @@ class Tabular(FourTabular): def set_properties(self): self.properties = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["properties", "validator"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["properties", "validator"], ) diff --git a/src/rougail/output_doc/tabular/four_columns.py b/src/rougail/output_doc/tabular/four_columns.py index 47f050bb1..4f79821b3 100644 --- a/src/rougail/output_doc/tabular/four_columns.py +++ b/src/rougail/output_doc/tabular/four_columns.py @@ -33,14 +33,25 @@ class Tabular(ThreeTabular): def _add(self) -> tuple: first_column = self.add_first_column() - second_column = self.get_column(self.description, self.help_, self.validators, self.choices, self.examples, self.tags, *self.calculated_properties) + second_column = self.get_column( + self.description, + self.help_, + self.validators, + self.choices, + self.examples, + self.tags, + *self.calculated_properties, + ) if second_column: self.second_column = True third_column = self.get_column(self.default) if third_column: self.third_column = True types = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents="type", + self.informations, + self.calculated_properties, + self.modified_attributes, + contents="type", ) four_column = self.get_column(types) if four_column: @@ -66,5 +77,8 @@ class Tabular(ThreeTabular): def set_properties(self): self.properties = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["properties", "mode", "access_control", "validator"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["properties", "mode", "access_control", "validator"], ) diff --git a/src/rougail/output_doc/tabular/six_columns.py b/src/rougail/output_doc/tabular/six_columns.py index 8bf4bc989..61fa78852 100644 --- a/src/rougail/output_doc/tabular/six_columns.py +++ b/src/rougail/output_doc/tabular/six_columns.py @@ -33,31 +33,49 @@ class Tabular(FiveTabular): def _add(self) -> tuple: first_column = self.add_first_column() - second_column = self.get_column(self.description, self.help_, self.examples, self.tags) + second_column = self.get_column( + self.description, self.help_, self.examples, self.tags + ) if second_column: self.second_column = True third_column = self.get_column(self.default) if third_column: self.third_column = True types = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["type"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["type"], ) four_column = self.get_column(types) if four_column: self.four_column = True mode = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["mode", "access_control"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["mode", "access_control"], ) five_column = self.get_column(mode, *self.calculated_properties) if five_column: self.five_column = True validators = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["validator"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["validator"], ) six_column = self.get_column(validators, self.validators, self.choices) if six_column: self.six_column = True - return first_column, second_column, third_column, four_column, five_column, six_column + return ( + first_column, + second_column, + third_column, + four_column, + five_column, + six_column, + ) def headers(self) -> tuple: header = super().headers() @@ -82,10 +100,18 @@ class Tabular(FiveTabular): def set_properties(self): self.properties = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, contents=["properties"], + self.informations, + self.calculated_properties, + self.modified_attributes, + contents=["properties"], ) def set_validators(self): self.validators = self.formatter.convert_section_to_string( - "validators", self.informations, self.modified_attributes, multi=True, section_name=False, with_to_phrase=True, + "validators", + self.informations, + self.modified_attributes, + multi=True, + section_name=False, + with_to_phrase=True, ) diff --git a/src/rougail/output_doc/tabular/three_columns.py b/src/rougail/output_doc/tabular/three_columns.py index 55c075840..9a24446da 100644 --- a/src/rougail/output_doc/tabular/three_columns.py +++ b/src/rougail/output_doc/tabular/three_columns.py @@ -32,7 +32,15 @@ class Tabular(TwoTabular): def _add(self) -> tuple: first_column = self.add_first_column() - second_column = self.get_column(self.description, self.help_, self.validators, self.choices, self.examples, self.tags, *self.calculated_properties) + second_column = self.get_column( + self.description, + self.help_, + self.validators, + self.choices, + self.examples, + self.tags, + *self.calculated_properties, + ) if second_column: self.second_column = True third_column = self.get_column(self.default) @@ -58,12 +66,18 @@ class Tabular(TwoTabular): def set_default(self): if "default" in self.informations: self.default = self.formatter.convert_section_to_string( - "default", self.informations, self.modified_attributes, multi=self.multi, section_name=False - ) + "default", + self.informations, + self.modified_attributes, + multi=self.multi, + section_name=False, + ) else: self.default = None def set_choices(self): - self.default_is_already_set, self.choices = self.formatter.convert_choices_to_string( - self.informations, self.modified_attributes, with_default=False + self.default_is_already_set, self.choices = ( + self.formatter.convert_choices_to_string( + self.informations, self.modified_attributes, with_default=False + ) ) diff --git a/src/rougail/output_doc/tabular/two_columns.py b/src/rougail/output_doc/tabular/two_columns.py index 618c76e29..9e67a652a 100644 --- a/src/rougail/output_doc/tabular/two_columns.py +++ b/src/rougail/output_doc/tabular/two_columns.py @@ -33,13 +33,24 @@ class Tabular(CommonTabular): def _add(self) -> tuple: first_column = self.add_first_column() default = self.default if not self.default_is_already_set else None - second_column = self.get_column(self.description, self.help_, self.validators, self.choices, default, self.examples, self.tags, *self.calculated_properties) + second_column = self.get_column( + self.description, + self.help_, + self.validators, + self.choices, + default, + self.examples, + self.tags, + *self.calculated_properties, + ) if second_column: self.second_column = True return first_column, second_column def add_first_column(self) -> str: - return self.get_column(self.paths, self.properties, self.commandlines, self.environments) + return self.get_column( + self.paths, self.properties, self.commandlines, self.environments + ) def headers(self) -> tuple: headers = [_("Variable")] diff --git a/src/rougail/output_doc/utils.py b/src/rougail/output_doc/utils.py index 1c627256a..b965b0ea4 100644 --- a/src/rougail/output_doc/utils.py +++ b/src/rougail/output_doc/utils.py @@ -26,6 +26,7 @@ from tabulate import tabulate from rougail.tiramisu import normalize_family from tiramisu import undefined from tiramisu.error import PropertiesOptionError, display_list + try: from tiramisu_cmdline_parser.api import gen_argument_name except: @@ -86,7 +87,12 @@ class CommonTabular: self.clear() return columns - def add(self, informations: dict, modified_attributes: dict, force_identifiers: Optional[str]) -> tuple: + def add( + self, + informations: dict, + modified_attributes: dict, + force_identifiers: Optional[str], + ) -> tuple: self.informations = informations self.modified_attributes = modified_attributes self.force_identifiers = force_identifiers @@ -107,15 +113,22 @@ class CommonTabular: def set_description(self): if "description" in self.informations: self.description = self.formatter.get_description( - "variable", self.informations, self.modified_attributes, self.force_identifiers, + "variable", + self.informations, + self.modified_attributes, + self.force_identifiers, ) else: self.description = None - self.help_ = self.formatter.convert_list_to_string("help", self.informations, self.modified_attributes) + self.help_ = self.formatter.convert_list_to_string( + "help", self.informations, self.modified_attributes + ) def set_choices(self): - self.default_is_already_set, self.choices = self.formatter.convert_choices_to_string( - self.informations, self.modified_attributes + self.default_is_already_set, self.choices = ( + self.formatter.convert_choices_to_string( + self.informations, self.modified_attributes + ) ) def set_type(self): @@ -125,8 +138,8 @@ class CommonTabular: def set_default(self): if "default" in self.informations: self.default = self.formatter.convert_section_to_string( - "default", self.informations, self.modified_attributes, multi=self.multi - ) + "default", self.informations, self.modified_attributes, multi=self.multi + ) else: self.default = None @@ -136,33 +149,80 @@ class CommonTabular: ) def set_paths(self): - self.paths = self.formatter.join(self.formatter.display_paths(self.informations, self.modified_attributes, self.force_identifiers, is_variable=True)) + self.paths = self.formatter.join( + self.formatter.display_paths( + self.informations, + self.modified_attributes, + self.force_identifiers, + is_variable=True, + ) + ) def set_commandline(self): - if self.formatter.with_commandline and not self.informations.get('not_for_commandline', False): - commandlines = self.formatter.display_paths(self.informations, self.modified_attributes, self.force_identifiers, is_variable=True, is_bold=False, variable_prefix="--", with_anchor=False) - if self.type == 'boolean': - for path in self.formatter.display_paths(self.informations, self.modified_attributes, self.force_identifiers, is_variable=True, is_bold=False, is_upper=False, with_anchor=False, variable_prefix="--"): - commandlines.append("--" + gen_argument_name(path[2:], False, True, False)) + if self.formatter.with_commandline and not self.informations.get( + "not_for_commandline", False + ): + commandlines = self.formatter.display_paths( + self.informations, + self.modified_attributes, + self.force_identifiers, + is_variable=True, + is_bold=False, + variable_prefix="--", + with_anchor=False, + ) + if self.type == "boolean": + for path in self.formatter.display_paths( + self.informations, + self.modified_attributes, + self.force_identifiers, + is_variable=True, + is_bold=False, + is_upper=False, + with_anchor=False, + variable_prefix="--", + ): + commandlines.append( + "--" + gen_argument_name(path[2:], False, True, False) + ) if "alternative_name" in self.informations: alternative_name = self.informations["alternative_name"] commandlines[0] = f"-{alternative_name}, {commandlines[0]}" - if self.type == 'boolean': - commandlines[1] = "-" + gen_argument_name(alternative_name, True, True, False) + f", {commandlines[1]}" - self.commandlines = self.formatter.section(_("Command line"), commandlines, force_enter=True) + if self.type == "boolean": + commandlines[1] = ( + "-" + + gen_argument_name(alternative_name, True, True, False) + + f", {commandlines[1]}" + ) + self.commandlines = self.formatter.section( + _("Command line"), commandlines, force_enter=True + ) else: self.commandlines = None def set_environment(self): if self.formatter.with_environment: - environments = self.formatter.display_paths(self.informations, self.modified_attributes, self.force_identifiers, is_variable=True, is_bold=False, is_upper=True, variable_prefix=self.formatter.prefix, with_anchor=False) - self.environments = self.formatter.section(_("Environment variable"), environments) + environments = self.formatter.display_paths( + self.informations, + self.modified_attributes, + self.force_identifiers, + is_variable=True, + is_bold=False, + is_upper=True, + variable_prefix=self.formatter.prefix, + with_anchor=False, + ) + self.environments = self.formatter.section( + _("Environment variable"), environments + ) else: self.environments = None def set_properties(self): self.properties = self.formatter.property_to_string( - self.informations, self.calculated_properties, self.modified_attributes, + self.informations, + self.calculated_properties, + self.modified_attributes, ) def set_validators(self): @@ -194,9 +254,7 @@ class CommonFormatter: self.rougailconfig = rougailconfig self.support_namespace = support_namespace - def run( - self, informations: dict, *, dico_is_already_treated=False - ) -> str: + def run(self, informations: dict, *, dico_is_already_treated=False) -> str: """Transform to string""" if informations: level = self.rougailconfig["doc.title_level"] @@ -208,12 +266,14 @@ class CommonFormatter: self.with_commandline = self.rougailconfig["doc.tabulars.with_commandline"] self.with_environment = self.rougailconfig["doc.tabulars.with_environment"] if self.with_environment and not gen_argument_name: - raise Exception('please install tiramisu_cmdline_parser') + raise Exception("please install tiramisu_cmdline_parser") if not self.rougailconfig["main_namespace"] and self.with_environment: if self.support_namespace: self.prefix = "" else: - self.prefix = self.rougailconfig["doc.tabulars.environment_prefix"] + "_" + self.prefix = ( + self.rougailconfig["doc.tabulars.environment_prefix"] + "_" + ) self.with_family = not self.rougailconfig["doc.tabulars.without_family"] self.other_root_filenames = None tabular_template = self.rougailconfig["doc.tabular_template"] @@ -252,19 +312,21 @@ class CommonFormatter: """Set a text to underline""" raise NotImplementedError() - def anchor(self, - path: str, - true_path: str, - ) -> str: + def anchor( + self, + path: str, + true_path: str, + ) -> str: """Set a text to a link anchor""" return path - def link_variable(self, - path: str, - true_path: str, - description: str, - filename: Optional[str], - ) -> str: + def link_variable( + self, + path: str, + true_path: str, + description: str, + filename: Optional[str], + ) -> str: """Set a text link to variable anchor""" return path @@ -279,8 +341,8 @@ class CommonFormatter: self, choices: list, *, - inside_tabular: bool=True, - type_: str="variable", + inside_tabular: bool = True, + type_: str = "variable", with_enter: bool = False, ) -> str: """Display a liste of element""" @@ -320,16 +382,18 @@ class CommonFormatter: force_identifiers: Optional[str], *, is_variable=False, - variable_prefix: str="", - is_bold: bool=True, - is_upper: bool=False, - with_anchor: bool=True, + variable_prefix: str = "", + is_bold: bool = True, + is_upper: bool = False, + with_anchor: bool = True, ) -> str: if with_anchor: anchor = self.anchor else: + def anchor(path, true_path): return path + ret_paths = [] path = informations["path"] if not path: @@ -337,19 +401,34 @@ class CommonFormatter: if is_bold: bold = self.bold else: + def bold(value): return value + if is_upper: + def upper(value): return value.upper() + else: + def upper(value): return value + if "identifiers" in modified_attributes: name, previous, new = modified_attributes["identifiers"] ret_paths.extend( [ - bold(self.delete(upper(variable_prefix + calc_path(path, self, identifier)))) + bold( + self.delete( + upper( + variable_prefix + + calc_path( + path, formatter=self, identifiers=identifier + ) + ) + ) + ) for identifier in previous ] ) @@ -359,7 +438,7 @@ class CommonFormatter: for idx, identifier in enumerate(informations["identifiers"]): if force_identifiers and identifier != force_identifiers: continue - path_ = calc_path(path, self, identifier) + path_ = calc_path(path, formatter=self, identifiers=identifier) if variable_prefix: path_ = variable_prefix + upper(path_) if not idx: @@ -403,12 +482,15 @@ class CommonFormatter: namespace = False if self.tabular_datas.columns: msg.append(self.tabular()) - msg.extend(self.family_to_string(value["informations"], level, namespace)) + msg.extend( + self.family_to_string(value["informations"], level, namespace) + ) msg.extend(self.dict_to_dict(value["children"], level + 1)) msg.append(self.end_family(level)) else: self.dict_to_dict( - value["children"], level + 1, + value["children"], + level + 1, ) if self.tabular_datas.columns and (init or self.with_family): msg.append(self.tabular()) @@ -427,13 +509,19 @@ class CommonFormatter: if namespace: ret = [self.namespace_to_title(informations, level)] else: - ret = [self.title(self.get_description("family", informations, {}, None), level)] + ret = [ + self.title( + self.get_description("family", informations, {}, None), level + ) + ] msg = [] helps = informations.get("help") if helps: for help_ in helps: - msg.extend([to_phrase(h) for h in help_.strip().split('\n')]) - path = self.display_paths(informations, {}, None, with_anchor=False, is_bold=False) + msg.extend([to_phrase(h) for h in help_.strip().split("\n")]) + path = self.display_paths( + informations, {}, None, with_anchor=False, is_bold=False + ) if path: msg.append(self.section(_("Path"), path, type_="family")) calculated_properties = [] @@ -441,18 +529,24 @@ class CommonFormatter: if property_str: msg.append(property_str) if calculated_properties: - msg.append(self.join(calculated_properties) - ) + msg.append(self.join(calculated_properties)) if "identifier" in informations: msg.append( - self.section(_("Identifiers"), informations["identifier"], type_="family") + self.section( + _("Identifiers"), informations["identifier"], type_="family" + ) ) starts_line = self.family_informations_starts_line() if msg: fam_info = self.family_informations() if fam_info: ret.append(fam_info) - ret.append(self.family_informations_ends_line().join([starts_line + m for m in msg]) + self.end_family_informations()) + ret.append( + self.family_informations_ends_line().join( + [starts_line + m for m in msg] + ) + + self.end_family_informations() + ) return ret def family_informations_starts_line(self) -> str: @@ -491,13 +585,22 @@ class CommonFormatter: return self.stripped(self.join(datas)) def get_description( - self, type_: str, informations: dict, modified_attributes: dict, force_identifiers: Optional[str] + self, + type_: str, + informations: dict, + modified_attributes: dict, + force_identifiers: Optional[str], ) -> str(): def _get_description(description, identifiers, delete=False, new=[]): if identifiers and "{{ identifier }}" in description: if type_ == "variable": identifiers_text = display_list( - [self.italic(i[-1]) for i in identifiers if not force_identifiers or i == force_identifiers], separator="or" + [ + self.italic(i[-1]) + for i in identifiers + if not force_identifiers or i == force_identifiers + ], + separator="or", ) description = description.replace( "{{ identifier }}", identifiers_text @@ -546,13 +649,23 @@ class CommonFormatter: # VARIABLE def variable_to_string( - self, informations: dict, modified_attributes: dict = {}, force_identifiers: Optional[str]=None + self, + informations: dict, + modified_attributes: dict = {}, + force_identifiers: Optional[str] = None, ) -> None: """Manage variable""" self.tabular_datas.add(informations, modified_attributes, force_identifiers) def convert_section_to_string( - self, attribute: str, informations: dict, modified_attributes: dict, multi: bool, *, section_name: bool = True, with_to_phrase = False + self, + attribute: str, + informations: dict, + modified_attributes: dict, + multi: bool, + *, + section_name: bool = True, + with_to_phrase=False, ) -> str(): values = [] submessage = "" @@ -592,10 +705,19 @@ class CommonFormatter: if old["values"] in new: values = self.underline(values) if values != []: - return self.section(name, values, submessage=submessage, section_name=section_name, with_to_phrase=with_to_phrase) + return self.section( + name, + values, + submessage=submessage, + section_name=section_name, + with_to_phrase=with_to_phrase, + ) def convert_choices_to_string( - self, informations: dict, modified_attributes: dict, with_default: bool = True, + self, + informations: dict, + modified_attributes: dict, + with_default: bool = True, ) -> str(): default_is_already_set = False if "choices" in informations: @@ -709,27 +831,47 @@ class CommonFormatter: informations: dict, calculated_properties: list, modified_attributes: dict, - contents: list = ["type", "properties", "mode", "access_control", "validator"] + contents: list = ["type", "properties", "mode", "access_control", "validator"], ) -> str: """Transform properties to string""" properties = [] modified_properties = [] if "type" in contents: if "type" in modified_attributes: - properties.append(self.prop(modified_attributes["type"], italic=False, delete=True, underline=False)) + properties.append( + self.prop( + modified_attributes["type"], + italic=False, + delete=True, + underline=False, + ) + ) if "multi" in modified_attributes: - properties.append(self.prop("multiple", italic=False, delete=True, underline=False)) + properties.append( + self.prop("multiple", italic=False, delete=True, underline=False) + ) if "properties" not in contents and "properties" in modified_attributes: for prop in modified_attributes["properties"]: if prop["ori_name"] == "mandatory": - properties.append(self.prop(prop["ori_name"], italic=False, delete=True, underline=False)) + properties.append( + self.prop( + prop["ori_name"], + italic=False, + delete=True, + underline=False, + ) + ) break if "mode" in contents and "mode" in modified_attributes: name, previous, new = modified_attributes["mode"] if previous: - properties.append(self.prop(previous[0], italic=False, delete=True, underline=False)) + properties.append( + self.prop(previous[0], italic=False, delete=True, underline=False) + ) if new: - properties.append(self.prop(new[0], italic=False, delete=False, underline=True)) + properties.append( + self.prop(new[0], italic=False, delete=False, underline=True) + ) if "properties" in modified_attributes: if "properties" in contents: for props in modified_attributes["properties"]: @@ -760,9 +902,13 @@ class CommonFormatter: if "validator" not in contents and data[0] == "unique": continue if p not in new: - properties.append(self.prop(p, italic=False, delete=True, underline=False)) + properties.append( + self.prop(p, italic=False, delete=True, underline=False) + ) if data[1] is not None: - local_calculated_properties[p] = [{"annotation": data[1], "delete": True}] + local_calculated_properties[p] = [ + {"annotation": data[1], "delete": True} + ] else: previous = new = [] others = [] @@ -795,14 +941,19 @@ class CommonFormatter: others.append(prop) for prop in others: prop_name = prop["name"] - if "type" not in contents and prop.get("ori_name", prop_name) == "mandatory": + if ( + "type" not in contents + and prop.get("ori_name", prop_name) == "mandatory" + ): continue if prop_name not in previous and prop_name in new: underline = True else: underline = False if prop["type"] == "type": - properties.append(self.link(prop_name, ROUGAIL_VARIABLE_TYPE, underline=underline)) + properties.append( + self.link(prop_name, ROUGAIL_VARIABLE_TYPE, underline=underline) + ) else: if "annotation" in prop: italic = True @@ -815,11 +966,15 @@ class CommonFormatter: else: underline_ = False local_calculated_properties.setdefault(prop["name"], []).append( - {"annotation": prop_annotation, "underline": underline_} + {"annotation": prop_annotation, "underline": underline_} ) else: italic = False - properties.append(self.prop(prop_name, italic=italic, delete=False, underline=underline)) + properties.append( + self.prop( + prop_name, italic=italic, delete=False, underline=underline + ) + ) if local_calculated_properties: for ( calculated_property_name, @@ -887,12 +1042,17 @@ class CommonFormatter: if self.other_root_filenames: path = msg["path"]["path"] for root in self.other_root_filenames: - if path == root or path.startswith(f'{root}.'): + if path == root or path.startswith(f"{root}."): filename = self.other_root_filenames[root] break if "identifiers" in msg["path"]: msg["identifiers"] = [msg["path"]["identifiers"]] - path = self.link_variable(calc_path(msg["path"], self, identifiers), msg["path"]["path"], self.get_description("variable", msg, {}, None), filename=filename) + path = self.link_variable( + calc_path(msg["path"], formatter=self, identifiers=identifiers), + msg["path"]["path"], + self.get_description("variable", msg, {}, None), + filename=filename, + ) msg = msg["message"].format(path) elif "description" in msg: if "variables" in msg: @@ -902,12 +1062,26 @@ class CommonFormatter: if self.other_root_filenames: path = msg["path"] for root in self.other_root_filenames: - if path == root or path.startswith(f'{root}.'): + if path == root or path.startswith(f"{root}."): filename = self.other_root_filenames[root] break identifiers = variable.get("identifiers") - path = calc_path(variable, self, identifiers) - paths.append(self.link_variable(path, variable["path"], self.get_description("variable", variable, {}, force_identifiers=identifiers), filename=filename)) + path = calc_path( + variable, formatter=self, identifiers=identifiers + ) + paths.append( + self.link_variable( + path, + variable["path"], + self.get_description( + "variable", + variable, + {}, + force_identifiers=identifiers, + ), + filename=filename, + ) + ) msg = msg["description"].format(*paths) else: msg = msg["description"] @@ -918,7 +1092,7 @@ class CommonFormatter: name: str, msg: str, submessage: str = "", - type_ = "variable", + type_="variable", section_name=True, with_to_phrase=False, force_enter=False, @@ -952,9 +1126,12 @@ class CommonFormatter: return submessage -def calc_path(path, formatter=None, identifiers: List[str] = None) -> str: +def calc_path(path, *, formatter=None, identifiers: List[str] = None) -> str: def _path_with_identifier(path, identifier): - identifier = normalize_family(str(identifier)) + if identifier is None: + identifier = "{{ __identifier__ }}" + else: + identifier = normalize_family(str(identifier)) if formatter: identifier = formatter.italic(identifier) return path.replace("{{ identifier }}", identifier, 1) @@ -964,10 +1141,12 @@ def calc_path(path, formatter=None, identifiers: List[str] = None) -> str: if "identifiers" in path: for identifier in path["identifiers"]: path_ = _path_with_identifier(path_, identifier) + path_ = path_.replace("{{ __identifier__ }}", "{{ identifier }}") elif identifiers: path_ = path for identifier in identifiers: path_ = _path_with_identifier(path_, identifier) + path_ = path_.replace("{{ __identifier__ }}", "{{ identifier }}") else: path_ = path return path_ diff --git a/tests/mode_basic.adoc b/tests/mode_basic.adoc index 6c7d28234..c795f77a1 100644 --- a/tests/mode_basic.adoc +++ b/tests/mode_basic.adoc @@ -3,7 +3,7 @@ | Variable | Description | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | My var2. + -**Default**: depends on an undocumented variable +**Default**: the value of an undocumented variable | **var3** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `advanced` `mandatory` `__hidden__` | My var3. + **Hidden**: var could be hidden diff --git a/tests/mode_basic_advanced.adoc b/tests/mode_basic_advanced.adoc index 26289760c..9bf6bea13 100644 --- a/tests/mode_basic_advanced.adoc +++ b/tests/mode_basic_advanced.adoc @@ -3,6 +3,6 @@ | Variable | Description | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | My var2. + -**Default**: depends on an undocumented variable +**Default**: the value of an undocumented variable |==== diff --git a/tests/result_tutorial/000/doc.sh b/tests/result_tutorial/000/doc.sh new file mode 100644 index 000000000..e69de29bb diff --git a/tests/result_tutorial/001/doc.json b/tests/result_tutorial/001/doc.json index a2554264d..496b2c592 100644 --- a/tests/result_tutorial/001/doc.json +++ b/tests/result_tutorial/001/doc.json @@ -1,11 +1,7 @@ { "proxy_mode": { - "type": "variable", - "variable_type": "string", "path": "proxy_mode", - "names": [ - "proxy_mode" - ], + "name": "proxy_mode", "properties": [ { "type": "property", @@ -15,9 +11,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/result_tutorial/001/doc.sh b/tests/result_tutorial/001/doc.sh new file mode 100644 index 000000000..ef7af69b1 --- /dev/null +++ b/tests/result_tutorial/001/doc.sh @@ -0,0 +1,6 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ +│  string   basic   mandatory  │ +└──────────────────────────────────────────────────────────────────────────────┘ diff --git a/tests/result_tutorial/001/doc_changelog.sh b/tests/result_tutorial/001/doc_changelog.sh index de4b0b1b8..b3bd93b5c 100644 --- a/tests/result_tutorial/001/doc_changelog.sh +++ b/tests/result_tutorial/001/doc_changelog.sh @@ -1,9 +1,9 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ proxy_mode │ -│  string   basic   mandatory  │ -└───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ +│  string   basic   mandatory  │ +└──────────────────────────────────────────────────────────────────────────────┘ diff --git a/tests/result_tutorial/002/doc.json b/tests/result_tutorial/002/doc.json index 22cb9e390..4f89f49a7 100644 --- a/tests/result_tutorial/002/doc.json +++ b/tests/result_tutorial/002/doc.json @@ -1,11 +1,7 @@ { "proxy_mode": { - "type": "variable", - "variable_type": "string", "path": "proxy_mode", - "names": [ - "proxy_mode" - ], + "name": "proxy_mode", "description": "Configure Proxy Access to the Internet.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/result_tutorial/002/doc.sh b/tests/result_tutorial/002/doc.sh new file mode 100644 index 000000000..6cf04ccb4 --- /dev/null +++ b/tests/result_tutorial/002/doc.sh @@ -0,0 +1,6 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  string   basic   mandatory  │ Internet. │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/002/doc_changelog.sh b/tests/result_tutorial/002/doc_changelog.sh index 91dc8e1a2..c8a5bb04b 100644 --- a/tests/result_tutorial/002/doc_changelog.sh +++ b/tests/result_tutorial/002/doc_changelog.sh @@ -1,9 +1,9 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ proxy_mode │ Configure Proxy Access to the Internet. │ -│  string   basic   mandatory  │ │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the  │ +│  string   basic   mandatory  │ Internet. │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/003/doc.json b/tests/result_tutorial/003/doc.json index 05ba6d71f..c1438ebec 100644 --- a/tests/result_tutorial/003/doc.json +++ b/tests/result_tutorial/003/doc.json @@ -1,15 +1,7 @@ { "proxy_mode": { - "type": "variable", - "default": { - "name": "Default", - "values": "No proxy" - }, - "variable_type": "string", "path": "proxy_mode", - "names": [ - "proxy_mode" - ], + "name": "proxy_mode", "description": "Configure Proxy Access to the Internet.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "No proxy" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/result_tutorial/003/doc.sh b/tests/result_tutorial/003/doc.sh new file mode 100644 index 000000000..9bff8f67e --- /dev/null +++ b/tests/result_tutorial/003/doc.sh @@ -0,0 +1,7 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  string   standard   mandatory  │ Internet. │ +│ │ Default: No proxy │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/003/doc_changelog.sh b/tests/result_tutorial/003/doc_changelog.sh index 45e24f484..efd7852f0 100644 --- a/tests/result_tutorial/003/doc_changelog.sh +++ b/tests/result_tutorial/003/doc_changelog.sh @@ -1,9 +1,10 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ proxy_mode │ Configure Proxy Access to the Internet. │ -│  basic   standard   string   standard   mandatory  │ Default: No proxy │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  basic   standard   string   standard │ Internet. │ +│ mandatory  │ Default: No proxy │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/010/doc.json b/tests/result_tutorial/010/doc.json index c657151fa..2e96f7e40 100644 --- a/tests/result_tutorial/010/doc.json +++ b/tests/result_tutorial/010/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,24 +27,6 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/result_tutorial/010/doc.sh b/tests/result_tutorial/010/doc.sh new file mode 100644 index 000000000..798e0972e --- /dev/null +++ b/tests/result_tutorial/010/doc.sh @@ -0,0 +1,13 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/010/doc_changelog.sh b/tests/result_tutorial/010/doc_changelog.sh index 55f0db061..f4428fab9 100644 --- a/tests/result_tutorial/010/doc_changelog.sh +++ b/tests/result_tutorial/010/doc_changelog.sh @@ -1,14 +1,16 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ proxy_mode │ Configure Proxy Access to the Internet. │ -│  choice   standard   mandatory  │ Choices: │ -│ │ • No proxy ← (default) │ -│ │ • Auto-detect proxy settings for this network │ -│ │ • Use system proxy settings │ -│ │ • Manual proxy configuration │ -│ │ • Automatic proxy configuration URL │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for  │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/020/doc.json b/tests/result_tutorial/020/doc.json index c657151fa..2e96f7e40 100644 --- a/tests/result_tutorial/020/doc.json +++ b/tests/result_tutorial/020/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,24 +27,6 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/result_tutorial/020/doc.sh b/tests/result_tutorial/020/doc.sh new file mode 100644 index 000000000..798e0972e --- /dev/null +++ b/tests/result_tutorial/020/doc.sh @@ -0,0 +1,13 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/021/doc.json b/tests/result_tutorial/021/doc.json index c657151fa..2e96f7e40 100644 --- a/tests/result_tutorial/021/doc.json +++ b/tests/result_tutorial/021/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,24 +27,6 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/result_tutorial/021/doc.sh b/tests/result_tutorial/021/doc.sh new file mode 100644 index 000000000..798e0972e --- /dev/null +++ b/tests/result_tutorial/021/doc.sh @@ -0,0 +1,13 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/022/doc.json b/tests/result_tutorial/022/doc.json index 6055caf7b..d732fac6b 100644 --- a/tests/result_tutorial/022/doc.json +++ b/tests/result_tutorial/022/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [], "mode": "basic" @@ -51,21 +43,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "string", "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -76,10 +62,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/result_tutorial/022/doc.sh b/tests/result_tutorial/022/doc.sh new file mode 100644 index 000000000..5551987e1 --- /dev/null +++ b/tests/result_tutorial/022/doc.sh @@ -0,0 +1,35 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic  + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  string   basic   mandatory  │ │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/022/doc_changelog.sh b/tests/result_tutorial/022/doc_changelog.sh index 3d887e49f..ce8636b97 100644 --- a/tests/result_tutorial/022/doc_changelog.sh +++ b/tests/result_tutorial/022/doc_changelog.sh @@ -1,9 +1,9 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.http_proxy.address │ HTTP address. │ -│  string   basic   mandatory  │ │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  string   basic   mandatory  │ │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/030/doc.json b/tests/result_tutorial/030/doc.json index 48be25b7d..787489289 100644 --- a/tests/result_tutorial/030/doc.json +++ b/tests/result_tutorial/030/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [], "mode": "basic" @@ -51,25 +43,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validator", - "values": "type domainname" - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -80,10 +62,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validator", + "values": "type domainname" + } } } } diff --git a/tests/result_tutorial/030/doc.sh b/tests/result_tutorial/030/doc.sh new file mode 100644 index 000000000..d68bba312 --- /dev/null +++ b/tests/result_tutorial/030/doc.sh @@ -0,0 +1,35 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic  + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validator: type domainname │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/030/doc_changelog.sh b/tests/result_tutorial/030/doc_changelog.sh index 1bd29144c..a239c6205 100644 --- a/tests/result_tutorial/030/doc_changelog.sh +++ b/tests/result_tutorial/030/doc_changelog.sh @@ -1,9 +1,9 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.http_proxy.address │ HTTP address. │ -│  domainname   basic   mandatory  │ Validator: type domainname │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validator: type domainname │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/031/doc.json b/tests/result_tutorial/031/doc.json index d9d6457a1..61c81542f 100644 --- a/tests/result_tutorial/031/doc.json +++ b/tests/result_tutorial/031/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [], "mode": "basic" @@ -51,28 +43,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -83,10 +62,15 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } } } } diff --git a/tests/result_tutorial/031/doc.sh b/tests/result_tutorial/031/doc.sh new file mode 100644 index 000000000..a4e56333c --- /dev/null +++ b/tests/result_tutorial/031/doc.sh @@ -0,0 +1,37 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic  + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/031/doc_changelog.sh b/tests/result_tutorial/031/doc_changelog.sh index 1bd768246..60aac85d2 100644 --- a/tests/result_tutorial/031/doc_changelog.sh +++ b/tests/result_tutorial/031/doc_changelog.sh @@ -1,11 +1,11 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.http_proxy.address │ HTTP address. │ -│  domainname   basic   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/032/doc.json b/tests/result_tutorial/032/doc.json index c475721fb..38dfa6b9b 100644 --- a/tests/result_tutorial/032/doc.json +++ b/tests/result_tutorial/032/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [], "mode": "basic" @@ -51,28 +43,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -83,12 +62,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -102,25 +98,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/032/doc.sh b/tests/result_tutorial/032/doc.sh new file mode 100644 index 000000000..3204d4f1f --- /dev/null +++ b/tests/result_tutorial/032/doc.sh @@ -0,0 +1,47 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic  + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/032/doc_changelog.sh b/tests/result_tutorial/032/doc_changelog.sh index d89c99a5e..910e14dc4 100644 --- a/tests/result_tutorial/032/doc_changelog.sh +++ b/tests/result_tutorial/032/doc_changelog.sh @@ -1,13 +1,16 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.http_proxy.port │ HTTP Port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: 8080 │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/033/doc.json b/tests/result_tutorial/033/doc.json index 992efee75..36787849d 100644 --- a/tests/result_tutorial/033/doc.json +++ b/tests/result_tutorial/033/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [], "mode": "basic" @@ -51,28 +43,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -83,12 +62,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -102,39 +98,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -145,10 +115,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/result_tutorial/033/doc.sh b/tests/result_tutorial/033/doc.sh new file mode 100644 index 000000000..c920d31da --- /dev/null +++ b/tests/result_tutorial/033/doc.sh @@ -0,0 +1,53 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic  + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + diff --git a/tests/result_tutorial/033/doc_changelog.sh b/tests/result_tutorial/033/doc_changelog.sh index bb6b79e5d..2f7a42c99 100644 --- a/tests/result_tutorial/033/doc_changelog.sh +++ b/tests/result_tutorial/033/doc_changelog.sh @@ -1,9 +1,9 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.use_for_https │ Also use this proxy for HTTPS. │ -│  boolean   standard   mandatory  │ Default: true │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/040/doc.json b/tests/result_tutorial/040/doc.json index 3c4c84270..2b62262a2 100644 --- a/tests/result_tutorial/040/doc.json +++ b/tests/result_tutorial/040/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [], "mode": "basic" @@ -51,28 +43,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -83,30 +62,19 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true - }, - "port": { "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, - "variable_type": "port", + "variable_type": "domainname", "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" + "type domainname", + "the domain name can be an IP" ] - }, + } + }, + "port": { "path": "manual.http_proxy.port", - "names": [ - "port" - ], + "name": "port", "description": "HTTP Port.", "properties": [ { @@ -117,81 +85,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - } - } - }, - "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", - "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], - "description": "Also use this proxy for HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "https_proxy": { - "type": "family", - "informations": { - "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], - "description": "HTTPS Proxy", - "properties": [], - "mode": "basic" - }, - "children": { - "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "HTTPS address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -205,11 +98,66 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" + } + } + } + }, + "use_for_https": { + "path": "manual.use_for_https", + "name": "use_for_https", + "description": "Also use this proxy for HTTPS.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" + }, + "https_proxy": { + "type": "family", + "informations": { + "path": "manual.https_proxy", + "name": "https_proxy", + "description": "HTTPS Proxy", + "properties": [], + "mode": "basic" + }, + "children": { + "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "HTTPS address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "basic", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", "description": "HTTPS Port.", "properties": [ { @@ -220,10 +168,20 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "8080" + }, + "variable_type": "port", + "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" + ] + } } } } diff --git a/tests/result_tutorial/040/doc.sh b/tests/result_tutorial/040/doc.sh new file mode 100644 index 000000000..affe83fbb --- /dev/null +++ b/tests/result_tutorial/040/doc.sh @@ -0,0 +1,79 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic  + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/040/doc_changelog.sh b/tests/result_tutorial/040/doc_changelog.sh index a8ea4ef91..9fc7d7e04 100644 --- a/tests/result_tutorial/040/doc_changelog.sh +++ b/tests/result_tutorial/040/doc_changelog.sh @@ -1,18 +1,21 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.https_proxy.address │ HTTPS address. │ -│  domainname   basic   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.port │ HTTPS Port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: 8080 │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/041/doc.json b/tests/result_tutorial/041/doc.json index 9b03c38f0..cb4e4f81f 100644 --- a/tests/result_tutorial/041/doc.json +++ b/tests/result_tutorial/041/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [], "mode": "basic" @@ -51,28 +43,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -83,12 +62,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -102,39 +98,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -145,24 +115,36 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "HTTPS address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -182,12 +164,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "HTTPS address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "HTTPS Port.", "properties": [ { "type": "property", @@ -197,12 +179,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -223,25 +199,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "HTTPS Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/041/doc.sh b/tests/result_tutorial/041/doc.sh new file mode 100644 index 000000000..1e2975028 --- /dev/null +++ b/tests/result_tutorial/041/doc.sh @@ -0,0 +1,82 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic  + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/041/doc_changelog.sh b/tests/result_tutorial/041/doc_changelog.sh index 82a92c943..3061658d1 100644 --- a/tests/result_tutorial/041/doc_changelog.sh +++ b/tests/result_tutorial/041/doc_changelog.sh @@ -1,20 +1,25 @@ Modified variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.https_proxy.address │ HTTPS address. │ -│  basic   standard   domainname   standard   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.port │ HTTPS Port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: 8080 │ -│ │ the value of the variable "manual.http_proxy.port" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS address. │ +│  basic   standard   domainname    │ Validators: │ +│ standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable  │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +│ │ the value of the variable  │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/050/doc.json b/tests/result_tutorial/050/doc.json index c657151fa..2e96f7e40 100644 --- a/tests/result_tutorial/050/doc.json +++ b/tests/result_tutorial/050/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,24 +27,6 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/result_tutorial/050/doc.sh b/tests/result_tutorial/050/doc.sh new file mode 100644 index 000000000..798e0972e --- /dev/null +++ b/tests/result_tutorial/050/doc.sh @@ -0,0 +1,13 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/051/doc.json b/tests/result_tutorial/051/doc.json index e73eb8f5b..fc02b99da 100644 --- a/tests/result_tutorial/051/doc.json +++ b/tests/result_tutorial/051/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,24 +129,36 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "HTTPS address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -196,12 +178,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "HTTPS address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "HTTPS Port.", "properties": [ { "type": "property", @@ -211,12 +193,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -237,25 +213,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "HTTPS Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/051/doc.sh b/tests/result_tutorial/051/doc.sh new file mode 100644 index 000000000..17826197d --- /dev/null +++ b/tests/result_tutorial/051/doc.sh @@ -0,0 +1,84 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/051/doc_changelog.sh b/tests/result_tutorial/051/doc_changelog.sh index b31de23fc..71e4b7423 100644 --- a/tests/result_tutorial/051/doc_changelog.sh +++ b/tests/result_tutorial/051/doc_changelog.sh @@ -1,34 +1,42 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.http_proxy.address │ HTTP address. │ -│  domainname   basic   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.http_proxy.port │ HTTP Port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: 8080 │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.use_for_https │ Also use this proxy for HTTPS. │ -│  boolean   standard   mandatory  │ Default: true │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.address │ HTTPS address. │ -│  domainname   standard   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.port │ HTTPS Port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "manual.http_proxy.port" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.address │ HTTPS address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/052/doc.json b/tests/result_tutorial/052/doc.json index b6bacbe00..266a86f36 100644 --- a/tests/result_tutorial/052/doc.json +++ b/tests/result_tutorial/052/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,10 +129,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/result_tutorial/052/doc.sh b/tests/result_tutorial/052/doc.sh new file mode 100644 index 000000000..a300836fd --- /dev/null +++ b/tests/result_tutorial/052/doc.sh @@ -0,0 +1,55 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + diff --git a/tests/result_tutorial/053/doc.json b/tests/result_tutorial/053/doc.json index 232c0375b..9c0e24227 100644 --- a/tests/result_tutorial/053/doc.json +++ b/tests/result_tutorial/053/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "HTTPS address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "HTTPS address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "HTTPS Port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "HTTPS Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/053/doc.sh b/tests/result_tutorial/053/doc.sh new file mode 100644 index 000000000..d566d6ebb --- /dev/null +++ b/tests/result_tutorial/053/doc.sh @@ -0,0 +1,85 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/053/doc_changelog.sh b/tests/result_tutorial/053/doc_changelog.sh index 2719db6d2..c935ae6ec 100644 --- a/tests/result_tutorial/053/doc_changelog.sh +++ b/tests/result_tutorial/053/doc_changelog.sh @@ -1,19 +1,24 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.https_proxy.address │ HTTPS address. │ -│  domainname   standard   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.port │ HTTPS Port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "manual.http_proxy.port" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/060/doc.json b/tests/result_tutorial/060/doc.json index 02a50afd6..c02f3f214 100644 --- a/tests/result_tutorial/060/doc.json +++ b/tests/result_tutorial/060/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,27 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "{{ identifier }}_proxy": { "type": "dynamic", "informations": { - "names": [ - "https_proxy", - "socks_proxy" - ], - "identifiers": [ - [ - "HTTPS" - ], - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy", + "name": "{{ identifier }}_proxy", "description": "{{ identifier }} Proxy", "properties": [ { @@ -197,20 +158,36 @@ } ], "mode": "standard", - "identifier": [ - "HTTPS", - "SOCKS" + "identifiers": [ + [ + "HTTPS" + ], + [ + "SOCKS" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "HTTPS", + "SOCKS" ] }, "children": { "address": { - "names": [ - "address", - "address" + "path": "manual.{{ identifier }}_proxy.address", + "name": "address", + "description": "{{ identifier }} address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "HTTPS" @@ -219,8 +196,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.address", - "description": "{{ identifier }} address.", "type": "variable", "default": { "name": "Default", @@ -240,7 +215,12 @@ "type domainname", "the domain name can be an IP" ] - }, + } + }, + "port": { + "path": "manual.{{ identifier }}_proxy.port", + "name": "port", + "description": "{{ identifier }} port.", "properties": [ { "type": "property", @@ -250,17 +230,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net", - "example.net" - ], - "mandatory_without_value": false - }, - "port": { - "names": [ - "port", - "port" - ], "identifiers": [ [ "HTTPS" @@ -269,8 +238,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.port", - "description": "{{ identifier }} port.", "type": "variable", "default": { "name": "Default", @@ -291,21 +258,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080", - "8080" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/060/doc.sh b/tests/result_tutorial/060/doc.sh new file mode 100644 index 000000000..379cd60cd --- /dev/null +++ b/tests/result_tutorial/060/doc.sh @@ -0,0 +1,91 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy or SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ This family builds families dynamically. +▌ Path: +▌  • manual.https_proxy +▌  • manual.socks_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" +▌ Identifiers: +▌  • HTTPS +▌  • SOCKS + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/060/doc_changelog.sh b/tests/result_tutorial/060/doc_changelog.sh index 6ae7c2930..4a6ed7f0f 100644 --- a/tests/result_tutorial/060/doc_changelog.sh +++ b/tests/result_tutorial/060/doc_changelog.sh @@ -1,21 +1,26 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.https_proxy.address │ HTTPS or SOCKS address. │ -│ manual.socks_proxy.address │ Validators: │ -│  domainname   standard   mandatory  │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.port │ HTTPS or SOCKS port. │ -│ manual.socks_proxy.port │ Validators: │ -│  port   standard   mandatory  │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "manual.http_proxy.port" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ Deleted variables diff --git a/tests/result_tutorial/061/doc.json b/tests/result_tutorial/061/doc.json index c46958c3e..68b96c35d 100644 --- a/tests/result_tutorial/061/doc.json +++ b/tests/result_tutorial/061/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,27 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "{{ identifier }}_proxy": { "type": "dynamic", "informations": { - "names": [ - "https_proxy", - "socks_proxy" - ], - "identifiers": [ - [ - "HTTPS" - ], - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy", + "name": "{{ identifier }}_proxy", "description": "{{ identifier }} Proxy", "properties": [ { @@ -197,20 +158,36 @@ } ], "mode": "standard", - "identifier": [ - "HTTPS", - "SOCKS" + "identifiers": [ + [ + "HTTPS" + ], + [ + "SOCKS" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "HTTPS", + "SOCKS" ] }, "children": { "address": { - "names": [ - "address", - "address" + "path": "manual.{{ identifier }}_proxy.address", + "name": "address", + "description": "{{ identifier }} address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "HTTPS" @@ -219,8 +196,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.address", - "description": "{{ identifier }} address.", "type": "variable", "default": { "name": "Default", @@ -240,7 +215,12 @@ "type domainname", "the domain name can be an IP" ] - }, + } + }, + "port": { + "path": "manual.{{ identifier }}_proxy.port", + "name": "port", + "description": "{{ identifier }} port.", "properties": [ { "type": "property", @@ -250,17 +230,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net", - "example.net" - ], - "mandatory_without_value": false - }, - "port": { - "names": [ - "port", - "port" - ], "identifiers": [ [ "HTTPS" @@ -269,8 +238,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.port", - "description": "{{ identifier }} port.", "type": "variable", "default": { "name": "Default", @@ -291,46 +258,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080", - "8080" - ], - "mandatory_without_value": false + } }, "version": { - "names": [ - "version" - ], - "identifiers": [ - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy.version", + "name": "version", "description": "SOCKS host version used by proxy.", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - }, "properties": [ { "type": "property", @@ -347,11 +280,24 @@ } ], "mode": "standard", - "gen_examples": [ - "v5", - "v5" + "identifiers": [ + [ + "SOCKS" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } } } } diff --git a/tests/result_tutorial/061/doc.sh b/tests/result_tutorial/061/doc.sh new file mode 100644 index 000000000..284dfea08 --- /dev/null +++ b/tests/result_tutorial/061/doc.sh @@ -0,0 +1,98 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy or SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ This family builds families dynamically. +▌ Path: +▌  • manual.https_proxy +▌  • manual.socks_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" +▌ Identifiers: +▌  • HTTPS +▌  • SOCKS + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • v4 │ +│ │ • v5 ← (default) │ +│ │ Disabled: when the identifier is │ +│ │ "HTTPS" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/061/doc_changelog.sh b/tests/result_tutorial/061/doc_changelog.sh index ea5a2ed57..d80a06c7c 100644 --- a/tests/result_tutorial/061/doc_changelog.sh +++ b/tests/result_tutorial/061/doc_changelog.sh @@ -1,12 +1,13 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ -│  choice   standard   mandatory   disabled  │ Choices: │ -│ │ • v4 │ -│ │ • v5 ← (default) │ -│ │ Disabled: when the identifier is "HTTPS" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • v4 │ +│ │ • v5 ← (default) │ +│ │ Disabled: when the identifier is │ +│ │ "HTTPS" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/070/doc.json b/tests/result_tutorial/070/doc.json index 893b461fe..39ec499a1 100644 --- a/tests/result_tutorial/070/doc.json +++ b/tests/result_tutorial/070/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,27 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "{{ identifier }}_proxy": { "type": "dynamic", "informations": { - "names": [ - "https_proxy", - "socks_proxy" - ], - "identifiers": [ - [ - "HTTPS" - ], - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy", + "name": "{{ identifier }}_proxy", "description": "{{ identifier }} Proxy", "properties": [ { @@ -191,20 +152,36 @@ } ], "mode": "standard", - "identifier": [ - "HTTPS", - "SOCKS" + "identifiers": [ + [ + "HTTPS" + ], + [ + "SOCKS" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "HTTPS", + "SOCKS" ] }, "children": { "address": { - "names": [ - "address", - "address" + "path": "manual.{{ identifier }}_proxy.address", + "name": "address", + "description": "{{ identifier }} address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "HTTPS" @@ -213,8 +190,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.address", - "description": "{{ identifier }} address.", "type": "variable", "default": { "name": "Default", @@ -234,7 +209,12 @@ "type domainname", "the domain name can be an IP" ] - }, + } + }, + "port": { + "path": "manual.{{ identifier }}_proxy.port", + "name": "port", + "description": "{{ identifier }} port.", "properties": [ { "type": "property", @@ -244,17 +224,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net", - "example.net" - ], - "mandatory_without_value": false - }, - "port": { - "names": [ - "port", - "port" - ], "identifiers": [ [ "HTTPS" @@ -263,8 +232,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.port", - "description": "{{ identifier }} port.", "type": "variable", "default": { "name": "Default", @@ -285,46 +252,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080", - "8080" - ], - "mandatory_without_value": false + } }, "version": { - "names": [ - "version" - ], - "identifiers": [ - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy.version", + "name": "version", "description": "SOCKS host version used by proxy.", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - }, "properties": [ { "type": "property", @@ -341,11 +274,24 @@ } ], "mode": "standard", - "gen_examples": [ - "v5", - "v5" + "identifiers": [ + [ + "SOCKS" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } } } } diff --git a/tests/result_tutorial/070/doc.sh b/tests/result_tutorial/070/doc.sh new file mode 100644 index 000000000..1b231bcea --- /dev/null +++ b/tests/result_tutorial/070/doc.sh @@ -0,0 +1,98 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy or SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ This family builds families dynamically. +▌ Path: +▌  • manual.https_proxy +▌  • manual.socks_proxy +▌  standard   hidden  +▌ Hidden: depends on a calculation +▌ Identifiers: +▌  • HTTPS +▌  • SOCKS + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • v4 │ +│ │ • v5 ← (default) │ +│ │ Disabled: when the identifier is │ +│ │ "HTTPS" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/071/doc.json b/tests/result_tutorial/071/doc.json index 5e80f9390..d7acd06b6 100644 --- a/tests/result_tutorial/071/doc.json +++ b/tests/result_tutorial/071/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,27 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "{{ identifier }}_proxy": { "type": "dynamic", "informations": { - "names": [ - "https_proxy", - "socks_proxy" - ], - "identifiers": [ - [ - "HTTPS" - ], - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy", + "name": "{{ identifier }}_proxy", "description": "{{ identifier }} Proxy", "properties": [ { @@ -199,20 +160,36 @@ } ], "mode": "standard", - "identifier": [ - "HTTPS", - "SOCKS" + "identifiers": [ + [ + "HTTPS" + ], + [ + "SOCKS" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "HTTPS", + "SOCKS" ] }, "children": { "address": { - "names": [ - "address", - "address" + "path": "manual.{{ identifier }}_proxy.address", + "name": "address", + "description": "{{ identifier }} address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "HTTPS" @@ -221,8 +198,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.address", - "description": "{{ identifier }} address.", "type": "variable", "default": { "name": "Default", @@ -242,7 +217,12 @@ "type domainname", "the domain name can be an IP" ] - }, + } + }, + "port": { + "path": "manual.{{ identifier }}_proxy.port", + "name": "port", + "description": "{{ identifier }} port.", "properties": [ { "type": "property", @@ -252,17 +232,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net", - "example.net" - ], - "mandatory_without_value": false - }, - "port": { - "names": [ - "port", - "port" - ], "identifiers": [ [ "HTTPS" @@ -271,8 +240,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.port", - "description": "{{ identifier }} port.", "type": "variable", "default": { "name": "Default", @@ -293,46 +260,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080", - "8080" - ], - "mandatory_without_value": false + } }, "version": { - "names": [ - "version" - ], - "identifiers": [ - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy.version", + "name": "version", "description": "SOCKS host version used by proxy.", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - }, "properties": [ { "type": "property", @@ -349,11 +282,24 @@ } ], "mode": "standard", - "gen_examples": [ - "v5", - "v5" + "identifiers": [ + [ + "SOCKS" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } } } } diff --git a/tests/result_tutorial/071/doc.sh b/tests/result_tutorial/071/doc.sh new file mode 100644 index 000000000..ce3b74ffd --- /dev/null +++ b/tests/result_tutorial/071/doc.sh @@ -0,0 +1,98 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy or SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ This family builds families dynamically. +▌ Path: +▌  • manual.https_proxy +▌  • manual.socks_proxy +▌  standard   hidden  +▌ Hidden: in HTTPS case if "manual.use_for_https" is set to "true" +▌ Identifiers: +▌  • HTTPS +▌  • SOCKS + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • v4 │ +│ │ • v5 ← (default) │ +│ │ Disabled: when the identifier is │ +│ │ "HTTPS" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/072/doc.json b/tests/result_tutorial/072/doc.json index 5e80f9390..d7acd06b6 100644 --- a/tests/result_tutorial/072/doc.json +++ b/tests/result_tutorial/072/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,27 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "{{ identifier }}_proxy": { "type": "dynamic", "informations": { - "names": [ - "https_proxy", - "socks_proxy" - ], - "identifiers": [ - [ - "HTTPS" - ], - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy", + "name": "{{ identifier }}_proxy", "description": "{{ identifier }} Proxy", "properties": [ { @@ -199,20 +160,36 @@ } ], "mode": "standard", - "identifier": [ - "HTTPS", - "SOCKS" + "identifiers": [ + [ + "HTTPS" + ], + [ + "SOCKS" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "HTTPS", + "SOCKS" ] }, "children": { "address": { - "names": [ - "address", - "address" + "path": "manual.{{ identifier }}_proxy.address", + "name": "address", + "description": "{{ identifier }} address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "HTTPS" @@ -221,8 +198,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.address", - "description": "{{ identifier }} address.", "type": "variable", "default": { "name": "Default", @@ -242,7 +217,12 @@ "type domainname", "the domain name can be an IP" ] - }, + } + }, + "port": { + "path": "manual.{{ identifier }}_proxy.port", + "name": "port", + "description": "{{ identifier }} port.", "properties": [ { "type": "property", @@ -252,17 +232,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net", - "example.net" - ], - "mandatory_without_value": false - }, - "port": { - "names": [ - "port", - "port" - ], "identifiers": [ [ "HTTPS" @@ -271,8 +240,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.port", - "description": "{{ identifier }} port.", "type": "variable", "default": { "name": "Default", @@ -293,46 +260,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080", - "8080" - ], - "mandatory_without_value": false + } }, "version": { - "names": [ - "version" - ], - "identifiers": [ - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy.version", + "name": "version", "description": "SOCKS host version used by proxy.", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - }, "properties": [ { "type": "property", @@ -349,11 +282,24 @@ } ], "mode": "standard", - "gen_examples": [ - "v5", - "v5" + "identifiers": [ + [ + "SOCKS" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } } } } diff --git a/tests/result_tutorial/072/doc.sh b/tests/result_tutorial/072/doc.sh new file mode 100644 index 000000000..ce3b74ffd --- /dev/null +++ b/tests/result_tutorial/072/doc.sh @@ -0,0 +1,98 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy or SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ This family builds families dynamically. +▌ Path: +▌  • manual.https_proxy +▌  • manual.socks_proxy +▌  standard   hidden  +▌ Hidden: in HTTPS case if "manual.use_for_https" is set to "true" +▌ Identifiers: +▌  • HTTPS +▌  • SOCKS + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • v4 │ +│ │ • v5 ← (default) │ +│ │ Disabled: when the identifier is │ +│ │ "HTTPS" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/073/doc.json b/tests/result_tutorial/073/doc.json index 5e80f9390..d7acd06b6 100644 --- a/tests/result_tutorial/073/doc.json +++ b/tests/result_tutorial/073/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "HTTP address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "HTTP Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "HTTP Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,27 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "{{ identifier }}_proxy": { "type": "dynamic", "informations": { - "names": [ - "https_proxy", - "socks_proxy" - ], - "identifiers": [ - [ - "HTTPS" - ], - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy", + "name": "{{ identifier }}_proxy", "description": "{{ identifier }} Proxy", "properties": [ { @@ -199,20 +160,36 @@ } ], "mode": "standard", - "identifier": [ - "HTTPS", - "SOCKS" + "identifiers": [ + [ + "HTTPS" + ], + [ + "SOCKS" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "HTTPS", + "SOCKS" ] }, "children": { "address": { - "names": [ - "address", - "address" + "path": "manual.{{ identifier }}_proxy.address", + "name": "address", + "description": "{{ identifier }} address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "HTTPS" @@ -221,8 +198,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.address", - "description": "{{ identifier }} address.", "type": "variable", "default": { "name": "Default", @@ -242,7 +217,12 @@ "type domainname", "the domain name can be an IP" ] - }, + } + }, + "port": { + "path": "manual.{{ identifier }}_proxy.port", + "name": "port", + "description": "{{ identifier }} port.", "properties": [ { "type": "property", @@ -252,17 +232,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net", - "example.net" - ], - "mandatory_without_value": false - }, - "port": { - "names": [ - "port", - "port" - ], "identifiers": [ [ "HTTPS" @@ -271,8 +240,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.port", - "description": "{{ identifier }} port.", "type": "variable", "default": { "name": "Default", @@ -293,46 +260,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080", - "8080" - ], - "mandatory_without_value": false + } }, "version": { - "names": [ - "version" - ], - "identifiers": [ - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy.version", + "name": "version", "description": "SOCKS host version used by proxy.", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - }, "properties": [ { "type": "property", @@ -349,11 +282,24 @@ } ], "mode": "standard", - "gen_examples": [ - "v5", - "v5" + "identifiers": [ + [ + "SOCKS" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } } } } diff --git a/tests/result_tutorial/073/doc.sh b/tests/result_tutorial/073/doc.sh new file mode 100644 index 000000000..ce3b74ffd --- /dev/null +++ b/tests/result_tutorial/073/doc.sh @@ -0,0 +1,98 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy or SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ This family builds families dynamically. +▌ Path: +▌  • manual.https_proxy +▌  • manual.socks_proxy +▌  standard   hidden  +▌ Hidden: in HTTPS case if "manual.use_for_https" is set to "true" +▌ Identifiers: +▌  • HTTPS +▌  • SOCKS + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • v4 │ +│ │ • v5 ← (default) │ +│ │ Disabled: when the identifier is │ +│ │ "HTTPS" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/080/doc.json b/tests/result_tutorial/080/doc.json index 71d28ab60..3a5d96ab3 100644 --- a/tests/result_tutorial/080/doc.json +++ b/tests/result_tutorial/080/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,27 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "{{ identifier }}_proxy": { "type": "dynamic", "informations": { - "names": [ - "https_proxy", - "socks_proxy" - ], - "identifiers": [ - [ - "HTTPS" - ], - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy", + "name": "{{ identifier }}_proxy", "description": "{{ identifier }} Proxy", "properties": [ { @@ -199,20 +160,36 @@ } ], "mode": "standard", - "identifier": [ - "HTTPS", - "SOCKS" + "identifiers": [ + [ + "HTTPS" + ], + [ + "SOCKS" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "HTTPS", + "SOCKS" ] }, "children": { "address": { - "names": [ - "address", - "address" + "path": "manual.{{ identifier }}_proxy.address", + "name": "address", + "description": "{{ identifier }} address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "HTTPS" @@ -221,8 +198,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.address", - "description": "{{ identifier }} address.", "type": "variable", "default": { "name": "Default", @@ -242,7 +217,12 @@ "type domainname", "the domain name can be an IP" ] - }, + } + }, + "port": { + "path": "manual.{{ identifier }}_proxy.port", + "name": "port", + "description": "{{ identifier }} port.", "properties": [ { "type": "property", @@ -252,17 +232,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net", - "example.net" - ], - "mandatory_without_value": false - }, - "port": { - "names": [ - "port", - "port" - ], "identifiers": [ [ "HTTPS" @@ -271,8 +240,6 @@ "SOCKS" ] ], - "path": "manual.{{ identifier }}_proxy.port", - "description": "{{ identifier }} port.", "type": "variable", "default": { "name": "Default", @@ -293,46 +260,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080", - "8080" - ], - "mandatory_without_value": false + } }, "version": { - "names": [ - "version" - ], - "identifiers": [ - [ - "SOCKS" - ] - ], "path": "manual.{{ identifier }}_proxy.version", + "name": "version", "description": "SOCKS host version used by proxy.", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - }, "properties": [ { "type": "property", @@ -349,11 +282,24 @@ } ], "mode": "standard", - "gen_examples": [ - "v5", - "v5" + "identifiers": [ + [ + "SOCKS" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "v5" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "v4", + "v5" + ] + } } } } diff --git a/tests/result_tutorial/080/doc.sh b/tests/result_tutorial/080/doc.sh new file mode 100644 index 000000000..f0be15d60 --- /dev/null +++ b/tests/result_tutorial/080/doc.sh @@ -0,0 +1,98 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy or SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ This family builds families dynamically. +▌ Path: +▌  • manual.https_proxy +▌  • manual.socks_proxy +▌  standard   hidden  +▌ Hidden: in HTTPS case if "manual.use_for_https" is set to "true" +▌ Identifiers: +▌  • HTTPS +▌  • SOCKS + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • v4 │ +│ │ • v5 ← (default) │ +│ │ Disabled: when the identifier is │ +│ │ "HTTPS" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/080/doc_changelog.sh b/tests/result_tutorial/080/doc_changelog.sh index d31d791db..68b4922f3 100644 --- a/tests/result_tutorial/080/doc_changelog.sh +++ b/tests/result_tutorial/080/doc_changelog.sh @@ -1,35 +1,45 @@ Modified variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.http_proxy.address │ HTTP address. │ -│  domainname   basic   mandatory  │ Proxy address. │ -│ │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.http_proxy.port │ HTTP Port. │ -│  port   standard   mandatory  │ Proxy port. │ -│ │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: 8080 │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.address │ HTTPS or SOCKS address. │ -│ manual.socks_proxy.address │ Validators: │ -│  domainname   standard   mandatory  │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "manual.http_proxy.address" │ -│ │ the value of the variable "manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.port │ HTTPS or SOCKS port. │ -│ manual.socks_proxy.port │ Validators: │ -│  port   standard   mandatory  │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "manual.http_proxy.port" │ -│ │ the value of the variable "manual.http_proxy.port" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ HTTP address. │ +│  domainname   basic   mandatory  │ Proxy address. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ HTTP Port. │ +│  port   standard   mandatory  │ Proxy port. │ +│ │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.address │ HTTPS or SOCKS address. │ +│ manual.socks_proxy.address │ Validators: │ +│  domainname   standard   mandatory  │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable  │ +│ │ "manual.http_proxy.address" │ +│ │ the value of the variable  │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ HTTPS or SOCKS port. │ +│ manual.socks_proxy.port │ Validators: │ +│  port   standard   mandatory  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable  │ +│ │ "manual.http_proxy.port" │ +│ │ the value of the variable  │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/081/doc.json b/tests/result_tutorial/081/doc.json index 4dc6064c0..2deb7b1aa 100644 --- a/tests/result_tutorial/081/doc.json +++ b/tests/result_tutorial/081/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,25 +335,7 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/081/doc.sh b/tests/result_tutorial/081/doc.sh new file mode 100644 index 000000000..db884483f --- /dev/null +++ b/tests/result_tutorial/081/doc.sh @@ -0,0 +1,119 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/081/doc_changelog.sh b/tests/result_tutorial/081/doc_changelog.sh index 223998893..c8530b84b 100644 --- a/tests/result_tutorial/081/doc_changelog.sh +++ b/tests/result_tutorial/081/doc_changelog.sh @@ -1,39 +1,49 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ manual.https_proxy.address │ Proxy address. │ -│  domainname   standard   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.https_proxy.port │ Proxy port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "manual.http_proxy.port" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.socks_proxy.address │ Proxy address. │ -│  domainname   standard   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.socks_proxy.port │ Proxy port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "manual.http_proxy.port" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ -│  choice   standard   mandatory  │ Choices: │ -│ │ • v4 │ -│ │ • v5 ← (default) │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ Deleted variables diff --git a/tests/result_tutorial/090/doc.json b/tests/result_tutorial/090/doc.json index 9424a6cb3..a5ae2defd 100644 --- a/tests/result_tutorial/090/doc.json +++ b/tests/result_tutorial/090/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,9 +367,16 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } } } \ No newline at end of file diff --git a/tests/result_tutorial/090/doc.sh b/tests/result_tutorial/090/doc.sh new file mode 100644 index 000000000..dd4c2fdac --- /dev/null +++ b/tests/result_tutorial/090/doc.sh @@ -0,0 +1,134 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/090/doc_changelog.sh b/tests/result_tutorial/090/doc_changelog.sh index c1f63e5c4..5329c0d7b 100644 --- a/tests/result_tutorial/090/doc_changelog.sh +++ b/tests/result_tutorial/090/doc_changelog.sh @@ -1,14 +1,18 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ auto │ Automatic proxy configuration URL. │ -│  web address   basic   mandatory   disabled  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ Disabled: when the variable "proxy_mode" hasn't the value "Automatic proxy configuration URL" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/100/doc.json b/tests/result_tutorial/100/doc.json index 26b308d39..25ad5fd84 100644 --- a/tests/result_tutorial/100/doc.json +++ b/tests/result_tutorial/100/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "properties": [ { @@ -487,9 +405,17 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + } } } \ No newline at end of file diff --git a/tests/result_tutorial/100/doc.sh b/tests/result_tutorial/100/doc.sh new file mode 100644 index 000000000..8a435f4d1 --- /dev/null +++ b/tests/result_tutorial/100/doc.sh @@ -0,0 +1,148 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   basic   mandatory    │ desactivated. │ +│ disabled  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/100/doc_changelog.sh b/tests/result_tutorial/100/doc_changelog.sh index f48fe50bb..cd39a509d 100644 --- a/tests/result_tutorial/100/doc_changelog.sh +++ b/tests/result_tutorial/100/doc_changelog.sh @@ -1,15 +1,20 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ no_proxy │ Address for which proxy will be desactivated. │ -│  domainname   basic   mandatory   disabled  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can starts by a dot │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ • the domain name can be network in CIDR format │ -│ │ Disabled: when the variable "proxy_mode" has the value "No proxy" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ no_proxy │ Address for which proxy will be │ +│  domainname   basic   mandatory    │ desactivated. │ +│ disabled  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/101/doc.json b/tests/result_tutorial/101/doc.json index 112e57948..623ab1bdb 100644 --- a/tests/result_tutorial/101/doc.json +++ b/tests/result_tutorial/101/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "properties": [ { @@ -493,12 +411,18 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" ] - ], - "mandatory_without_value": true + }, + "multiple": true } } \ No newline at end of file diff --git a/tests/result_tutorial/101/doc.sh b/tests/result_tutorial/101/doc.sh new file mode 100644 index 000000000..412409c4a --- /dev/null +++ b/tests/result_tutorial/101/doc.sh @@ -0,0 +1,148 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   basic    │ desactivated. │ +│ mandatory   disabled   unique  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/101/doc_changelog.sh b/tests/result_tutorial/101/doc_changelog.sh index 106767194..f0b8248c0 100644 --- a/tests/result_tutorial/101/doc_changelog.sh +++ b/tests/result_tutorial/101/doc_changelog.sh @@ -1,15 +1,20 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ no_proxy │ Address for which proxy will be desactivated. │ -│  domainname   multiple   basic   mandatory   disabled   unique  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can starts by a dot │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ • the domain name can be network in CIDR format │ -│ │ Disabled: when the variable "proxy_mode" has the value "No proxy" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   basic    │ desactivated. │ +│ mandatory   disabled   unique  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/102/doc.json b/tests/result_tutorial/102/doc.json index 7865696aa..e656a316e 100644 --- a/tests/result_tutorial/102/doc.json +++ b/tests/result_tutorial/102/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "properties": [ { @@ -487,12 +405,18 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" ] - ], - "mandatory_without_value": false + }, + "multiple": true } } \ No newline at end of file diff --git a/tests/result_tutorial/102/doc.sh b/tests/result_tutorial/102/doc.sh new file mode 100644 index 000000000..2a5d06edd --- /dev/null +++ b/tests/result_tutorial/102/doc.sh @@ -0,0 +1,148 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/102/doc_changelog.sh b/tests/result_tutorial/102/doc_changelog.sh index e319ac794..6ecef8171 100644 --- a/tests/result_tutorial/102/doc_changelog.sh +++ b/tests/result_tutorial/102/doc_changelog.sh @@ -1,15 +1,20 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ no_proxy │ Address for which proxy will be desactivated. │ -│  basic   standard   mandatory   domainname   multiple   standard   disabled   unique  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can starts by a dot │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ • the domain name can be network in CIDR format │ -│ │ Disabled: when the variable "proxy_mode" has the value "No proxy" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ no_proxy │ Address for which proxy will be │ +│  basic   standard   mandatory    │ desactivated. │ +│ domainname   multiple   standard    │ Validators: │ +│ disabled   unique  │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/103/doc.json b/tests/result_tutorial/103/doc.json index 3556e06af..86b897b08 100644 --- a/tests/result_tutorial/103/doc.json +++ b/tests/result_tutorial/103/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "properties": [ { @@ -487,6 +405,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -495,14 +425,6 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/result_tutorial/103/doc.sh b/tests/result_tutorial/103/doc.sh new file mode 100644 index 000000000..c19e196d9 --- /dev/null +++ b/tests/result_tutorial/103/doc.sh @@ -0,0 +1,152 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/103/doc_changelog.sh b/tests/result_tutorial/103/doc_changelog.sh index d24e38ae4..1b1e1b660 100644 --- a/tests/result_tutorial/103/doc_changelog.sh +++ b/tests/result_tutorial/103/doc_changelog.sh @@ -1,19 +1,24 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ no_proxy │ Address for which proxy will be desactivated. │ -│  domainname   multiple   standard   disabled   unique  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can starts by a dot │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ • the domain name can be network in CIDR format │ -│ │ Examples: │ -│ │ • .mozilla.org │ -│ │ • .net.nz │ -│ │ • 192.168.1.0/24 │ -│ │ Disabled: when the variable "proxy_mode" has the value "No proxy" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/104/doc.json b/tests/result_tutorial/104/doc.json index 898459c01..f36e2d196 100644 --- a/tests/result_tutorial/104/doc.json +++ b/tests/result_tutorial/104/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,14 +428,6 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/result_tutorial/104/doc.sh b/tests/result_tutorial/104/doc.sh new file mode 100644 index 000000000..06ba7ca97 --- /dev/null +++ b/tests/result_tutorial/104/doc.sh @@ -0,0 +1,155 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/104/doc_changelog.sh b/tests/result_tutorial/104/doc_changelog.sh index 6a2ee14a8..1d79e3c37 100644 --- a/tests/result_tutorial/104/doc_changelog.sh +++ b/tests/result_tutorial/104/doc_changelog.sh @@ -1,20 +1,27 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ no_proxy │ Address for which proxy will be desactivated. │ -│  domainname   multiple   standard   disabled   unique  │ Connections to localhost, 127.0.0.1/8 and ::1 are never proxied. │ -│ │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can starts by a dot │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ • the domain name can be network in CIDR format │ -│ │ Examples: │ -│ │ • .mozilla.org │ -│ │ • .net.nz │ -│ │ • 192.168.1.0/24 │ -│ │ Disabled: when the variable "proxy_mode" has the value "No proxy" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost,  │ +│ │ 127.0.0.1/8 and ::1 are never  │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/110/doc.json b/tests/result_tutorial/110/doc.json index 0dc253cff..bdfcc32d0 100644 --- a/tests/result_tutorial/110/doc.json +++ b/tests/result_tutorial/110/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,9 +456,11 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/110/doc.sh b/tests/result_tutorial/110/doc.sh new file mode 100644 index 000000000..7813c71f2 --- /dev/null +++ b/tests/result_tutorial/110/doc.sh @@ -0,0 +1,162 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/110/doc_changelog.sh b/tests/result_tutorial/110/doc_changelog.sh index adc291a6f..19a0b37e8 100644 --- a/tests/result_tutorial/110/doc_changelog.sh +++ b/tests/result_tutorial/110/doc_changelog.sh @@ -1,10 +1,13 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ prompt_authentication │ Prompt for authentication if password is saved. │ -│  boolean   standard   mandatory   disabled  │ Default: true │ -│ │ Disabled: when the variable "proxy_mode" has the value "No proxy" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/111/doc.json b/tests/result_tutorial/111/doc.json index b56a497b0..23aa2ec70 100644 --- a/tests/result_tutorial/111/doc.json +++ b/tests/result_tutorial/111/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -568,9 +476,11 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/111/doc.sh b/tests/result_tutorial/111/doc.sh new file mode 100644 index 000000000..aa3c49915 --- /dev/null +++ b/tests/result_tutorial/111/doc.sh @@ -0,0 +1,165 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   standard   mandatory  │ Default: false │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/111/doc_changelog.sh b/tests/result_tutorial/111/doc_changelog.sh index 58492ca9e..8e1df076f 100644 --- a/tests/result_tutorial/111/doc_changelog.sh +++ b/tests/result_tutorial/111/doc_changelog.sh @@ -1,9 +1,9 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ -│  boolean   standard   mandatory  │ Default: false │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   standard   mandatory  │ Default: false │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/112/doc.json b/tests/result_tutorial/112/doc.json index 353ade74b..5ce9acda0 100644 --- a/tests/result_tutorial/112/doc.json +++ b/tests/result_tutorial/112/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -587,9 +495,11 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/112/doc.sh b/tests/result_tutorial/112/doc.sh new file mode 100644 index 000000000..e2fcf6eac --- /dev/null +++ b/tests/result_tutorial/112/doc.sh @@ -0,0 +1,169 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   standard   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/112/doc_changelog.sh b/tests/result_tutorial/112/doc_changelog.sh index b439aab7e..dfe6eaaa8 100644 --- a/tests/result_tutorial/112/doc_changelog.sh +++ b/tests/result_tutorial/112/doc_changelog.sh @@ -1,11 +1,13 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ -│  boolean   standard   mandatory   disabled  │ Default: false │ -│ │ Disabled: if "proxy_mode" is not "Manual proxy configuration" │ -│ │ or "manual.socks_proxy.version" is "v4" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   standard   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not  │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is  │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/120/doc.json b/tests/result_tutorial/120/doc.json index 353ade74b..5ce9acda0 100644 --- a/tests/result_tutorial/120/doc.json +++ b/tests/result_tutorial/120/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -587,9 +495,11 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/120/doc.sh b/tests/result_tutorial/120/doc.sh new file mode 100644 index 000000000..e2fcf6eac --- /dev/null +++ b/tests/result_tutorial/120/doc.sh @@ -0,0 +1,169 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   standard   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/130/doc.json b/tests/result_tutorial/130/doc.json index f14ee3d69..d31a52624 100644 --- a/tests/result_tutorial/130/doc.json +++ b/tests/result_tutorial/130/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -587,9 +495,11 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/result_tutorial/130/doc.sh b/tests/result_tutorial/130/doc.sh new file mode 100644 index 000000000..76d6b3c22 --- /dev/null +++ b/tests/result_tutorial/130/doc.sh @@ -0,0 +1,169 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/130/doc_changelog.sh b/tests/result_tutorial/130/doc_changelog.sh index 49541c615..06e8ae199 100644 --- a/tests/result_tutorial/130/doc_changelog.sh +++ b/tests/result_tutorial/130/doc_changelog.sh @@ -1,11 +1,13 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ -│  standard   advanced   boolean   advanced   mandatory   disabled  │ Default: false │ -│ │ Disabled: if "proxy_mode" is not "Manual proxy configuration" │ -│ │ or "manual.socks_proxy.version" is "v4" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  standard   advanced   boolean    │ Default: false │ +│ advanced   mandatory   disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/140/doc.json b/tests/result_tutorial/140/doc.json index 005195273..88773f367 100644 --- a/tests/result_tutorial/140/doc.json +++ b/tests/result_tutorial/140/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -587,34 +495,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "standard" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -625,10 +525,12 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } } diff --git a/tests/result_tutorial/140/doc.sh b/tests/result_tutorial/140/doc.sh new file mode 100644 index 000000000..f4674d4c2 --- /dev/null +++ b/tests/result_tutorial/140/doc.sh @@ -0,0 +1,183 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: dns_over_https +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.enable_dns_over_https │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + diff --git a/tests/result_tutorial/140/doc_changelog.sh b/tests/result_tutorial/140/doc_changelog.sh index e2068fc06..a0a0ee75c 100644 --- a/tests/result_tutorial/140/doc_changelog.sh +++ b/tests/result_tutorial/140/doc_changelog.sh @@ -1,9 +1,9 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ dns_over_https.enable_dns_over_https │ Enable DNS over HTTPS. │ -│  boolean   standard   mandatory  │ Default: false │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.enable_dns_over_https │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/141/doc.json b/tests/result_tutorial/141/doc.json index 6d94141b6..b296b703f 100644 --- a/tests/result_tutorial/141/doc.json +++ b/tests/result_tutorial/141/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -587,34 +495,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "standard" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -625,30 +525,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -672,10 +558,20 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } } } } diff --git a/tests/result_tutorial/141/doc.sh b/tests/result_tutorial/141/doc.sh new file mode 100644 index 000000000..af5d6a7bb --- /dev/null +++ b/tests/result_tutorial/141/doc.sh @@ -0,0 +1,192 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: dns_over_https +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.enable_dns_over_https │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "dns_over_https.enable_dns_over_htt… │ +│ │ has the value "false" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + diff --git a/tests/result_tutorial/141/doc_changelog.sh b/tests/result_tutorial/141/doc_changelog.sh index 7afd0c5fa..1079998de 100644 --- a/tests/result_tutorial/141/doc_changelog.sh +++ b/tests/result_tutorial/141/doc_changelog.sh @@ -1,13 +1,15 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ dns_over_https.provider │ Use Provider. │ -│  choice   standard   mandatory   disabled  │ Choices: │ -│ │ • Cloudflare ← (default) │ -│ │ • NextDNS │ -│ │ • Custom │ -│ │ Disabled: when the variable "dns_over_https.enable_dns_over_https" has the value "false" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "dns_over_https.enable_dns_over_htt… │ +│ │ has the value "false" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/142/doc.json b/tests/result_tutorial/142/doc.json index 114966dc3..0ace6f61f 100644 --- a/tests/result_tutorial/142/doc.json +++ b/tests/result_tutorial/142/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -587,34 +495,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -625,30 +525,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -672,27 +558,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -718,10 +601,17 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" + ] + } } } } diff --git a/tests/result_tutorial/142/doc.sh b/tests/result_tutorial/142/doc.sh new file mode 100644 index 000000000..8e60da78a --- /dev/null +++ b/tests/result_tutorial/142/doc.sh @@ -0,0 +1,204 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.enable_dns_over_https │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "dns_over_https.enable_dns_over_htt… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: if │ +│ │ "dns_over_https.provider" is not │ +│ │ "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + diff --git a/tests/result_tutorial/142/doc_changelog.sh b/tests/result_tutorial/142/doc_changelog.sh index e562de667..9f444b3e1 100644 --- a/tests/result_tutorial/142/doc_changelog.sh +++ b/tests/result_tutorial/142/doc_changelog.sh @@ -1,14 +1,18 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ dns_over_https.custom_dns_url │ Custom DNS URL. │ -│  web address   basic   mandatory   disabled  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ Disabled: if "dns_over_https.provider" is not "Custom" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: if │ +│ │ "dns_over_https.provider" is not │ +│ │ "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/150/doc.json b/tests/result_tutorial/150/doc.json index 6d3d67379..9ac3025d7 100644 --- a/tests/result_tutorial/150/doc.json +++ b/tests/result_tutorial/150/doc.json @@ -1,5 +1,17 @@ { "proxy_mode": { + "path": "proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -15,33 +27,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -65,28 +57,15 @@ "type": "family", "informations": { "path": "manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -97,12 +76,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -116,39 +112,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -159,18 +129,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -191,6 +161,18 @@ }, "children": { "address": { + "path": "manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -210,12 +192,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -225,12 +207,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -251,25 +227,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -277,15 +235,25 @@ "type": "family", "informations": { "path": "manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -305,12 +273,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -320,12 +288,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -346,12 +308,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -361,12 +323,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -379,46 +335,15 @@ "v4", "v5" ] - }, - "path": "manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -442,28 +367,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -490,6 +408,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -498,27 +428,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -542,22 +456,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -587,34 +495,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -625,30 +525,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -672,30 +558,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -721,10 +601,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } diff --git a/tests/result_tutorial/150/doc.sh b/tests/result_tutorial/150/doc.sh new file mode 100644 index 000000000..11abc5819 --- /dev/null +++ b/tests/result_tutorial/150/doc.sh @@ -0,0 +1,205 @@ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: manual +▌  basic   disabled  +▌ Disabled: when the variable "proxy_mode" hasn't the value "Manual proxy  +configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" hasn't the value │ +│ │ "Automatic proxy configuration URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "proxy_mode" has the value "No │ +│ │ proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "proxy_mode" is not │ +│ │ "Manual proxy configuration" │ +│ │ or "manual.socks_proxy.version" is │ +│ │ "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ +DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.enable_dns_over_https │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "dns_over_https.enable_dns_over_htt… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "dns_over_https.provider" is not │ +│ │ "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + diff --git a/tests/result_tutorial/150/doc_changelog.sh b/tests/result_tutorial/150/doc_changelog.sh index 5df709ffa..3823dccab 100644 --- a/tests/result_tutorial/150/doc_changelog.sh +++ b/tests/result_tutorial/150/doc_changelog.sh @@ -1,15 +1,19 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ dns_over_https.custom_dns_url │ Custom DNS URL. │ -│  web address   basic   mandatory   disabled  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ • must starts with 'https://' only │ -│ │ Disabled: if "dns_over_https.provider" is not "Custom" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "dns_over_https.provider" is not │ +│ │ "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/160/doc.json b/tests/result_tutorial/160/doc.json index f6d4797a7..966924ff3 100644 --- a/tests/result_tutorial/160/doc.json +++ b/tests/result_tutorial/160/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } diff --git a/tests/result_tutorial/160/doc.sh b/tests/result_tutorial/160/doc.sh new file mode 100644 index 000000000..04da6b1f4 --- /dev/null +++ b/tests/result_tutorial/160/doc.sh @@ -0,0 +1,216 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/160/doc_changelog.sh b/tests/result_tutorial/160/doc_changelog.sh index a234af414..1eeb08a96 100644 --- a/tests/result_tutorial/160/doc_changelog.sh +++ b/tests/result_tutorial/160/doc_changelog.sh @@ -1,112 +1,151 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ firefox.proxy_mode │ Configure Proxy Access to the Internet. │ -│  choice   standard   mandatory  │ Choices: │ -│ │ • No proxy ← (default) │ -│ │ • Auto-detect proxy settings for this network │ -│ │ • Use system proxy settings │ -│ │ • Manual proxy configuration │ -│ │ • Automatic proxy configuration URL │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.http_proxy.address │ Proxy address. │ -│  domainname   basic   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.http_proxy.port │ Proxy port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: 8080 │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ -│  boolean   standard   mandatory  │ Default: true │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.https_proxy.address │ Proxy address. │ -│  domainname   standard   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "firefox.manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.https_proxy.port │ Proxy port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "firefox.manual.http_proxy.port" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.socks_proxy.address │ Proxy address. │ -│  domainname   standard   mandatory  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ Default: the value of the variable "firefox.manual.http_proxy.address" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.socks_proxy.port │ Proxy port. │ -│  port   standard   mandatory  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: the value of the variable "firefox.manual.http_proxy.port" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ -│  choice   standard   mandatory  │ Choices: │ -│ │ • v4 │ -│ │ • v5 ← (default) │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.auto │ Automatic proxy configuration URL. │ -│  web address   basic   mandatory   disabled  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Automatic proxy configuration URL" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.no_proxy │ Address for which proxy will be desactivated. │ -│  domainname   multiple   standard   disabled   unique  │ Connections to localhost, 127.0.0.1/8 and ::1 are never proxied. │ -│ │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can starts by a dot │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ • the domain name can be network in CIDR format │ -│ │ Examples: │ -│ │ • .mozilla.org │ -│ │ • .net.nz │ -│ │ • 192.168.1.0/24 │ -│ │ Disabled: when the variable "firefox.proxy_mode" has the value "No proxy" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.prompt_authentication │ Prompt for authentication if password is saved. │ -│  boolean   standard   mandatory   disabled  │ Default: true │ -│ │ Disabled: when the variable "firefox.proxy_mode" has the value "No proxy" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ -│  boolean   advanced   mandatory   disabled  │ Default: false │ -│ │ Disabled: if "firefox.proxy_mode" is not "Manual proxy configuration" │ -│ │ or "firefox.manual.socks_proxy.version" is "v4" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.dns_over_https.enable_dns_over_https │ Enable DNS over HTTPS. │ -│  boolean   standard   mandatory  │ Default: false │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.dns_over_https.provider │ Use Provider. │ -│  choice   standard   mandatory   disabled  │ Choices: │ -│ │ • Cloudflare ← (default) │ -│ │ • NextDNS │ -│ │ • Custom │ -│ │ Disabled: when the variable "firefox.dns_over_https.enable_dns_over_https" has the value "false" │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ -│  web address   basic   mandatory   disabled  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ • must starts with 'https://' only │ -│ │ Disabled: if "firefox.dns_over_https.provider" is not "Custom" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ Deleted variables diff --git a/tests/result_tutorial/161/doc.json b/tests/result_tutorial/161/doc.json index f6d4797a7..966924ff3 100644 --- a/tests/result_tutorial/161/doc.json +++ b/tests/result_tutorial/161/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } diff --git a/tests/result_tutorial/161/doc.sh b/tests/result_tutorial/161/doc.sh new file mode 100644 index 000000000..04da6b1f4 --- /dev/null +++ b/tests/result_tutorial/161/doc.sh @@ -0,0 +1,216 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/170/doc.json b/tests/result_tutorial/170/doc.json index 6c9e7dc59..c700314b9 100644 --- a/tests/result_tutorial/170/doc.json +++ b/tests/result_tutorial/170/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "basic", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "basic", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,21 +672,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "color": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "color": { "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], + "name": "color", "description": "Color.", "properties": [ { @@ -817,12 +689,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/result_tutorial/170/doc.sh b/tests/result_tutorial/170/doc.sh new file mode 100644 index 000000000..e23698b48 --- /dev/null +++ b/tests/result_tutorial/170/doc.sh @@ -0,0 +1,244 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  basic  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  string   basic   mandatory  │ │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/170/doc_changelog.sh b/tests/result_tutorial/170/doc_changelog.sh index 8711f3f67..b0cdaace1 100644 --- a/tests/result_tutorial/170/doc_changelog.sh +++ b/tests/result_tutorial/170/doc_changelog.sh @@ -1,12 +1,13 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.title │ Title or Description. │ -│  string   multiple   standard   unique  │ │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ foxyproxy.proxies.color │ Color. │ -│  string   basic   mandatory  │ │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  string   basic   mandatory  │ │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/180/doc.json b/tests/result_tutorial/180/doc.json index f9e2fa930..48d1950b7 100644 --- a/tests/result_tutorial/180/doc.json +++ b/tests/result_tutorial/180/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "basic", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "basic", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,25 +672,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "color": { - "type": "variable", - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], + "name": "color", "description": "Color.", "properties": [ { @@ -821,12 +689,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "xxx" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } } } } diff --git a/tests/result_tutorial/180/doc.sh b/tests/result_tutorial/180/doc.sh new file mode 100644 index 000000000..4c2fecf06 --- /dev/null +++ b/tests/result_tutorial/180/doc.sh @@ -0,0 +1,246 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  basic  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   basic   mandatory  │ Validator: text based with regular │ +│ │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/180/doc_changelog.sh b/tests/result_tutorial/180/doc_changelog.sh index 6ad721b8e..5acbbd2ae 100644 --- a/tests/result_tutorial/180/doc_changelog.sh +++ b/tests/result_tutorial/180/doc_changelog.sh @@ -1,9 +1,11 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.color │ Color. │ -│  regexp   basic   mandatory  │ Validator: text based with regular expressions "^#(?:[0-9a-f]{3}){1,2}$" │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   basic   mandatory  │ Validator: text based with regular  │ +│ │ expressions  │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/181/doc.json b/tests/result_tutorial/181/doc.json index aa88e771e..4763fef8b 100644 --- a/tests/result_tutorial/181/doc.json +++ b/tests/result_tutorial/181/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "standard", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "standard", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,15 +672,23 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "color": { + "path": "foxyproxy.proxies.color", + "name": "color", + "description": "Color.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -812,27 +700,7 @@ "validators": { "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, - "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], - "description": "Color.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "#f50d51" - ] - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/181/doc.sh b/tests/result_tutorial/181/doc.sh new file mode 100644 index 000000000..e0ad2453c --- /dev/null +++ b/tests/result_tutorial/181/doc.sh @@ -0,0 +1,247 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  standard  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   standard   mandatory  │ Validator: text based with regular │ +│ │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/181/doc_changelog.sh b/tests/result_tutorial/181/doc_changelog.sh index ca47324b9..13df4a8a9 100644 --- a/tests/result_tutorial/181/doc_changelog.sh +++ b/tests/result_tutorial/181/doc_changelog.sh @@ -1,10 +1,12 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.color │ Color. │ -│  basic   standard   regexp   standard   mandatory  │ Validator: text based with regular expressions "^#(?:[0-9a-f]{3}){1,2}$" │ -│ │ Default: random color value │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.color │ Color. │ +│  basic   standard   regexp   standard │ Validator: text based with regular │ +│ mandatory  │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/182/doc.json b/tests/result_tutorial/182/doc.json index 39907843a..fe3e07454 100644 --- a/tests/result_tutorial/182/doc.json +++ b/tests/result_tutorial/182/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "basic", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "basic", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,31 +672,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "color": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value" - } - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], + "name": "color", "description": "Color.", "properties": [ { @@ -833,12 +695,18 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "#6f30e9" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "random color value" + } + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } } } } diff --git a/tests/result_tutorial/182/doc.sh b/tests/result_tutorial/182/doc.sh new file mode 100644 index 000000000..b3417d7fe --- /dev/null +++ b/tests/result_tutorial/182/doc.sh @@ -0,0 +1,247 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  basic  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   basic   mandatory   auto  │ Validator: text based with regular │ +│ modified  │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/182/doc_changelog.sh b/tests/result_tutorial/182/doc_changelog.sh index e308e99db..aa8621ef2 100644 --- a/tests/result_tutorial/182/doc_changelog.sh +++ b/tests/result_tutorial/182/doc_changelog.sh @@ -1,10 +1,12 @@ Modified variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.color │ Color. │ -│  standard   basic   regexp   basic   mandatory   auto modified  │ Validator: text based with regular expressions "^#(?:[0-9a-f]{3}){1,2}$" │ -│ │ Default: random color value │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.color │ Color. │ +│  standard   basic   regexp   basic    │ Validator: text based with regular │ +│ mandatory   auto modified  │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/190/doc.json b/tests/result_tutorial/190/doc.json index 14bc6ae1c..dfe0e9f81 100644 --- a/tests/result_tutorial/190/doc.json +++ b/tests/result_tutorial/190/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "basic", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "basic", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,15 +672,23 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "type": { + "path": "foxyproxy.proxies.type", + "name": "type", + "description": "Proxy Type.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -819,45 +707,11 @@ "System (use system settings)", "Direct (no proxy)" ] - }, - "path": "foxyproxy.proxies.type", - "names": [ - "type" - ], - "description": "Proxy Type.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "Direct (no proxy)" - ] - ], - "mandatory_without_value": false + } }, "color": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value" - } - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], + "name": "color", "description": "Color.", "properties": [ { @@ -874,12 +728,18 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "#d9102f" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "random color value" + } + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } } } } diff --git a/tests/result_tutorial/190/doc.sh b/tests/result_tutorial/190/doc.sh new file mode 100644 index 000000000..e58f6d2c4 --- /dev/null +++ b/tests/result_tutorial/190/doc.sh @@ -0,0 +1,258 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  basic  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.type │ Proxy Type. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • HTTP │ +│ │ • HTTPS/SSL │ +│ │ • SOCKS4 │ +│ │ • SOCKS5 │ +│ │ • PAC URL │ +│ │ • WPAD │ +│ │ • System (use system settings) │ +│ │ • Direct (no proxy) ← (default) │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   basic   mandatory   auto  │ Validator: text based with regular │ +│ modified  │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/190/doc_changelog.sh b/tests/result_tutorial/190/doc_changelog.sh index 299745178..7662b21fa 100644 --- a/tests/result_tutorial/190/doc_changelog.sh +++ b/tests/result_tutorial/190/doc_changelog.sh @@ -1,27 +1,17 @@ New variable -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.type │ Proxy Type. │ -│  choice   standard   mandatory  │ Choices: │ -│ │ • HTTP │ -│ │ • HTTPS/SSL │ -│ │ • SOCKS4 │ -│ │ • SOCKS5 │ -│ │ • PAC URL │ -│ │ • WPAD │ -│ │ • System (use system settings) │ -│ │ • Direct (no proxy) ← (default) │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - -Modified variable - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.color │ Color. │ -│  regexp   basic   mandatory   auto modified  │ Validator: text based with regular expressions "^#(?:[0-9a-f]{3}){1,2}$" │ -│ │ Default: random color value │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.type │ Proxy Type. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • HTTP │ +│ │ • HTTPS/SSL │ +│ │ • SOCKS4 │ +│ │ • SOCKS5 │ +│ │ • PAC URL │ +│ │ • WPAD │ +│ │ • System (use system settings) │ +│ │ • Direct (no proxy) ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/200/doc.json b/tests/result_tutorial/200/doc.json index 5f35b35f9..74320855d 100644 --- a/tests/result_tutorial/200/doc.json +++ b/tests/result_tutorial/200/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "basic", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "basic", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,15 +672,23 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "type": { + "path": "foxyproxy.proxies.type", + "name": "type", + "description": "Proxy Type.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -819,45 +707,11 @@ "System (use system settings)", "Direct (no proxy)" ] - }, - "path": "foxyproxy.proxies.type", - "names": [ - "type" - ], - "description": "Proxy Type.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "Direct (no proxy)" - ] - ], - "mandatory_without_value": false + } }, "color": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value" - } - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], + "name": "color", "description": "Color.", "properties": [ { @@ -874,34 +728,22 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "#9b61e0" - ] - ], - "mandatory_without_value": false - }, - "address": { "type": "variable", "default": { "name": "Default", "values": { - "description": "copy HTTP address if proxy is not \"Manual\"" + "description": "random color value" } }, - "variable_type": "domainname", + "variable_type": "regexp", "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be a hostname", - "the domain name can be an IP" - ] - }, + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } + }, + "address": { "path": "foxyproxy.proxies.address", - "names": [ - "address" - ], + "name": "address", "description": "IP address, DNS name, server name.", "properties": [ { @@ -921,34 +763,26 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", "values": { - "description": "copy HTTP port if proxy is not \"Manual\"" + "description": "copy HTTP address if proxy is not \"Manual\"" } }, - "variable_type": "port", + "variable_type": "domainname", "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" + "type domainname", + "the domain name can be a hostname", + "the domain name can be an IP" ] - }, + } + }, + "port": { "path": "foxyproxy.proxies.port", - "names": [ - "port" - ], + "name": "port", "description": "Port.", "properties": [ { @@ -968,35 +802,26 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "8080" - ] - ], - "mandatory_without_value": false - }, - "url": { "type": "variable", "default": { "name": "Default", "values": { - "description": "copy HTTP address if proxy is \"Auto\"" + "description": "copy HTTP port if proxy is not \"Manual\"" } }, - "variable_type": "web address", + "variable_type": "port", "validators": { "name": "Validators", "values": [ "well-known ports (1 to 1023) are allowed", "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" + "private ports (greater than 49152) are allowed" ] - }, + } + }, + "url": { "path": "foxyproxy.proxies.url", - "names": [ - "url" - ], + "name": "url", "description": "URL.", "properties": [ { @@ -1016,12 +841,23 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "https://example.net" + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is \"Auto\"" + } + }, + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" ] - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/200/doc.sh b/tests/result_tutorial/200/doc.sh new file mode 100644 index 000000000..3c282e895 --- /dev/null +++ b/tests/result_tutorial/200/doc.sh @@ -0,0 +1,301 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  basic  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.type │ Proxy Type. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • HTTP │ +│ │ • HTTPS/SSL │ +│ │ • SOCKS4 │ +│ │ • SOCKS5 │ +│ │ • PAC URL │ +│ │ • WPAD │ +│ │ • System (use system settings) │ +│ │ • Direct (no proxy) ← (default) │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   basic   mandatory   auto  │ Validator: text based with regular │ +│ modified  │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.address │ IP address, DNS name, server name. │ +│  domainname   standard   mandatory    │ Validators: │ +│ disabled  │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ Default: copy HTTP address if proxy │ +│ │ is not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.port │ Port. │ +│  port   standard   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: copy HTTP port if proxy is │ +│ │ not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.url │ URL. │ +│  web address   standard   mandatory  │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Default: copy HTTP address if proxy │ +│ │ is "Auto" │ +│ │ Disabled: if type is not in: │ +│ │ - PAC URL │ +│ │ - WPAD │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/200/doc_changelog.sh b/tests/result_tutorial/200/doc_changelog.sh index 11fc2e766..09fd2e95f 100644 --- a/tests/result_tutorial/200/doc_changelog.sh +++ b/tests/result_tutorial/200/doc_changelog.sh @@ -1,51 +1,49 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.address │ IP address, DNS name, server name. │ -│  domainname   standard   mandatory   disabled  │ Validators: │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ Default: copy HTTP address if proxy is not "Manual" │ -│ │ Disabled: if type not in: │ -│ │ - HTTP │ -│ │ - HTTPS/SSL │ -│ │ - SOCKS4 │ -│ │ - SOCKS5 │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ foxyproxy.proxies.port │ Port. │ -│  port   standard   mandatory   disabled  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • private ports (greater than 49152) are allowed │ -│ │ Default: copy HTTP port if proxy is not "Manual" │ -│ │ Disabled: if type not in: │ -│ │ - HTTP │ -│ │ - HTTPS/SSL │ -│ │ - SOCKS4 │ -│ │ - SOCKS5 │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ foxyproxy.proxies.url │ URL. │ -│  web address   standard   mandatory   disabled  │ Validators: │ -│ │ • well-known ports (1 to 1023) are allowed │ -│ │ • registred ports (1024 to 49151) are allowed │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ Default: copy HTTP address if proxy is "Auto" │ -│ │ Disabled: if type is not in: │ -│ │ - PAC URL │ -│ │ - WPAD │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - -Modified variable - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.color │ Color. │ -│  regexp   basic   mandatory   auto modified  │ Validator: text based with regular expressions "^#(?:[0-9a-f]{3}){1,2}$" │ -│ │ Default: random color value │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.address │ IP address, DNS name, server name. │ +│  domainname   standard   mandatory    │ Validators: │ +│ disabled  │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ Default: copy HTTP address if proxy │ +│ │ is not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.port │ Port. │ +│  port   standard   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: copy HTTP port if proxy is │ +│ │ not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.url │ URL. │ +│  web address   standard   mandatory  │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Default: copy HTTP address if proxy │ +│ │ is "Auto" │ +│ │ Disabled: if type is not in: │ +│ │ - PAC URL │ +│ │ - WPAD │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/210/doc.json b/tests/result_tutorial/210/doc.json index 261affe41..87522d70d 100644 --- a/tests/result_tutorial/210/doc.json +++ b/tests/result_tutorial/210/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "basic", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "basic", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,15 +672,23 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "type": { + "path": "foxyproxy.proxies.type", + "name": "type", + "description": "Proxy Type.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -819,45 +707,11 @@ "System (use system settings)", "Direct (no proxy)" ] - }, - "path": "foxyproxy.proxies.type", - "names": [ - "type" - ], - "description": "Proxy Type.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "Direct (no proxy)" - ] - ], - "mandatory_without_value": false + } }, "color": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value" - } - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], + "name": "color", "description": "Color.", "properties": [ { @@ -874,34 +728,22 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "#c4f644" - ] - ], - "mandatory_without_value": false - }, - "address": { "type": "variable", "default": { "name": "Default", "values": { - "description": "copy HTTP address if proxy is not \"Manual\"" + "description": "random color value" } }, - "variable_type": "domainname", + "variable_type": "regexp", "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be a hostname", - "the domain name can be an IP" - ] - }, + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } + }, + "address": { "path": "foxyproxy.proxies.address", - "names": [ - "address" - ], + "name": "address", "description": "IP address, DNS name, server name.", "properties": [ { @@ -921,34 +763,26 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", "values": { - "description": "copy HTTP port if proxy is not \"Manual\"" + "description": "copy HTTP address if proxy is not \"Manual\"" } }, - "variable_type": "port", + "variable_type": "domainname", "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" + "type domainname", + "the domain name can be a hostname", + "the domain name can be an IP" ] - }, + } + }, + "port": { "path": "foxyproxy.proxies.port", - "names": [ - "port" - ], + "name": "port", "description": "Port.", "properties": [ { @@ -968,20 +802,26 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "8080" + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP port if proxy is not \"Manual\"" + } + }, + "variable_type": "port", + "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" ] - ], - "mandatory_without_value": false + } }, "username": { - "type": "variable", - "variable_type": "UNIX user", "path": "foxyproxy.proxies.username", - "names": [ - "username" - ], + "name": "username", "description": "Username.", "properties": [ { @@ -1004,20 +844,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "username" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "UNIX user" }, "password": { - "type": "variable", - "variable_type": "secret", "path": "foxyproxy.proxies.password", - "names": [ - "password" - ], + "name": "password", "description": "Password.", "properties": [ { @@ -1031,35 +863,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "secrets" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "secret" }, "url": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is \"Auto\"" - } - }, - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "foxyproxy.proxies.url", - "names": [ - "url" - ], + "name": "url", "description": "URL.", "properties": [ { @@ -1079,12 +888,23 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "https://example.net" + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is \"Auto\"" + } + }, + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" ] - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/210/doc.sh b/tests/result_tutorial/210/doc.sh new file mode 100644 index 000000000..51d0f2910 --- /dev/null +++ b/tests/result_tutorial/210/doc.sh @@ -0,0 +1,316 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  basic  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.type │ Proxy Type. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • HTTP │ +│ │ • HTTPS/SSL │ +│ │ • SOCKS4 │ +│ │ • SOCKS5 │ +│ │ • PAC URL │ +│ │ • WPAD │ +│ │ • System (use system settings) │ +│ │ • Direct (no proxy) ← (default) │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   basic   mandatory   auto  │ Validator: text based with regular │ +│ modified  │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.address │ IP address, DNS name, server name. │ +│  domainname   standard   mandatory    │ Validators: │ +│ disabled  │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ Default: copy HTTP address if proxy │ +│ │ is not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.port │ Port. │ +│  port   standard   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: copy HTTP port if proxy is │ +│ │ not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.username │ Username. │ +│  UNIX user   standard   mandatory    │ Mandatory: if a password is set │ +│ disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.password │ Password. │ +│  secret   standard   disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.url │ URL. │ +│  web address   standard   mandatory  │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Default: copy HTTP address if proxy │ +│ │ is "Auto" │ +│ │ Disabled: if type is not in: │ +│ │ - PAC URL │ +│ │ - WPAD │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/210/doc_changelog.sh b/tests/result_tutorial/210/doc_changelog.sh index ed15ea1d2..4cf5d663e 100644 --- a/tests/result_tutorial/210/doc_changelog.sh +++ b/tests/result_tutorial/210/doc_changelog.sh @@ -1,31 +1,21 @@ New variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.username │ Username. │ -│  UNIX user   standard   mandatory   disabled  │ Mandatory: if a password is set │ -│ │ Disabled: if type not in: │ -│ │ - HTTP │ -│ │ - HTTPS/SSL │ -│ │ - SOCKS4 │ -│ │ - SOCKS5 │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ foxyproxy.proxies.password │ Password. │ -│  secret   standard   disabled  │ Disabled: if type not in: │ -│ │ - HTTP │ -│ │ - HTTPS/SSL │ -│ │ - SOCKS4 │ -│ │ - SOCKS5 │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - -Modified variable - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.color │ Color. │ -│  regexp   basic   mandatory   auto modified  │ Validator: text based with regular expressions "^#(?:[0-9a-f]{3}){1,2}$" │ -│ │ Default: random color value │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.username │ Username. │ +│  UNIX user   standard   mandatory    │ Mandatory: if a password is set │ +│ disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.password │ Password. │ +│  secret   standard   disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/result_tutorial/211/doc.json b/tests/result_tutorial/211/doc.json index e51ed935c..125c8634d 100644 --- a/tests/result_tutorial/211/doc.json +++ b/tests/result_tutorial/211/doc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "firefox", - "names": [ - "firefox" - ], + "name": "firefox", "description": "Firefox", "properties": [], "mode": "basic", @@ -15,6 +13,18 @@ }, "children": { "proxy_mode": { + "path": "firefox.proxy_mode", + "name": "proxy_mode", + "description": "Configure Proxy Access to the Internet.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -30,33 +40,13 @@ "Manual proxy configuration", "Automatic proxy configuration URL" ] - }, - "path": "firefox.proxy_mode", - "names": [ - "proxy_mode" - ], - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "No proxy" - ], - "mandatory_without_value": false + } }, "manual": { "type": "family", "informations": { "path": "firefox.manual", - "names": [ - "manual" - ], + "name": "manual", "description": "Manual proxy configuration", "properties": [ { @@ -80,28 +70,15 @@ "type": "family", "informations": { "path": "firefox.manual.http_proxy", - "names": [ - "http_proxy" - ], + "name": "http_proxy", "description": "HTTP Proxy", "properties": [], "mode": "basic" }, "children": { "address": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "firefox.manual.http_proxy.address", - "names": [ - "address" - ], + "name": "address", "description": "Proxy address.", "properties": [ { @@ -112,12 +89,29 @@ } ], "mode": "basic", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" + ] + } }, "port": { + "path": "firefox.manual.http_proxy.port", + "name": "port", + "description": "Proxy port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,39 +125,13 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.http_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, "use_for_https": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.manual.use_for_https", - "names": [ - "use_for_https" - ], + "name": "use_for_https", "description": "Also use this proxy for HTTPS.", "properties": [ { @@ -174,18 +142,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "https_proxy": { "type": "family", "informations": { "path": "firefox.manual.https_proxy", - "names": [ - "https_proxy" - ], + "name": "https_proxy", "description": "HTTPS Proxy", "properties": [ { @@ -206,6 +174,18 @@ }, "children": { "address": { + "path": "firefox.manual.https_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -225,12 +205,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.https_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.https_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -240,12 +220,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -266,25 +240,7 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.https_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + } } } }, @@ -292,15 +248,25 @@ "type": "family", "informations": { "path": "firefox.manual.socks_proxy", - "names": [ - "socks_proxy" - ], + "name": "socks_proxy", "description": "SOCKS Proxy", "properties": [], "mode": "standard" }, "children": { "address": { + "path": "firefox.manual.socks_proxy.address", + "name": "address", + "description": "Proxy address.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -320,12 +286,12 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "firefox.manual.socks_proxy.address", - "names": [ - "address" - ], - "description": "Proxy address.", + } + }, + "port": { + "path": "firefox.manual.socks_proxy.port", + "name": "port", + "description": "Proxy port.", "properties": [ { "type": "property", @@ -335,12 +301,6 @@ } ], "mode": "standard", - "gen_examples": [ - "example.net" - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", @@ -361,12 +321,12 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, - "path": "firefox.manual.socks_proxy.port", - "names": [ - "port" - ], - "description": "Proxy port.", + } + }, + "version": { + "path": "firefox.manual.socks_proxy.version", + "name": "version", + "description": "SOCKS host version used by proxy.", "properties": [ { "type": "property", @@ -376,12 +336,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "version": { "type": "variable", "default": { "name": "Default", @@ -394,46 +348,15 @@ "v4", "v5" ] - }, - "path": "firefox.manual.socks_proxy.version", - "names": [ - "version" - ], - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "v5" - ], - "mandatory_without_value": false + } } } } } }, "auto": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "firefox.auto", - "names": [ - "auto" - ], + "name": "auto", "description": "Automatic proxy configuration URL.", "properties": [ { @@ -457,28 +380,21 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true - }, - "no_proxy": { "type": "variable", - "variable_type": "domainname", + "variable_type": "web address", "validators": { "name": "Validators", "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" + "the domain name can be a hostname" ] - }, + } + }, + "no_proxy": { "path": "firefox.no_proxy", - "names": [ - "no_proxy" - ], + "name": "no_proxy", "description": "Address for which proxy will be desactivated.", "help": [ "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." @@ -505,6 +421,18 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can starts by a dot", + "the domain name can be a hostname", + "the domain name can be an IP", + "the domain name can be network in CIDR format" + ] + }, "multiple": true, "examples": { "name": "Examples", @@ -513,27 +441,11 @@ ".net.nz", "192.168.1.0/24" ] - }, - "gen_examples": [ - [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - ], - "mandatory_without_value": false + } }, "prompt_authentication": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "firefox.prompt_authentication", - "names": [ - "prompt_authentication" - ], + "name": "prompt_authentication", "description": "Prompt for authentication if password is saved.", "properties": [ { @@ -557,22 +469,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "proxy_dns_socks5": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "proxy_dns_socks5": { "path": "firefox.proxy_dns_socks5", - "names": [ - "proxy_dns_socks5" - ], + "name": "proxy_dns_socks5", "description": "Use proxy DNS when using SOCKS v5.", "properties": [ { @@ -602,34 +508,26 @@ } ], "mode": "advanced", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "dns_over_https": { "type": "family", "informations": { "path": "firefox.dns_over_https", - "names": [ - "dns_over_https" - ], + "name": "dns_over_https", "description": "DNS over HTTPS", "properties": [], "mode": "basic" }, "children": { "enable_dns_over_https": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "firefox.dns_over_https.enable_dns_over_https", - "names": [ - "enable_dns_over_https" - ], + "name": "enable_dns_over_https", "description": "Enable DNS over HTTPS.", "properties": [ { @@ -640,30 +538,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "provider": { "type": "variable", "default": { "name": "Default", - "values": "Cloudflare" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "Cloudflare", - "NextDNS", - "Custom" - ] + "values": false }, + "variable_type": "boolean" + }, + "provider": { "path": "firefox.dns_over_https.provider", - "names": [ - "provider" - ], + "name": "provider", "description": "Use Provider.", "properties": [ { @@ -687,30 +571,24 @@ } ], "mode": "standard", - "gen_examples": [ - "Cloudflare" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "Cloudflare" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "Cloudflare", + "NextDNS", + "Custom" + ] + } }, "custom_dns_url": { - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname", - { - "description": "must starts with 'https://' only" - } - ] - }, "path": "firefox.dns_over_https.custom_dns_url", - "names": [ - "custom_dns_url" - ], + "name": "custom_dns_url", "description": "Custom DNS URL.", "properties": [ { @@ -736,10 +614,20 @@ } ], "mode": "basic", - "gen_examples": [ - "https://example.net" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname", + { + "description": "must starts with 'https://' only" + } + ] + } } } } @@ -749,9 +637,7 @@ "type": "namespace", "informations": { "path": "foxyproxy", - "names": [ - "foxyproxy" - ], + "name": "foxyproxy", "description": "Foxyproxy", "properties": [], "mode": "basic", @@ -764,9 +650,7 @@ "type": "leadership", "informations": { "path": "foxyproxy.proxies", - "names": [ - "proxies" - ], + "name": "proxies", "description": "Proxy configuration", "properties": [], "mode": "basic", @@ -776,12 +660,8 @@ }, "children": { "title": { - "type": "variable", - "variable_type": "string", "path": "foxyproxy.proxies.title", - "names": [ - "title" - ], + "name": "title", "description": "Title or Description.", "properties": [ { @@ -792,15 +672,23 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "type": { + "path": "foxyproxy.proxies.type", + "name": "type", + "description": "Proxy Type.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -819,45 +707,11 @@ "System (use system settings)", "Direct (no proxy)" ] - }, - "path": "foxyproxy.proxies.type", - "names": [ - "type" - ], - "description": "Proxy Type.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "Direct (no proxy)" - ] - ], - "mandatory_without_value": false + } }, "color": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "random color value" - } - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "foxyproxy.proxies.color", - "names": [ - "color" - ], + "name": "color", "description": "Color.", "properties": [ { @@ -874,34 +728,22 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "#28a5ff" - ] - ], - "mandatory_without_value": false - }, - "address": { "type": "variable", "default": { "name": "Default", "values": { - "description": "copy HTTP address if proxy is not \"Manual\"" + "description": "random color value" } }, - "variable_type": "domainname", + "variable_type": "regexp", "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be a hostname", - "the domain name can be an IP" - ] - }, + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + } + }, + "address": { "path": "foxyproxy.proxies.address", - "names": [ - "address" - ], + "name": "address", "description": "IP address, DNS name, server name.", "properties": [ { @@ -921,34 +763,26 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false - }, - "port": { "type": "variable", "default": { "name": "Default", "values": { - "description": "copy HTTP port if proxy is not \"Manual\"" + "description": "copy HTTP address if proxy is not \"Manual\"" } }, - "variable_type": "port", + "variable_type": "domainname", "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" + "type domainname", + "the domain name can be a hostname", + "the domain name can be an IP" ] - }, + } + }, + "port": { "path": "foxyproxy.proxies.port", - "names": [ - "port" - ], + "name": "port", "description": "Port.", "properties": [ { @@ -968,20 +802,26 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "8080" + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP port if proxy is not \"Manual\"" + } + }, + "variable_type": "port", + "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" ] - ], - "mandatory_without_value": false + } }, "username": { - "type": "variable", - "variable_type": "UNIX user", "path": "foxyproxy.proxies.username", - "names": [ - "username" - ], + "name": "username", "description": "Username.", "properties": [ { @@ -995,20 +835,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "username" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "UNIX user" }, "password": { - "type": "variable", - "variable_type": "secret", "path": "foxyproxy.proxies.password", - "names": [ - "password" - ], + "name": "password", "description": "Password.", "properties": [ { @@ -1031,35 +863,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "secrets" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "secret" }, "url": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is \"Auto\"" - } - }, - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - }, "path": "foxyproxy.proxies.url", - "names": [ - "url" - ], + "name": "url", "description": "URL.", "properties": [ { @@ -1079,12 +888,23 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "https://example.net" + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is \"Auto\"" + } + }, + "variable_type": "web address", + "validators": { + "name": "Validators", + "values": [ + "well-known ports (1 to 1023) are allowed", + "registred ports (1024 to 49151) are allowed", + "type domainname", + "the domain name can be a hostname" ] - ], - "mandatory_without_value": false + } } } } diff --git a/tests/result_tutorial/211/doc.sh b/tests/result_tutorial/211/doc.sh new file mode 100644 index 000000000..8ec495d62 --- /dev/null +++ b/tests/result_tutorial/211/doc.sh @@ -0,0 +1,316 @@ +Firefox + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: firefox +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.proxy_mode │ Configure Proxy Access to the │ +│  choice   standard   mandatory  │ Internet. │ +│ │ Choices: │ +│ │ • No proxy ← (default) │ +│ │ • Auto-detect proxy settings for │ +│ │ this network │ +│ │ • Use system proxy settings │ +│ │ • Manual proxy configuration │ +│ │ • Automatic proxy configuration URL │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + Manual proxy configuration + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual +▌  basic   disabled  +▌ Disabled: when the variable "firefox.proxy_mode" hasn't the value "Manual  +proxy configuration" + + HTTP Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.http_proxy +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.http_proxy.address │ Proxy address. │ +│  domainname   basic   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.http_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: 8080 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.use_for_https │ Also use this proxy for HTTPS. │ +│  boolean   standard   mandatory  │ Default: true │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + HTTPS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.https_proxy +▌  standard   hidden  +▌ Hidden: when the variable "firefox.manual.use_for_https" has the value "true" + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.https_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.https_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + SOCKS Proxy + +▌ 🛈 Informations +▌  +▌ Path: firefox.manual.socks_proxy +▌  standard  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.manual.socks_proxy.address │ Proxy address. │ +│  domainname   standard   mandatory  │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can be an IP │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.address" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.port │ Proxy port. │ +│  port   standard   mandatory  │ Validators: │ +│ │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: the value of the variable │ +│ │ "firefox.manual.http_proxy.port" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.manual.socks_proxy.version │ SOCKS host version used by proxy. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • v4 │ +│ │ • v5 ← (default) │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.auto │ Automatic proxy configuration URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" hasn't the │ +│ │ value "Automatic proxy configuration │ +│ │ URL" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.no_proxy │ Address for which proxy will be │ +│  domainname   multiple   standard    │ desactivated. │ +│ disabled   unique  │ Connections to localhost, │ +│ │ 127.0.0.1/8 and ::1 are never │ +│ │ proxied. │ +│ │ Validators: │ +│ │ • type domainname │ +│ │ • the domain name can starts by a │ +│ │ dot │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ • the domain name can be network in │ +│ │ CIDR format │ +│ │ Examples: │ +│ │ • .mozilla.org │ +│ │ • .net.nz │ +│ │ • 192.168.1.0/24 │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.prompt_authentication │ Prompt for authentication if │ +│  boolean   standard   mandatory    │ password is saved. │ +│ disabled  │ Default: true │ +│ │ Disabled: when the variable │ +│ │ "firefox.proxy_mode" has the value │ +│ │ "No proxy" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.proxy_dns_socks5 │ Use proxy DNS when using SOCKS v5. │ +│  boolean   advanced   mandatory    │ Default: false │ +│ disabled  │ Disabled: if "firefox.proxy_mode" is │ +│ │ not "Manual proxy configuration" │ +│ │ or │ +│ │ "firefox.manual.socks_proxy.version" │ +│ │ is "v4" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + DNS over HTTPS + +▌ 🛈 Informations +▌  +▌ Path: firefox.dns_over_https +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ firefox.dns_over_https.enable_dns_ov… │ Enable DNS over HTTPS. │ +│  boolean   standard   mandatory  │ Default: false │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.provider │ Use Provider. │ +│  choice   standard   mandatory    │ Choices: │ +│ disabled  │ • Cloudflare ← (default) │ +│ │ • NextDNS │ +│ │ • Custom │ +│ │ Disabled: when the variable │ +│ │ "firefox.dns_over_https.enable_dns_… │ +│ │ has the value "false" │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ firefox.dns_over_https.custom_dns_url │ Custom DNS URL. │ +│  web address   basic   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • must starts with 'https://' only │ +│ │ Disabled: if │ +│ │ "firefox.dns_over_https.provider" is │ +│ │ not "Custom" │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + +Foxyproxy + +▌ 🛈 Informations +▌  +▌ This family is a namespace. +▌ Path: foxyproxy +▌  basic  + + Proxy configuration + +▌ 🛈 Informations +▌  +▌ This family contains lists of variable blocks. +▌ Path: foxyproxy.proxies +▌  basic  + +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.title │ Title or Description. │ +│  string   multiple   standard    │ │ +│ unique  │ │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.type │ Proxy Type. │ +│  choice   standard   mandatory  │ Choices: │ +│ │ • HTTP │ +│ │ • HTTPS/SSL │ +│ │ • SOCKS4 │ +│ │ • SOCKS5 │ +│ │ • PAC URL │ +│ │ • WPAD │ +│ │ • System (use system settings) │ +│ │ • Direct (no proxy) ← (default) │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.color │ Color. │ +│  regexp   basic   mandatory   auto  │ Validator: text based with regular │ +│ modified  │ expressions │ +│ │ "^#(?:[0-9a-f]{3}){1,2}$" │ +│ │ Default: random color value │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.address │ IP address, DNS name, server name. │ +│  domainname   standard   mandatory    │ Validators: │ +│ disabled  │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ • the domain name can be an IP │ +│ │ Default: copy HTTP address if proxy │ +│ │ is not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.port │ Port. │ +│  port   standard   mandatory    │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • private ports (greater than 49152) │ +│ │ are allowed │ +│ │ Default: copy HTTP port if proxy is │ +│ │ not "Manual" │ +│ │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.username │ Username. │ +│  UNIX user   standard   disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.password │ Password. │ +│  secret   standard   hidden    │ Hidden: if username is empty │ +│ disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.url │ URL. │ +│  web address   standard   mandatory  │ Validators: │ +│ disabled  │ • well-known ports (1 to 1023) are │ +│ │ allowed │ +│ │ • registred ports (1024 to 49151) │ +│ │ are allowed │ +│ │ • type domainname │ +│ │ • the domain name can be a hostname │ +│ │ Default: copy HTTP address if proxy │ +│ │ is "Auto" │ +│ │ Disabled: if type is not in: │ +│ │ - PAC URL │ +│ │ - WPAD │ +└───────────────────────────────────────┴──────────────────────────────────────┘ + + diff --git a/tests/result_tutorial/211/doc_changelog.sh b/tests/result_tutorial/211/doc_changelog.sh index e99de294c..de58585b0 100644 --- a/tests/result_tutorial/211/doc_changelog.sh +++ b/tests/result_tutorial/211/doc_changelog.sh @@ -1,26 +1,22 @@ Modified variables -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Variable  ┃ Description  ┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ foxyproxy.proxies.color │ Color. │ -│  regexp   basic   mandatory   auto modified  │ Validator: text based with regular expressions "^#(?:[0-9a-f]{3}){1,2}$" │ -│ │ Default: random color value │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ foxyproxy.proxies.username │ Username. │ -│  mandatory   UNIX user   standard   disabled  │ Mandatory: if a password is set │ -│ │ Disabled: if type not in: │ -│ │ - HTTP │ -│ │ - HTTPS/SSL │ -│ │ - SOCKS4 │ -│ │ - SOCKS5 │ -├────────────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ foxyproxy.proxies.password │ Password. │ -│  secret   standard   hidden   disabled  │ Hidden: if username is empty │ -│ │ Disabled: if type not in: │ -│ │ - HTTP │ -│ │ - HTTPS/SSL │ -│ │ - SOCKS4 │ -│ │ - SOCKS5 │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ +┃ Variable  ┃ Description  ┃ +┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ +│ foxyproxy.proxies.username │ Username. │ +│  mandatory   UNIX user   standard    │ Mandatory: if a password is set │ +│ disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +├───────────────────────────────────────┼──────────────────────────────────────┤ +│ foxyproxy.proxies.password │ Password. │ +│  secret   standard   hidden    │ Hidden: if username is empty │ +│ disabled  │ Disabled: if type not in: │ +│ │ - HTTP │ +│ │ - HTTPS/SSL │ +│ │ - SOCKS4 │ +│ │ - SOCKS5 │ +└───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test/00_0version_underscore.json b/tests/results/test/00_0version_underscore.json index a55b11525..f44cdb8f6 100644 --- a/tests/results/test/00_0version_underscore.json +++ b/tests/results/test/00_0version_underscore.json @@ -1,11 +1,7 @@ { "version": { - "type": "variable", - "variable_type": "string", "path": "version", - "names": [ - "version" - ], + "name": "version", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_1empty_variable.json b/tests/results/test/00_1empty_variable.json index ad3c8f23d..d592c39c3 100644 --- a/tests/results/test/00_1empty_variable.json +++ b/tests/results/test/00_1empty_variable.json @@ -1,11 +1,7 @@ { "empty": { - "type": "variable", - "variable_type": "string", "path": "empty", - "names": [ - "empty" - ], + "name": "empty", "properties": [ { "type": "property", @@ -15,9 +11,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_2default_calculated.json b/tests/results/test/00_2default_calculated.json index 1bbd0e3e8..86c7b9f36 100644 --- a/tests/results/test/00_2default_calculated.json +++ b/tests/results/test/00_2default_calculated.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,24 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value of var1" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -54,12 +38,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var1" + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_2default_calculated_multi.json b/tests/results/test/00_2default_calculated_multi.json index 013f7a00a..1d66b97ec 100644 --- a/tests/results/test/00_2default_calculated_multi.json +++ b/tests/results/test/00_2default_calculated_multi.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes", - "maybe" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -30,35 +18,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "no", "yes", "maybe" ] - ], - "mandatory_without_value": false - }, - "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of \"{0}\"", - "variables": [ - { - "path": "var1", - "description": "a first variable" - } - ] - } }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -75,14 +49,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no", - "yes", - "maybe" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "var1", + "description": "a first variable" + } + ] + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_2default_calculated_params_permissive.json b/tests/results/test/00_2default_calculated_params_permissive.json index 13a242260..f392e16fe 100644 --- a/tests/results/test/00_2default_calculated_params_permissive.json +++ b/tests/results/test/00_2default_calculated_params_permissive.json @@ -1,15 +1,7 @@ { "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "a_value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_2default_calculated_variable.json b/tests/results/test/00_2default_calculated_variable.json index 9d5cfeff9..d7fa72456 100644 --- a/tests/results/test/00_2default_calculated_variable.json +++ b/tests/results/test/00_2default_calculated_variable.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -29,15 +18,36 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" ] - ], - "mandatory_without_value": true + }, + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -55,32 +65,6 @@ "name": "Validator", "values": "type domainname" }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_2default_calculated_variable_description.json b/tests/results/test/00_2default_calculated_variable_description.json index 95c8afdfd..188918ca7 100644 --- a/tests/results/test/00_2default_calculated_variable_description.json +++ b/tests/results/test/00_2default_calculated_variable_description.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,24 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "value of a variable!" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -44,9 +28,13 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "value of a variable!" + } + }, + "variable_type": "string" } } \ No newline at end of file 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 8cd3729dc..9286d7dae 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 @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,24 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "value\nof\na\nvariable!" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -44,18 +28,18 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "value\nof\na\nvariable!" + } + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A new variable.", "properties": [ { @@ -66,9 +50,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_2default_calculated_variable_transitive.json b/tests/results/test/00_2default_calculated_variable_transitive.json index 7b15f900c..11e5dda9f 100644 --- a/tests/results/test/00_2default_calculated_variable_transitive.json +++ b/tests/results/test/00_2default_calculated_variable_transitive.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -29,15 +18,36 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" ] - ], - "mandatory_without_value": true + }, + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -58,32 +68,6 @@ "the domain name can be an IP" ] }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_4load_subfolder.json b/tests/results/test/00_4load_subfolder.json index b22d24502..a1da77af6 100644 --- a/tests/results/test/00_4load_subfolder.json +++ b/tests/results/test/00_4load_subfolder.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -16,18 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -38,9 +28,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_5load_notype.json b/tests/results/test/00_5load_notype.json index 3a379e5cd..ad6667eb0 100644 --- a/tests/results/test/00_5load_notype.json +++ b/tests/results/test/00_5load_notype.json @@ -1,15 +1,7 @@ { "without_type": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "without_type", - "names": [ - "without_type" - ], + "name": "without_type", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_6boolean.json b/tests/results/test/00_6boolean.json index 80df69245..a8603fe8b 100644 --- a/tests/results/test/00_6boolean.json +++ b/tests/results/test/00_6boolean.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/results/test/00_6boolean_no_mandatory.json b/tests/results/test/00_6boolean_no_mandatory.json index 629315cf1..c30395b40 100644 --- a/tests/results/test/00_6boolean_no_mandatory.json +++ b/tests/results/test/00_6boolean_no_mandatory.json @@ -1,21 +1,15 @@ { "variable": { + "path": "variable", + "name": "variable", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", - "path": "variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/results/test/00_6choice.json b/tests/results/test/00_6choice.json index 565de5475..eee67096b 100644 --- a/tests/results/test/00_6choice.json +++ b/tests/results/test/00_6choice.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -24,12 +12,6 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true - }, - "var2": { "type": "variable", "variable_type": "choice", "choices": { @@ -39,11 +21,11 @@ "b", "c" ] - }, + } + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -54,12 +36,23 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + } }, "var3": { + "path": "var3", + "name": "var3", + "description": "The third variable.", + "properties": [], + "mode": "standard", "type": "variable", "variable_type": "choice", "choices": { @@ -70,20 +63,14 @@ "c", null ] - }, - "path": "var3", - "names": [ - "var3" - ], - "description": "The third variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } }, "var4": { + "path": "var4", + "name": "var4", + "description": "The forth variable.", + "properties": [], + "mode": "standard", "type": "variable", "variable_type": "choice", "choices": { @@ -93,20 +80,21 @@ "b", "c" ] - }, - "path": "var4", - "names": [ - "var4" - ], - "description": "The forth variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } }, "var5": { + "path": "var5", + "name": "var5", + "description": "The fifth variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -120,12 +108,12 @@ "b", "c" ] - }, - "path": "var5", - "names": [ - "var5" - ], - "description": "The fifth variable.", + } + }, + "var6": { + "path": "var6", + "name": "var6", + "description": "The sixth variable.", "properties": [ { "type": "property", @@ -135,12 +123,6 @@ } ], "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -154,24 +136,6 @@ 2, 3 ] - }, - "path": "var6", - "names": [ - "var6" - ], - "description": "The sixth variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6choice_calculation.json b/tests/results/test/00_6choice_calculation.json index fa5ae7779..4867da6f8 100644 --- a/tests/results/test/00_6choice_calculation.json +++ b/tests/results/test/00_6choice_calculation.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "choices is 0 to 9" } - }, - "path": "var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6choice_link.json b/tests/results/test/00_6choice_link.json index fb16ae262..8cceebe1e 100644 --- a/tests/results/test/00_6choice_link.json +++ b/tests/results/test/00_6choice_link.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -24,12 +12,30 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + } }, "var2": { + "path": "var2", + "name": "var2", + "description": "The second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -50,24 +56,6 @@ "b", "c" ] - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "The second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6choice_variable.json b/tests/results/test/00_6choice_variable.json index 1892c6788..5c78fdfdf 100644 --- a/tests/results/test/00_6choice_variable.json +++ b/tests/results/test/00_6choice_variable.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -57,24 +59,6 @@ }, "description": "A second variable" } - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6choice_variable_link.json b/tests/results/test/00_6choice_variable_link.json index 8c471e2e9..5cf89cf6c 100644 --- a/tests/results/test/00_6choice_variable_link.json +++ b/tests/results/test/00_6choice_variable_link.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -57,12 +59,12 @@ }, "description": "A second variable" } - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A first variable.", + } + }, + "var3": { + "path": "var3", + "name": "var3", + "description": "A third variable.", "properties": [ { "type": "property", @@ -72,12 +74,6 @@ } ], "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -101,24 +97,6 @@ }, "description": "A second variable" } - }, - "path": "var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6choice_variable_link2.json b/tests/results/test/00_6choice_variable_link2.json index 064f92b2b..0b892f6d0 100644 --- a/tests/results/test/00_6choice_variable_link2.json +++ b/tests/results/test/00_6choice_variable_link2.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -57,39 +59,31 @@ }, "description": "A second variable" } - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "standard" }, "children": { "var3": { + "path": "family.var3", + "name": "var3", + "description": "A third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -113,25 +107,7 @@ }, "description": "A second variable" } - }, - "path": "family.var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test/00_6custom.json b/tests/results/test/00_6custom.json index c7e278007..635c16d85 100644 --- a/tests/results/test/00_6custom.json +++ b/tests/results/test/00_6custom.json @@ -1,11 +1,7 @@ { "custom1": { - "type": "variable", - "variable_type": "custom", "path": "custom1", - "names": [ - "custom1" - ], + "name": "custom1", "description": "The first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "xxx" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "custom" }, "custom2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "custom", "path": "custom2", - "names": [ - "custom2" - ], + "name": "custom2", "description": "The seconf variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "custom" } } \ No newline at end of file diff --git a/tests/results/test/00_6domainname.json b/tests/results/test/00_6domainname.json index 302c0b890..1c044cff3 100644 --- a/tests/results/test/00_6domainname.json +++ b/tests/results/test/00_6domainname.json @@ -1,19 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "my.domain.name" - }, - "variable_type": "domainname", - "validators": { - "name": "Validator", - "values": "type domainname" - }, "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A domain name variable.", "properties": [ { @@ -24,9 +12,15 @@ } ], "mode": "standard", - "gen_examples": [ - "my.domain.name" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "my.domain.name" + }, + "variable_type": "domainname", + "validators": { + "name": "Validator", + "values": "type domainname" + } } } \ No newline at end of file diff --git a/tests/results/test/00_6domainname_params.json b/tests/results/test/00_6domainname_params.json index bc965714d..d4c9db648 100644 --- a/tests/results/test/00_6domainname_params.json +++ b/tests/results/test/00_6domainname_params.json @@ -1,5 +1,17 @@ { "variable": { + "path": "variable", + "name": "variable", + "description": "A domain name variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "variable", - "names": [ - "variable" - ], - "description": "A domain name variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "my.domain.name" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6float.json b/tests/results/test/00_6float.json index 64bee977d..9031038cb 100644 --- a/tests/results/test/00_6float.json +++ b/tests/results/test/00_6float.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0.0 - }, - "variable_type": "float", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10.1 + "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10.1 }, - "variable_type": "float", + "variable_type": "float" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10.1 }, - "variable_type": "float", + "variable_type": "float" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10.1 + }, + "variable_type": "float" } } \ No newline at end of file diff --git a/tests/results/test/00_6integer.json b/tests/results/test/00_6integer.json index e17f2bd49..64293bac2 100644 --- a/tests/results/test/00_6integer.json +++ b/tests/results/test/00_6integer.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0 - }, - "variable_type": "integer", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10 + "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "This forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10 + }, + "variable_type": "integer" } } \ No newline at end of file diff --git a/tests/results/test/00_6ip.adoc b/tests/results/test/00_6ip.adoc index 656055c1b..97349db9d 100644 --- a/tests/results/test/00_6ip.adoc +++ b/tests/results/test/00_6ip.adoc @@ -13,7 +13,7 @@ * reserved IP are allowed **Default**: 1.1.1.1/24 + -**Example**: 192.168.0.128/25 +**Example**: 192.168.0.129/25 | **var3** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[CIDR]` `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type. + **Validator**: IP must be in CIDR format + diff --git a/tests/results/test/00_6ip.gitlab.md b/tests/results/test/00_6ip.gitlab.md index 99a1ded55..987c09a28 100644 --- a/tests/results/test/00_6ip.gitlab.md +++ b/tests/results/test/00_6ip.gitlab.md @@ -1,6 +1,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
[`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
**Validator**: reserved IP are allowed
**Default**: 1.1.1.1 | -| **var2**
[`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
**Validators**:
• IP must be in CIDR format
• reserved IP are allowed
**Default**: 1.1.1.1/24
**Example**: 192.168.0.128/25 | +| **var2**
[`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
**Validators**:
• IP must be in CIDR format
• reserved IP are allowed
**Default**: 1.1.1.1/24
**Example**: 192.168.0.129/25 | | **var3**
[`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
**Validator**: IP must be in CIDR format
**Default**: 1.1.1.1/24 | diff --git a/tests/results/test/00_6ip.html b/tests/results/test/00_6ip.html index 86a690e85..531dea2b1 100644 --- a/tests/results/test/00_6ip.html +++ b/tests/results/test/00_6ip.html @@ -5,7 +5,7 @@ var1
IP standard mandatory An IP.
Validator: reserved IP are allowed
Default: 1.1.1.1 var2
IP standard mandatory An IP in CIDR format.
Validators:
  • IP must be in CIDR format
    • -
  • reserved IP are allowed

Default: 1.1.1.1/24
Example: 192.168.0.128/25 +
  • reserved IP are allowed

    • Default: 1.1.1.1/24
    Example: 192.168.0.129/25 var3
    CIDR standard mandatoryAn IP in CIDR format with obsolete CIDR type.
    Validator: IP must be in CIDR format
    Default: 1.1.1.1/24 diff --git a/tests/results/test/00_6ip.json b/tests/results/test/00_6ip.json index bb2d70e2b..570b31f8d 100644 --- a/tests/results/test/00_6ip.json +++ b/tests/results/test/00_6ip.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.1" - }, - "variable_type": "IP", - "validators": { - "name": "Validator", - "values": "reserved IP are allowed" - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "An IP.", "properties": [ { @@ -24,12 +12,30 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.1" + }, + "variable_type": "IP", + "validators": { + "name": "Validator", + "values": "reserved IP are allowed" + } }, "var2": { + "path": "var2", + "name": "var2", + "description": "An IP in CIDR format.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -43,44 +49,14 @@ "reserved IP are allowed" ] }, - "path": "var2", - "names": [ - "var2" - ], - "description": "An IP in CIDR format.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", - "values": "192.168.0.128/25" - }, - "gen_examples": [ - "192.168.0.128/25" - ], - "mandatory_without_value": false + "values": "192.168.0.129/25" + } }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.1/24" - }, - "variable_type": "CIDR", - "validators": { - "name": "Validator", - "values": "IP must be in CIDR format" - }, "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "An IP in CIDR format with obsolete CIDR type.", "properties": [ { @@ -91,9 +67,15 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.1/24" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.1/24" + }, + "variable_type": "CIDR", + "validators": { + "name": "Validator", + "values": "IP must be in CIDR format" + } } } \ No newline at end of file diff --git a/tests/results/test/00_6ip.md b/tests/results/test/00_6ip.md index 99a1ded55..987c09a28 100644 --- a/tests/results/test/00_6ip.md +++ b/tests/results/test/00_6ip.md @@ -1,6 +1,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test/00_6ip.sh b/tests/results/test/00_6ip.sh index 31c3f33f3..477bc2420 100644 --- a/tests/results/test/00_6ip.sh +++ b/tests/results/test/00_6ip.sh @@ -10,7 +10,7 @@ │ │ • IP must be in CIDR format │ │ │ • reserved IP are allowed │ │ │ Default: 1.1.1.1/24 │ -│ │ Example: 192.168.0.128/25 │ +│ │ Example: 192.168.0.129/25 │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var3 │ An IP in CIDR format with obsolete │ │  CIDR   standard   mandatory  │ CIDR type. │ diff --git a/tests/results/test/00_6network.json b/tests/results/test/00_6network.json index 838b00fbe..bfcc96f17 100644 --- a/tests/results/test/00_6network.json +++ b/tests/results/test/00_6network.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.0" - }, - "variable_type": "network", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "An network.", "properties": [ { @@ -20,26 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "1.1.1.0/24" - }, - "variable_type": "network", - "validators": { - "name": "Validator", - "values": "network must be in CIDR format" + "values": "1.1.1.0" }, + "variable_type": "network" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "An network in CIDR format.", "properties": [ { @@ -50,26 +32,20 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0/24" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": "1.1.1.0/24" }, - "variable_type": "network CIDR", + "variable_type": "network", "validators": { "name": "Validator", "values": "network must be in CIDR format" - }, + } + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "An network in CIDR format with obsolete CIDR type.", "properties": [ { @@ -80,9 +56,15 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0/24" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.0/24" + }, + "variable_type": "network CIDR", + "validators": { + "name": "Validator", + "values": "network must be in CIDR format" + } } } \ No newline at end of file diff --git a/tests/results/test/00_6number.json b/tests/results/test/00_6number.json index e17f2bd49..64293bac2 100644 --- a/tests/results/test/00_6number.json +++ b/tests/results/test/00_6number.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0 - }, - "variable_type": "integer", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10 + "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "This forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10 + }, + "variable_type": "integer" } } \ No newline at end of file diff --git a/tests/results/test/00_6port.json b/tests/results/test/00_6port.json index c6536fd69..aa91692ca 100644 --- a/tests/results/test/00_6port.json +++ b/tests/results/test/00_6port.json @@ -1,19 +1,7 @@ { "variable1": { - "type": "variable", - "variable_type": "port", - "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" - ] - }, "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A port variable.", "properties": [ { @@ -24,17 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "111" - ], - "mandatory_without_value": true - }, - "variable2": { "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, "variable_type": "port", "validators": { "name": "Validators", @@ -43,11 +21,11 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, + } + }, + "variable2": { "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A port variable with default value.", "properties": [ { @@ -58,12 +36,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "variable3": { "type": "variable", "default": { "name": "Default", @@ -77,11 +49,11 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, + } + }, + "variable3": { "path": "variable3", - "names": [ - "variable3" - ], + "name": "variable3", "description": "A port variable with integer default value.", "properties": [ { @@ -92,9 +64,19 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "8080" + }, + "variable_type": "port", + "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" + ] + } } } \ No newline at end of file diff --git a/tests/results/test/00_6regexp.json b/tests/results/test/00_6regexp.json index e156b37a4..da14904a2 100644 --- a/tests/results/test/00_6regexp.json +++ b/tests/results/test/00_6regexp.json @@ -1,19 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "#a1a1a1" - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A first variable.", "properties": [ { @@ -24,16 +12,22 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "examples": { "name": "Examples", "values": [ "#b1b1b1", "#b2b2b2" ] - }, - "gen_examples": [ - "#b1b1b1" - ], - "mandatory_without_value": false + } } } \ 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 b3e76aaa8..0f226a465 100644 --- a/tests/results/test/00_6regexp_link.json +++ b/tests/results/test/00_6regexp_link.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "#a1a1a1" - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -24,19 +12,37 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "examples": { "name": "Examples", "values": [ "#b1b1b1", "#b2b2b2" ] - }, - "gen_examples": [ - "#b1b1b1" - ], - "mandatory_without_value": false + } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -54,30 +60,12 @@ "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Examples", "values": [ "#b2b1b1", "#b3b2b2" ] - }, - "gen_examples": [ - "#b2b1b1" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6secret.json b/tests/results/test/00_6secret.json index 37111d131..69cb6c23b 100644 --- a/tests/results/test/00_6secret.json +++ b/tests/results/test/00_6secret.json @@ -1,11 +1,7 @@ { "secret1": { - "type": "variable", - "variable_type": "secret", "path": "secret1", - "names": [ - "secret1" - ], + "name": "secret1", "description": "The first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "secrets" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "secret" }, "secret2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "secret", "path": "secret2", - "names": [ - "secret2" - ], + "name": "secret2", "description": "The second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "secret" } } \ No newline at end of file diff --git a/tests/results/test/00_6secret_param.adoc b/tests/results/test/00_6secret_param.adoc index 1cea0a5d9..6ab1b5b9e 100644 --- a/tests/results/test/00_6secret_param.adoc +++ b/tests/results/test/00_6secret_param.adoc @@ -3,7 +3,8 @@ | Variable | Description | **secret1** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `basic` `mandatory` | The first variable. + -**Validator**: minimum length for the secret is 10 characters +**Validator**: minimum length for the secret is 10 characters + +**Example**: ALongS4cr4t | **secret2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `standard` `mandatory` | The second variable. + **Validators**: diff --git a/tests/results/test/00_6secret_param.gitlab.md b/tests/results/test/00_6secret_param.gitlab.md index a2571bb43..769c3635c 100644 --- a/tests/results/test/00_6secret_param.gitlab.md +++ b/tests/results/test/00_6secret_param.gitlab.md @@ -1,6 +1,6 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test/00_6secret_param.html b/tests/results/test/00_6secret_param.html index c03550757..c96f269c8 100644 --- a/tests/results/test/00_6secret_param.html +++ b/tests/results/test/00_6secret_param.html @@ -1,13 +1,13 @@ - + - + +
  • 'forbidden characters: "$" and "^"'

    • Default: value +
  • 'forbidden characters: "$"'

    • Default: value
    Variable Description
    Variable Description
    secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    Example: ALongS4cr4t
    secret2
    secret standard mandatory    		The second variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$" and "^"'

    Default: value
    secret3
    secret standard mandatory    		The third variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$"'

    Default: value
    diff --git a/tests/results/test/00_6secret_param.json b/tests/results/test/00_6secret_param.json index 3bd26f19b..9e7500a8b 100644 --- a/tests/results/test/00_6secret_param.json +++ b/tests/results/test/00_6secret_param.json @@ -1,15 +1,7 @@ { "secret1": { - "type": "variable", - "variable_type": "secret", - "validators": { - "name": "Validator", - "values": "minimum length for the secret is 10 characters" - }, "path": "secret1", - "names": [ - "secret1" - ], + "name": "secret1", "description": "The first variable.", "properties": [ { @@ -20,12 +12,30 @@ } ], "mode": "basic", - "gen_examples": [ - "secrets" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "secret", + "validators": { + "name": "Validator", + "values": "minimum length for the secret is 10 characters" + }, + "examples": { + "name": "Example", + "values": "ALongS4cr4t" + } }, "secret2": { + "path": "secret2", + "name": "secret2", + "description": "The second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -38,12 +48,12 @@ "maximum length for the secret is 10 characters", "forbidden characters: \"$\" and \"^\"" ] - }, - "path": "secret2", - "names": [ - "secret2" - ], - "description": "The second variable.", + } + }, + "secret3": { + "path": "secret3", + "name": "secret3", + "description": "The third variable.", "properties": [ { "type": "property", @@ -53,12 +63,6 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "secret3": { "type": "variable", "default": { "name": "Default", @@ -71,24 +75,6 @@ "maximum length for the secret is 10 characters", "forbidden characters: \"$\"" ] - }, - "path": "secret3", - "names": [ - "secret3" - ], - "description": "The third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_6secret_param.md b/tests/results/test/00_6secret_param.md index a2571bb43..769c3635c 100644 --- a/tests/results/test/00_6secret_param.md +++ b/tests/results/test/00_6secret_param.md @@ -1,6 +1,6 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test/00_6secret_param.sh b/tests/results/test/00_6secret_param.sh index df2e441e8..a38520869 100644 --- a/tests/results/test/00_6secret_param.sh +++ b/tests/results/test/00_6secret_param.sh @@ -4,6 +4,7 @@ │ secret1 │ The first variable. │ │  secret   basic   mandatory  │ Validator: minimum length for the │ │ │ secret is 10 characters │ +│ │ Example: ALongS4cr4t │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ secret2 │ The second variable. │ │  secret   standard   mandatory  │ Validators: │ diff --git a/tests/results/test/00_6string.json b/tests/results/test/00_6string.json index 444169622..c2e0d8fb1 100644 --- a/tests/results/test/00_6string.json +++ b/tests/results/test/00_6string.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -16,18 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -38,18 +28,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -60,22 +44,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var4": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -86,22 +60,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -112,22 +80,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -138,22 +100,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", - "values": "8080" + "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -164,22 +120,16 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", - "values": "true" + "values": "8080" }, - "variable_type": "string", + "variable_type": "string" + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The height variable.", "properties": [ { @@ -190,9 +140,11 @@ } ], "mode": "standard", - "gen_examples": [ - "true" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "true" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_7choice_quote.json b/tests/results/test/00_7choice_quote.json index 839140e61..74f472129 100644 --- a/tests/results/test/00_7choice_quote.json +++ b/tests/results/test/00_7choice_quote.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A choice.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -13,24 +25,6 @@ "quote\"", "quote\"'" ] - }, - "path": "var", - "names": [ - "var" - ], - "description": "A choice.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "quote'" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_7help.json b/tests/results/test/00_7help.json index 43ba40aff..0a573fe7c 100644 --- a/tests/results/test/00_7help.json +++ b/tests/results/test/00_7help.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "help": [ "Multi line\n\nHelp\n\nWith useful information." @@ -19,18 +15,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "help": [ "Multi line\nHelp\nWith useful information." @@ -44,9 +34,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_7help_quote.json b/tests/results/test/00_7help_quote.json index ab6053e19..5a3bde9ac 100644 --- a/tests/results/test/00_7help_quote.json +++ b/tests/results/test/00_7help_quote.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "help": [ "Message with '." @@ -19,18 +15,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "help": [ "Message with \"." @@ -44,9 +34,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_7help_sup.json b/tests/results/test/00_7help_sup.json index 033ab9bd3..34b1adba5 100644 --- a/tests/results/test/00_7help_sup.json +++ b/tests/results/test/00_7help_sup.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first .", "help": [ "Multi line\n\n\n\nWith useful information." @@ -19,18 +15,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second .", "help": [ "Multi line\n\nWith useful information." @@ -44,9 +34,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_7value_doublequote.json b/tests/results/test/00_7value_doublequote.json index bd84d644e..032a89b93 100644 --- a/tests/results/test/00_7value_doublequote.json +++ b/tests/results/test/00_7value_doublequote.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote\"" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote\"" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_7value_doublequote2.json b/tests/results/test/00_7value_doublequote2.json index f6a51faf9..163cd8225 100644 --- a/tests/results/test/00_7value_doublequote2.json +++ b/tests/results/test/00_7value_doublequote2.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote'\"" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote'\"" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote'\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_7value_doublequote3.json b/tests/results/test/00_7value_doublequote3.json index e1a6538ee..772a83db6 100644 --- a/tests/results/test/00_7value_doublequote3.json +++ b/tests/results/test/00_7value_doublequote3.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote\\\"\\'" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote\\\"\\'" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote\\\"\\'" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_7value_quote.json b/tests/results/test/00_7value_quote.json index e2641ba2c..84e76dad0 100644 --- a/tests/results/test/00_7value_quote.json +++ b/tests/results/test/00_7value_quote.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote'" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote'" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote'" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_8calculation_information.json b/tests/results/test/00_8calculation_information.json index 8b4564862..52cc6a009 100644 --- a/tests/results/test/00_8calculation_information.json +++ b/tests/results/test/00_8calculation_information.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "get information test_information" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "get information test_information" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_8test.json b/tests/results/test/00_8test.json index 40c559c81..d6eae5fbe 100644 --- a/tests/results/test/00_8test.json +++ b/tests/results/test/00_8test.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -16,26 +12,16 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Example", "values": "test" - }, - "gen_examples": [ - "test" - ], - "mandatory_without_value": true + } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string", "examples": { "name": "Example", "values": "test" - }, - "gen_examples": [ - "test" - ], - "mandatory_without_value": false + } }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,28 +56,24 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Examples", "values": [ "test1", "test2" ] - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": true + } }, "var4": { - "type": "variable", - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [], "mode": "standard", + "type": "variable", + "variable_type": "string", "examples": { "name": "Examples", "values": [ @@ -101,23 +81,11 @@ "test1", "test2" ] - }, - "gen_examples": [ - null - ], - "mandatory_without_value": false + } }, "var5": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -128,22 +96,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean", "examples": { "name": "Example", "values": false - }, - "gen_examples": [ - false - ], - "mandatory_without_value": false + } }, "var6": { - "type": "variable", - "variable_type": "string", "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -160,6 +126,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -167,13 +135,6 @@ "test1", "test2" ] - }, - "gen_examples": [ - [ - "test1", - "test2" - ] - ], - "mandatory_without_value": true + } } } \ 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 c166c09ed..73438b127 100644 --- a/tests/results/test/00_9choice_variable_multi.json +++ b/tests/results/test/00_9choice_variable_multi.json @@ -1,18 +1,7 @@ { "variable1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "val1", - "val2" - ] - }, "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -29,15 +18,6 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "a_choice" - ] - ], - "mandatory_without_value": true - }, - "variable2": { "type": "variable", "variable_type": "choice", "choices": { @@ -47,10 +27,11 @@ "val2" ] }, + "multiple": true + }, + "variable2": { "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -61,12 +42,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a_choice" + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "val1", + "val2" ] - ], - "mandatory_without_value": false + }, + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_9choice_variables.json b/tests/results/test/00_9choice_variables.json index d961bec6d..b324b8ff0 100644 --- a/tests/results/test/00_9choice_variables.json +++ b/tests/results/test/00_9choice_variables.json @@ -1,15 +1,7 @@ { "source_variable_1": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "source_variable_1", - "names": [ - "source_variable_1" - ], + "name": "source_variable_1", "description": "The first source variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "source_variable_2": { "type": "variable", "default": { "name": "Default", - "values": "val2" + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "source_variable_2": { "path": "source_variable_2", - "names": [ - "source_variable_2" - ], + "name": "source_variable_2", "description": "The second source variable.", "properties": [ { @@ -46,12 +32,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val2" + }, + "variable_type": "string" }, "my_variable": { + "path": "my_variable", + "name": "my_variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -78,24 +78,6 @@ "description": "The second source variable" } ] - }, - "path": "my_variable", - "names": [ - "my_variable" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation.json b/tests/results/test/00_9default_calculation.json index 33fa4bee8..7f740435e 100644 --- a/tests/results/test/00_9default_calculation.json +++ b/tests/results/test/00_9default_calculation.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "concat all parameters" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "string_1_True_" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "concat all parameters" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation_information.json b/tests/results/test/00_9default_calculation_information.json index 748d028dd..8379f3edb 100644 --- a/tests/results/test/00_9default_calculation_information.json +++ b/tests/results/test/00_9default_calculation_information.json @@ -1,17 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns the information" - } - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns the information" + } + }, + "variable_type": "string" } } \ No newline at end of file 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 e2a492dc8..77e9f1ca8 100644 --- a/tests/results/test/00_9default_calculation_information_other_variable.json +++ b/tests/results/test/00_9default_calculation_information_other_variable.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation_multi_optional.json b/tests/results/test/00_9default_calculation_multi_optional.json index 181de22d6..2e3638b08 100644 --- a/tests/results/test/00_9default_calculation_multi_optional.json +++ b/tests/results/test/00_9default_calculation_multi_optional.json @@ -1,15 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -19,31 +11,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -59,12 +36,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation_multi_optional2.json b/tests/results/test/00_9default_calculation_multi_optional2.json index 181de22d6..2e3638b08 100644 --- a/tests/results/test/00_9default_calculation_multi_optional2.json +++ b/tests/results/test/00_9default_calculation_multi_optional2.json @@ -1,15 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -19,31 +11,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -59,12 +36,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation_multi_optional_default.json b/tests/results/test/00_9default_calculation_multi_optional_default.json index 8bcea7345..2e3638b08 100644 --- a/tests/results/test/00_9default_calculation_multi_optional_default.json +++ b/tests/results/test/00_9default_calculation_multi_optional_default.json @@ -1,15 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -19,31 +11,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -59,13 +36,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "value" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation_optional.json b/tests/results/test/00_9default_calculation_optional.json index 4c00044e1..72ca1373f 100644 --- a/tests/results/test/00_9default_calculation_optional.json +++ b/tests/results/test/00_9default_calculation_optional.json @@ -1,11 +1,7 @@ { "my_calculated_variable": { - "type": "variable", - "variable_type": "string", "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -21,12 +17,8 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation_optional_exists.json b/tests/results/test/00_9default_calculation_optional_exists.json index e05694279..77dd7dea9 100644 --- a/tests/results/test/00_9default_calculation_optional_exists.json +++ b/tests/results/test/00_9default_calculation_optional_exists.json @@ -1,18 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -28,16 +17,35 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "my_calculated_variable": { + "path": "my_calculated_variable", + "name": "my_calculated_variable", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -51,32 +59,6 @@ } }, "variable_type": "string", - "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/00_9default_calculation_param_optional.json b/tests/results/test/00_9default_calculation_param_optional.json index 24732372a..bf11dbfc4 100644 --- a/tests/results/test/00_9default_calculation_param_optional.json +++ b/tests/results/test/00_9default_calculation_param_optional.json @@ -1,5 +1,10 @@ { "var1": { + "path": "var1", + "name": "var1", + "description": "A first variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -7,30 +12,11 @@ "description": "returns a value" } }, - "variable_type": "string", - "path": "var1", - "names": [ - "var1" - ], - "description": "A first variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -41,9 +27,11 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_9default_information_other_variable.json b/tests/results/test/00_9default_information_other_variable.json index d596ee5a8..42c1358f6 100644 --- a/tests/results/test/00_9default_information_other_variable.json +++ b/tests/results/test/00_9default_information_other_variable.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"var1\"" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"var1\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_9default_information_other_variable2.json b/tests/results/test/00_9default_information_other_variable2.json index d596ee5a8..42c1358f6 100644 --- a/tests/results/test/00_9default_information_other_variable2.json +++ b/tests/results/test/00_9default_information_other_variable2.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"var1\"" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"var1\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/00_9default_integer.json b/tests/results/test/00_9default_integer.json index 4f3d9ac18..73e0a04a2 100644 --- a/tests/results/test/00_9default_integer.json +++ b/tests/results/test/00_9default_integer.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "choice for 0 to 9" } - }, - "path": "var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/00_9default_number.json b/tests/results/test/00_9default_number.json index 4f3d9ac18..73e0a04a2 100644 --- a/tests/results/test/00_9default_number.json +++ b/tests/results/test/00_9default_number.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "choice for 0 to 9" } - }, - "path": "var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/01_6boolean_multi.json b/tests/results/test/01_6boolean_multi.json index f525b5f23..a69a4b448 100644 --- a/tests/results/test/01_6boolean_multi.json +++ b/tests/results/test/01_6boolean_multi.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - true - ] - }, - "variable_type": "boolean", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,15 +18,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -45,10 +26,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -65,15 +47,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -82,10 +55,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -102,27 +76,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - false + true ] }, "variable_type": "boolean", + "multiple": true + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -139,15 +105,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -156,10 +113,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -176,15 +134,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -193,10 +142,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -213,27 +163,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - true + false ] }, "variable_type": "boolean", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -250,15 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -267,10 +200,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -287,12 +221,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ true ] - ], - "mandatory_without_value": false + }, + "variable_type": "boolean", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_6custom_multi.json b/tests/results/test/01_6custom_multi.json index e95ef462f..d785e4923 100644 --- a/tests/results/test/01_6custom_multi.json +++ b/tests/results/test/01_6custom_multi.json @@ -1,11 +1,7 @@ { "custom1": { - "type": "variable", - "variable_type": "custom", "path": "custom1", - "names": [ - "custom1" - ], + "name": "custom1", "description": "A first custom variable.", "properties": [ { @@ -22,27 +18,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "xxx" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "custom", + "multiple": true }, "custom2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "custom", "path": "custom2", - "names": [ - "custom2" - ], + "name": "custom2", "description": "A second custom variable.", "properties": [ { @@ -59,12 +41,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "custom", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_6float_multi.json b/tests/results/test/01_6float_multi.json index 979d78e1c..4ae5efa9b 100644 --- a/tests/results/test/01_6float_multi.json +++ b/tests/results/test/01_6float_multi.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0.0 - ] - }, - "variable_type": "float", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,15 +18,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -45,10 +26,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -65,15 +47,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -82,10 +55,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -102,27 +76,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - 10.1 + 0.0 ] }, "variable_type": "float", + "multiple": true + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -139,15 +105,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -156,10 +113,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -176,15 +134,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -193,10 +142,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -213,27 +163,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - 0.0 + 10.1 ] }, "variable_type": "float", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -250,15 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -267,10 +200,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -287,12 +221,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ 0.0 ] - ], - "mandatory_without_value": false + }, + "variable_type": "float", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_6integer_multi.json b/tests/results/test/01_6integer_multi.json index 767dcee8f..c48e7bf46 100644 --- a/tests/results/test/01_6integer_multi.json +++ b/tests/results/test/01_6integer_multi.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0 - ] - }, - "variable_type": "integer", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,15 +18,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -45,10 +26,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -65,15 +47,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -82,10 +55,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -102,27 +76,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - 10 + 0 ] }, "variable_type": "integer", + "multiple": true + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -139,15 +105,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -156,10 +113,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -176,15 +134,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -193,10 +142,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -213,27 +163,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - 0 + 10 ] }, "variable_type": "integer", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -250,15 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -267,10 +200,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -287,12 +221,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ 0 ] - ], - "mandatory_without_value": false + }, + "variable_type": "integer", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_6integer_multi_mandatory.json b/tests/results/test/01_6integer_multi_mandatory.json index e5aee1c5a..3858d26bb 100644 --- a/tests/results/test/01_6integer_multi_mandatory.json +++ b/tests/results/test/01_6integer_multi_mandatory.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "integer", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "The first variable.", "properties": [ { @@ -22,12 +18,8 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - 42 - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "integer", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_6string_empty.json b/tests/results/test/01_6string_empty.json index b5fb497d6..0f899e7be 100644 --- a/tests/results/test/01_6string_empty.json +++ b/tests/results/test/01_6string_empty.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value", - null - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The second variable.", "properties": [ { @@ -29,13 +18,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value", null ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_6string_multi.json b/tests/results/test/01_6string_multi.json index 1ffb8cc01..5990b68e1 100644 --- a/tests/results/test/01_6string_multi.json +++ b/tests/results/test/01_6string_multi.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -22,21 +18,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "var2": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -53,21 +41,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "var3": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -84,27 +64,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "var4": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -121,15 +87,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -138,10 +95,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -158,15 +116,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -175,10 +124,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -195,15 +145,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", @@ -212,10 +153,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -232,15 +174,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -249,10 +182,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -269,12 +203,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_6string_multi_length.json b/tests/results/test/01_6string_multi_length.json index d1e123338..4cbdfa669 100644 --- a/tests/results/test/01_6string_multi_length.json +++ b/tests/results/test/01_6string_multi_length.json @@ -1,25 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2", - "val3" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "needs exactly 3 values" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The variable.", "properties": [ { @@ -36,17 +18,43 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2", "val3" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "needs exactly 3 values" + } + }, + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "The variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -67,33 +75,6 @@ } ] }, - "path": "var2", - "names": [ - "var2" - ], - "description": "The variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val4", - "val5" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_7value_multi_doublequote.json b/tests/results/test/01_7value_multi_doublequote.json index bbc1e9374..bc05a5814 100644 --- a/tests/results/test/01_7value_multi_doublequote.json +++ b/tests/results/test/01_7value_multi_doublequote.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote\"" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote\"" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_7value_multi_doublequote2.json b/tests/results/test/01_7value_multi_doublequote2.json index 3107ffa95..4025a2537 100644 --- a/tests/results/test/01_7value_multi_doublequote2.json +++ b/tests/results/test/01_7value_multi_doublequote2.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote'\"" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote'\"" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_7value_multi_quote.json b/tests/results/test/01_7value_multi_quote.json index a415bb340..edf7fa3da 100644 --- a/tests/results/test/01_7value_multi_quote.json +++ b/tests/results/test/01_7value_multi_quote.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote'" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote'" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_8calculation_information_multi.json b/tests/results/test/01_8calculation_information_multi.json index 98f22fc6a..aca212f9c 100644 --- a/tests/results/test/01_8calculation_information_multi.json +++ b/tests/results/test/01_8calculation_information_multi.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "get information test_information" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "get information test_information" + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/01_9choice_variable_multi.json b/tests/results/test/01_9choice_variable_multi.json index 5e8b02318..e72dc5eb5 100644 --- a/tests/results/test/01_9choice_variable_multi.json +++ b/tests/results/test/01_9choice_variable_multi.json @@ -1,19 +1,7 @@ { "variable1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "variable2": { + "path": "variable2", + "name": "variable2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", "type": "variable", "variable_type": "choice", "choices": { @@ -53,24 +55,6 @@ }, "description": "A first variable" } - }, - "path": "variable2", - "names": [ - "variable2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + } } } \ No newline at end of file diff --git a/tests/results/test/01_9choice_variable_optional.json b/tests/results/test/01_9choice_variable_optional.json index 54c857238..03126714f 100644 --- a/tests/results/test/01_9choice_variable_optional.json +++ b/tests/results/test/01_9choice_variable_optional.json @@ -1,5 +1,17 @@ { "variable": { + "path": "variable", + "name": "variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -13,24 +25,6 @@ "b", "c" ] - }, - "path": "variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "c" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/02_0tags.json b/tests/results/test/02_0tags.json index 65f33dee2..224a84d72 100644 --- a/tests/results/test/02_0tags.json +++ b/tests/results/test/02_0tags.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -16,22 +12,16 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "tags": { "name": "Tag", "values": "one_tag" - }, - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + } }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -42,16 +32,14 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "tags": { "name": "Tags", "values": [ "one_tag", "second_tag" ] - }, - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + } } } \ No newline at end of file diff --git a/tests/results/test/04_0type_param.json b/tests/results/test/04_0type_param.json index a1b44b6be..edc6f7d83 100644 --- a/tests/results/test/04_0type_param.json +++ b/tests/results/test/04_0type_param.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "A limited number.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "the minimum value is 0", "the maximum value is 100" ] - }, - "path": "int", - "names": [ - "int" - ], - "description": "A limited number.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/04_0type_param_integer.json b/tests/results/test/04_0type_param_integer.json index 38433d7ce..8435a3958 100644 --- a/tests/results/test/04_0type_param_integer.json +++ b/tests/results/test/04_0type_param_integer.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "A limited integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "the minimum value is 0", "the maximum value is 100" ] - }, - "path": "int", - "names": [ - "int" - ], - "description": "A limited integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/04_1auto_save.json b/tests/results/test/04_1auto_save.json index 74d0d5ee6..4eb151f4e 100644 --- a/tests/results/test/04_1auto_save.json +++ b/tests/results/test/04_1auto_save.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "An auto save variable.", "properties": [ { @@ -26,9 +18,11 @@ } ], "mode": "basic", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_1auto_save_and_calculated.json b/tests/results/test/04_1auto_save_and_calculated.json index 839988099..eeb7b9550 100644 --- a/tests/results/test/04_1auto_save_and_calculated.json +++ b/tests/results/test/04_1auto_save_and_calculated.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,29 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "var1", - "type": "variable" - }, - "description": "A first variable" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -59,9 +38,18 @@ } ], "mode": "basic", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "var1", + "type": "variable" + }, + "description": "A first variable" + } + }, + "variable_type": "string" } } \ No newline at end of file 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 79e748a52..31c64e04d 100644 --- a/tests/results/test/04_1auto_save_and_calculated_hidden.json +++ b/tests/results/test/04_1auto_save_and_calculated_hidden.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,24 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value is always yes" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -63,9 +47,13 @@ } ], "mode": "basic", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value is always yes" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_1default_calculation_hidden.json b/tests/results/test/04_1default_calculation_hidden.json index 689c96aef..a8ad15f79 100644 --- a/tests/results/test/04_1default_calculation_hidden.json +++ b/tests/results/test/04_1default_calculation_hidden.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -55,22 +45,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -81,9 +61,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_1default_calculation_hidden_2.json b/tests/results/test/04_1default_calculation_hidden_2.json index 1e2dda4e0..a8ad15f79 100644 --- a/tests/results/test/04_1default_calculation_hidden_2.json +++ b/tests/results/test/04_1default_calculation_hidden_2.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -55,22 +45,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -81,9 +61,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_1default_calculation_hidden_3.json b/tests/results/test/04_1default_calculation_hidden_3.json index d80296a03..9ea1b3e54 100644 --- a/tests/results/test/04_1default_calculation_hidden_3.json +++ b/tests/results/test/04_1default_calculation_hidden_3.json @@ -1,15 +1,7 @@ { "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_1default_calculation_hidden_4.json b/tests/results/test/04_1default_calculation_hidden_4.json index 2bfb72c59..3d005b962 100644 --- a/tests/results/test/04_1default_calculation_hidden_4.json +++ b/tests/results/test/04_1default_calculation_hidden_4.json @@ -1,11 +1,7 @@ { "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_1default_calculation_hidden_5.json b/tests/results/test/04_1default_calculation_hidden_5.json index 059403285..ac191e6e2 100644 --- a/tests/results/test/04_1default_calculation_hidden_5.json +++ b/tests/results/test/04_1default_calculation_hidden_5.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -49,9 +39,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_1default_calculation_hidden_6.json b/tests/results/test/04_1default_calculation_hidden_6.json index 059403285..ac191e6e2 100644 --- a/tests/results/test/04_1default_calculation_hidden_6.json +++ b/tests/results/test/04_1default_calculation_hidden_6.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -49,9 +39,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_boolean.json b/tests/results/test/04_5disabled_calculation_boolean.json index a84626714..9db58d1f2 100644 --- a/tests/results/test/04_5disabled_calculation_boolean.json +++ b/tests/results/test/04_5disabled_calculation_boolean.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A conditional variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -51,18 +41,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A seconde variable.", "properties": [ { @@ -82,9 +66,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_optional.json b/tests/results/test/04_5disabled_calculation_optional.json index 5de8baa9b..5e03809c6 100644 --- a/tests/results/test/04_5disabled_calculation_optional.json +++ b/tests/results/test/04_5disabled_calculation_optional.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -45,18 +35,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -70,9 +54,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_optional_default.json b/tests/results/test/04_5disabled_calculation_optional_default.json index 0f97a606e..d8ff57db3 100644 --- a/tests/results/test/04_5disabled_calculation_optional_default.json +++ b/tests/results/test/04_5disabled_calculation_optional_default.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,33 +12,25 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A second variable.", "properties": [ { @@ -64,18 +48,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var4": { - "type": "variable", - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "A forth variable.", "properties": [ { @@ -93,9 +71,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable.json b/tests/results/test/04_5disabled_calculation_variable.json index 0ed57c787..953a2b8a0 100644 --- a/tests/results/test/04_5disabled_calculation_variable.json +++ b/tests/results/test/04_5disabled_calculation_variable.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable10.json b/tests/results/test/04_5disabled_calculation_variable10.json index 0d8f4a70b..ae6237d4c 100644 --- a/tests/results/test/04_5disabled_calculation_variable10.json +++ b/tests/results/test/04_5disabled_calculation_variable10.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable2.json b/tests/results/test/04_5disabled_calculation_variable2.json index 0d8f4a70b..ae6237d4c 100644 --- a/tests/results/test/04_5disabled_calculation_variable2.json +++ b/tests/results/test/04_5disabled_calculation_variable2.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable3.json b/tests/results/test/04_5disabled_calculation_variable3.json index cae16009f..eea98baa9 100644 --- a/tests/results/test/04_5disabled_calculation_variable3.json +++ b/tests/results/test/04_5disabled_calculation_variable3.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable4.json b/tests/results/test/04_5disabled_calculation_variable4.json index 5c4a1e5b7..48ab236a3 100644 --- a/tests/results/test/04_5disabled_calculation_variable4.json +++ b/tests/results/test/04_5disabled_calculation_variable4.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable5.json b/tests/results/test/04_5disabled_calculation_variable5.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test/04_5disabled_calculation_variable5.json +++ b/tests/results/test/04_5disabled_calculation_variable5.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable6.json b/tests/results/test/04_5disabled_calculation_variable6.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test/04_5disabled_calculation_variable6.json +++ b/tests/results/test/04_5disabled_calculation_variable6.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable7.json b/tests/results/test/04_5disabled_calculation_variable7.json index 0ed57c787..953a2b8a0 100644 --- a/tests/results/test/04_5disabled_calculation_variable7.json +++ b/tests/results/test/04_5disabled_calculation_variable7.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable9.json b/tests/results/test/04_5disabled_calculation_variable9.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test/04_5disabled_calculation_variable9.json +++ b/tests/results/test/04_5disabled_calculation_variable9.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable_multi.json b/tests/results/test/04_5disabled_calculation_variable_multi.json index 197851f38..fa049fc98 100644 --- a/tests/results/test/04_5disabled_calculation_variable_multi.json +++ b/tests/results/test/04_5disabled_calculation_variable_multi.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -61,12 +51,8 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable_transitive.json b/tests/results/test/04_5disabled_calculation_variable_transitive.json index d83a8b2a8..9d356470d 100644 --- a/tests/results/test/04_5disabled_calculation_variable_transitive.json +++ b/tests/results/test/04_5disabled_calculation_variable_transitive.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -55,18 +45,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -90,9 +74,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable_transitive_3.json b/tests/results/test/04_5disabled_calculation_variable_transitive_3.json index c71ad909b..e83fcf784 100644 --- a/tests/results/test/04_5disabled_calculation_variable_transitive_3.json +++ b/tests/results/test/04_5disabled_calculation_variable_transitive_3.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "variable1": { "type": "variable", "default": { "name": "Default", - "values": "disabled" + "values": false }, - "variable_type": "string", + "variable_type": "boolean" + }, + "variable1": { "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -59,18 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - "disabled" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "disabled" + }, + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -94,9 +78,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5disabled_calculation_variable_transitive_4.json b/tests/results/test/04_5disabled_calculation_variable_transitive_4.json index 734c45467..3355a85ce 100644 --- a/tests/results/test/04_5disabled_calculation_variable_transitive_4.json +++ b/tests/results/test/04_5disabled_calculation_variable_transitive_4.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "variable1": { "type": "variable", "default": { "name": "Default", - "values": "not_disabled" + "values": true }, - "variable_type": "string", + "variable_type": "boolean" + }, + "variable1": { "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -59,18 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - "not_disabled" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "not_disabled" + }, + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -94,9 +78,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5validators.json b/tests/results/test/04_5validators.json index 13cd3a94c..ecee67eac 100644 --- a/tests/results/test/04_5validators.json +++ b/tests/results/test/04_5validators.json @@ -1,17 +1,7 @@ { "int": { - "type": "variable", - "variable_type": "integer", - "validators": { - "name": "Validator", - "values": { - "description": "the max value is 100" - } - }, "path": "int", - "names": [ - "int" - ], + "name": "int", "description": "An integer.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "basic", - "gen_examples": [ - 42 - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "integer", + "validators": { + "name": "Validator", + "values": { + "description": "the max value is 100" + } + } } } \ No newline at end of file diff --git a/tests/results/test/04_5validators_differ.json b/tests/results/test/04_5validators_differ.json index da8d432d1..6461db247 100644 --- a/tests/results/test/04_5validators_differ.json +++ b/tests/results/test/04_5validators_differ.json @@ -1,5 +1,17 @@ { "var1": { + "path": "var1", + "name": "var1", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,40 +24,14 @@ "description": "var1 must be different than var2" } }, - "path": "var1", - "names": [ - "var1" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", "values": "another_value" - }, - "gen_examples": [ - "another_value" - ], - "mandatory_without_value": false + } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -56,9 +42,11 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/04_5validators_multi.json b/tests/results/test/04_5validators_multi.json index 9314651ba..1a783ab5c 100644 --- a/tests/results/test/04_5validators_multi.json +++ b/tests/results/test/04_5validators_multi.json @@ -1,24 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "check length is less than 10" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -35,13 +18,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "no", "yes" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "check length is less than 10" + } + }, + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/04_5validators_multi2.json b/tests/results/test/04_5validators_multi2.json index c83c702fb..b25952a88 100644 --- a/tests/results/test/04_5validators_multi2.json +++ b/tests/results/test/04_5validators_multi2.json @@ -1,24 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "check length is less than 3" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -35,6 +18,21 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "no", + "yes" + ] + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "check length is less than 3" + } + }, "multiple": true, "examples": { "name": "Examples", @@ -42,13 +40,6 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } } } \ 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 ff9c853dc..74f9e2f85 100644 --- a/tests/results/test/04_5validators_multi3.json +++ b/tests/results/test/04_5validators_multi3.json @@ -1,25 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0, - 1, - 2 - ] - }, - "variable_type": "integer", - "validators": { - "name": "Validator", - "values": { - "description": "value must be equal to index" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -36,16 +18,26 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + 0, + 1, + 2 + ] + }, + "variable_type": "integer", + "validators": { + "name": "Validator", + "values": { + "description": "value must be equal to index" + } + }, "multiple": true, "examples": { "name": "Example", "values": 0 - }, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/04_5validators_warnings.json b/tests/results/test/04_5validators_warnings.json index a7c76ca5a..2e3c8ef66 100644 --- a/tests/results/test/04_5validators_warnings.json +++ b/tests/results/test/04_5validators_warnings.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "An integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "the max value is 100" } - }, - "path": "int", - "names": [ - "int" - ], - "description": "An integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1000 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/04_5validators_warnings_all.json b/tests/results/test/04_5validators_warnings_all.json index f734a6fec..9fd2c6562 100644 --- a/tests/results/test/04_5validators_warnings_all.json +++ b/tests/results/test/04_5validators_warnings_all.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "An integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "the minimum value is 10", "the maximum value is 100" ] - }, - "path": "int", - "names": [ - "int" - ], - "description": "An integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1000 - ], - "mandatory_without_value": false + } } } \ 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 f4818cf28..8867fa338 100644 --- a/tests/results/test/05_0multi_not_uniq.json +++ b/tests/results/test/05_0multi_not_uniq.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -22,12 +12,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/05_0multi_uniq.json b/tests/results/test/05_0multi_uniq.json index 2efba714d..3aaf54a22 100644 --- a/tests/results/test/05_0multi_uniq.json +++ b/tests/results/test/05_0multi_uniq.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/12_1auto_save_expert.json b/tests/results/test/12_1auto_save_expert.json index 4e6ed5c2b..40914a93d 100644 --- a/tests/results/test/12_1auto_save_expert.json +++ b/tests/results/test/12_1auto_save_expert.json @@ -1,15 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -26,9 +18,11 @@ } ], "mode": "advanced", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_0redefine_description.json b/tests/results/test/16_0redefine_description.json index 77382f82b..2d7e0a50e 100644 --- a/tests/results/test/16_0redefine_description.json +++ b/tests/results/test/16_0redefine_description.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "Redefined.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_2family_redefine_calculation.json b/tests/results/test/16_2family_redefine_calculation.json index 92794b41e..daac7f402 100644 --- a/tests/results/test/16_2family_redefine_calculation.json +++ b/tests/results/test/16_2family_redefine_calculation.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [ { @@ -20,12 +18,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "properties": [ { "type": "property", @@ -35,10 +29,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/16_3family_empty_at_ends.json b/tests/results/test/16_3family_empty_at_ends.json index 19f9fe27b..1cb56b40b 100644 --- a/tests/results/test/16_3family_empty_at_ends.json +++ b/tests/results/test/16_3family_empty_at_ends.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "properties": [ { "type": "property", @@ -27,10 +21,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/16_5exists_nonexists.json b/tests/results/test/16_5exists_nonexists.json index f22c5f245..73b48bb2a 100644 --- a/tests/results/test/16_5exists_nonexists.json +++ b/tests/results/test/16_5exists_nonexists.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "yes" + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A new variable.", "properties": [ { @@ -46,9 +32,11 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_5redefine_calculation.json b/tests/results/test/16_5redefine_calculation.json index 9c079b363..a70f51937 100644 --- a/tests/results/test/16_5redefine_calculation.json +++ b/tests/results/test/16_5redefine_calculation.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns yes" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns yes" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_5redefine_choice.json b/tests/results/test/16_5redefine_choice.json index 079a6f041..c4b706eab 100644 --- a/tests/results/test/16_5redefine_choice.json +++ b/tests/results/test/16_5redefine_choice.json @@ -1,18 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b" - ] - }, "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -23,9 +12,14 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b" + ] + } } } \ No newline at end of file diff --git a/tests/results/test/16_5redefine_default.json b/tests/results/test/16_5redefine_default.json index 9f8f1f8e7..96ece61f5 100644 --- a/tests/results/test/16_5redefine_default.json +++ b/tests/results/test/16_5redefine_default.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_5redefine_default_calculation.json b/tests/results/test/16_5redefine_default_calculation.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test/16_5redefine_default_calculation.json +++ b/tests/results/test/16_5redefine_default_calculation.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_5redefine_family.json b/tests/results/test/16_5redefine_family.json index dc9aed737..e03b60005 100644 --- a/tests/results/test/16_5redefine_family.json +++ b/tests/results/test/16_5redefine_family.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "New description", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,10 +22,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/16_5redefine_help.json b/tests/results/test/16_5redefine_help.json index 37b6fe77c..27a29d9dc 100644 --- a/tests/results/test/16_5redefine_help.json +++ b/tests/results/test/16_5redefine_help.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "help": [ "Redefine help family ok." @@ -15,12 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "Redefine help.", "help": [ "Redefine help ok." @@ -34,10 +28,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/16_5redefine_multi.json b/tests/results/test/16_5redefine_multi.json index 2efba714d..3aaf54a22 100644 --- a/tests/results/test/16_5redefine_multi.json +++ b/tests/results/test/16_5redefine_multi.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/16_5redefine_remove_disable_calculation.json b/tests/results/test/16_5redefine_remove_disable_calculation.json index 6170e09d5..2c5e848aa 100644 --- a/tests/results/test/16_5redefine_remove_disable_calculation.json +++ b/tests/results/test/16_5redefine_remove_disable_calculation.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -42,9 +32,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_5test_redefine.json b/tests/results/test/16_5test_redefine.json index 43e175309..9a657b26c 100644 --- a/tests/results/test/16_5test_redefine.json +++ b/tests/results/test/16_5test_redefine.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,26 +12,20 @@ } ], "mode": "standard", - "examples": { - "name": "Example", - "values": "test1" - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "non" + "values": "no" }, "variable_type": "string", + "examples": { + "name": "Example", + "values": "test1" + } + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -50,22 +36,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string", "examples": { "name": "Example", "values": "test1" - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": false + } }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -76,9 +60,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/16_6choice_redefine.json b/tests/results/test/16_6choice_redefine.json index 567bc0a26..e6609dac2 100644 --- a/tests/results/test/16_6choice_redefine.json +++ b/tests/results/test/16_6choice_redefine.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A choice.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "a", "c" ] - }, - "path": "var", - "names": [ - "var" - ], - "description": "A choice.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "c" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/16_6exists_redefine_family.json b/tests/results/test/16_6exists_redefine_family.json index 341507773..aa9c2ba3f 100644 --- a/tests/results/test/16_6exists_redefine_family.json +++ b/tests/results/test/16_6exists_redefine_family.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family1", - "names": [ - "family1" - ], + "name": "family1", "description": "New description", "properties": [], "mode": "basic" }, "children": { "variable1": { - "type": "variable", - "variable_type": "string", "path": "family1.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -28,10 +22,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -39,21 +31,15 @@ "type": "family", "informations": { "path": "family2", - "names": [ - "family2" - ], + "name": "family2", "description": "A second family", "properties": [], "mode": "basic" }, "children": { "variable2": { - "type": "variable", - "variable_type": "string", "path": "family2.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -64,10 +50,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/16exists_exists.json b/tests/results/test/16exists_exists.json index d83887252..8536932c8 100644 --- a/tests/results/test/16exists_exists.json +++ b/tests/results/test/16exists_exists.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "Description.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/20_0family_append.json b/tests/results/test/20_0family_append.json index e012f519e..23283b6a5 100644 --- a/tests/results/test/20_0family_append.json +++ b/tests/results/test/20_0family_append.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,18 +22,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -50,10 +38,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/20_0multi_family.json b/tests/results/test/20_0multi_family.json index f17b31189..84f616b19 100644 --- a/tests/results/test/20_0multi_family.json +++ b/tests/results/test/20_0multi_family.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "standard" @@ -15,28 +13,20 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "standard" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/20_0multi_family_basic.json b/tests/results/test/20_0multi_family_basic.json index 8729b07d3..d88556062 100644 --- a/tests/results/test/20_0multi_family_basic.json +++ b/tests/results/test/20_0multi_family_basic.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" @@ -15,21 +13,15 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -40,10 +32,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/20_0multi_family_expert.json b/tests/results/test/20_0multi_family_expert.json index 9d95cc9df..d7710af63 100644 --- a/tests/results/test/20_0multi_family_expert.json +++ b/tests/results/test/20_0multi_family_expert.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "advanced" @@ -15,28 +13,20 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "advanced" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [], "mode": "advanced", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/20_0multi_family_order.json b/tests/results/test/20_0multi_family_order.json index 08d15721b..8c1ca4578 100644 --- a/tests/results/test/20_0multi_family_order.json +++ b/tests/results/test/20_0multi_family_order.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,30 +12,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "variable1": { - "type": "variable", - "variable_type": "string", "path": "family.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -50,30 +38,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "subfamily": { "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -84,20 +64,14 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "family.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -108,10 +82,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/20_0validators_differ_redefine.json b/tests/results/test/20_0validators_differ_redefine.json index 61294f695..a047c43f2 100644 --- a/tests/results/test/20_0validators_differ_redefine.json +++ b/tests/results/test/20_0validators_differ_redefine.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -46,12 +32,26 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var3": { + "path": "var3", + "name": "var3", + "description": "A third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -64,27 +64,9 @@ "description": "var3 must be different than var2" } }, - "path": "var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", "values": "yes" - }, - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test/20_2family_looks_like_dynamic.json b/tests/results/test/20_2family_looks_like_dynamic.json index b82d6b297..a57c896f8 100644 --- a/tests/results/test/20_2family_looks_like_dynamic.json +++ b/tests/results/test/20_2family_looks_like_dynamic.json @@ -3,28 +3,15 @@ "type": "family", "informations": { "path": "my_family", - "names": [ - "my_family" - ], + "name": "my_family", "description": "my_family", "properties": [], "mode": "standard" }, "children": { "dynamic": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "my_family.dynamic", - "names": [ - "dynamic" - ], + "name": "dynamic", "properties": [ { "type": "property", @@ -40,26 +27,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var": { "type": "variable", "default": { "name": "Default", - "values": true + "values": [ + "val1", + "val2" + ] }, - "variable_type": "boolean", + "variable_type": "string", + "multiple": true + }, + "var": { "path": "my_family.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -70,10 +51,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test/20_2family_looks_like_variable.json b/tests/results/test/20_2family_looks_like_variable.json index 909118875..ab0a865c3 100644 --- a/tests/results/test/20_2family_looks_like_variable.json +++ b/tests/results/test/20_2family_looks_like_variable.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "my_family", - "names": [ - "my_family" - ], + "name": "my_family", "description": "my_family", "properties": [], "mode": "standard" }, "children": { "default": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "my_family.default", - "names": [ - "default" - ], + "name": "default", "properties": [ { "type": "property", @@ -31,10 +21,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test/20_7help_family.json b/tests/results/test/20_7help_family.json index 65a4cf861..52e6501fc 100644 --- a/tests/results/test/20_7help_family.json +++ b/tests/results/test/20_7help_family.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family1", - "names": [ - "family1" - ], + "name": "family1", "description": "The first family", "help": [ "Multi line\n\nHelp\n\nWith useful information." @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "family1.var", - "names": [ - "var" - ], + "name": "var", "properties": [ { "type": "property", @@ -30,10 +24,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -41,9 +33,7 @@ "type": "family", "informations": { "path": "family2", - "names": [ - "family2" - ], + "name": "family2", "description": "The second family", "help": [ "Multi line\nHelp\nWith useful information." @@ -53,12 +43,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "family2.var", - "names": [ - "var" - ], + "name": "var", "properties": [ { "type": "property", @@ -68,10 +54,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/20_9default_information_parent.json b/tests/results/test/20_9default_information_parent.json index e09a64b2f..e159355b4 100644 --- a/tests/results/test/20_9default_information_parent.json +++ b/tests/results/test/20_9default_information_parent.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -28,22 +22,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"family\"" - }, - "variable_type": "string", "path": "family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -54,10 +38,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"family\"" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/20_9family_absolute.json b/tests/results/test/20_9family_absolute.json index 2293a0fff..86cbfcf47 100644 --- a/tests/results/test/20_9family_absolute.json +++ b/tests/results/test/20_9family_absolute.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "First variable.", "properties": [ { @@ -16,30 +12,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var2": { - "type": "variable", - "variable_type": "string", "path": "family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -50,28 +38,42 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Example", "values": "string6" - }, - "gen_examples": [ - "string6" - ], - "mandatory_without_value": true + } }, "subfamily": { "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "standard" }, "children": { "variable": { + "path": "family.subfamily.variable", + "name": "variable", + "description": "Third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -95,11 +97,86 @@ ] }, "variable_type": "string", - "path": "family.subfamily.variable", - "names": [ - "variable" - ], - "description": "Third variable.", + "multiple": true + } + } + } + } + }, + "family2": { + "type": "family", + "informations": { + "path": "family2", + "name": "family2", + "description": "A family", + "properties": [], + "mode": "standard" + }, + "children": { + "var2": { + "path": "family2.var2", + "name": "var2", + "description": "A variable2.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "family.var2", + "type": "variable" + }, + "description": "A second variable" + } + }, + "variable_type": "string" + }, + "var3": { + "path": "family2.var3", + "name": "var3", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "string4" + }, + "variable_type": "string", + "examples": { + "name": "Example", + "values": "string5" + } + }, + "subfamily": { + "type": "family", + "informations": { + "path": "family2.subfamily", + "name": "subfamily", + "description": "A sub family", + "properties": [], + "mode": "standard" + }, + "children": { + "variable": { + "path": "family2.subfamily.variable", + "name": "variable", + "description": "Fourth variable.", "properties": [ { "type": "property", @@ -115,106 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false - } - } - } - } - }, - "family2": { - "type": "family", - "informations": { - "path": "family2", - "names": [ - "family2" - ], - "description": "A family", - "properties": [], - "mode": "standard" - }, - "children": { - "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "family.var2", - "type": "variable" - }, - "description": "A second variable" - } - }, - "variable_type": "string", - "path": "family2.var2", - "names": [ - "var2" - ], - "description": "A variable2.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false - }, - "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "string4" - }, - "variable_type": "string", - "path": "family2.var3", - "names": [ - "var3" - ], - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "examples": { - "name": "Example", - "values": "string5" - }, - "gen_examples": [ - "string5" - ], - "mandatory_without_value": false - }, - "subfamily": { - "type": "family", - "informations": { - "path": "family2.subfamily", - "names": [ - "subfamily" - ], - "description": "A sub family", - "properties": [], - "mode": "standard" - }, - "children": { - "variable": { "type": "variable", "default": { "name": "Default", @@ -246,35 +223,7 @@ ] }, "variable_type": "string", - "path": "family2.subfamily.variable", - "names": [ - "variable" - ], - "description": "Fourth variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null, - "string4" - ] - ], - "mandatory_without_value": false + "multiple": true } } } 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 cec8a4186..24b5a4470 100644 --- a/tests/results/test/24_0family_hidden_condition_sub_family.json +++ b/tests/results/test/24_0family_hidden_condition_sub_family.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -51,21 +43,15 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "subfamily", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -76,10 +62,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } 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 3e16a74e7..c6ab09bdc 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,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -55,28 +47,20 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A subfamily", "properties": [], "mode": "standard" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } 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 9fa9ca0da..7461fb058 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,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -51,21 +43,15 @@ "type": "family", "informations": { "path": "family.sub_family", - "names": [ - "sub_family" - ], + "name": "sub_family", "description": "A subfamily", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.sub_family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -76,10 +62,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/24_0family_mandatory_condition.json b/tests/results/test/24_0family_mandatory_condition.json index 4dfc5e083..1a7e64bad 100644 --- a/tests/results/test/24_0family_mandatory_condition.json +++ b/tests/results/test/24_0family_mandatory_condition.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -45,9 +35,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/24_0family_mandatory_condition_variable.json b/tests/results/test/24_0family_mandatory_condition_variable.json index 3a6bb17ec..65a97bf1f 100644 --- a/tests/results/test/24_0family_mandatory_condition_variable.json +++ b/tests/results/test/24_0family_mandatory_condition_variable.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -49,9 +39,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/24_7validators_variable_optional.json b/tests/results/test/24_7validators_variable_optional.json index 7406c1e8c..ba1301478 100644 --- a/tests/results/test/24_7validators_variable_optional.json +++ b/tests/results/test/24_7validators_variable_optional.json @@ -3,15 +3,25 @@ "type": "family", "informations": { "path": "general", - "names": [ - "general" - ], + "name": "general", "description": "A family", "properties": [], "mode": "basic" }, "children": { "int": { + "path": "general.int", + "name": "int", + "description": "A first integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", "type": "variable", "variable_type": "integer", "validators": { @@ -25,40 +35,14 @@ } ] }, - "path": "general.int", - "names": [ - "int" - ], - "description": "A first integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", "examples": { "name": "Example", "values": 5 - }, - "gen_examples": [ - 5 - ], - "mandatory_without_value": true + } }, "int2": { - "type": "variable", - "default": { - "name": "Default", - "values": 1 - }, - "variable_type": "integer", "path": "general.int2", - "names": [ - "int2" - ], + "name": "int2", "description": "A second integer.", "properties": [ { @@ -69,10 +53,12 @@ } ], "mode": "standard", - "gen_examples": [ - 1 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 1 + }, + "variable_type": "integer" } } } diff --git a/tests/results/test/40_0leadership.json b/tests/results/test/40_0leadership.json index 7fd9d42de..5df64f007 100644 --- a/tests/results/test/40_0leadership.json +++ b/tests/results/test/40_0leadership.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -62,20 +48,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -86,12 +64,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/40_0leadership_diff_name.json b/tests/results/test/40_0leadership_diff_name.json index 6072d2405..f80b394c7 100644 --- a/tests/results/test/40_0leadership_diff_name.json +++ b/tests/results/test/40_0leadership_diff_name.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -62,20 +48,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -86,12 +64,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/40_0leadership_follower_default_calculation.json b/tests/results/test/40_0leadership_follower_default_calculation.json index 25f6ce006..e82b8b9b3 100644 --- a/tests/results/test/40_0leadership_follower_default_calculation.json +++ b/tests/results/test/40_0leadership_follower_default_calculation.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,25 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -66,26 +48,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "returns follower1 value" - } + "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A second follower.", "properties": [ { @@ -96,12 +68,14 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns follower1 value" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test/40_0leadership_follower_default_value.json b/tests/results/test/40_0leadership_follower_default_value.json index 917d62962..ade859d17 100644 --- a/tests/results/test/40_0leadership_follower_default_value.json +++ b/tests/results/test/40_0leadership_follower_default_value.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -31,25 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower with default value.", "properties": [ { @@ -60,12 +42,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/40_0leadership_leader_follower.json b/tests/results/test/40_0leadership_leader_follower.json index 2147c9cdf..4ccf1f0e7 100644 --- a/tests/results/test/40_0leadership_leader_follower.json +++ b/tests/results/test/40_0leadership_leader_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,16 +31,30 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { + "path": "leadership.follower", + "name": "follower", + "description": "A follower.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -66,28 +67,7 @@ "description": "A leader" } }, - "variable_type": "string", - "path": "leadership.follower", - "names": [ - "follower" - ], - "description": "A follower.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test/40_0leadership_leader_not_multi.json b/tests/results/test/40_0leadership_leader_not_multi.json index d747e4e03..0390609c7 100644 --- a/tests/results/test/40_0leadership_leader_not_multi.json +++ b/tests/results/test/40_0leadership_leader_not_multi.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "general", - "names": [ - "general" - ], + "name": "general", "description": "general", "properties": [], "mode": "standard" }, "children": { "mode_conteneur_actif": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "general.mode_conteneur_actif", - "names": [ - "mode_conteneur_actif" - ], + "name": "mode_conteneur_actif", "description": "No change.", "properties": [ { @@ -32,10 +22,12 @@ } ], "mode": "standard", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } }, @@ -43,9 +35,7 @@ "type": "family", "informations": { "path": "general1", - "names": [ - "general1" - ], + "name": "general1", "description": "general1", "properties": [], "mode": "basic" @@ -55,9 +45,7 @@ "type": "leadership", "informations": { "path": "general1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leader", "properties": [], "mode": "basic", @@ -67,12 +55,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "general1.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leader.", "properties": [ { @@ -89,21 +73,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "general1.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "Follower1.", "properties": [ { @@ -114,20 +90,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "general1.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "Follower2.", "properties": [ { @@ -138,12 +106,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/40_0leadership_reduce.json b/tests/results/test/40_0leadership_reduce.json index 241ffa168..54a5fc961 100644 --- a/tests/results/test/40_0leadership_reduce.json +++ b/tests/results/test/40_0leadership_reduce.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,20 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value_1", - "value_2", - "value_3" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -45,6 +31,16 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value_1", + "value_2", + "value_3" + ] + }, + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -52,22 +48,11 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -78,13 +63,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/40_1leadership_append_follower.json b/tests/results/test/40_1leadership_append_follower.json index d00968d91..07d65641e 100644 --- a/tests/results/test/40_1leadership_append_follower.json +++ b/tests/results/test/40_1leadership_append_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The follower1.", "properties": [ { @@ -62,20 +48,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The follower2.", "properties": [ { @@ -86,20 +64,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower3": { - "type": "variable", - "variable_type": "string", "path": "leader.follower3", - "names": [ - "follower3" - ], + "name": "follower3", "description": "The follower3.", "properties": [ { @@ -110,12 +80,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/40_2leadership_calculation_index.json b/tests/results/test/40_2leadership_calculation_index.json index c8e93b7c3..bb09a8564 100644 --- a/tests/results/test/40_2leadership_calculation_index.json +++ b/tests/results/test/40_2leadership_calculation_index.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -45,27 +31,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the index" - }, - "variable_type": "integer", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -76,14 +56,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - 0, - 1, - 2 - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the index" + }, + "variable_type": "integer" } } } diff --git a/tests/results/test/40_2leadership_calculation_index_2.json b/tests/results/test/40_2leadership_calculation_index_2.json index c8e93b7c3..bb09a8564 100644 --- a/tests/results/test/40_2leadership_calculation_index_2.json +++ b/tests/results/test/40_2leadership_calculation_index_2.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -45,27 +31,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the index" - }, - "variable_type": "integer", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -76,14 +56,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - 0, - 1, - 2 - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the index" + }, + "variable_type": "integer" } } } diff --git a/tests/results/test/40_6leadership_follower_multi.json b/tests/results/test/40_6leadership_follower_multi.json index f9a344cea..8255b8b54 100644 --- a/tests/results/test/40_6leadership_follower_multi.json +++ b/tests/results/test/40_6leadership_follower_multi.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The first follower.", "properties": [ { @@ -68,29 +54,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - [ - "example" - ] - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The second follower.", "properties": [ { @@ -107,15 +77,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } 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 62631ee6b..e226bccc0 100644 --- a/tests/results/test/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test/40_6leadership_follower_multi_no_mandatory.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -31,21 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The first follower.", "properties": [ { @@ -62,29 +48,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - [ - "example" - ] - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The second follower.", "properties": [ { @@ -101,15 +71,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test/40_8calculation_boolean.json b/tests/results/test/40_8calculation_boolean.json index 2197563d6..280744dab 100644 --- a/tests/results/test/40_8calculation_boolean.json +++ b/tests/results/test/40_8calculation_boolean.json @@ -1,15 +1,7 @@ { "bool": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "bool", - "names": [ - "bool" - ], + "name": "bool", "description": "A boolean variable.", "properties": [ { @@ -20,24 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "multi1": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "a calculation" - } + "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "multi1": { "path": "multi1", - "names": [ - "multi1" - ], + "name": "multi1", "description": "A first multi variable.", "properties": [ { @@ -54,15 +38,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "multi2": { "type": "variable", "default": { "name": "Default", @@ -71,10 +46,11 @@ } }, "variable_type": "boolean", + "multiple": true + }, + "multi2": { "path": "multi2", - "names": [ - "multi2" - ], + "name": "multi2", "description": "A second multi variable.", "properties": [ { @@ -91,13 +67,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true, - false - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "a calculation" + } + }, + "variable_type": "boolean", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/40_8calculation_multi_variable.json b/tests/results/test/40_8calculation_multi_variable.json index 9477ae34c..1dcc9a086 100644 --- a/tests/results/test/40_8calculation_multi_variable.json +++ b/tests/results/test/40_8calculation_multi_variable.json @@ -1,5 +1,23 @@ { "var": { + "path": "var", + "name": "var", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -23,46 +41,11 @@ ] }, "variable_type": "string", - "path": "var", - "names": [ - "var" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no", - "yes" - ] - ], - "mandatory_without_value": false + "multiple": true }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -73,22 +56,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", - "values": "yes" + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -99,9 +76,11 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/40_8calculation_multi_variable_parent.json b/tests/results/test/40_8calculation_multi_variable_parent.json index 33cd14710..7e475b6f0 100644 --- a/tests/results/test/40_8calculation_multi_variable_parent.json +++ b/tests/results/test/40_8calculation_multi_variable_parent.json @@ -1,15 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -20,24 +12,36 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "fam1": { "type": "family", "informations": { "path": "fam1", - "names": [ - "fam1" - ], + "name": "fam1", "description": "A family", "properties": [], "mode": "standard" }, "children": { "var": { + "path": "fam1.var", + "name": "var", + "description": "A calculated variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -50,25 +54,7 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "fam1.var", - "names": [ - "var" - ], - "description": "A calculated variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test/40_8calculation_multi_variable_parent2.json b/tests/results/test/40_8calculation_multi_variable_parent2.json index b68dec800..e3b9c8094 100644 --- a/tests/results/test/40_8calculation_multi_variable_parent2.json +++ b/tests/results/test/40_8calculation_multi_variable_parent2.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "fam1", - "names": [ - "fam1" - ], + "name": "fam1", "description": "First family", "properties": [], "mode": "standard" }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "fam1.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -32,10 +22,12 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } }, @@ -43,15 +35,25 @@ "type": "family", "informations": { "path": "fam2", - "names": [ - "fam2" - ], + "name": "fam2", "description": "Second family", "properties": [], "mode": "standard" }, "children": { "var": { + "path": "fam2.var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -64,25 +66,7 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "fam2.var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" } } } 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 cc209c7b1..88666d612 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 @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,35 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "default": { "name": "Default", "values": [ - { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "leadership.leader", - "type": "variable" - }, - "description": "A leader" - } + "value1", + "value2" ] }, "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -89,18 +61,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value1" - ], - [ - "value2" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "leadership.leader", + "type": "variable" + }, + "description": "A leader" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } 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 647ff1e5e..4130d4af2 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-first.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,12 +97,12 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file 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 647ff1e5e..4130d4af2 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-last.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,12 +97,12 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file 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 94c123ffd..49001a32e 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 @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "leader", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "properties": [ { "type": "property", @@ -43,35 +30,39 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } }, "variable": { + "path": "variable", + "name": "variable", + "properties": [ + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -85,26 +76,6 @@ } }, "variable_type": "string", - "path": "variable", - "names": [ - "variable" - ], - "properties": [ - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/40_9leadership-calculation-outside-follower.json b/tests/results/test/40_9leadership-calculation-outside-follower.json index 1684c699e..0d3807f17 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,17 +75,28 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { + "path": "calculate", + "name": "calculate", + "description": "A calculated variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -127,27 +110,6 @@ } }, "variable_type": "string", - "path": "calculate", - "names": [ - "calculate" - ], - "description": "A calculated variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file 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 9828bbb63..e6891c149 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader-first.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,9 +97,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file 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 f3e918702..e6891c149 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader-last.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,9 +97,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/40_9leadership-calculation-outside-leader.json b/tests/results/test/40_9leadership-calculation-outside-leader.json index bb12ea51d..2d5dea33b 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,34 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "leader.leader", - "type": "variable" - }, - "description": "A leader" - } - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -147,13 +103,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "leader.leader", + "type": "variable" + }, + "description": "A leader" + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/40_9leadership-calculation-variable.json b/tests/results/test/40_9leadership-calculation-variable.json index 46688f078..da047780a 100644 --- a/tests/results/test/40_9leadership-calculation-variable.json +++ b/tests/results/test/40_9leadership-calculation-variable.json @@ -1,18 +1,7 @@ { "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -29,22 +18,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "leader": { "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -54,23 +43,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "calculate", - "type": "variable" - }, - "description": "A calculated variable" - } - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -87,26 +61,24 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "calculate", + "type": "variable" + }, + "description": "A calculated variable" + } }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -117,25 +89,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -146,13 +109,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } } 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 d8d4310c3..38a39ba0b 100644 --- a/tests/results/test/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test/40_9leadership-calculation-variable_leader_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership_1", - "names": [ - "leadership_1" - ], + "name": "leadership_1", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership_1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,22 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leadership_1.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -70,13 +55,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -84,9 +64,7 @@ "type": "leadership", "informations": { "path": "leadership_2", - "names": [ - "leadership_2" - ], + "name": "leadership_2", "description": "A second leadership", "properties": [], "mode": "standard", @@ -96,6 +74,24 @@ }, "children": { "leader": { + "path": "leadership_2.leader", + "name": "leader", + "description": "A leader.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -109,46 +105,11 @@ } }, "variable_type": "string", - "path": "leadership_2.leader", - "names": [ - "leader" - ], - "description": "A leader.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true }, "follower": { - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "path": "leadership_2.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -159,13 +120,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val", - "val" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } 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 a1ffc12d2..19c19fb0a 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 @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership_1", - "names": [ - "leadership_1" - ], + "name": "leadership_1", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership_1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,22 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leadership_1.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -70,13 +55,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -84,9 +64,7 @@ "type": "leadership", "informations": { "path": "leadership_2", - "names": [ - "leadership_2" - ], + "name": "leadership_2", "description": "A second leadership", "properties": [], "mode": "standard", @@ -96,19 +74,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership_2.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -125,16 +92,36 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { + "path": "leadership_2.follower", + "name": "follower", + "description": "A follower.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -148,40 +135,7 @@ } }, "variable_type": "string", - "path": "leadership_2.follower", - "names": [ - "follower" - ], - "description": "A follower.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value1", - "value2" - ], - [ - "value1", - "value2" - ] - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test/41_0choice_leader.json b/tests/results/test/41_0choice_leader.json index ad42f5299..474687e50 100644 --- a/tests/results/test/41_0choice_leader.json +++ b/tests/results/test/41_0choice_leader.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -31,29 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -64,12 +42,16 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "a_choice" + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" ] - ], - "mandatory_without_value": true + } } } } diff --git a/tests/results/test/44_4disabled_calcultion_follower_index.json b/tests/results/test/44_4disabled_calcultion_follower_index.json index 526f9588d..d12b98c39 100644 --- a/tests/results/test/44_4disabled_calcultion_follower_index.json +++ b/tests/results/test/44_4disabled_calcultion_follower_index.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Aleader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a", - "b" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "default": { "name": "Default", - "values": "value" + "values": [ + "a", + "b" + ] }, "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -81,13 +62,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value", - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/44_4leadership_mandatory.json b/tests/results/test/44_4leadership_mandatory.json index 2187db91d..0f515ec57 100644 --- a/tests/results/test/44_4leadership_mandatory.json +++ b/tests/results/test/44_4leadership_mandatory.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,30 +31,18 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/44_4leadership_mandatory_follower.json b/tests/results/test/44_4leadership_mandatory_follower.json index 2657dcc60..ac79d6bef 100644 --- a/tests/results/test/44_4leadership_mandatory_follower.json +++ b/tests/results/test/44_4leadership_mandatory_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -31,21 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -56,12 +42,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/44_5leadership_leader_hidden_calculation.json b/tests/results/test/44_5leadership_leader_hidden_calculation.json index 699d26cc8..4f2de55ab 100644 --- a/tests/results/test/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test/44_5leadership_leader_hidden_calculation.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "leader": { "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [ { @@ -51,12 +43,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -67,21 +55,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -92,12 +72,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/44_6leadership_follower_disabled_calculation.json b/tests/results/test/44_6leadership_follower_disabled_calculation.json index e9a9849ea..123284df6 100644 --- a/tests/results/test/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test/44_6leadership_follower_disabled_calculation.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "leader": { "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -41,12 +33,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -63,21 +51,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -97,12 +77,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic.json b/tests/results/test/60_0family_dynamic.json index 551479532..6beb13eae 100644 --- a/tests/results/test/60_0family_dynamic.json +++ b/tests/results/test/60_0family_dynamic.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_1_1.json b/tests/results/test/60_0family_dynamic_1_1.json index 986d92cd1..2d1e57873 100644 --- a/tests/results/test/60_0family_dynamic_1_1.json +++ b/tests/results/test/60_0family_dynamic_1_1.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } 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 c00f5a65d..2ca9018b3 100644 --- a/tests/results/test/60_0family_dynamic_1_1_empty.json +++ b/tests/results/test/60_0family_dynamic_1_1_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,29 +51,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -92,11 +67,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_empty.json b/tests/results/test/60_0family_dynamic_empty.json index c1883f429..5c68a315b 100644 --- a/tests/results/test/60_0family_dynamic_empty.json +++ b/tests/results/test/60_0family_dynamic_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,29 +12,26 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynexample" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "example" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -48,25 +41,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "example" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -76,10 +57,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example" + "identifiers": [ + [ + "example" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_forbidden_char.json b/tests/results/test/60_0family_dynamic_forbidden_char.json index 82b1f8cf6..866a3290b 100644 --- a/tests/results/test/60_0family_dynamic_forbidden_char.json +++ b/tests/results/test/60_0family_dynamic_forbidden_char.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val.1", - "val.2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val.1", "val.2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval_1", - "dynval_2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val.1" @@ -53,10 +45,9 @@ "val.2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,17 +57,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" + "path": "dyn{{ identifier }}.var1", + "name": "var1", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val.1" @@ -85,14 +81,17 @@ "val.2" ] ], - "path": "dyn{{ identifier }}.var1", - "description": "A dynamic variable.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { + "path": "dyn{{ identifier }}.var2", + "name": "var2", + "description": "A dynamic variable.", "properties": [ { "type": "property", @@ -102,17 +101,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val.1", - "val.2" - ], - "mandatory_without_value": false - }, - "var2": { - "names": [ - "var2", - "var2" - ], "identifiers": [ [ "val.1" @@ -121,28 +109,12 @@ "val.2" ] ], - "path": "dyn{{ identifier }}.var2", - "description": "A dynamic variable.", "type": "variable", "default": { "name": "Default", "values": "depends on a calculation" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val.1", - "val.2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_no_description.json b/tests/results/test/60_0family_dynamic_no_description.json index 5b54c4ba4..59f1c8866 100644 --- a/tests/results/test/60_0family_dynamic_no_description.json +++ b/tests/results/test/60_0family_dynamic_no_description.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,28 +57,12 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -97,11 +72,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } 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 62a372f0e..62fa21236 100644 --- a/tests/results/test/60_0family_dynamic_no_description_empty.json +++ b/tests/results/test/60_0family_dynamic_no_description_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,28 +51,12 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -91,11 +66,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_source_hidden.json b/tests/results/test/60_0family_dynamic_source_hidden.json index 0a4cec8a7..534118a8f 100644 --- a/tests/results/test/60_0family_dynamic_source_hidden.json +++ b/tests/results/test/60_0family_dynamic_source_hidden.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,10 +15,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "submessage": "(from an undocumented variable)", @@ -26,29 +26,13 @@ "val2" ] } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -58,11 +42,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_static.json b/tests/results/test/60_0family_dynamic_static.json index d04df4742..6dcdcaa9f 100644 --- a/tests/results/test/60_0family_dynamic_static.json +++ b/tests/results/test/60_0family_dynamic_static.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside a dynamic family.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,11 +37,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_test.json b/tests/results/test/60_0family_dynamic_test.json index aaf9d94ac..08b0888d4 100644 --- a/tests/results/test/60_0family_dynamic_test.json +++ b/tests/results/test/60_0family_dynamic_test.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -22,6 +18,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -29,22 +27,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": true + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_upper_char.json b/tests/results/test/60_0family_dynamic_upper_char.json index 1f8678e85..4c80246e5 100644 --- a/tests/results/test/60_0family_dynamic_upper_char.json +++ b/tests/results/test/60_0family_dynamic_upper_char.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "Val1", - "VAL2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "Val1", "VAL2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "Val1" @@ -53,10 +45,9 @@ "VAL2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "Val1" - ], - [ - "VAL2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "Val1" + ], + [ + "VAL2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_variable_empty.json b/tests/results/test/60_0family_dynamic_variable_empty.json index abe9b6b63..23cf318c0 100644 --- a/tests/results/test/60_0family_dynamic_variable_empty.json +++ b/tests/results/test/60_0family_dynamic_variable_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -22,29 +18,26 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynexample" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "example" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -54,29 +47,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "example" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -86,10 +63,17 @@ } ], "mode": "standard", - "gen_examples": [ - "val" + "identifiers": [ + [ + "example" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_variable_optional.json b/tests/results/test/60_0family_dynamic_variable_optional.json index ff3de1c2d..31d5b6f95 100644 --- a/tests/results/test/60_0family_dynamic_variable_optional.json +++ b/tests/results/test/60_0family_dynamic_variable_optional.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyna", - "dynb" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "a" @@ -14,40 +15,19 @@ "b" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "a", "b" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "a" - ], - [ - "b" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -57,11 +37,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "a" + ], + [ + "b" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_dynamic_variable_suffix.json b/tests/results/test/60_0family_dynamic_variable_suffix.json index 0e315f8d9..1e29e5e80 100644 --- a/tests/results/test/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test/60_0family_dynamic_variable_suffix.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable with suffix {{ identifier }}.", - "type": "variable", - "default": { - "name": "Default", - "values": "a value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,11 +73,20 @@ } ], "mode": "standard", - "gen_examples": [ - "a value", - "a value" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a value" + }, + "variable_type": "string" } } } 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 034d21d4d..c9fb5e421 100644 --- a/tests/results/test/60_0family_dynamic_variable_suffix_empty.json +++ b/tests/results/test/60_0family_dynamic_variable_suffix_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -22,6 +18,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -29,22 +27,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": true + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable with suffix {{ identifier }}.", - "type": "variable", - "default": { - "name": "Default", - "values": "a value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,11 +73,20 @@ } ], "mode": "standard", - "gen_examples": [ - "a value", - "a value" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/60_0family_mode.json b/tests/results/test/60_0family_mode.json index 8dae08cbf..7782ca891 100644 --- a/tests/results/test/60_0family_mode.json +++ b/tests/results/test/60_0family_mode.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "family.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -32,10 +22,12 @@ } ], "mode": "basic", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/60_1family_dynamic_jinja.json b/tests/results/test/60_1family_dynamic_jinja.json index 94c2db583..2dc734716 100644 --- a/tests/results/test/60_1family_dynamic_jinja.json +++ b/tests/results/test/60_1family_dynamic_jinja.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn1", - "dyn2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "1" @@ -53,41 +45,20 @@ "2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "description": "index of suffix value" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "1" - ], - [ - "2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -97,11 +68,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "1" + ], + [ + "2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } 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 5a3302a6b..2c2688586 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,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,19 +57,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -86,30 +75,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "basic" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "With a variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -119,17 +91,34 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -146,24 +135,6 @@ ] } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file 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 17b61b003..77c2beaed 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,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,19 +57,17 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family inside dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -86,34 +75,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family inside dynamic family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -123,29 +91,28 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of var" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A varible outside dynamic family.", "properties": [ { @@ -156,9 +123,13 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var" + } + }, + "variable_type": "string" } } \ No newline at end of file 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 ee39ac645..cdc5b37d7 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 @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,19 +51,17 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family inside dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -80,34 +69,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family inside dynamic family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,17 +85,31 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A varible outside dynamic family.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -135,17 +117,6 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A varible outside dynamic family.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file 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 70e1ddc27..6713d4bb7 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 @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,19 +51,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -80,30 +69,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "basic" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "With a variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,17 +85,27 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,17 +113,6 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/60_2family_dynamic_outside_calc.json b/tests/results/test/60_2family_dynamic_outside_calc.json index 081efd1df..b84238570 100644 --- a/tests/results/test/60_2family_dynamic_outside_calc.json +++ b/tests/results/test/60_2family_dynamic_outside_calc.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffx variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffx variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,27 +73,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "newvar": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of var" - } - }, - "variable_type": "string", "path": "newvar", - "names": [ - "newvar" - ], + "name": "newvar", "description": "A second variable.", "properties": [ { @@ -133,9 +103,13 @@ } ], "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var" + } + }, + "variable_type": "string" } } \ No newline at end of file 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 ff28c5660..ea3150476 100644 --- a/tests/results/test/60_2family_dynamic_outside_calc_empty.json +++ b/tests/results/test/60_2family_dynamic_outside_calc_empty.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffx variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,33 +51,13 @@ }, "description": "A suffx variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -96,15 +67,29 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "newvar": { + "path": "newvar", + "name": "newvar", + "description": "A second variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -112,17 +97,6 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "newvar", - "names": [ - "newvar" - ], - "description": "A second variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/60_5family_dynamic_calc_description.json b/tests/results/test/60_5family_dynamic_calc_description.json index 913121e13..96ffd5c89 100644 --- a/tests/results/test/60_5family_dynamic_calc_description.json +++ b/tests/results/test/60_5family_dynamic_calc_description.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable for {{ identifier }}.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,21 +37,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A new variable.", "properties": [ { @@ -94,12 +79,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { + "path": "var2", + "name": "var2", + "description": "A new variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -127,27 +122,6 @@ ] }, "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A new variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/60_5family_dynamic_calc_identifier.json b/tests/results/test/60_5family_dynamic_calc_identifier.json index 234cd2295..887e2164e 100644 --- a/tests/results/test/60_5family_dynamic_calc_identifier.json +++ b/tests/results/test/60_5family_dynamic_calc_identifier.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,26 +18,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "val1" + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A suffix variable2.", "properties": [ { @@ -59,18 +42,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val1" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -79,10 +65,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -92,33 +77,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -128,15 +93,36 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var3": { + "path": "var3", + "name": "var3", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -163,24 +149,6 @@ } ] }, - "variable_type": "string", - "path": "var3", - "names": [ - "var3" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/60_5family_dynamic_calc_identifier_multi.json b/tests/results/test/60_5family_dynamic_calc_identifier_multi.json index cb939c39f..08d71b2a9 100644 --- a/tests/results/test/60_5family_dynamic_calc_identifier_multi.json +++ b/tests/results/test/60_5family_dynamic_calc_identifier_multi.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,26 +18,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "val1" + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A suffix variable2.", "properties": [ { @@ -59,18 +42,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val1" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -79,10 +65,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -92,35 +77,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": [ - "the value of the identifier" - ] - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -136,8 +99,7 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ "val1" ], @@ -145,11 +107,37 @@ "val2" ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": [ + "the value of the identifier" + ] + }, + "variable_type": "string", + "multiple": true } } }, "var3": { + "path": "var3", + "name": "var3", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -177,32 +165,6 @@ ] }, "variable_type": "string", - "path": "var3", - "names": [ - "var3" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test/60_5family_dynamic_calc_suffix2.json b/tests/results/test/60_5family_dynamic_calc_suffix2.json index b580061a1..4e61a2eda 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix2.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "Suffix has value.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,11 +73,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } 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 cb0735363..e8155d33c 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix2_empty.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix2_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,33 +51,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "Suffix has value.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -96,11 +67,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } diff --git a/tests/results/test/60_5family_dynamic_calc_suffix_disabled.json b/tests/results/test/60_5family_dynamic_calc_suffix_disabled.json index 60e0c37cb..fb5de0597 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix_disabled.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix_disabled.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,32 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -56,11 +44,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } 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 f8401f24d..b67888c2d 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix_param.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,35 +57,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "from suffix" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -104,11 +73,22 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "from suffix" + } + }, + "variable_type": "string" } } } 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 c2d8aaf0e..16b1504c7 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 @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,35 +51,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "from suffix" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +67,22 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "from suffix" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test/60_5family_dynamic_calc_variable.json b/tests/results/test/60_5family_dynamic_calc_variable.json index 93083bf8d..a4ef9f0c5 100644 --- a/tests/results/test/60_5family_dynamic_calc_variable.json +++ b/tests/results/test/60_5family_dynamic_calc_variable.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,35 +73,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -137,9 +99,20 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/60_5family_dynamic_calc_variable_disabled.json b/tests/results/test/60_5family_dynamic_calc_variable_disabled.json index b6aae3865..74270cbba 100644 --- a/tests/results/test/60_5family_dynamic_calc_variable_disabled.json +++ b/tests/results/test/60_5family_dynamic_calc_variable_disabled.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var1", + "name": "var1", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,17 +37,6 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": true - }, - "var2": { - "names": [ - "var2", - "var2" - ], "identifiers": [ [ "val1" @@ -72,10 +45,13 @@ "val2" ] ], - "path": "dyn{{ identifier }}.var2", - "description": "A new variable.", "type": "variable", - "variable_type": "string", + "variable_type": "string" + }, + "var2": { + "path": "dyn{{ identifier }}.var2", + "name": "var2", + "description": "A new variable.", "properties": [ { "type": "property", @@ -113,11 +89,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/60_5family_dynamic_calc_variable_disabled_outside.json b/tests/results/test/60_5family_dynamic_calc_variable_disabled_outside.json index 86b72cf14..24f533c76 100644 --- a/tests/results/test/60_5family_dynamic_calc_variable_disabled_outside.json +++ b/tests/results/test/60_5family_dynamic_calc_variable_disabled_outside.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var1", + "name": "var1", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,21 +37,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A new variable.", "properties": [ { @@ -94,9 +79,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file 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 7f5b92288..5b641bcca 100644 --- a/tests/results/test/60_5family_dynamic_calc_variable_empty.json +++ b/tests/results/test/60_5family_dynamic_calc_variable_empty.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,29 +51,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -92,35 +67,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -131,9 +93,20 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/60_5family_dynamic_hidden_suffix.json b/tests/results/test/60_5family_dynamic_hidden_suffix.json index a7fab8583..cdf1f3cf6 100644 --- a/tests/results/test/60_5family_dynamic_hidden_suffix.json +++ b/tests/results/test/60_5family_dynamic_hidden_suffix.json @@ -2,19 +2,8 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", "description": "A dynamic family", "properties": [ { @@ -28,20 +17,29 @@ } ], "mode": "standard", - "identifier": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "val1", + "val2" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "dyn{{ identifier }}.var", + "name": "var", + "description": "A variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -50,25 +48,17 @@ "val2" ] ], - "path": "dyn{{ identifier }}.var", - "description": "A variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" }, "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -76,18 +66,15 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "dyn{{ identifier }}.family.var", + "name": "var", + "description": "A new variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -96,17 +83,8 @@ "val2" ] ], - "path": "dyn{{ identifier }}.family.var", - "description": "A new variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } 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 1f168c5f3..fefd99a75 100644 --- a/tests/results/test/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test/60_5family_dynamic_variable_outside_suffix.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_val1", - "dyn_val2" - ], + "path": "dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn_{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,35 +73,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "dyn_{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A variable inside dynamic family" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -141,9 +103,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "dyn_{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A variable inside dynamic family" + } + }, + "variable_type": "string" } } \ No newline at end of file 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 201da66c2..f6892a8cc 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 @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "Asuffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_val1", - "dyn_val2" - ], + "path": "dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,33 +51,13 @@ }, "description": "Asuffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn_{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -96,15 +67,29 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -114,23 +99,11 @@ "path": "dyn_{{ identifier }}.var", "identifiers": [ "val1" - ], - "type": "variable" + ] }, "description": "A variable inside dynamic family" } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test/60_6family_dynamic_leadership.json b/tests/results/test/60_6family_dynamic_leadership.json index 3257dfae5..483600687 100644 --- a/tests/results/test/60_6family_dynamic_leadership.json +++ b/tests/results/test/60_6family_dynamic_leadership.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,19 +57,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "leadership": { "type": "leadership", "informations": { - "names": [ - "leadership", - "leadership" - ], + "path": "dyn{{ identifier }}.leadership", + "name": "leadership", + "description": "A leadership", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -87,32 +76,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership", - "description": "A leadership", - "properties": [], - "mode": "basic", "help": [ "This family contains lists of variable blocks" ] }, "children": { "leader": { - "names": [ - "leader", - "leader" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.leadership.leader", + "name": "leader", "description": "A leader.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -128,22 +100,24 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "example" + "val1" ], [ - "example" + "val2" ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "names": [ - "follower1", - "follower1" - ], + "path": "dyn{{ identifier }}.leadership.follower1", + "name": "follower1", + "description": "A follower1.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -152,27 +126,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower1", - "description": "A follower1.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" }, "follower2": { - "names": [ - "follower2", - "follower2" - ], + "path": "dyn{{ identifier }}.leadership.follower2", + "name": "follower2", + "description": "A follower2.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -181,21 +143,8 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower2", - "description": "A follower2.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test/60_6family_dynamic_leadership_empty.json b/tests/results/test/60_6family_dynamic_leadership_empty.json index 6bc03850f..1792f9e74 100644 --- a/tests/results/test/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test/60_6family_dynamic_leadership_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,19 +51,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "leadership": { "type": "leadership", "informations": { - "names": [ - "leadership", - "leadership" - ], + "path": "dyn{{ identifier }}.leadership", + "name": "leadership", + "description": "A leadership", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -81,32 +70,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership", - "description": "A leadership", - "properties": [], - "mode": "basic", "help": [ "This family contains lists of variable blocks" ] }, "children": { "leader": { - "names": [ - "leader", - "leader" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.leadership.leader", + "name": "leader", "description": "A leader.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -122,22 +94,24 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "example" + "val1" ], [ - "example" + "val2" ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "names": [ - "follower1", - "follower1" - ], + "path": "dyn{{ identifier }}.leadership.follower1", + "name": "follower1", + "description": "A follower1.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -146,27 +120,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower1", - "description": "A follower1.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" }, "follower2": { - "names": [ - "follower2", - "follower2" - ], + "path": "dyn{{ identifier }}.leadership.follower2", + "name": "follower2", + "description": "A follower2.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -175,21 +137,8 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower2", - "description": "A follower2.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test/60_9family_dynamic_calc_both.json b/tests/results/test/60_9family_dynamic_calc_both.json index 928c6bb83..606dde925 100644 --- a/tests/results/test/60_9family_dynamic_calc_both.json +++ b/tests/results/test/60_9family_dynamic_calc_both.json @@ -1,15 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "val2" - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -20,18 +12,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val2" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -40,10 +35,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", { @@ -54,29 +48,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -86,11 +64,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/68_0family_leadership_mode.json b/tests/results/test/68_0family_leadership_mode.json index 96a040174..65e8c5318 100644 --- a/tests/results/test/68_0family_leadership_mode.json +++ b/tests/results/test/68_0family_leadership_mode.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -31,38 +25,22 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower1.", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A follower2.", "properties": [ { @@ -73,12 +51,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test/warnings_16_2family_redefine_calculation b/tests/results/test/warnings_16_2family_redefine_calculation index 3f9eeed42..df74ea6b7 100644 --- a/tests/results/test/warnings_16_2family_redefine_calculation +++ b/tests/results/test/warnings_16_2family_redefine_calculation @@ -1 +1 @@ -["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test/warnings_16_3family_empty_at_ends b/tests/results/test/warnings_16_3family_empty_at_ends index 24f1e340f..1f3058183 100644 --- a/tests/results/test/warnings_16_3family_empty_at_ends +++ b/tests/results/test/warnings_16_3family_empty_at_ends @@ -1 +1 @@ -["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test/warnings_20_2family_looks_like_dynamic b/tests/results/test/warnings_20_2family_looks_like_dynamic index e707364ec..8a0a73d67 100644 --- a/tests/results/test/warnings_20_2family_looks_like_dynamic +++ b/tests/results/test/warnings_20_2family_looks_like_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test/warnings_20_2family_looks_like_variable b/tests/results/test/warnings_20_2family_looks_like_variable index bac0697e5..4c3a70745 100644 --- a/tests/results/test/warnings_20_2family_looks_like_variable +++ b/tests/results/test/warnings_20_2family_looks_like_variable @@ -1 +1 @@ -["No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test/warnings_40_9leadership-calculation-outside-follower-no-mandatory index cf9783a34..02c23d08a 100644 --- a/tests/results/test/warnings_40_9leadership-calculation-outside-follower-no-mandatory +++ b/tests/results/test/warnings_40_9leadership-calculation-outside-follower-no-mandatory @@ -1 +1 @@ -["No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test/warnings_60_0family_dynamic_forbidden_char b/tests/results/test/warnings_60_0family_dynamic_forbidden_char index 7d2eda8c3..2ea96ed2b 100644 --- a/tests/results/test/warnings_60_0family_dynamic_forbidden_char +++ b/tests/results/test/warnings_60_0family_dynamic_forbidden_char @@ -1 +1 @@ -["\"default\" is a calculation for dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file +["\"default\" is a calculation for dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples/00_6choice.adoc b/tests/results/test_examples/00_6choice.adoc index 46720bd92..82092782f 100644 --- a/tests/results/test_examples/00_6choice.adoc +++ b/tests/results/test_examples/00_6choice.adoc @@ -3,18 +3,18 @@ [,yaml] ---- --- -var1: a_choice -var2: a_choice +var1: a +var2: a ---- == Example with all variables modifiable [,yaml] ---- --- -var1: a_choice -var2: a_choice -var3: a_choice -var4: a_choice +var1: a +var2: a +var3: a +var4: b var5: a var6: 1 ---- diff --git a/tests/results/test_examples/00_6choice.gitlab.md b/tests/results/test_examples/00_6choice.gitlab.md index 19738f99f..44a584603 100644 --- a/tests/results/test_examples/00_6choice.gitlab.md +++ b/tests/results/test_examples/00_6choice.gitlab.md @@ -2,8 +2,8 @@ ```yaml --- -var1: a_choice -var2: a_choice +var1: a +var2: a ``` @@ -11,10 +11,10 @@ var2: a_choice ```yaml --- -var1: a_choice -var2: a_choice -var3: a_choice -var4: a_choice +var1: a +var2: a +var3: a +var4: b var5: a var6: 1 ``` diff --git a/tests/results/test_examples/00_6choice.html b/tests/results/test_examples/00_6choice.html index 00be96e92..d65dda2d1 100644 --- a/tests/results/test_examples/00_6choice.html +++ b/tests/results/test_examples/00_6choice.html @@ -1,11 +1,11 @@

    Example with mandatory variables not filled in

    -
    var1: a_choice
-var2: a_choice

    Example with all variables modifiable

    +
    var1: a
+var2: a

    Example with all variables modifiable

    -
    var1: a_choice
-var2: a_choice
-var3: a_choice
-var4: a_choice
+
    var1: a
+var2: a
+var3: a
+var4: b
 var5: a
 var6: 1
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_6choice.md b/tests/results/test_examples/00_6choice.md
index 8b1bd78a4..a4e732877 100644
--- a/tests/results/test_examples/00_6choice.md
+++ b/tests/results/test_examples/00_6choice.md
@@ -2,17 +2,17 @@
 
 ```yaml
 ---
-var1: a_choice
-var2: a_choice
+var1: a
+var2: a
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-var1: a_choice
-var2: a_choice
-var3: a_choice
-var4: a_choice
+var1: a
+var2: a
+var3: a
+var4: b
 var5: a
 var6: 1
 ```
diff --git a/tests/results/test_examples/00_6choice.sh b/tests/results/test_examples/00_6choice.sh
index 60fd4cbbe..13d1ef299 100644
--- a/tests/results/test_examples/00_6choice.sh
+++ b/tests/results/test_examples/00_6choice.sh
@@ -1,16 +1,16 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-var1: a_choice                                                                  
-var2: a_choice                                                                  
+var1: a                                                                         
+var2: a                                                                         
 
 Example with all variables modifiable
 
 ---                                                                             
-var1: a_choice                                                                  
-var2: a_choice                                                                  
-var3: a_choice                                                                  
-var4: a_choice                                                                  
+var1: a                                                                         
+var2: a                                                                         
+var3: a                                                                         
+var4: b                                                                         
 var5: a                                                                         
 var6: 1                                                                         
 
diff --git a/tests/results/test_examples/00_6choice_link.adoc b/tests/results/test_examples/00_6choice_link.adoc
index 2f49ad9ba..c2920aa01 100644
--- a/tests/results/test_examples/00_6choice_link.adoc
+++ b/tests/results/test_examples/00_6choice_link.adoc
@@ -3,13 +3,13 @@
 [,yaml]
 ----
 ---
-var1: a_choice
+var1: a
 ----
 == Example with all variables modifiable
 
 [,yaml]
 ----
 ---
-var1: a_choice
-var2: a_choice
+var1: a
+var2: a
 ----
diff --git a/tests/results/test_examples/00_6choice_link.gitlab.md b/tests/results/test_examples/00_6choice_link.gitlab.md
index 7580235c0..af8cd4afa 100644
--- a/tests/results/test_examples/00_6choice_link.gitlab.md
+++ b/tests/results/test_examples/00_6choice_link.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-var1: a_choice
+var1: a
 ```
 
 
@@ -10,8 +10,8 @@ var1: a_choice
 
 ```yaml
 ---
-var1: a_choice
-var2: a_choice
+var1: a
+var2: a
 ```
 
 
diff --git a/tests/results/test_examples/00_6choice_link.html b/tests/results/test_examples/00_6choice_link.html
index f55fbf3bf..72581c6ad 100644
--- a/tests/results/test_examples/00_6choice_link.html
+++ b/tests/results/test_examples/00_6choice_link.html
@@ -1,6 +1,6 @@
 
    Example with mandatory variables not filled in
    
 
-
    var1: a_choice
    Example with all variables modifiable
    
+
    var1: a
    Example with all variables modifiable
    
 
-
    var1: a_choice
-var2: a_choice
    
\ No newline at end of file
+
    var1: a
+var2: a
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_6choice_link.md b/tests/results/test_examples/00_6choice_link.md
index 91b752077..15c993f8c 100644
--- a/tests/results/test_examples/00_6choice_link.md
+++ b/tests/results/test_examples/00_6choice_link.md
@@ -2,12 +2,12 @@
 
 ```yaml
 ---
-var1: a_choice
+var1: a
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-var1: a_choice
-var2: a_choice
+var1: a
+var2: a
 ```
diff --git a/tests/results/test_examples/00_6choice_link.sh b/tests/results/test_examples/00_6choice_link.sh
index 188f606df..7bc71a0db 100644
--- a/tests/results/test_examples/00_6choice_link.sh
+++ b/tests/results/test_examples/00_6choice_link.sh
@@ -1,11 +1,11 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-var1: a_choice                                                                  
+var1: a                                                                         
 
 Example with all variables modifiable
 
 ---                                                                             
-var1: a_choice                                                                  
-var2: a_choice                                                                  
+var1: a                                                                         
+var2: a                                                                         
 
diff --git a/tests/results/test_examples/00_6custom.adoc b/tests/results/test_examples/00_6custom.adoc
index d63c3cb55..e53543511 100644
--- a/tests/results/test_examples/00_6custom.adoc
+++ b/tests/results/test_examples/00_6custom.adoc
@@ -3,13 +3,13 @@
 [,yaml]
 ----
 ---
-custom1: xxx
+custom1: example
 ----
 == Example with all variables modifiable
 
 [,yaml]
 ----
 ---
-custom1: xxx
+custom1: example
 custom2: value
 ----
diff --git a/tests/results/test_examples/00_6custom.gitlab.md b/tests/results/test_examples/00_6custom.gitlab.md
index 0cbd4fb93..a107e9a63 100644
--- a/tests/results/test_examples/00_6custom.gitlab.md
+++ b/tests/results/test_examples/00_6custom.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-custom1: xxx
+custom1: example
 ```
 
 
@@ -10,7 +10,7 @@ custom1: xxx
 
 ```yaml
 ---
-custom1: xxx
+custom1: example
 custom2: value
 ```
 
diff --git a/tests/results/test_examples/00_6custom.html b/tests/results/test_examples/00_6custom.html
index be5faf37b..b117a479d 100644
--- a/tests/results/test_examples/00_6custom.html
+++ b/tests/results/test_examples/00_6custom.html
@@ -1,6 +1,6 @@
 
    Example with mandatory variables not filled in
    
 
-
    custom1: xxx
    Example with all variables modifiable
    
+
    custom1: example
    Example with all variables modifiable
    
 
-
    custom1: xxx
+
    custom1: example
 custom2: value
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_6custom.md b/tests/results/test_examples/00_6custom.md
index d19e224f7..4812320f9 100644
--- a/tests/results/test_examples/00_6custom.md
+++ b/tests/results/test_examples/00_6custom.md
@@ -2,12 +2,12 @@
 
 ```yaml
 ---
-custom1: xxx
+custom1: example
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-custom1: xxx
+custom1: example
 custom2: value
 ```
diff --git a/tests/results/test_examples/00_6custom.sh b/tests/results/test_examples/00_6custom.sh
index 543ac209a..dace953f5 100644
--- a/tests/results/test_examples/00_6custom.sh
+++ b/tests/results/test_examples/00_6custom.sh
@@ -1,11 +1,11 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-custom1: xxx                                                                    
+custom1: example                                                                
 
 Example with all variables modifiable
 
 ---                                                                             
-custom1: xxx                                                                    
+custom1: example                                                                
 custom2: value                                                                  
 
diff --git a/tests/results/test_examples/00_6ip.adoc b/tests/results/test_examples/00_6ip.adoc
index 919da59bc..e2102d5ff 100644
--- a/tests/results/test_examples/00_6ip.adoc
+++ b/tests/results/test_examples/00_6ip.adoc
@@ -4,6 +4,6 @@
 ----
 ---
 var1: 1.1.1.1
-var2: 192.168.0.128/25
+var2: 192.168.0.129/25
 var3: 1.1.1.1/24
 ----
diff --git a/tests/results/test_examples/00_6ip.gitlab.md b/tests/results/test_examples/00_6ip.gitlab.md
index e1a33651e..c08ba7bfc 100644
--- a/tests/results/test_examples/00_6ip.gitlab.md
+++ b/tests/results/test_examples/00_6ip.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 var1: 1.1.1.1
-var2: 192.168.0.128/25
+var2: 192.168.0.129/25
 var3: 1.1.1.1/24
 ```
 
diff --git a/tests/results/test_examples/00_6ip.html b/tests/results/test_examples/00_6ip.html
index ad8601c68..2976a7069 100644
--- a/tests/results/test_examples/00_6ip.html
+++ b/tests/results/test_examples/00_6ip.html
@@ -1,5 +1,5 @@
 
    Example with all variables modifiable
    
 
 
    var1: 1.1.1.1
-var2: 192.168.0.128/25
+var2: 192.168.0.129/25
 var3: 1.1.1.1/24
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_6ip.md b/tests/results/test_examples/00_6ip.md
index aae0ed6fa..63ec7aa2d 100644
--- a/tests/results/test_examples/00_6ip.md
+++ b/tests/results/test_examples/00_6ip.md
@@ -3,6 +3,6 @@
 ```yaml
 ---
 var1: 1.1.1.1
-var2: 192.168.0.128/25
+var2: 192.168.0.129/25
 var3: 1.1.1.1/24
 ```
diff --git a/tests/results/test_examples/00_6ip.sh b/tests/results/test_examples/00_6ip.sh
index 295eb3953..ae337d4be 100644
--- a/tests/results/test_examples/00_6ip.sh
+++ b/tests/results/test_examples/00_6ip.sh
@@ -2,6 +2,6 @@
 
 ---                                                                             
 var1: 1.1.1.1                                                                   
-var2: 192.168.0.128/25                                                          
+var2: 192.168.0.129/25                                                          
 var3: 1.1.1.1/24                                                                
 
diff --git a/tests/results/test_examples/00_6secret_param.adoc b/tests/results/test_examples/00_6secret_param.adoc
index f33334935..530a90d73 100644
--- a/tests/results/test_examples/00_6secret_param.adoc
+++ b/tests/results/test_examples/00_6secret_param.adoc
@@ -3,14 +3,14 @@
 [,yaml]
 ----
 ---
-secret1: secrets
+secret1: ALongS4cr4t
 ----
 == Example with all variables modifiable
 
 [,yaml]
 ----
 ---
-secret1: secrets
+secret1: ALongS4cr4t
 secret2: value
 secret3: value
 ----
diff --git a/tests/results/test_examples/00_6secret_param.gitlab.md b/tests/results/test_examples/00_6secret_param.gitlab.md
index 9a46dbb9a..9aaae0461 100644
--- a/tests/results/test_examples/00_6secret_param.gitlab.md
+++ b/tests/results/test_examples/00_6secret_param.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-secret1: secrets
+secret1: ALongS4cr4t
 ```
 
 
@@ -10,7 +10,7 @@ secret1: secrets
 
 ```yaml
 ---
-secret1: secrets
+secret1: ALongS4cr4t
 secret2: value
 secret3: value
 ```
diff --git a/tests/results/test_examples/00_6secret_param.html b/tests/results/test_examples/00_6secret_param.html
index b821d799a..fd42a6001 100644
--- a/tests/results/test_examples/00_6secret_param.html
+++ b/tests/results/test_examples/00_6secret_param.html
@@ -1,7 +1,7 @@
 
    Example with mandatory variables not filled in
    
 
-
    secret1: secrets
    Example with all variables modifiable
    
+
    secret1: ALongS4cr4t
    Example with all variables modifiable
    
 
-
    secret1: secrets
+
    secret1: ALongS4cr4t
 secret2: value
 secret3: value
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_6secret_param.md b/tests/results/test_examples/00_6secret_param.md
index 5a3d282bb..fba9a4c11 100644
--- a/tests/results/test_examples/00_6secret_param.md
+++ b/tests/results/test_examples/00_6secret_param.md
@@ -2,13 +2,13 @@
 
 ```yaml
 ---
-secret1: secrets
+secret1: ALongS4cr4t
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-secret1: secrets
+secret1: ALongS4cr4t
 secret2: value
 secret3: value
 ```
diff --git a/tests/results/test_examples/00_6secret_param.sh b/tests/results/test_examples/00_6secret_param.sh
index 4aa831c10..5ae33693a 100644
--- a/tests/results/test_examples/00_6secret_param.sh
+++ b/tests/results/test_examples/00_6secret_param.sh
@@ -1,12 +1,12 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-secret1: secrets                                                                
+secret1: ALongS4cr4t                                                            
 
 Example with all variables modifiable
 
 ---                                                                             
-secret1: secrets                                                                
+secret1: ALongS4cr4t                                                            
 secret2: value                                                                  
 secret3: value                                                                  
 
diff --git a/tests/results/test_examples/00_8calculation_information.adoc b/tests/results/test_examples/00_8calculation_information.adoc
index dce98276e..200de95ef 100644
--- a/tests/results/test_examples/00_8calculation_information.adoc
+++ b/tests/results/test_examples/00_8calculation_information.adoc
@@ -3,5 +3,5 @@
 [,yaml]
 ----
 ---
-variable: example
+variable: value
 ----
diff --git a/tests/results/test_examples/00_8calculation_information.gitlab.md b/tests/results/test_examples/00_8calculation_information.gitlab.md
index 8eb39eed9..2b5da57f3 100644
--- a/tests/results/test_examples/00_8calculation_information.gitlab.md
+++ b/tests/results/test_examples/00_8calculation_information.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-variable: example
+variable: value
 ```
 
 
diff --git a/tests/results/test_examples/00_8calculation_information.html b/tests/results/test_examples/00_8calculation_information.html
index 7baa59dea..d2ea26d34 100644
--- a/tests/results/test_examples/00_8calculation_information.html
+++ b/tests/results/test_examples/00_8calculation_information.html
@@ -1,3 +1,3 @@
 
    Example with all variables modifiable
    
 
-
    variable: example
    
\ No newline at end of file
+
    variable: value
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_8calculation_information.md b/tests/results/test_examples/00_8calculation_information.md
index dc986dc24..bee313c55 100644
--- a/tests/results/test_examples/00_8calculation_information.md
+++ b/tests/results/test_examples/00_8calculation_information.md
@@ -2,5 +2,5 @@
 
 ```yaml
 ---
-variable: example
+variable: value
 ```
diff --git a/tests/results/test_examples/00_8calculation_information.sh b/tests/results/test_examples/00_8calculation_information.sh
index b1345ce1f..db8804eb4 100644
--- a/tests/results/test_examples/00_8calculation_information.sh
+++ b/tests/results/test_examples/00_8calculation_information.sh
@@ -1,5 +1,5 @@
 Example with all variables modifiable
 
 ---                                                                             
-variable: example                                                               
+variable: value                                                                 
 
diff --git a/tests/results/test_examples/00_8test.adoc b/tests/results/test_examples/00_8test.adoc
index 1ef0e5725..67083aa89 100644
--- a/tests/results/test_examples/00_8test.adoc
+++ b/tests/results/test_examples/00_8test.adoc
@@ -17,7 +17,7 @@ var6:
 var1: test
 var2: test
 var3: test1
-var4: null
+var4: example
 var5: false
 var6:
   - test1
diff --git a/tests/results/test_examples/00_8test.gitlab.md b/tests/results/test_examples/00_8test.gitlab.md
index 3ee3b211c..fcd81a85e 100644
--- a/tests/results/test_examples/00_8test.gitlab.md
+++ b/tests/results/test_examples/00_8test.gitlab.md
@@ -17,7 +17,7 @@ var6:
 var1: test
 var2: test
 var3: test1
-var4: null
+var4: example
 var5: false
 var6:
   - test1
diff --git a/tests/results/test_examples/00_8test.html b/tests/results/test_examples/00_8test.html
index 5329313fd..3ae91a0cb 100644
--- a/tests/results/test_examples/00_8test.html
+++ b/tests/results/test_examples/00_8test.html
@@ -9,7 +9,7 @@ var6:
 
    var1: test
 var2: test
 var3: test1
-var4: null
+var4: example
 var5: false
 var6:
   - test1
diff --git a/tests/results/test_examples/00_8test.md b/tests/results/test_examples/00_8test.md
index 04490035f..cc1e91968 100644
--- a/tests/results/test_examples/00_8test.md
+++ b/tests/results/test_examples/00_8test.md
@@ -15,7 +15,7 @@ var6:
 var1: test
 var2: test
 var3: test1
-var4: null
+var4: example
 var5: false
 var6:
   - test1
diff --git a/tests/results/test_examples/00_8test.sh b/tests/results/test_examples/00_8test.sh
index bc19e3590..adbbb8405 100644
--- a/tests/results/test_examples/00_8test.sh
+++ b/tests/results/test_examples/00_8test.sh
@@ -13,7 +13,7 @@
 var1: test                                                                      
 var2: test                                                                      
 var3: test1                                                                     
-var4: null                                                                      
+var4: example                                                                   
 var5: false                                                                     
 var6:                                                                           
   - test1                                                                       
diff --git a/tests/results/test_examples/00_9choice_variable_multi.adoc b/tests/results/test_examples/00_9choice_variable_multi.adoc
index 534273f16..6bf4240f4 100644
--- a/tests/results/test_examples/00_9choice_variable_multi.adoc
+++ b/tests/results/test_examples/00_9choice_variable_multi.adoc
@@ -4,7 +4,8 @@
 ----
 ---
 variable1:
-  - a_choice
+  - val1
+  - val2
 ----
 == Example with all variables modifiable
 
@@ -12,7 +13,9 @@ variable1:
 ----
 ---
 variable1:
-  - a_choice
+  - val1
+  - val2
 variable2:
-  - a_choice
+  - val1
+  - val2
 ----
diff --git a/tests/results/test_examples/00_9choice_variable_multi.gitlab.md b/tests/results/test_examples/00_9choice_variable_multi.gitlab.md
index 5c20ad8f2..9a9ef9ed6 100644
--- a/tests/results/test_examples/00_9choice_variable_multi.gitlab.md
+++ b/tests/results/test_examples/00_9choice_variable_multi.gitlab.md
@@ -3,7 +3,8 @@
 ```yaml
 ---
 variable1:
-  - a_choice
+  - val1
+  - val2
 ```
 
 
@@ -12,9 +13,11 @@ variable1:
 ```yaml
 ---
 variable1:
-  - a_choice
+  - val1
+  - val2
 variable2:
-  - a_choice
+  - val1
+  - val2
 ```
 
 
diff --git a/tests/results/test_examples/00_9choice_variable_multi.html b/tests/results/test_examples/00_9choice_variable_multi.html
index 8fc6006ca..7136d6aeb 100644
--- a/tests/results/test_examples/00_9choice_variable_multi.html
+++ b/tests/results/test_examples/00_9choice_variable_multi.html
@@ -1,9 +1,12 @@
 
    Example with mandatory variables not filled in
    
 
 
    variable1:
-  - a_choice
    Example with all variables modifiable
    
+  - val1
+  - val2
    Example with all variables modifiable
    
 
 
    variable1:
-  - a_choice
+  - val1
+  - val2
 variable2:
-  - a_choice
    
\ No newline at end of file
+  - val1
+  - val2
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_9choice_variable_multi.md b/tests/results/test_examples/00_9choice_variable_multi.md
index b0088337a..232f5423c 100644
--- a/tests/results/test_examples/00_9choice_variable_multi.md
+++ b/tests/results/test_examples/00_9choice_variable_multi.md
@@ -3,14 +3,17 @@
 ```yaml
 ---
 variable1:
-  - a_choice
+  - val1
+  - val2
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
 variable1:
-  - a_choice
+  - val1
+  - val2
 variable2:
-  - a_choice
+  - val1
+  - val2
 ```
diff --git a/tests/results/test_examples/00_9choice_variable_multi.sh b/tests/results/test_examples/00_9choice_variable_multi.sh
index 28c38d31f..6180cb8b0 100644
--- a/tests/results/test_examples/00_9choice_variable_multi.sh
+++ b/tests/results/test_examples/00_9choice_variable_multi.sh
@@ -2,13 +2,16 @@
 
 ---                                                                             
 variable1:                                                                      
-  - a_choice                                                                    
+  - val1                                                                        
+  - val2                                                                        
 
 Example with all variables modifiable
 
 ---                                                                             
 variable1:                                                                      
-  - a_choice                                                                    
+  - val1                                                                        
+  - val2                                                                        
 variable2:                                                                      
-  - a_choice                                                                    
+  - val1                                                                        
+  - val2                                                                        
 
diff --git a/tests/results/test_examples/00_9default_calculation_information.adoc b/tests/results/test_examples/00_9default_calculation_information.adoc
index 304e47533..914220253 100644
--- a/tests/results/test_examples/00_9default_calculation_information.adoc
+++ b/tests/results/test_examples/00_9default_calculation_information.adoc
@@ -3,5 +3,5 @@
 [,yaml]
 ----
 ---
-var: example
+var: value
 ----
diff --git a/tests/results/test_examples/00_9default_calculation_information.gitlab.md b/tests/results/test_examples/00_9default_calculation_information.gitlab.md
index 3fdf50681..d51c376a4 100644
--- a/tests/results/test_examples/00_9default_calculation_information.gitlab.md
+++ b/tests/results/test_examples/00_9default_calculation_information.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-var: example
+var: value
 ```
 
 
diff --git a/tests/results/test_examples/00_9default_calculation_information.html b/tests/results/test_examples/00_9default_calculation_information.html
index bc1883979..b11bc9e56 100644
--- a/tests/results/test_examples/00_9default_calculation_information.html
+++ b/tests/results/test_examples/00_9default_calculation_information.html
@@ -1,3 +1,3 @@
 
    Example with all variables modifiable
    
 
-
    var: example
    
\ No newline at end of file
+
    var: value
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_9default_calculation_information.md b/tests/results/test_examples/00_9default_calculation_information.md
index 1eb419aa5..0b174915e 100644
--- a/tests/results/test_examples/00_9default_calculation_information.md
+++ b/tests/results/test_examples/00_9default_calculation_information.md
@@ -2,5 +2,5 @@
 
 ```yaml
 ---
-var: example
+var: value
 ```
diff --git a/tests/results/test_examples/00_9default_calculation_information.sh b/tests/results/test_examples/00_9default_calculation_information.sh
index 2cefeb024..fe53fa45b 100644
--- a/tests/results/test_examples/00_9default_calculation_information.sh
+++ b/tests/results/test_examples/00_9default_calculation_information.sh
@@ -1,5 +1,5 @@
 Example with all variables modifiable
 
 ---                                                                             
-var: example                                                                    
+var: value                                                                      
 
diff --git a/tests/results/test_examples/00_9default_calculation_information_other_variable.adoc b/tests/results/test_examples/00_9default_calculation_information_other_variable.adoc
index 1e16b08e0..72dc27cb2 100644
--- a/tests/results/test_examples/00_9default_calculation_information_other_variable.adoc
+++ b/tests/results/test_examples/00_9default_calculation_information_other_variable.adoc
@@ -11,5 +11,5 @@ var1: example
 ----
 ---
 var1: example
-var2: example
+var2: value
 ----
diff --git a/tests/results/test_examples/00_9default_calculation_information_other_variable.gitlab.md b/tests/results/test_examples/00_9default_calculation_information_other_variable.gitlab.md
index 9dcc86315..6dfbbb0fb 100644
--- a/tests/results/test_examples/00_9default_calculation_information_other_variable.gitlab.md
+++ b/tests/results/test_examples/00_9default_calculation_information_other_variable.gitlab.md
@@ -11,7 +11,7 @@ var1: example
 ```yaml
 ---
 var1: example
-var2: example
+var2: value
 ```
 
 
diff --git a/tests/results/test_examples/00_9default_calculation_information_other_variable.html b/tests/results/test_examples/00_9default_calculation_information_other_variable.html
index 6d424fc0f..9bb032cc1 100644
--- a/tests/results/test_examples/00_9default_calculation_information_other_variable.html
+++ b/tests/results/test_examples/00_9default_calculation_information_other_variable.html
@@ -3,4 +3,4 @@
 
    var1: example
    Example with all variables modifiable
    
 
 
    var1: example
-var2: example
    
\ No newline at end of file
+var2: value
    
\ No newline at end of file
diff --git a/tests/results/test_examples/00_9default_calculation_information_other_variable.md b/tests/results/test_examples/00_9default_calculation_information_other_variable.md
index 4c4e66c06..dc101660d 100644
--- a/tests/results/test_examples/00_9default_calculation_information_other_variable.md
+++ b/tests/results/test_examples/00_9default_calculation_information_other_variable.md
@@ -9,5 +9,5 @@ var1: example
 ```yaml
 ---
 var1: example
-var2: example
+var2: value
 ```
diff --git a/tests/results/test_examples/00_9default_calculation_information_other_variable.sh b/tests/results/test_examples/00_9default_calculation_information_other_variable.sh
index adc9640a8..cb72a98c0 100644
--- a/tests/results/test_examples/00_9default_calculation_information_other_variable.sh
+++ b/tests/results/test_examples/00_9default_calculation_information_other_variable.sh
@@ -7,5 +7,5 @@
 
 ---                                                                             
 var1: example                                                                   
-var2: example                                                                   
+var2: value                                                                     
 
diff --git a/tests/results/test_examples/00_9default_information_other_variable.adoc b/tests/results/test_examples/00_9default_information_other_variable.adoc
index 1e16b08e0..72dc27cb2 100644
--- a/tests/results/test_examples/00_9default_information_other_variable.adoc
+++ b/tests/results/test_examples/00_9default_information_other_variable.adoc
@@ -11,5 +11,5 @@ var1: example
 ----
 ---
 var1: example
-var2: example
+var2: value
 ----
diff --git a/tests/results/test_examples/00_9default_information_other_variable.gitlab.md b/tests/results/test_examples/00_9default_information_other_variable.gitlab.md
index 9dcc86315..6dfbbb0fb 100644
--- a/tests/results/test_examples/00_9default_information_other_variable.gitlab.md
+++ b/tests/results/test_examples/00_9default_information_other_variable.gitlab.md
@@ -11,7 +11,7 @@ var1: example
 ```yaml
 ---
 var1: example
-var2: example
+var2: value
 ```
 
 
diff --git a/tests/results/test_examples/00_9default_information_other_variable.html b/tests/results/test_examples/00_9default_information_other_variable.html
index 6d424fc0f..9bb032cc1 100644
--- a/tests/results/test_examples/00_9default_information_other_variable.html
+++ b/tests/results/test_examples/00_9default_information_other_variable.html
@@ -3,4 +3,4 @@
 
    var1: example
    Example with all variables modifiable
    
 
 
    var1: example
-var2: example
    
\ No newline at end of file
+var2: value
    \ No newline at end of file diff --git a/tests/results/test_examples/00_9default_information_other_variable.md b/tests/results/test_examples/00_9default_information_other_variable.md index 4c4e66c06..dc101660d 100644 --- a/tests/results/test_examples/00_9default_information_other_variable.md +++ b/tests/results/test_examples/00_9default_information_other_variable.md @@ -9,5 +9,5 @@ var1: example ```yaml --- var1: example -var2: example +var2: value ``` diff --git a/tests/results/test_examples/00_9default_information_other_variable.sh b/tests/results/test_examples/00_9default_information_other_variable.sh index adc9640a8..cb72a98c0 100644 --- a/tests/results/test_examples/00_9default_information_other_variable.sh +++ b/tests/results/test_examples/00_9default_information_other_variable.sh @@ -7,5 +7,5 @@ ---  var1: example  -var2: example  +var2: value  diff --git a/tests/results/test_examples/00_9default_information_other_variable2.adoc b/tests/results/test_examples/00_9default_information_other_variable2.adoc index 1e16b08e0..e6a432e62 100644 --- a/tests/results/test_examples/00_9default_information_other_variable2.adoc +++ b/tests/results/test_examples/00_9default_information_other_variable2.adoc @@ -4,6 +4,7 @@ ---- --- var1: example +var2: example ---- == Example with all variables modifiable diff --git a/tests/results/test_examples/00_9default_information_other_variable2.gitlab.md b/tests/results/test_examples/00_9default_information_other_variable2.gitlab.md index 9dcc86315..c07364179 100644 --- a/tests/results/test_examples/00_9default_information_other_variable2.gitlab.md +++ b/tests/results/test_examples/00_9default_information_other_variable2.gitlab.md @@ -3,6 +3,7 @@ ```yaml --- var1: example +var2: example ``` diff --git a/tests/results/test_examples/00_9default_information_other_variable2.html b/tests/results/test_examples/00_9default_information_other_variable2.html index 6d424fc0f..0bf2e0214 100644 --- a/tests/results/test_examples/00_9default_information_other_variable2.html +++ b/tests/results/test_examples/00_9default_information_other_variable2.html @@ -1,6 +1,7 @@

    Example with mandatory variables not filled in

    -
    var1: example

    Example with all variables modifiable

    +
    var1: example
+var2: example

    Example with all variables modifiable

    var1: example
 var2: example
    \ No newline at end of file diff --git a/tests/results/test_examples/00_9default_information_other_variable2.md b/tests/results/test_examples/00_9default_information_other_variable2.md index 4c4e66c06..878b944e1 100644 --- a/tests/results/test_examples/00_9default_information_other_variable2.md +++ b/tests/results/test_examples/00_9default_information_other_variable2.md @@ -3,6 +3,7 @@ ```yaml --- var1: example +var2: example ``` # Example with all variables modifiable diff --git a/tests/results/test_examples/00_9default_information_other_variable2.sh b/tests/results/test_examples/00_9default_information_other_variable2.sh index adc9640a8..0381b6ceb 100644 --- a/tests/results/test_examples/00_9default_information_other_variable2.sh +++ b/tests/results/test_examples/00_9default_information_other_variable2.sh @@ -2,6 +2,7 @@ ---  var1: example  +var2: example  Example with all variables modifiable diff --git a/tests/results/test_examples/01_6custom_multi.adoc b/tests/results/test_examples/01_6custom_multi.adoc index d8f678619..83df1fd24 100644 --- a/tests/results/test_examples/01_6custom_multi.adoc +++ b/tests/results/test_examples/01_6custom_multi.adoc @@ -4,7 +4,7 @@ ---- --- custom1: - - xxx + - example ---- == Example with all variables modifiable @@ -12,7 +12,7 @@ custom1: ---- --- custom1: - - xxx + - example custom2: - value ---- diff --git a/tests/results/test_examples/01_6custom_multi.gitlab.md b/tests/results/test_examples/01_6custom_multi.gitlab.md index ca33bf46c..8380bcc11 100644 --- a/tests/results/test_examples/01_6custom_multi.gitlab.md +++ b/tests/results/test_examples/01_6custom_multi.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- custom1: - - xxx + - example ``` @@ -12,7 +12,7 @@ custom1: ```yaml --- custom1: - - xxx + - example custom2: - value ``` diff --git a/tests/results/test_examples/01_6custom_multi.html b/tests/results/test_examples/01_6custom_multi.html index d1adec673..b68bc4325 100644 --- a/tests/results/test_examples/01_6custom_multi.html +++ b/tests/results/test_examples/01_6custom_multi.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    custom1:
-  - xxx

    Example with all variables modifiable

    + - example

    Example with all variables modifiable

    custom1:
-  - xxx
+  - example
 custom2:
   - value
    \ No newline at end of file diff --git a/tests/results/test_examples/01_6custom_multi.md b/tests/results/test_examples/01_6custom_multi.md index 1187b48c9..f98a7a645 100644 --- a/tests/results/test_examples/01_6custom_multi.md +++ b/tests/results/test_examples/01_6custom_multi.md @@ -3,14 +3,14 @@ ```yaml --- custom1: - - xxx + - example ``` # Example with all variables modifiable ```yaml --- custom1: - - xxx + - example custom2: - value ``` diff --git a/tests/results/test_examples/01_6custom_multi.sh b/tests/results/test_examples/01_6custom_multi.sh index cb2ce5235..a80cc5b47 100644 --- a/tests/results/test_examples/01_6custom_multi.sh +++ b/tests/results/test_examples/01_6custom_multi.sh @@ -2,13 +2,13 @@ ---  custom1:  - - xxx  + - example  Example with all variables modifiable ---  custom1:  - - xxx  + - example  custom2:   - value  diff --git a/tests/results/test_examples/01_8calculation_information_multi.adoc b/tests/results/test_examples/01_8calculation_information_multi.adoc index 375aa5616..8360f3a40 100644 --- a/tests/results/test_examples/01_8calculation_information_multi.adoc +++ b/tests/results/test_examples/01_8calculation_information_multi.adoc @@ -4,5 +4,5 @@ ---- --- variable: - - example + - value ---- diff --git a/tests/results/test_examples/01_8calculation_information_multi.gitlab.md b/tests/results/test_examples/01_8calculation_information_multi.gitlab.md index d403b5e83..55643ca59 100644 --- a/tests/results/test_examples/01_8calculation_information_multi.gitlab.md +++ b/tests/results/test_examples/01_8calculation_information_multi.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- variable: - - example + - value ``` diff --git a/tests/results/test_examples/01_8calculation_information_multi.html b/tests/results/test_examples/01_8calculation_information_multi.html index 1b70abd78..0d6eda369 100644 --- a/tests/results/test_examples/01_8calculation_information_multi.html +++ b/tests/results/test_examples/01_8calculation_information_multi.html @@ -1,4 +1,4 @@

    Example with all variables modifiable

    variable:
-  - example
    \ No newline at end of file + - value \ No newline at end of file diff --git a/tests/results/test_examples/01_8calculation_information_multi.md b/tests/results/test_examples/01_8calculation_information_multi.md index 8484f37f6..2b23942dc 100644 --- a/tests/results/test_examples/01_8calculation_information_multi.md +++ b/tests/results/test_examples/01_8calculation_information_multi.md @@ -3,5 +3,5 @@ ```yaml --- variable: - - example + - value ``` diff --git a/tests/results/test_examples/01_8calculation_information_multi.sh b/tests/results/test_examples/01_8calculation_information_multi.sh index 96931d69c..60f8833e5 100644 --- a/tests/results/test_examples/01_8calculation_information_multi.sh +++ b/tests/results/test_examples/01_8calculation_information_multi.sh @@ -2,5 +2,5 @@ ---  variable:  - - example  + - value  diff --git a/tests/results/test_examples/01_9choice_variable_multi.adoc b/tests/results/test_examples/01_9choice_variable_multi.adoc index 349cb901d..98a96b41c 100644 --- a/tests/results/test_examples/01_9choice_variable_multi.adoc +++ b/tests/results/test_examples/01_9choice_variable_multi.adoc @@ -3,7 +3,7 @@ [,yaml] ---- --- -variable2: a_choice +variable2: a ---- == Example with all variables modifiable @@ -14,5 +14,5 @@ variable1: - a - b - c -variable2: a_choice +variable2: a ---- diff --git a/tests/results/test_examples/01_9choice_variable_multi.gitlab.md b/tests/results/test_examples/01_9choice_variable_multi.gitlab.md index 1e8b72685..61f2a40bc 100644 --- a/tests/results/test_examples/01_9choice_variable_multi.gitlab.md +++ b/tests/results/test_examples/01_9choice_variable_multi.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -variable2: a_choice +variable2: a ``` @@ -14,7 +14,7 @@ variable1: - a - b - c -variable2: a_choice +variable2: a ``` diff --git a/tests/results/test_examples/01_9choice_variable_multi.html b/tests/results/test_examples/01_9choice_variable_multi.html index a434fa513..5356c1d6a 100644 --- a/tests/results/test_examples/01_9choice_variable_multi.html +++ b/tests/results/test_examples/01_9choice_variable_multi.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    -
    variable2: a_choice

    Example with all variables modifiable

    +
    variable2: a

    Example with all variables modifiable

    variable1:
   - a
   - b
   - c
-variable2: a_choice
    \ No newline at end of file +variable2: a \ No newline at end of file diff --git a/tests/results/test_examples/01_9choice_variable_multi.md b/tests/results/test_examples/01_9choice_variable_multi.md index ba31acfc1..c5f303e59 100644 --- a/tests/results/test_examples/01_9choice_variable_multi.md +++ b/tests/results/test_examples/01_9choice_variable_multi.md @@ -2,7 +2,7 @@ ```yaml --- -variable2: a_choice +variable2: a ``` # Example with all variables modifiable @@ -12,5 +12,5 @@ variable1: - a - b - c -variable2: a_choice +variable2: a ``` diff --git a/tests/results/test_examples/01_9choice_variable_multi.sh b/tests/results/test_examples/01_9choice_variable_multi.sh index c64189d14..46786a056 100644 --- a/tests/results/test_examples/01_9choice_variable_multi.sh +++ b/tests/results/test_examples/01_9choice_variable_multi.sh @@ -1,7 +1,7 @@ Example with mandatory variables not filled in ---  -variable2: a_choice  +variable2: a  Example with all variables modifiable @@ -10,5 +10,5 @@  - a   - b   - c  -variable2: a_choice  +variable2: a  diff --git a/tests/results/test_examples/04_1default_calculation_hidden.adoc b/tests/results/test_examples/04_1default_calculation_hidden.adoc index 7051a5229..7f6f56a07 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden.adoc +++ b/tests/results/test_examples/04_1default_calculation_hidden.adoc @@ -1,16 +1,8 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -var2: example ----- == Example with all variables modifiable [,yaml] ---- --- var1: value -var2: example var3: value ---- diff --git a/tests/results/test_examples/04_1default_calculation_hidden.gitlab.md b/tests/results/test_examples/04_1default_calculation_hidden.gitlab.md index 5fc8b5ffd..c9b10ed74 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden.gitlab.md +++ b/tests/results/test_examples/04_1default_calculation_hidden.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -var2: example -``` -
    -
    Example with all variables modifiable ```yaml --- var1: value -var2: example var3: value ```
    diff --git a/tests/results/test_examples/04_1default_calculation_hidden.html b/tests/results/test_examples/04_1default_calculation_hidden.html index bfc90961c..2a75c60d5 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden.html +++ b/tests/results/test_examples/04_1default_calculation_hidden.html @@ -1,7 +1,4 @@ -

    Example with mandatory variables not filled in

    - -
    var2: example

    Example with all variables modifiable

    +

    Example with all variables modifiable

    var1: value
-var2: example
 var3: value
    \ No newline at end of file diff --git a/tests/results/test_examples/04_1default_calculation_hidden.md b/tests/results/test_examples/04_1default_calculation_hidden.md index 9655cda8e..13dddbf60 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden.md +++ b/tests/results/test_examples/04_1default_calculation_hidden.md @@ -1,14 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -var2: example -``` # Example with all variables modifiable ```yaml --- var1: value -var2: example var3: value ``` diff --git a/tests/results/test_examples/04_1default_calculation_hidden.sh b/tests/results/test_examples/04_1default_calculation_hidden.sh index 999cf1f14..589d4a197 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden.sh +++ b/tests/results/test_examples/04_1default_calculation_hidden.sh @@ -1,12 +1,6 @@ -Example with mandatory variables not filled in - ----  -var2: example  - Example with all variables modifiable ---  var1: value  -var2: example  var3: value  diff --git a/tests/results/test_examples/04_1default_calculation_hidden_2.adoc b/tests/results/test_examples/04_1default_calculation_hidden_2.adoc index 9ff6ac63d..7f6f56a07 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_2.adoc +++ b/tests/results/test_examples/04_1default_calculation_hidden_2.adoc @@ -1,16 +1,8 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -var2: example ----- == Example with all variables modifiable [,yaml] ---- --- var1: value -var2: example -var3: example +var3: value ---- diff --git a/tests/results/test_examples/04_1default_calculation_hidden_2.gitlab.md b/tests/results/test_examples/04_1default_calculation_hidden_2.gitlab.md index f76959f5b..c9b10ed74 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_2.gitlab.md +++ b/tests/results/test_examples/04_1default_calculation_hidden_2.gitlab.md @@ -1,18 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -var2: example -``` -
    -
    Example with all variables modifiable ```yaml --- var1: value -var2: example -var3: example +var3: value ```
    diff --git a/tests/results/test_examples/04_1default_calculation_hidden_2.html b/tests/results/test_examples/04_1default_calculation_hidden_2.html index f4f986f21..2a75c60d5 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_2.html +++ b/tests/results/test_examples/04_1default_calculation_hidden_2.html @@ -1,7 +1,4 @@ -

    Example with mandatory variables not filled in

    - -
    var2: example

    Example with all variables modifiable

    +

    Example with all variables modifiable

    var1: value
-var2: example
-var3: example
    \ No newline at end of file +var3: value \ No newline at end of file diff --git a/tests/results/test_examples/04_1default_calculation_hidden_2.md b/tests/results/test_examples/04_1default_calculation_hidden_2.md index 9f4195330..13dddbf60 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_2.md +++ b/tests/results/test_examples/04_1default_calculation_hidden_2.md @@ -1,14 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -var2: example -``` # Example with all variables modifiable ```yaml --- var1: value -var2: example -var3: example +var3: value ``` diff --git a/tests/results/test_examples/04_1default_calculation_hidden_2.sh b/tests/results/test_examples/04_1default_calculation_hidden_2.sh index 78cff0bab..589d4a197 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_2.sh +++ b/tests/results/test_examples/04_1default_calculation_hidden_2.sh @@ -1,12 +1,6 @@ -Example with mandatory variables not filled in - ----  -var2: example  - Example with all variables modifiable ---  var1: value  -var2: example  -var3: example  +var3: value  diff --git a/tests/results/test_examples/04_1default_calculation_hidden_5.adoc b/tests/results/test_examples/04_1default_calculation_hidden_5.adoc index b984f1233..b24da17fe 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_5.adoc +++ b/tests/results/test_examples/04_1default_calculation_hidden_5.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -var3: example ----- == Example with all variables modifiable [,yaml] ---- --- var1: value -var3: example ---- diff --git a/tests/results/test_examples/04_1default_calculation_hidden_5.gitlab.md b/tests/results/test_examples/04_1default_calculation_hidden_5.gitlab.md index bf315d053..eef5d379f 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_5.gitlab.md +++ b/tests/results/test_examples/04_1default_calculation_hidden_5.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -var3: example -``` -
    -
    Example with all variables modifiable ```yaml --- var1: value -var3: example ```
    diff --git a/tests/results/test_examples/04_1default_calculation_hidden_5.html b/tests/results/test_examples/04_1default_calculation_hidden_5.html index 15dccfa97..d1d7225cc 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_5.html +++ b/tests/results/test_examples/04_1default_calculation_hidden_5.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    var3: example

    Example with all variables modifiable

    - -
    var1: value
-var3: example
    \ No newline at end of file +
    var1: value
    \ No newline at end of file diff --git a/tests/results/test_examples/04_1default_calculation_hidden_5.md b/tests/results/test_examples/04_1default_calculation_hidden_5.md index 54b22484d..521277032 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_5.md +++ b/tests/results/test_examples/04_1default_calculation_hidden_5.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -var3: example -``` # Example with all variables modifiable ```yaml --- var1: value -var3: example ``` diff --git a/tests/results/test_examples/04_1default_calculation_hidden_5.sh b/tests/results/test_examples/04_1default_calculation_hidden_5.sh index 30e7572aa..d86905066 100644 --- a/tests/results/test_examples/04_1default_calculation_hidden_5.sh +++ b/tests/results/test_examples/04_1default_calculation_hidden_5.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -var3: example  - Example with all variables modifiable ---  var1: value  -var3: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_boolean.adoc b/tests/results/test_examples/04_5disabled_calculation_boolean.adoc index f06f5ff2d..f2f2911fb 100644 --- a/tests/results/test_examples/04_5disabled_calculation_boolean.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_boolean.adoc @@ -4,7 +4,6 @@ ---- --- variable1: example -variable2: example ---- == Example with all variables modifiable @@ -13,5 +12,4 @@ variable2: example --- condition: no variable1: example -variable2: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_boolean.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_boolean.gitlab.md index ae241b65c..e96ebad35 100644 --- a/tests/results/test_examples/04_5disabled_calculation_boolean.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_boolean.gitlab.md @@ -3,7 +3,6 @@ ```yaml --- variable1: example -variable2: example ``` @@ -13,7 +12,6 @@ variable2: example --- condition: no variable1: example -variable2: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_boolean.html b/tests/results/test_examples/04_5disabled_calculation_boolean.html index 8e504c234..f429d7cad 100644 --- a/tests/results/test_examples/04_5disabled_calculation_boolean.html +++ b/tests/results/test_examples/04_5disabled_calculation_boolean.html @@ -1,8 +1,6 @@

    Example with mandatory variables not filled in

    -
    variable1: example
-variable2: example

    Example with all variables modifiable

    +
    variable1: example

    Example with all variables modifiable

    condition: no
-variable1: example
-variable2: example
    \ No newline at end of file +variable1: example \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_boolean.md b/tests/results/test_examples/04_5disabled_calculation_boolean.md index 1bc6b79e2..d3eaea13d 100644 --- a/tests/results/test_examples/04_5disabled_calculation_boolean.md +++ b/tests/results/test_examples/04_5disabled_calculation_boolean.md @@ -3,7 +3,6 @@ ```yaml --- variable1: example -variable2: example ``` # Example with all variables modifiable @@ -11,5 +10,4 @@ variable2: example --- condition: no variable1: example -variable2: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_boolean.sh b/tests/results/test_examples/04_5disabled_calculation_boolean.sh index 276ffed25..ff3c928cb 100644 --- a/tests/results/test_examples/04_5disabled_calculation_boolean.sh +++ b/tests/results/test_examples/04_5disabled_calculation_boolean.sh @@ -2,12 +2,10 @@ ---  variable1: example  -variable2: example  Example with all variables modifiable ---  condition: no  variable1: example  -variable2: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_optional.adoc b/tests/results/test_examples/04_5disabled_calculation_optional.adoc index 32a99ed51..21fae5acb 100644 --- a/tests/results/test_examples/04_5disabled_calculation_optional.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_optional.adoc @@ -4,6 +4,4 @@ ---- --- condition: no -var1: example -var2: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_optional.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_optional.gitlab.md index 7e76c91c6..3c2d359fe 100644 --- a/tests/results/test_examples/04_5disabled_calculation_optional.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_optional.gitlab.md @@ -3,8 +3,6 @@ ```yaml --- condition: no -var1: example -var2: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_optional.html b/tests/results/test_examples/04_5disabled_calculation_optional.html index 5ed447cfa..60c2efe96 100644 --- a/tests/results/test_examples/04_5disabled_calculation_optional.html +++ b/tests/results/test_examples/04_5disabled_calculation_optional.html @@ -1,5 +1,3 @@

    Example with all variables modifiable

    -
    condition: no
-var1: example
-var2: example
    \ No newline at end of file +
    condition: no
    \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_optional.md b/tests/results/test_examples/04_5disabled_calculation_optional.md index b4646ea60..99d8c8b03 100644 --- a/tests/results/test_examples/04_5disabled_calculation_optional.md +++ b/tests/results/test_examples/04_5disabled_calculation_optional.md @@ -3,6 +3,4 @@ ```yaml --- condition: no -var1: example -var2: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_optional.sh b/tests/results/test_examples/04_5disabled_calculation_optional.sh index 67d293534..6ca989a26 100644 --- a/tests/results/test_examples/04_5disabled_calculation_optional.sh +++ b/tests/results/test_examples/04_5disabled_calculation_optional.sh @@ -2,6 +2,4 @@ ---  condition: no  -var1: example  -var2: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_variable10.adoc b/tests/results/test_examples/04_5disabled_calculation_variable10.adoc index 4138ae615..ddbdb33b2 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable10.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_variable10.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable: example ----- == Example with all variables modifiable [,yaml] ---- --- condition: true -variable: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_variable10.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_variable10.gitlab.md index e818e46ab..af099cc00 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable10.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable10.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable: example -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true -variable: example ```
    diff --git a/tests/results/test_examples/04_5disabled_calculation_variable10.html b/tests/results/test_examples/04_5disabled_calculation_variable10.html index 8d05e013a..b002b97de 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable10.html +++ b/tests/results/test_examples/04_5disabled_calculation_variable10.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable: example

    Example with all variables modifiable

    - -
    condition: true
-variable: example
    \ No newline at end of file +
    condition: true
    \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_variable10.md b/tests/results/test_examples/04_5disabled_calculation_variable10.md index 915194deb..681867d84 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable10.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable10.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable: example -``` # Example with all variables modifiable ```yaml --- condition: true -variable: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_variable10.sh b/tests/results/test_examples/04_5disabled_calculation_variable10.sh index d3d34ed04..e3e590c19 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable10.sh +++ b/tests/results/test_examples/04_5disabled_calculation_variable10.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable: example  - Example with all variables modifiable ---  condition: true  -variable: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_variable2.adoc b/tests/results/test_examples/04_5disabled_calculation_variable2.adoc index 4138ae615..ddbdb33b2 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable2.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_variable2.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable: example ----- == Example with all variables modifiable [,yaml] ---- --- condition: true -variable: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_variable2.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_variable2.gitlab.md index e818e46ab..af099cc00 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable2.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable2.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable: example -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true -variable: example ```
    diff --git a/tests/results/test_examples/04_5disabled_calculation_variable2.html b/tests/results/test_examples/04_5disabled_calculation_variable2.html index 8d05e013a..b002b97de 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable2.html +++ b/tests/results/test_examples/04_5disabled_calculation_variable2.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable: example

    Example with all variables modifiable

    - -
    condition: true
-variable: example
    \ No newline at end of file +
    condition: true
    \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_variable2.md b/tests/results/test_examples/04_5disabled_calculation_variable2.md index 915194deb..681867d84 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable2.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable2.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable: example -``` # Example with all variables modifiable ```yaml --- condition: true -variable: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_variable2.sh b/tests/results/test_examples/04_5disabled_calculation_variable2.sh index d3d34ed04..e3e590c19 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable2.sh +++ b/tests/results/test_examples/04_5disabled_calculation_variable2.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable: example  - Example with all variables modifiable ---  condition: true  -variable: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_variable3.adoc b/tests/results/test_examples/04_5disabled_calculation_variable3.adoc index 7ef41d626..d7d6f5719 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable3.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_variable3.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable: example ----- == Example with all variables modifiable [,yaml] ---- --- condition: yes -variable: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_variable3.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_variable3.gitlab.md index 4a07bacd7..100219108 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable3.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable3.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable: example -``` -
    -
    Example with all variables modifiable ```yaml --- condition: yes -variable: example ```
    diff --git a/tests/results/test_examples/04_5disabled_calculation_variable3.html b/tests/results/test_examples/04_5disabled_calculation_variable3.html index dd7050fb3..6e86c92cc 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable3.html +++ b/tests/results/test_examples/04_5disabled_calculation_variable3.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable: example

    Example with all variables modifiable

    - -
    condition: yes
-variable: example
    \ No newline at end of file +
    condition: yes
    \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_variable3.md b/tests/results/test_examples/04_5disabled_calculation_variable3.md index ba0657909..efd32e560 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable3.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable3.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable: example -``` # Example with all variables modifiable ```yaml --- condition: yes -variable: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_variable3.sh b/tests/results/test_examples/04_5disabled_calculation_variable3.sh index 1865849d5..7e29787e1 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable3.sh +++ b/tests/results/test_examples/04_5disabled_calculation_variable3.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable: example  - Example with all variables modifiable ---  condition: yes  -variable: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.adoc b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.adoc index 7c7d70832..ddbdb33b2 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.adoc @@ -1,17 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable1: example -variable2: example ----- == Example with all variables modifiable [,yaml] ---- --- condition: true -variable1: example -variable2: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.gitlab.md index df00ee2e9..af099cc00 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.gitlab.md @@ -1,19 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable1: example -variable2: example -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true -variable1: example -variable2: example ```
    diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.html b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.html index 630a6558f..b002b97de 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.html +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.html @@ -1,8 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable1: example
-variable2: example

    Example with all variables modifiable

    - -
    condition: true
-variable1: example
-variable2: example
    \ No newline at end of file +
    condition: true
    \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.md b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.md index 50fa50cb6..681867d84 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.md @@ -1,15 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable1: example -variable2: example -``` # Example with all variables modifiable ```yaml --- condition: true -variable1: example -variable2: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.sh b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.sh index c6a19251a..e3e590c19 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive.sh +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive.sh @@ -1,13 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable1: example  -variable2: example  - Example with all variables modifiable ---  condition: true  -variable1: example  -variable2: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.adoc b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.adoc index e257313e0..b122a6520 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.adoc @@ -1,10 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable2: example ----- == Example with all variables modifiable [,yaml] @@ -12,5 +5,4 @@ variable2: example --- condition: false variable1: disabled -variable2: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md index ff27fe6f8..1856c07a8 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md @@ -1,18 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable2: example -``` -
    -
    Example with all variables modifiable ```yaml --- condition: false variable1: disabled -variable2: example ```
    diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.html b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.html index 68aef21d1..9d58a4617 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.html +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.html @@ -1,7 +1,4 @@ -

    Example with mandatory variables not filled in

    - -
    variable2: example

    Example with all variables modifiable

    +

    Example with all variables modifiable

    condition: false
-variable1: disabled
-variable2: example
    \ No newline at end of file +variable1: disabled \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.md b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.md index ba41113fb..362b73904 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.md @@ -1,14 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable2: example -``` # Example with all variables modifiable ```yaml --- condition: false variable1: disabled -variable2: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.sh b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.sh index fe6b5b35c..1422f5226 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.sh +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_3.sh @@ -1,12 +1,6 @@ -Example with mandatory variables not filled in - ----  -variable2: example  - Example with all variables modifiable ---  condition: false  variable1: disabled  -variable2: example  diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.adoc b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.adoc index 36c3f3648..ddbdb33b2 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.adoc +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.adoc @@ -1,16 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable2: example ----- == Example with all variables modifiable [,yaml] ---- --- condition: true -variable1: not_disabled -variable2: example ---- diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md index 216c728f5..af099cc00 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md @@ -1,18 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable2: example -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true -variable1: not_disabled -variable2: example ```
    diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.html b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.html index d6bece665..b002b97de 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.html +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.html @@ -1,7 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable2: example

    Example with all variables modifiable

    - -
    condition: true
-variable1: not_disabled
-variable2: example
    \ No newline at end of file +
    condition: true
    \ No newline at end of file diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.md b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.md index 4463a3fb5..681867d84 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.md +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.md @@ -1,14 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable2: example -``` # Example with all variables modifiable ```yaml --- condition: true -variable1: not_disabled -variable2: example ``` diff --git a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.sh b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.sh index 029f52e4f..e3e590c19 100644 --- a/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.sh +++ b/tests/results/test_examples/04_5disabled_calculation_variable_transitive_4.sh @@ -1,12 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable2: example  - Example with all variables modifiable ---  condition: true  -variable1: not_disabled  -variable2: example  diff --git a/tests/results/test_examples/16_2family_redefine_calculation.adoc b/tests/results/test_examples/16_2family_redefine_calculation.adoc index a5aaf52ce..e69de29bb 100644 --- a/tests/results/test_examples/16_2family_redefine_calculation.adoc +++ b/tests/results/test_examples/16_2family_redefine_calculation.adoc @@ -1,16 +0,0 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -family: - var1: example ----- -== Example with all variables modifiable - -[,yaml] ----- ---- -family: - var1: example ----- diff --git a/tests/results/test_examples/16_2family_redefine_calculation.gitlab.md b/tests/results/test_examples/16_2family_redefine_calculation.gitlab.md index a19b8647f..e69de29bb 100644 --- a/tests/results/test_examples/16_2family_redefine_calculation.gitlab.md +++ b/tests/results/test_examples/16_2family_redefine_calculation.gitlab.md @@ -1,18 +0,0 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -family: - var1: example -``` -
    - -
    Example with all variables modifiable - -```yaml ---- -family: - var1: example -``` -
    - diff --git a/tests/results/test_examples/16_2family_redefine_calculation.html b/tests/results/test_examples/16_2family_redefine_calculation.html index 603ee8b52..e69de29bb 100644 --- a/tests/results/test_examples/16_2family_redefine_calculation.html +++ b/tests/results/test_examples/16_2family_redefine_calculation.html @@ -1,7 +0,0 @@ -

    Example with mandatory variables not filled in

    - -
    family:
-  var1: example

    Example with all variables modifiable

    - -
    family:
-  var1: example
    \ No newline at end of file diff --git a/tests/results/test_examples/16_2family_redefine_calculation.md b/tests/results/test_examples/16_2family_redefine_calculation.md index ae8b7bc9e..e69de29bb 100644 --- a/tests/results/test_examples/16_2family_redefine_calculation.md +++ b/tests/results/test_examples/16_2family_redefine_calculation.md @@ -1,14 +0,0 @@ -# Example with mandatory variables not filled in - -```yaml ---- -family: - var1: example -``` -# Example with all variables modifiable - -```yaml ---- -family: - var1: example -``` diff --git a/tests/results/test_examples/16_2family_redefine_calculation.sh b/tests/results/test_examples/16_2family_redefine_calculation.sh index 343fac9ff..e69de29bb 100644 --- a/tests/results/test_examples/16_2family_redefine_calculation.sh +++ b/tests/results/test_examples/16_2family_redefine_calculation.sh @@ -1,12 +0,0 @@ -Example with mandatory variables not filled in - ----  -family:  - var1: example  - -Example with all variables modifiable - ----  -family:  - var1: example  - diff --git a/tests/results/test_examples/16_5redefine_choice.adoc b/tests/results/test_examples/16_5redefine_choice.adoc index 95af1dc4e..4402967f6 100644 --- a/tests/results/test_examples/16_5redefine_choice.adoc +++ b/tests/results/test_examples/16_5redefine_choice.adoc @@ -3,12 +3,12 @@ [,yaml] ---- --- -variable: a_choice +variable: a ---- == Example with all variables modifiable [,yaml] ---- --- -variable: a_choice +variable: a ---- diff --git a/tests/results/test_examples/16_5redefine_choice.gitlab.md b/tests/results/test_examples/16_5redefine_choice.gitlab.md index 3dde86122..ce667478f 100644 --- a/tests/results/test_examples/16_5redefine_choice.gitlab.md +++ b/tests/results/test_examples/16_5redefine_choice.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -variable: a_choice +variable: a ``` @@ -10,7 +10,7 @@ variable: a_choice ```yaml --- -variable: a_choice +variable: a ``` diff --git a/tests/results/test_examples/16_5redefine_choice.html b/tests/results/test_examples/16_5redefine_choice.html index 6b8433557..6482f05d8 100644 --- a/tests/results/test_examples/16_5redefine_choice.html +++ b/tests/results/test_examples/16_5redefine_choice.html @@ -1,5 +1,5 @@

    Example with mandatory variables not filled in

    -
    variable: a_choice

    Example with all variables modifiable

    +
    variable: a

    Example with all variables modifiable

    -
    variable: a_choice
    \ No newline at end of file +
    variable: a
    \ No newline at end of file diff --git a/tests/results/test_examples/16_5redefine_choice.md b/tests/results/test_examples/16_5redefine_choice.md index 64f9fb695..ce5a07bad 100644 --- a/tests/results/test_examples/16_5redefine_choice.md +++ b/tests/results/test_examples/16_5redefine_choice.md @@ -2,11 +2,11 @@ ```yaml --- -variable: a_choice +variable: a ``` # Example with all variables modifiable ```yaml --- -variable: a_choice +variable: a ``` diff --git a/tests/results/test_examples/16_5redefine_choice.sh b/tests/results/test_examples/16_5redefine_choice.sh index c83c74b8c..c387ab094 100644 --- a/tests/results/test_examples/16_5redefine_choice.sh +++ b/tests/results/test_examples/16_5redefine_choice.sh @@ -1,10 +1,10 @@ Example with mandatory variables not filled in ---  -variable: a_choice  +variable: a  Example with all variables modifiable ---  -variable: a_choice  +variable: a  diff --git a/tests/results/test_examples/20_9default_information_parent.adoc b/tests/results/test_examples/20_9default_information_parent.adoc index cc39bb787..5b89e2c67 100644 --- a/tests/results/test_examples/20_9default_information_parent.adoc +++ b/tests/results/test_examples/20_9default_information_parent.adoc @@ -13,5 +13,5 @@ family: --- family: var1: example - var2: example + var2: value ---- diff --git a/tests/results/test_examples/20_9default_information_parent.gitlab.md b/tests/results/test_examples/20_9default_information_parent.gitlab.md index 0f29bbe5f..179dc0535 100644 --- a/tests/results/test_examples/20_9default_information_parent.gitlab.md +++ b/tests/results/test_examples/20_9default_information_parent.gitlab.md @@ -13,7 +13,7 @@ family: --- family: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_examples/20_9default_information_parent.html b/tests/results/test_examples/20_9default_information_parent.html index 2258e4ef9..89fc07731 100644 --- a/tests/results/test_examples/20_9default_information_parent.html +++ b/tests/results/test_examples/20_9default_information_parent.html @@ -5,4 +5,4 @@ 
    family:
   var1: example
-  var2: example
    \ No newline at end of file + var2: value \ No newline at end of file diff --git a/tests/results/test_examples/20_9default_information_parent.md b/tests/results/test_examples/20_9default_information_parent.md index 9b7e43ad6..e9a36182e 100644 --- a/tests/results/test_examples/20_9default_information_parent.md +++ b/tests/results/test_examples/20_9default_information_parent.md @@ -11,5 +11,5 @@ family: --- family: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_examples/20_9default_information_parent.sh b/tests/results/test_examples/20_9default_information_parent.sh index 03d90f417..c4e30683d 100644 --- a/tests/results/test_examples/20_9default_information_parent.sh +++ b/tests/results/test_examples/20_9default_information_parent.sh @@ -9,5 +9,5 @@ ---  family:   var1: example  - var2: example  + var2: value  diff --git a/tests/results/test_examples/20_9family_absolute.adoc b/tests/results/test_examples/20_9family_absolute.adoc index a6d13a07c..22b01c902 100644 --- a/tests/results/test_examples/20_9family_absolute.adoc +++ b/tests/results/test_examples/20_9family_absolute.adoc @@ -6,6 +6,13 @@ var1: example family: var2: string6 + subfamily: + variable: + - example +family2: + subfamily: + variable: + - example ---- == Example with all variables modifiable @@ -17,14 +24,11 @@ family: var2: string6 subfamily: variable: - - null - - null + - example family2: - var2: example + var2: string6 var3: string5 subfamily: variable: - - null - - null - - string4 + - example ---- diff --git a/tests/results/test_examples/20_9family_absolute.gitlab.md b/tests/results/test_examples/20_9family_absolute.gitlab.md index 5914447fc..e1214ee02 100644 --- a/tests/results/test_examples/20_9family_absolute.gitlab.md +++ b/tests/results/test_examples/20_9family_absolute.gitlab.md @@ -5,6 +5,13 @@ var1: example family: var2: string6 + subfamily: + variable: + - example +family2: + subfamily: + variable: + - example ``` @@ -17,16 +24,13 @@ family: var2: string6 subfamily: variable: - - null - - null + - example family2: - var2: example + var2: string6 var3: string5 subfamily: variable: - - null - - null - - string4 + - example ``` diff --git a/tests/results/test_examples/20_9family_absolute.html b/tests/results/test_examples/20_9family_absolute.html index accc031b6..f57e1805c 100644 --- a/tests/results/test_examples/20_9family_absolute.html +++ b/tests/results/test_examples/20_9family_absolute.html @@ -1,21 +1,25 @@

    Example with mandatory variables not filled in

    -
    var1: example
-family:
-  var2: string6

    Example with all variables modifiable

    - 
    var1: example
 family:
   var2: string6
   subfamily:
     variable:
-      - null
-      - null
+      - example
 family2:
-  var2: example
+  subfamily:
+    variable:
+      - example

    Example with all variables modifiable

    + +
    var1: example
+family:
+  var2: string6
+  subfamily:
+    variable:
+      - example
+family2:
+  var2: string6
   var3: string5
   subfamily:
     variable:
-      - null
-      - null
-      - string4
    \ No newline at end of file + - example \ No newline at end of file diff --git a/tests/results/test_examples/20_9family_absolute.md b/tests/results/test_examples/20_9family_absolute.md index 3c7508c29..b985c3828 100644 --- a/tests/results/test_examples/20_9family_absolute.md +++ b/tests/results/test_examples/20_9family_absolute.md @@ -5,6 +5,13 @@ var1: example family: var2: string6 + subfamily: + variable: + - example +family2: + subfamily: + variable: + - example ``` # Example with all variables modifiable @@ -15,14 +22,11 @@ family: var2: string6 subfamily: variable: - - null - - null + - example family2: - var2: example + var2: string6 var3: string5 subfamily: variable: - - null - - null - - string4 + - example ``` diff --git a/tests/results/test_examples/20_9family_absolute.sh b/tests/results/test_examples/20_9family_absolute.sh index 244e0e9f1..d05438311 100644 --- a/tests/results/test_examples/20_9family_absolute.sh +++ b/tests/results/test_examples/20_9family_absolute.sh @@ -4,6 +4,13 @@ var1: example  family:   var2: string6  + subfamily:  + variable:  + - example  +family2:  + subfamily:  + variable:  + - example  Example with all variables modifiable @@ -13,14 +20,11 @@  var2: string6   subfamily:   variable:  - - null  - - null  + - example  family2:  - var2: example  + var2: string6   var3: string5   subfamily:   variable:  - - null  - - null  - - string4  + - example  diff --git a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.adoc b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.adoc index f7ca0d4d5..ddbdb33b2 100644 --- a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.adoc +++ b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.adoc @@ -4,7 +4,4 @@ ---- --- condition: true -family: - subfamily: - var1: example ---- diff --git a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md index 9235a1e62..af099cc00 100644 --- a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md +++ b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md @@ -3,9 +3,6 @@ ```yaml --- condition: true -family: - subfamily: - var1: example ``` diff --git a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.html b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.html index 8879a1bb9..b002b97de 100644 --- a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.html +++ b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.html @@ -1,6 +1,3 @@

    Example with all variables modifiable

    -
    condition: true
-family:
-  subfamily:
-    var1: example
    \ No newline at end of file +
    condition: true
    \ No newline at end of file diff --git a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.md b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.md index b634aed54..681867d84 100644 --- a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.md +++ b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.md @@ -3,7 +3,4 @@ ```yaml --- condition: true -family: - subfamily: - var1: example ``` diff --git a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.sh b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.sh index da4a00751..e3e590c19 100644 --- a/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.sh +++ b/tests/results/test_examples/24_0family_hidden_condition_variable_sub_family.sh @@ -2,7 +2,4 @@ ---  condition: true  -family:  - subfamily:  - var1: example  diff --git a/tests/results/test_examples/24_0family_mandatory_condition_variable.adoc b/tests/results/test_examples/24_0family_mandatory_condition_variable.adoc index 27a6781e4..b81c913d7 100644 --- a/tests/results/test_examples/24_0family_mandatory_condition_variable.adoc +++ b/tests/results/test_examples/24_0family_mandatory_condition_variable.adoc @@ -1,3 +1,10 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +var: example +---- == Example with all variables modifiable [,yaml] diff --git a/tests/results/test_examples/24_0family_mandatory_condition_variable.gitlab.md b/tests/results/test_examples/24_0family_mandatory_condition_variable.gitlab.md index 3a9dac69c..e0ac646d9 100644 --- a/tests/results/test_examples/24_0family_mandatory_condition_variable.gitlab.md +++ b/tests/results/test_examples/24_0family_mandatory_condition_variable.gitlab.md @@ -1,3 +1,11 @@ +
    Example with mandatory variables not filled in + +```yaml +--- +var: example +``` +
    +
    Example with all variables modifiable ```yaml diff --git a/tests/results/test_examples/24_0family_mandatory_condition_variable.html b/tests/results/test_examples/24_0family_mandatory_condition_variable.html index d6bd9b361..5dc4f1dc5 100644 --- a/tests/results/test_examples/24_0family_mandatory_condition_variable.html +++ b/tests/results/test_examples/24_0family_mandatory_condition_variable.html @@ -1,4 +1,6 @@ -

    Example with all variables modifiable

    +

    Example with mandatory variables not filled in

    + +
    var: example

    Example with all variables modifiable

    condition: true
 var: example
    \ No newline at end of file diff --git a/tests/results/test_examples/24_0family_mandatory_condition_variable.md b/tests/results/test_examples/24_0family_mandatory_condition_variable.md index eb5d066f0..4b6263856 100644 --- a/tests/results/test_examples/24_0family_mandatory_condition_variable.md +++ b/tests/results/test_examples/24_0family_mandatory_condition_variable.md @@ -1,3 +1,9 @@ +# Example with mandatory variables not filled in + +```yaml +--- +var: example +``` # Example with all variables modifiable ```yaml diff --git a/tests/results/test_examples/24_0family_mandatory_condition_variable.sh b/tests/results/test_examples/24_0family_mandatory_condition_variable.sh index f0269cbcd..7b5c293d5 100644 --- a/tests/results/test_examples/24_0family_mandatory_condition_variable.sh +++ b/tests/results/test_examples/24_0family_mandatory_condition_variable.sh @@ -1,3 +1,8 @@ +Example with mandatory variables not filled in + +---  +var: example  + Example with all variables modifiable ---  diff --git a/tests/results/test_examples/40_0leadership_reduce.adoc b/tests/results/test_examples/40_0leadership_reduce.adoc index dcecbec82..9a8850055 100644 --- a/tests/results/test_examples/40_0leadership_reduce.adoc +++ b/tests/results/test_examples/40_0leadership_reduce.adoc @@ -7,5 +7,5 @@ leadership: - leader: val1 follower: example - leader: val2 - follower: example + follower: example1 ---- diff --git a/tests/results/test_examples/40_0leadership_reduce.gitlab.md b/tests/results/test_examples/40_0leadership_reduce.gitlab.md index 92f726a1b..acd3bf325 100644 --- a/tests/results/test_examples/40_0leadership_reduce.gitlab.md +++ b/tests/results/test_examples/40_0leadership_reduce.gitlab.md @@ -6,7 +6,7 @@ leadership: - leader: val1 follower: example - leader: val2 - follower: example + follower: example1 ```
    diff --git a/tests/results/test_examples/40_0leadership_reduce.html b/tests/results/test_examples/40_0leadership_reduce.html index 7aaf01491..874929d93 100644 --- a/tests/results/test_examples/40_0leadership_reduce.html +++ b/tests/results/test_examples/40_0leadership_reduce.html @@ -4,4 +4,4 @@ - leader: val1 follower: example - leader: val2 - follower: example \ No newline at end of file + follower: example1 \ No newline at end of file diff --git a/tests/results/test_examples/40_0leadership_reduce.md b/tests/results/test_examples/40_0leadership_reduce.md index dfd9db780..680d3b427 100644 --- a/tests/results/test_examples/40_0leadership_reduce.md +++ b/tests/results/test_examples/40_0leadership_reduce.md @@ -6,5 +6,5 @@ leadership: - leader: val1 follower: example - leader: val2 - follower: example + follower: example1 ``` diff --git a/tests/results/test_examples/40_0leadership_reduce.sh b/tests/results/test_examples/40_0leadership_reduce.sh index 8593f6f89..a981d024f 100644 --- a/tests/results/test_examples/40_0leadership_reduce.sh +++ b/tests/results/test_examples/40_0leadership_reduce.sh @@ -5,5 +5,5 @@  - leader: val1   follower: example   - leader: val2  - follower: example  + follower: example1  diff --git a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc index b9b23d831..5119f0b13 100644 --- a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc +++ b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc @@ -7,8 +7,8 @@ leader: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ---- diff --git a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md index 0e728b75f..0692d389c 100644 --- a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md +++ b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md @@ -6,10 +6,10 @@ leader: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ``` diff --git a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.html b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.html index 7aab0e238..f08b44639 100644 --- a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.html +++ b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.html @@ -4,7 +4,7 @@ - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null \ No newline at end of file + - example + - example1 \ No newline at end of file diff --git a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.md b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.md index cf6cbf1a0..4d5c0aad6 100644 --- a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.md +++ b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.md @@ -6,8 +6,8 @@ leader: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ``` diff --git a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh index 0c37ebefe..54a9eae22 100644 --- a/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh +++ b/tests/results/test_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh @@ -5,8 +5,8 @@  - leader: a   follower: example   - leader: b  - follower: example  + follower: example1  variable:  - - null  - - null  + - example  + - example1  diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.adoc b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.adoc index 4b139a5bd..01974a5c7 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.adoc +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.adoc @@ -7,10 +7,10 @@ leadership_1: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val ---- diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md index b0aaf0b68..946f6e25b 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md @@ -6,11 +6,11 @@ leadership_1: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val ``` diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.html b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.html index 4055446d8..ac5297ac9 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.html +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.html @@ -4,9 +4,9 @@ - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val \ No newline at end of file diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.md b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.md index 288bd800d..d52d244ff 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.md +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.md @@ -6,10 +6,10 @@ leadership_1: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val ``` diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.sh b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.sh index cc8e80f05..fd69ddf27 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.sh +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower.sh @@ -5,10 +5,10 @@  - leader: value1   follower: example   - leader: value2  - follower: example  + follower: example1  leadership_2:  - - leader: null  + - leader: example   follower: val  - - leader: null  + - leader: example1   follower: val  diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc index 064c299df..8bf0fd455 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc @@ -7,7 +7,7 @@ leadership_1: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md index dc96388b4..dc1d36a08 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md @@ -6,7 +6,7 @@ leadership_1: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.html b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.html index 376d12f30..f88a5b625 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.html +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.html @@ -4,7 +4,7 @@ - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.md b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.md index 498b576a7..7ca2b480e 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.md +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.md @@ -6,7 +6,7 @@ leadership_1: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh index 1afbb8b47..2e8decb4d 100644 --- a/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh +++ b/tests/results/test_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh @@ -5,7 +5,7 @@  - leader: value1   follower: example   - leader: value2  - follower: example  + follower: example1  leadership_2:   - leader: value1   follower:  diff --git a/tests/results/test_examples/41_0choice_leader.adoc b/tests/results/test_examples/41_0choice_leader.adoc index ffa759829..1c1d7a250 100644 --- a/tests/results/test_examples/41_0choice_leader.adoc +++ b/tests/results/test_examples/41_0choice_leader.adoc @@ -5,5 +5,5 @@ --- leader: - leader: example - follower1: a_choice + follower1: a ---- diff --git a/tests/results/test_examples/41_0choice_leader.gitlab.md b/tests/results/test_examples/41_0choice_leader.gitlab.md index 56aa90299..6d79931a5 100644 --- a/tests/results/test_examples/41_0choice_leader.gitlab.md +++ b/tests/results/test_examples/41_0choice_leader.gitlab.md @@ -4,7 +4,7 @@ --- leader: - leader: example - follower1: a_choice + follower1: a ``` diff --git a/tests/results/test_examples/41_0choice_leader.html b/tests/results/test_examples/41_0choice_leader.html index bb694fc04..f3c189be6 100644 --- a/tests/results/test_examples/41_0choice_leader.html +++ b/tests/results/test_examples/41_0choice_leader.html @@ -2,4 +2,4 @@ 
    leader:
   - leader: example
-    follower1: a_choice
    \ No newline at end of file + follower1: a \ No newline at end of file diff --git a/tests/results/test_examples/41_0choice_leader.md b/tests/results/test_examples/41_0choice_leader.md index 1c00cf58e..f9c44f782 100644 --- a/tests/results/test_examples/41_0choice_leader.md +++ b/tests/results/test_examples/41_0choice_leader.md @@ -4,5 +4,5 @@ --- leader: - leader: example - follower1: a_choice + follower1: a ``` diff --git a/tests/results/test_examples/41_0choice_leader.sh b/tests/results/test_examples/41_0choice_leader.sh index 90a95edf9..70e59ccba 100644 --- a/tests/results/test_examples/41_0choice_leader.sh +++ b/tests/results/test_examples/41_0choice_leader.sh @@ -3,5 +3,5 @@ ---  leader:   - leader: example  - follower1: a_choice  + follower1: a  diff --git a/tests/results/test_examples/44_4disabled_calcultion_follower_index.adoc b/tests/results/test_examples/44_4disabled_calcultion_follower_index.adoc index e76605fdb..ab81ec144 100644 --- a/tests/results/test_examples/44_4disabled_calcultion_follower_index.adoc +++ b/tests/results/test_examples/44_4disabled_calcultion_follower_index.adoc @@ -5,7 +5,6 @@ --- leadership: - leader: a - follower: value - leader: b follower: value ---- diff --git a/tests/results/test_examples/44_4disabled_calcultion_follower_index.gitlab.md b/tests/results/test_examples/44_4disabled_calcultion_follower_index.gitlab.md index 120242c65..031771b6b 100644 --- a/tests/results/test_examples/44_4disabled_calcultion_follower_index.gitlab.md +++ b/tests/results/test_examples/44_4disabled_calcultion_follower_index.gitlab.md @@ -4,7 +4,6 @@ --- leadership: - leader: a - follower: value - leader: b follower: value ``` diff --git a/tests/results/test_examples/44_4disabled_calcultion_follower_index.html b/tests/results/test_examples/44_4disabled_calcultion_follower_index.html index 49cd4c026..cda9588ea 100644 --- a/tests/results/test_examples/44_4disabled_calcultion_follower_index.html +++ b/tests/results/test_examples/44_4disabled_calcultion_follower_index.html @@ -2,6 +2,5 @@ 
    leadership:
   - leader: a
-    follower: value
   - leader: b
     follower: value
    \ 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 index 41cf49e67..67a7c63eb 100644 --- a/tests/results/test_examples/44_4disabled_calcultion_follower_index.md +++ b/tests/results/test_examples/44_4disabled_calcultion_follower_index.md @@ -4,7 +4,6 @@ --- leadership: - leader: a - follower: value - leader: b follower: value ``` diff --git a/tests/results/test_examples/44_4disabled_calcultion_follower_index.sh b/tests/results/test_examples/44_4disabled_calcultion_follower_index.sh index 9ad212f02..1dbd227ad 100644 --- a/tests/results/test_examples/44_4disabled_calcultion_follower_index.sh +++ b/tests/results/test_examples/44_4disabled_calcultion_follower_index.sh @@ -3,7 +3,6 @@ ---  leadership:   - leader: a  - follower: value   - leader: b   follower: value  diff --git a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.adoc b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.adoc index 0edf3e3d8..21fae5acb 100644 --- a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.adoc +++ b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.adoc @@ -4,7 +4,4 @@ ---- --- condition: no -leader: - - leader: example - follower: example ---- diff --git a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.gitlab.md b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.gitlab.md index 2233ee386..3c2d359fe 100644 --- a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.gitlab.md +++ b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.gitlab.md @@ -3,9 +3,6 @@ ```yaml --- condition: no -leader: - - leader: example - follower: example ``` diff --git a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.html b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.html index 43081d81a..60c2efe96 100644 --- a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.html +++ b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.html @@ -1,6 +1,3 @@

    Example with all variables modifiable

    -
    condition: no
-leader:
-  - leader: example
-    follower: example
    \ No newline at end of file +
    condition: no
    \ No newline at end of file diff --git a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.md b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.md index e2efe43e7..99d8c8b03 100644 --- a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.md +++ b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.md @@ -3,7 +3,4 @@ ```yaml --- condition: no -leader: - - leader: example - follower: example ``` diff --git a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.sh b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.sh index 15afe0f6c..6ca989a26 100644 --- a/tests/results/test_examples/44_5leadership_leader_hidden_calculation.sh +++ b/tests/results/test_examples/44_5leadership_leader_hidden_calculation.sh @@ -2,7 +2,4 @@ ---  condition: no  -leader:  - - leader: example  - follower: example  diff --git a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.adoc b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.adoc index 78780611e..f4dc4233f 100644 --- a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.adoc +++ b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.adoc @@ -5,7 +5,6 @@ --- leader: - leader: example - follower: example ---- == Example with all variables modifiable @@ -15,5 +14,4 @@ leader: condition: yes leader: - leader: example - follower: example ---- diff --git a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.gitlab.md b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.gitlab.md index 71360c57b..a920a9208 100644 --- a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.gitlab.md +++ b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.gitlab.md @@ -4,7 +4,6 @@ --- leader: - leader: example - follower: example ``` @@ -15,7 +14,6 @@ leader: condition: yes leader: - leader: example - follower: example ``` diff --git a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.html b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.html index 8f0d41559..f7bbf12b2 100644 --- a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.html +++ b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.html @@ -1,10 +1,8 @@

    Example with mandatory variables not filled in

    leader:
-  - leader: example
-    follower: example

    Example with all variables modifiable

    + - leader: example

    Example with all variables modifiable

    condition: yes
 leader:
-  - leader: example
-    follower: example
    \ No newline at end of file + - leader: example \ No newline at end of file diff --git a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md index 5aea301c3..aa2988af7 100644 --- a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md +++ b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md @@ -4,7 +4,6 @@ --- leader: - leader: example - follower: example ``` # Example with all variables modifiable @@ -13,5 +12,4 @@ leader: condition: yes leader: - leader: example - follower: example ``` diff --git a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.sh b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.sh index ff47e227a..73a2fa519 100644 --- a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.sh +++ b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.sh @@ -3,7 +3,6 @@ ---  leader:   - leader: example  - follower: example  Example with all variables modifiable @@ -11,5 +10,4 @@ condition: yes  leader:   - leader: example  - follower: example  diff --git a/tests/results/test_examples/60_0family_dynamic_test.adoc b/tests/results/test_examples/60_0family_dynamic_test.adoc index 366e40460..1a4609ecf 100644 --- a/tests/results/test_examples/60_0family_dynamic_test.adoc +++ b/tests/results/test_examples/60_0family_dynamic_test.adoc @@ -3,9 +3,6 @@ [,yaml] ---- --- -var: - - val1 - - val2 dynval1: var: example dynval2: diff --git a/tests/results/test_examples/60_0family_dynamic_test.gitlab.md b/tests/results/test_examples/60_0family_dynamic_test.gitlab.md index e14196ea4..84eeb2dc8 100644 --- a/tests/results/test_examples/60_0family_dynamic_test.gitlab.md +++ b/tests/results/test_examples/60_0family_dynamic_test.gitlab.md @@ -2,9 +2,6 @@ ```yaml --- -var: - - val1 - - val2 dynval1: var: example dynval2: diff --git a/tests/results/test_examples/60_0family_dynamic_test.html b/tests/results/test_examples/60_0family_dynamic_test.html index 092b205cd..ada267626 100644 --- a/tests/results/test_examples/60_0family_dynamic_test.html +++ b/tests/results/test_examples/60_0family_dynamic_test.html @@ -1,9 +1,6 @@

    Example with mandatory variables not filled in

    -
    var:
-  - val1
-  - val2
-dynval1:
+
    dynval1:
   var: example
 dynval2:
   var: example
    Example with all variables modifiable
    
diff --git a/tests/results/test_examples/60_0family_dynamic_test.md b/tests/results/test_examples/60_0family_dynamic_test.md
index ce2e358dd..1ba2e6632 100644
--- a/tests/results/test_examples/60_0family_dynamic_test.md
+++ b/tests/results/test_examples/60_0family_dynamic_test.md
@@ -2,9 +2,6 @@
 
 ```yaml
 ---
-var:
-  - val1
-  - val2
 dynval1:
   var: example
 dynval2:
diff --git a/tests/results/test_examples/60_0family_dynamic_test.sh b/tests/results/test_examples/60_0family_dynamic_test.sh
index 74d6e356e..d1d03135a 100644
--- a/tests/results/test_examples/60_0family_dynamic_test.sh
+++ b/tests/results/test_examples/60_0family_dynamic_test.sh
@@ -1,9 +1,6 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-var:                                                                            
-  - val1                                                                        
-  - val2                                                                        
 dynval1:                                                                        
   var: example                                                                  
 dynval2:                                                                        
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_empty.adoc b/tests/results/test_examples/60_0family_dynamic_variable_empty.adoc
index 86eadc0b9..1ec4c557d 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_empty.adoc
+++ b/tests/results/test_examples/60_0family_dynamic_variable_empty.adoc
@@ -1,11 +1,3 @@
-== Example with mandatory variables not filled in
-
-[,yaml]
-----
----
-var:
-  - example
-----
 == Example with all variables modifiable
 
 [,yaml]
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_empty.gitlab.md b/tests/results/test_examples/60_0family_dynamic_variable_empty.gitlab.md
index 251e245e9..f7c36f787 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_empty.gitlab.md
+++ b/tests/results/test_examples/60_0family_dynamic_variable_empty.gitlab.md
@@ -1,12 +1,3 @@
-
    Example with mandatory variables not filled in
-
-```yaml
----
-var:
-  - example
-```
-
    
-
 
    Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_empty.html b/tests/results/test_examples/60_0family_dynamic_variable_empty.html
index bd4a3c7cc..f5bb60071 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_empty.html
+++ b/tests/results/test_examples/60_0family_dynamic_variable_empty.html
@@ -1,7 +1,4 @@
-
    Example with mandatory variables not filled in
    
-
-
    var:
-  - example
    Example with all variables modifiable
    
+
    Example with all variables modifiable
    
 
 
    var:
   - example
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_empty.md b/tests/results/test_examples/60_0family_dynamic_variable_empty.md
index 18cdf72ea..e175d1ce1 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_empty.md
+++ b/tests/results/test_examples/60_0family_dynamic_variable_empty.md
@@ -1,10 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-var:
-  - example
-```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_empty.sh b/tests/results/test_examples/60_0family_dynamic_variable_empty.sh
index 5c37fd634..2a7549c83 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_empty.sh
+++ b/tests/results/test_examples/60_0family_dynamic_variable_empty.sh
@@ -1,9 +1,3 @@
-Example with mandatory variables not filled in
-
----                                                                             
-var:                                                                            
-  - example                                                                     
-
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.adoc b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.adoc
index 7c2aec3a1..9c40ea36a 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.adoc
+++ b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.adoc
@@ -1,12 +1,3 @@
-== Example with mandatory variables not filled in
-
-[,yaml]
-----
----
-var:
-  - val1
-  - val2
-----
 == Example with all variables modifiable
 
 [,yaml]
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md
index ba680447e..317db76b3 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md
+++ b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md
@@ -1,13 +1,3 @@
-
    Example with mandatory variables not filled in
-
-```yaml
----
-var:
-  - val1
-  - val2
-```
-
    
-
 
    Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.html b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.html
index bff4c169f..7d2d01fdf 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.html
+++ b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.html
@@ -1,8 +1,4 @@
-
    Example with mandatory variables not filled in
    
-
-
    var:
-  - val1
-  - val2
    Example with all variables modifiable
    
+
    Example with all variables modifiable
    
 
 
    var:
   - val1
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.md b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.md
index e54812d09..38a84d5b3 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.md
+++ b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.md
@@ -1,11 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-var:
-  - val1
-  - val2
-```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.sh b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.sh
index 73656d5a0..0c669fa23 100644
--- a/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.sh
+++ b/tests/results/test_examples/60_0family_dynamic_variable_suffix_empty.sh
@@ -1,10 +1,3 @@
-Example with mandatory variables not filled in
-
----                                                                             
-var:                                                                            
-  - val1                                                                        
-  - val2                                                                        
-
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_examples/60_5family_dynamic_calc_description.adoc b/tests/results/test_examples/60_5family_dynamic_calc_description.adoc
index 4e9d0919a..3a9a0efd1 100644
--- a/tests/results/test_examples/60_5family_dynamic_calc_description.adoc
+++ b/tests/results/test_examples/60_5family_dynamic_calc_description.adoc
@@ -20,6 +20,6 @@ dynval2:
   var: example
 var1: example
 var2:
-  - null
-  - null
+  - example
+  - example
 ----
diff --git a/tests/results/test_examples/60_5family_dynamic_calc_description.gitlab.md b/tests/results/test_examples/60_5family_dynamic_calc_description.gitlab.md
index 5ae67b5a6..ba868f03b 100644
--- a/tests/results/test_examples/60_5family_dynamic_calc_description.gitlab.md
+++ b/tests/results/test_examples/60_5family_dynamic_calc_description.gitlab.md
@@ -20,8 +20,8 @@ dynval2:
   var: example
 var1: example
 var2:
-  - null
-  - null
+  - example
+  - example
 ```
 
    
 
diff --git a/tests/results/test_examples/60_5family_dynamic_calc_description.html b/tests/results/test_examples/60_5family_dynamic_calc_description.html
index 2a1967f2b..f0527feae 100644
--- a/tests/results/test_examples/60_5family_dynamic_calc_description.html
+++ b/tests/results/test_examples/60_5family_dynamic_calc_description.html
@@ -12,5 +12,5 @@ dynval2:
   var: example
 var1: example
 var2:
-  - null
-  - null
    
\ No newline at end of file
+  - example
+  - example
    \ No newline at end of file diff --git a/tests/results/test_examples/60_5family_dynamic_calc_description.md b/tests/results/test_examples/60_5family_dynamic_calc_description.md index 0c90d9d94..f18604e1a 100644 --- a/tests/results/test_examples/60_5family_dynamic_calc_description.md +++ b/tests/results/test_examples/60_5family_dynamic_calc_description.md @@ -18,6 +18,6 @@ dynval2: var: example var1: example var2: - - null - - null + - example + - example ``` diff --git a/tests/results/test_examples/60_5family_dynamic_calc_description.sh b/tests/results/test_examples/60_5family_dynamic_calc_description.sh index be1509ab1..6241a721c 100644 --- a/tests/results/test_examples/60_5family_dynamic_calc_description.sh +++ b/tests/results/test_examples/60_5family_dynamic_calc_description.sh @@ -16,6 +16,6 @@  var: example  var1: example  var2:  - - null  - - null  + - example  + - example  diff --git a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.adoc b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.adoc index 99127c1a1..9251726a0 100644 --- a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.adoc +++ b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.adoc @@ -7,8 +7,4 @@ dynval1: var: example family: var: example -dynval2: - var: example - family: - var: example ---- diff --git a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.gitlab.md b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.gitlab.md index 088310758..9cf94557e 100644 --- a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.gitlab.md +++ b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.gitlab.md @@ -6,10 +6,6 @@ dynval1: var: example family: var: example -dynval2: - var: example - family: - var: example ``` diff --git a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.html b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.html index c84a08c53..a9c3c2e19 100644 --- a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.html +++ b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.html @@ -1,10 +1,6 @@

    Example with all variables modifiable

    dynval1:
-  var: example
-  family:
-    var: example
-dynval2:
   var: example
   family:
     var: example
    \ No newline at end of file diff --git a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.md b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.md index daa43f2fe..480e3df54 100644 --- a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.md +++ b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.md @@ -6,8 +6,4 @@ dynval1: var: example family: var: example -dynval2: - var: example - family: - var: example ``` diff --git a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.sh b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.sh index 243a68aae..e4862f5bf 100644 --- a/tests/results/test_examples/60_5family_dynamic_hidden_suffix.sh +++ b/tests/results/test_examples/60_5family_dynamic_hidden_suffix.sh @@ -5,8 +5,4 @@  var: example   family:   var: example  -dynval2:  - var: example  - family:  - var: example  diff --git a/tests/results/test_examples/warnings_04_5validators_warnings b/tests/results/test_examples/warnings_04_5validators_warnings index 0637a088a..375f58427 100644 --- a/tests/results/test_examples/warnings_04_5validators_warnings +++ b/tests/results/test_examples/warnings_04_5validators_warnings @@ -1 +1 @@ -[] \ No newline at end of file +["attention, \"1000\" could be an invalid integer for \"An integer\", value is too high"] \ No newline at end of file diff --git a/tests/results/test_examples/warnings_16_2family_redefine_calculation b/tests/results/test_examples/warnings_16_2family_redefine_calculation index 3f9eeed42..df74ea6b7 100644 --- a/tests/results/test_examples/warnings_16_2family_redefine_calculation +++ b/tests/results/test_examples/warnings_16_2family_redefine_calculation @@ -1 +1 @@ -["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples/warnings_16_3family_empty_at_ends b/tests/results/test_examples/warnings_16_3family_empty_at_ends index 24f1e340f..1f3058183 100644 --- a/tests/results/test_examples/warnings_16_3family_empty_at_ends +++ b/tests/results/test_examples/warnings_16_3family_empty_at_ends @@ -1 +1 @@ -["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples/warnings_20_2family_looks_like_dynamic b/tests/results/test_examples/warnings_20_2family_looks_like_dynamic index e707364ec..8a0a73d67 100644 --- a/tests/results/test_examples/warnings_20_2family_looks_like_dynamic +++ b/tests/results/test_examples/warnings_20_2family_looks_like_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples/warnings_20_2family_looks_like_variable b/tests/results/test_examples/warnings_20_2family_looks_like_variable index bac0697e5..4c3a70745 100644 --- a/tests/results/test_examples/warnings_20_2family_looks_like_variable +++ b/tests/results/test_examples/warnings_20_2family_looks_like_variable @@ -1 +1 @@ -["No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory index cf9783a34..02c23d08a 100644 --- a/tests/results/test_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory +++ b/tests/results/test_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory @@ -1 +1 @@ -["No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples/warnings_60_0family_dynamic_forbidden_char b/tests/results/test_examples/warnings_60_0family_dynamic_forbidden_char index 7d2eda8c3..2ea96ed2b 100644 --- a/tests/results/test_examples/warnings_60_0family_dynamic_forbidden_char +++ b/tests/results/test_examples/warnings_60_0family_dynamic_forbidden_char @@ -1 +1 @@ -["\"default\" is a calculation for dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file +["\"default\" is a calculation for dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_6choice.adoc b/tests/results/test_examples_comment/00_6choice.adoc index c7461b969..6891596dd 100644 --- a/tests/results/test_examples_comment/00_6choice.adoc +++ b/tests/results/test_examples_comment/00_6choice.adoc @@ -3,18 +3,18 @@ [,yaml] ---- --- -var1: a_choice # The first variable -var2: a_choice # The second variable +var1: a # The first variable +var2: a # The second variable ---- == Example with all variables modifiable [,yaml] ---- --- -var1: a_choice # The first variable -var2: a_choice # The second variable -var3: a_choice # The third variable -var4: a_choice # The forth variable +var1: a # The first variable +var2: a # The second variable +var3: a # The third variable +var4: b # The forth variable var5: a # The fifth variable var6: 1 # The sixth variable ---- diff --git a/tests/results/test_examples_comment/00_6choice.gitlab.md b/tests/results/test_examples_comment/00_6choice.gitlab.md index dd72172e6..fc19a26b0 100644 --- a/tests/results/test_examples_comment/00_6choice.gitlab.md +++ b/tests/results/test_examples_comment/00_6choice.gitlab.md @@ -2,8 +2,8 @@ ```yaml --- -var1: a_choice # The first variable -var2: a_choice # The second variable +var1: a # The first variable +var2: a # The second variable ``` @@ -11,10 +11,10 @@ var2: a_choice # The second variable ```yaml --- -var1: a_choice # The first variable -var2: a_choice # The second variable -var3: a_choice # The third variable -var4: a_choice # The forth variable +var1: a # The first variable +var2: a # The second variable +var3: a # The third variable +var4: b # The forth variable var5: a # The fifth variable var6: 1 # The sixth variable ``` diff --git a/tests/results/test_examples_comment/00_6choice.html b/tests/results/test_examples_comment/00_6choice.html index c0e4e56a6..12f307a5b 100644 --- a/tests/results/test_examples_comment/00_6choice.html +++ b/tests/results/test_examples_comment/00_6choice.html @@ -1,11 +1,11 @@

    Example with mandatory variables not filled in

    -
    var1: a_choice                # The first variable
-var2: a_choice                # The second variable

    Example with all variables modifiable

    +
    var1: a                       # The first variable
+var2: a                       # The second variable

    Example with all variables modifiable

    -
    var1: a_choice                # The first variable
-var2: a_choice                # The second variable
-var3: a_choice                # The third variable
-var4: a_choice                # The forth variable
+
    var1: a                       # The first variable
+var2: a                       # The second variable
+var3: a                       # The third variable
+var4: b                       # The forth variable
 var5: a                       # The fifth variable
 var6: 1                       # The sixth variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_6choice.md b/tests/results/test_examples_comment/00_6choice.md
index f68fc2688..d6eeb6f76 100644
--- a/tests/results/test_examples_comment/00_6choice.md
+++ b/tests/results/test_examples_comment/00_6choice.md
@@ -2,17 +2,17 @@
 
 ```yaml
 ---
-var1: a_choice                # The first variable
-var2: a_choice                # The second variable
+var1: a                       # The first variable
+var2: a                       # The second variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-var1: a_choice                # The first variable
-var2: a_choice                # The second variable
-var3: a_choice                # The third variable
-var4: a_choice                # The forth variable
+var1: a                       # The first variable
+var2: a                       # The second variable
+var3: a                       # The third variable
+var4: b                       # The forth variable
 var5: a                       # The fifth variable
 var6: 1                       # The sixth variable
 ```
diff --git a/tests/results/test_examples_comment/00_6choice.sh b/tests/results/test_examples_comment/00_6choice.sh
index 79d59bde6..b58704ef1 100644
--- a/tests/results/test_examples_comment/00_6choice.sh
+++ b/tests/results/test_examples_comment/00_6choice.sh
@@ -1,16 +1,16 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-var1: a_choice                # The first variable                              
-var2: a_choice                # The second variable                             
+var1: a                       # The first variable                              
+var2: a                       # The second variable                             
 
 Example with all variables modifiable
 
 ---                                                                             
-var1: a_choice                # The first variable                              
-var2: a_choice                # The second variable                             
-var3: a_choice                # The third variable                              
-var4: a_choice                # The forth variable                              
+var1: a                       # The first variable                              
+var2: a                       # The second variable                             
+var3: a                       # The third variable                              
+var4: b                       # The forth variable                              
 var5: a                       # The fifth variable                              
 var6: 1                       # The sixth variable                              
 
diff --git a/tests/results/test_examples_comment/00_6choice_link.adoc b/tests/results/test_examples_comment/00_6choice_link.adoc
index 3dfdeadb8..51570a5f8 100644
--- a/tests/results/test_examples_comment/00_6choice_link.adoc
+++ b/tests/results/test_examples_comment/00_6choice_link.adoc
@@ -3,13 +3,13 @@
 [,yaml]
 ----
 ---
-var1: a_choice                # The first variable
+var1: a                       # The first variable
 ----
 == Example with all variables modifiable
 
 [,yaml]
 ----
 ---
-var1: a_choice                # The first variable
-var2: a_choice                # The second variable
+var1: a                       # The first variable
+var2: a                       # The second variable
 ----
diff --git a/tests/results/test_examples_comment/00_6choice_link.gitlab.md b/tests/results/test_examples_comment/00_6choice_link.gitlab.md
index cb575b980..3e871bbe4 100644
--- a/tests/results/test_examples_comment/00_6choice_link.gitlab.md
+++ b/tests/results/test_examples_comment/00_6choice_link.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-var1: a_choice                # The first variable
+var1: a                       # The first variable
 ```
 
 
@@ -10,8 +10,8 @@ var1: a_choice                # The first variable
 
 ```yaml
 ---
-var1: a_choice                # The first variable
-var2: a_choice                # The second variable
+var1: a                       # The first variable
+var2: a                       # The second variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/00_6choice_link.html b/tests/results/test_examples_comment/00_6choice_link.html
index b4404ad4e..adcf4863b 100644
--- a/tests/results/test_examples_comment/00_6choice_link.html
+++ b/tests/results/test_examples_comment/00_6choice_link.html
@@ -1,6 +1,6 @@
 
    Example with mandatory variables not filled in
    
 
-
    var1: a_choice                # The first variable
    Example with all variables modifiable
    
+
    var1: a                       # The first variable
    Example with all variables modifiable
    
 
-
    var1: a_choice                # The first variable
-var2: a_choice                # The second variable
    
\ No newline at end of file
+
    var1: a                       # The first variable
+var2: a                       # The second variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_6choice_link.md b/tests/results/test_examples_comment/00_6choice_link.md
index 3df9259f7..ffadce133 100644
--- a/tests/results/test_examples_comment/00_6choice_link.md
+++ b/tests/results/test_examples_comment/00_6choice_link.md
@@ -2,12 +2,12 @@
 
 ```yaml
 ---
-var1: a_choice                # The first variable
+var1: a                       # The first variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-var1: a_choice                # The first variable
-var2: a_choice                # The second variable
+var1: a                       # The first variable
+var2: a                       # The second variable
 ```
diff --git a/tests/results/test_examples_comment/00_6choice_link.sh b/tests/results/test_examples_comment/00_6choice_link.sh
index ec2fd10a7..bfb16dcb6 100644
--- a/tests/results/test_examples_comment/00_6choice_link.sh
+++ b/tests/results/test_examples_comment/00_6choice_link.sh
@@ -1,11 +1,11 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-var1: a_choice                # The first variable                              
+var1: a                       # The first variable                              
 
 Example with all variables modifiable
 
 ---                                                                             
-var1: a_choice                # The first variable                              
-var2: a_choice                # The second variable                             
+var1: a                       # The first variable                              
+var2: a                       # The second variable                             
 
diff --git a/tests/results/test_examples_comment/00_6choice_variable_link2.adoc b/tests/results/test_examples_comment/00_6choice_variable_link2.adoc
index 68b623787..d3c028455 100644
--- a/tests/results/test_examples_comment/00_6choice_variable_link2.adoc
+++ b/tests/results/test_examples_comment/00_6choice_variable_link2.adoc
@@ -8,6 +8,6 @@ var1:                         # A second variable
   - b
   - c
 var2: a                       # A first variable
-family:                       # family
+family:
   var3: a                     # A third variable
 ----
diff --git a/tests/results/test_examples_comment/00_6choice_variable_link2.gitlab.md b/tests/results/test_examples_comment/00_6choice_variable_link2.gitlab.md
index 9ba7c7ce6..683ed286c 100644
--- a/tests/results/test_examples_comment/00_6choice_variable_link2.gitlab.md
+++ b/tests/results/test_examples_comment/00_6choice_variable_link2.gitlab.md
@@ -7,7 +7,7 @@ var1:                         # A second variable
   - b
   - c
 var2: a                       # A first variable
-family:                       # family
+family:
   var3: a                     # A third variable
 ```
 
diff --git a/tests/results/test_examples_comment/00_6choice_variable_link2.html b/tests/results/test_examples_comment/00_6choice_variable_link2.html
index 574ef508c..25725fc5b 100644
--- a/tests/results/test_examples_comment/00_6choice_variable_link2.html
+++ b/tests/results/test_examples_comment/00_6choice_variable_link2.html
@@ -5,5 +5,5 @@
   - b
   - c
 var2: a                       # A first variable
-family:                       # family
+family:
   var3: a                     # A third variable
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_6choice_variable_link2.md b/tests/results/test_examples_comment/00_6choice_variable_link2.md index 63e9dfe7e..6eaea3a20 100644 --- a/tests/results/test_examples_comment/00_6choice_variable_link2.md +++ b/tests/results/test_examples_comment/00_6choice_variable_link2.md @@ -7,6 +7,6 @@ var1: # A second variable - b - c var2: a # A first variable -family: # family +family: var3: a # A third variable ``` diff --git a/tests/results/test_examples_comment/00_6choice_variable_link2.sh b/tests/results/test_examples_comment/00_6choice_variable_link2.sh index c32fccb00..32419ac14 100644 --- a/tests/results/test_examples_comment/00_6choice_variable_link2.sh +++ b/tests/results/test_examples_comment/00_6choice_variable_link2.sh @@ -6,6 +6,6 @@  - b   - c  var2: a # A first variable  -family: # family  +family:   var3: a # A third variable  diff --git a/tests/results/test_examples_comment/00_6custom.adoc b/tests/results/test_examples_comment/00_6custom.adoc index 18333e4e9..91e920245 100644 --- a/tests/results/test_examples_comment/00_6custom.adoc +++ b/tests/results/test_examples_comment/00_6custom.adoc @@ -3,13 +3,13 @@ [,yaml] ---- --- -custom1: xxx # The first variable +custom1: example # The first variable ---- == Example with all variables modifiable [,yaml] ---- --- -custom1: xxx # The first variable +custom1: example # The first variable custom2: value # The seconf variable ---- diff --git a/tests/results/test_examples_comment/00_6custom.gitlab.md b/tests/results/test_examples_comment/00_6custom.gitlab.md index 210f8692b..bc47a0d7a 100644 --- a/tests/results/test_examples_comment/00_6custom.gitlab.md +++ b/tests/results/test_examples_comment/00_6custom.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -custom1: xxx # The first variable +custom1: example # The first variable ``` @@ -10,7 +10,7 @@ custom1: xxx # The first variable ```yaml --- -custom1: xxx # The first variable +custom1: example # The first variable custom2: value # The seconf variable ``` diff --git a/tests/results/test_examples_comment/00_6custom.html b/tests/results/test_examples_comment/00_6custom.html index 76266261b..f751154d5 100644 --- a/tests/results/test_examples_comment/00_6custom.html +++ b/tests/results/test_examples_comment/00_6custom.html @@ -1,6 +1,6 @@

    Example with mandatory variables not filled in

    -
    custom1: xxx                  # The first variable

    Example with all variables modifiable

    +
    custom1: example              # The first variable

    Example with all variables modifiable

    -
    custom1: xxx                  # The first variable
+
    custom1: example              # The first variable
 custom2: value                # The seconf variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_6custom.md b/tests/results/test_examples_comment/00_6custom.md
index b477a5564..ace7605c6 100644
--- a/tests/results/test_examples_comment/00_6custom.md
+++ b/tests/results/test_examples_comment/00_6custom.md
@@ -2,12 +2,12 @@
 
 ```yaml
 ---
-custom1: xxx                  # The first variable
+custom1: example              # The first variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-custom1: xxx                  # The first variable
+custom1: example              # The first variable
 custom2: value                # The seconf variable
 ```
diff --git a/tests/results/test_examples_comment/00_6custom.sh b/tests/results/test_examples_comment/00_6custom.sh
index ffc1e5693..3194c5358 100644
--- a/tests/results/test_examples_comment/00_6custom.sh
+++ b/tests/results/test_examples_comment/00_6custom.sh
@@ -1,11 +1,11 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-custom1: xxx                  # The first variable                              
+custom1: example              # The first variable                              
 
 Example with all variables modifiable
 
 ---                                                                             
-custom1: xxx                  # The first variable                              
+custom1: example              # The first variable                              
 custom2: value                # The seconf variable                             
 
diff --git a/tests/results/test_examples_comment/00_6ip.adoc b/tests/results/test_examples_comment/00_6ip.adoc
index 3819bb654..05be81602 100644
--- a/tests/results/test_examples_comment/00_6ip.adoc
+++ b/tests/results/test_examples_comment/00_6ip.adoc
@@ -4,6 +4,6 @@
 ----
 ---
 var1: 1.1.1.1                 # An IP
-var2: 192.168.0.128/25        # An IP in CIDR format
+var2: 192.168.0.129/25        # An IP in CIDR format
 var3: 1.1.1.1/24              # An IP in CIDR format with obsolete CIDR type
 ----
diff --git a/tests/results/test_examples_comment/00_6ip.gitlab.md b/tests/results/test_examples_comment/00_6ip.gitlab.md
index 334ff852f..a2262fea9 100644
--- a/tests/results/test_examples_comment/00_6ip.gitlab.md
+++ b/tests/results/test_examples_comment/00_6ip.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 var1: 1.1.1.1                 # An IP
-var2: 192.168.0.128/25        # An IP in CIDR format
+var2: 192.168.0.129/25        # An IP in CIDR format
 var3: 1.1.1.1/24              # An IP in CIDR format with obsolete CIDR type
 ```
 
diff --git a/tests/results/test_examples_comment/00_6ip.html b/tests/results/test_examples_comment/00_6ip.html
index 90fc6145c..38f50e89f 100644
--- a/tests/results/test_examples_comment/00_6ip.html
+++ b/tests/results/test_examples_comment/00_6ip.html
@@ -1,5 +1,5 @@
 
    Example with all variables modifiable
    
 
 
    var1: 1.1.1.1                 # An IP
-var2: 192.168.0.128/25        # An IP in CIDR format
+var2: 192.168.0.129/25        # An IP in CIDR format
 var3: 1.1.1.1/24              # An IP in CIDR format with obsolete CIDR type
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_6ip.md b/tests/results/test_examples_comment/00_6ip.md
index 5bfb5aa83..3b682b19f 100644
--- a/tests/results/test_examples_comment/00_6ip.md
+++ b/tests/results/test_examples_comment/00_6ip.md
@@ -3,6 +3,6 @@
 ```yaml
 ---
 var1: 1.1.1.1                 # An IP
-var2: 192.168.0.128/25        # An IP in CIDR format
+var2: 192.168.0.129/25        # An IP in CIDR format
 var3: 1.1.1.1/24              # An IP in CIDR format with obsolete CIDR type
 ```
diff --git a/tests/results/test_examples_comment/00_6ip.sh b/tests/results/test_examples_comment/00_6ip.sh
index 039543b69..619b3231d 100644
--- a/tests/results/test_examples_comment/00_6ip.sh
+++ b/tests/results/test_examples_comment/00_6ip.sh
@@ -2,6 +2,6 @@
 
 ---                                                                             
 var1: 1.1.1.1                 # An IP                                           
-var2: 192.168.0.128/25        # An IP in CIDR format                            
+var2: 192.168.0.129/25        # An IP in CIDR format                            
 var3: 1.1.1.1/24              # An IP in CIDR format with obsolete CIDR type    
 
diff --git a/tests/results/test_examples_comment/00_6secret_param.adoc b/tests/results/test_examples_comment/00_6secret_param.adoc
index cb7c7d900..b3b098c86 100644
--- a/tests/results/test_examples_comment/00_6secret_param.adoc
+++ b/tests/results/test_examples_comment/00_6secret_param.adoc
@@ -3,14 +3,14 @@
 [,yaml]
 ----
 ---
-secret1: secrets              # The first variable
+secret1: ALongS4cr4t          # The first variable
 ----
 == Example with all variables modifiable
 
 [,yaml]
 ----
 ---
-secret1: secrets              # The first variable
+secret1: ALongS4cr4t          # The first variable
 secret2: value                # The second variable
 secret3: value                # The third variable
 ----
diff --git a/tests/results/test_examples_comment/00_6secret_param.gitlab.md b/tests/results/test_examples_comment/00_6secret_param.gitlab.md
index 305f7ec4c..b589b0211 100644
--- a/tests/results/test_examples_comment/00_6secret_param.gitlab.md
+++ b/tests/results/test_examples_comment/00_6secret_param.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-secret1: secrets              # The first variable
+secret1: ALongS4cr4t          # The first variable
 ```
 
 
@@ -10,7 +10,7 @@ secret1: secrets              # The first variable
 
 ```yaml
 ---
-secret1: secrets              # The first variable
+secret1: ALongS4cr4t          # The first variable
 secret2: value                # The second variable
 secret3: value                # The third variable
 ```
diff --git a/tests/results/test_examples_comment/00_6secret_param.html b/tests/results/test_examples_comment/00_6secret_param.html
index d671cbc9e..7b378a437 100644
--- a/tests/results/test_examples_comment/00_6secret_param.html
+++ b/tests/results/test_examples_comment/00_6secret_param.html
@@ -1,7 +1,7 @@
 
    Example with mandatory variables not filled in
    
 
-
    secret1: secrets              # The first variable
    Example with all variables modifiable
    
+
    secret1: ALongS4cr4t          # The first variable
    Example with all variables modifiable
    
 
-
    secret1: secrets              # The first variable
+
    secret1: ALongS4cr4t          # The first variable
 secret2: value                # The second variable
 secret3: value                # The third variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_6secret_param.md b/tests/results/test_examples_comment/00_6secret_param.md
index c09694b00..39c3a4c65 100644
--- a/tests/results/test_examples_comment/00_6secret_param.md
+++ b/tests/results/test_examples_comment/00_6secret_param.md
@@ -2,13 +2,13 @@
 
 ```yaml
 ---
-secret1: secrets              # The first variable
+secret1: ALongS4cr4t          # The first variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-secret1: secrets              # The first variable
+secret1: ALongS4cr4t          # The first variable
 secret2: value                # The second variable
 secret3: value                # The third variable
 ```
diff --git a/tests/results/test_examples_comment/00_6secret_param.sh b/tests/results/test_examples_comment/00_6secret_param.sh
index e3ae89afd..45e1d5fc0 100644
--- a/tests/results/test_examples_comment/00_6secret_param.sh
+++ b/tests/results/test_examples_comment/00_6secret_param.sh
@@ -1,12 +1,12 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-secret1: secrets              # The first variable                              
+secret1: ALongS4cr4t          # The first variable                              
 
 Example with all variables modifiable
 
 ---                                                                             
-secret1: secrets              # The first variable                              
+secret1: ALongS4cr4t          # The first variable                              
 secret2: value                # The second variable                             
 secret3: value                # The third variable                              
 
diff --git a/tests/results/test_examples_comment/00_8calculation_information.adoc b/tests/results/test_examples_comment/00_8calculation_information.adoc
index 12771c356..f8c7ade8e 100644
--- a/tests/results/test_examples_comment/00_8calculation_information.adoc
+++ b/tests/results/test_examples_comment/00_8calculation_information.adoc
@@ -3,5 +3,5 @@
 [,yaml]
 ----
 ---
-variable: example             # A variable
+variable: value               # A variable
 ----
diff --git a/tests/results/test_examples_comment/00_8calculation_information.gitlab.md b/tests/results/test_examples_comment/00_8calculation_information.gitlab.md
index 7a2c9e86f..a0259ba82 100644
--- a/tests/results/test_examples_comment/00_8calculation_information.gitlab.md
+++ b/tests/results/test_examples_comment/00_8calculation_information.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-variable: example             # A variable
+variable: value               # A variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/00_8calculation_information.html b/tests/results/test_examples_comment/00_8calculation_information.html
index 96cc6429c..1e019755c 100644
--- a/tests/results/test_examples_comment/00_8calculation_information.html
+++ b/tests/results/test_examples_comment/00_8calculation_information.html
@@ -1,3 +1,3 @@
 
    Example with all variables modifiable
    
 
-
    variable: example             # A variable
    
\ No newline at end of file
+
    variable: value               # A variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_8calculation_information.md b/tests/results/test_examples_comment/00_8calculation_information.md
index 1e6623753..54d4b7040 100644
--- a/tests/results/test_examples_comment/00_8calculation_information.md
+++ b/tests/results/test_examples_comment/00_8calculation_information.md
@@ -2,5 +2,5 @@
 
 ```yaml
 ---
-variable: example             # A variable
+variable: value               # A variable
 ```
diff --git a/tests/results/test_examples_comment/00_8calculation_information.sh b/tests/results/test_examples_comment/00_8calculation_information.sh
index a6b407872..b1637b9ef 100644
--- a/tests/results/test_examples_comment/00_8calculation_information.sh
+++ b/tests/results/test_examples_comment/00_8calculation_information.sh
@@ -1,5 +1,5 @@
 Example with all variables modifiable
 
 ---                                                                             
-variable: example             # A variable                                      
+variable: value               # A variable                                      
 
diff --git a/tests/results/test_examples_comment/00_8test.adoc b/tests/results/test_examples_comment/00_8test.adoc
index 49cb263bb..45cd5c0cc 100644
--- a/tests/results/test_examples_comment/00_8test.adoc
+++ b/tests/results/test_examples_comment/00_8test.adoc
@@ -17,7 +17,7 @@ var6:                         # The sixth variable
 var1: test                    # The first variable
 var2: test                    # The second variable
 var3: test1                   # The third variable
-var4: null                    # The forth variable
+var4: example                 # The forth variable
 var5: false                   # The fifth variable
 var6:                         # The sixth variable
   - test1
diff --git a/tests/results/test_examples_comment/00_8test.gitlab.md b/tests/results/test_examples_comment/00_8test.gitlab.md
index 8c780b7f0..b130df775 100644
--- a/tests/results/test_examples_comment/00_8test.gitlab.md
+++ b/tests/results/test_examples_comment/00_8test.gitlab.md
@@ -17,7 +17,7 @@ var6:                         # The sixth variable
 var1: test                    # The first variable
 var2: test                    # The second variable
 var3: test1                   # The third variable
-var4: null                    # The forth variable
+var4: example                 # The forth variable
 var5: false                   # The fifth variable
 var6:                         # The sixth variable
   - test1
diff --git a/tests/results/test_examples_comment/00_8test.html b/tests/results/test_examples_comment/00_8test.html
index 3394b7883..663491a81 100644
--- a/tests/results/test_examples_comment/00_8test.html
+++ b/tests/results/test_examples_comment/00_8test.html
@@ -9,7 +9,7 @@ var6:                         # The sixth variable
 
    var1: test                    # The first variable
 var2: test                    # The second variable
 var3: test1                   # The third variable
-var4: null                    # The forth variable
+var4: example                 # The forth variable
 var5: false                   # The fifth variable
 var6:                         # The sixth variable
   - test1
diff --git a/tests/results/test_examples_comment/00_8test.md b/tests/results/test_examples_comment/00_8test.md
index cef53c9a6..a65a70128 100644
--- a/tests/results/test_examples_comment/00_8test.md
+++ b/tests/results/test_examples_comment/00_8test.md
@@ -15,7 +15,7 @@ var6:                         # The sixth variable
 var1: test                    # The first variable
 var2: test                    # The second variable
 var3: test1                   # The third variable
-var4: null                    # The forth variable
+var4: example                 # The forth variable
 var5: false                   # The fifth variable
 var6:                         # The sixth variable
   - test1
diff --git a/tests/results/test_examples_comment/00_8test.sh b/tests/results/test_examples_comment/00_8test.sh
index 383be4a69..1729e93d5 100644
--- a/tests/results/test_examples_comment/00_8test.sh
+++ b/tests/results/test_examples_comment/00_8test.sh
@@ -13,7 +13,7 @@
 var1: test                    # The first variable                              
 var2: test                    # The second variable                             
 var3: test1                   # The third variable                              
-var4: null                    # The forth variable                              
+var4: example                 # The forth variable                              
 var5: false                   # The fifth variable                              
 var6:                         # The sixth variable                              
   - test1                                                                       
diff --git a/tests/results/test_examples_comment/00_9choice_variable_multi.adoc b/tests/results/test_examples_comment/00_9choice_variable_multi.adoc
index 90ff27143..1b3b67301 100644
--- a/tests/results/test_examples_comment/00_9choice_variable_multi.adoc
+++ b/tests/results/test_examples_comment/00_9choice_variable_multi.adoc
@@ -4,7 +4,8 @@
 ----
 ---
 variable1:                    # A first variable
-  - a_choice
+  - val1
+  - val2
 ----
 == Example with all variables modifiable
 
@@ -12,7 +13,9 @@ variable1:                    # A first variable
 ----
 ---
 variable1:                    # A first variable
-  - a_choice
+  - val1
+  - val2
 variable2:                    # A second variable
-  - a_choice
+  - val1
+  - val2
 ----
diff --git a/tests/results/test_examples_comment/00_9choice_variable_multi.gitlab.md b/tests/results/test_examples_comment/00_9choice_variable_multi.gitlab.md
index 83519a60b..a4c24f7f2 100644
--- a/tests/results/test_examples_comment/00_9choice_variable_multi.gitlab.md
+++ b/tests/results/test_examples_comment/00_9choice_variable_multi.gitlab.md
@@ -3,7 +3,8 @@
 ```yaml
 ---
 variable1:                    # A first variable
-  - a_choice
+  - val1
+  - val2
 ```
 
 
@@ -12,9 +13,11 @@ variable1:                    # A first variable
 ```yaml
 ---
 variable1:                    # A first variable
-  - a_choice
+  - val1
+  - val2
 variable2:                    # A second variable
-  - a_choice
+  - val1
+  - val2
 ```
 
 
diff --git a/tests/results/test_examples_comment/00_9choice_variable_multi.html b/tests/results/test_examples_comment/00_9choice_variable_multi.html
index 4d5f98911..e03d36046 100644
--- a/tests/results/test_examples_comment/00_9choice_variable_multi.html
+++ b/tests/results/test_examples_comment/00_9choice_variable_multi.html
@@ -1,9 +1,12 @@
 
    Example with mandatory variables not filled in
    
 
 
    variable1:                    # A first variable
-  - a_choice
    Example with all variables modifiable
    
+  - val1
+  - val2
    Example with all variables modifiable
    
 
 
    variable1:                    # A first variable
-  - a_choice
+  - val1
+  - val2
 variable2:                    # A second variable
-  - a_choice
    
\ No newline at end of file
+  - val1
+  - val2
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_9choice_variable_multi.md b/tests/results/test_examples_comment/00_9choice_variable_multi.md
index d888098a8..c52272a74 100644
--- a/tests/results/test_examples_comment/00_9choice_variable_multi.md
+++ b/tests/results/test_examples_comment/00_9choice_variable_multi.md
@@ -3,14 +3,17 @@
 ```yaml
 ---
 variable1:                    # A first variable
-  - a_choice
+  - val1
+  - val2
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
 variable1:                    # A first variable
-  - a_choice
+  - val1
+  - val2
 variable2:                    # A second variable
-  - a_choice
+  - val1
+  - val2
 ```
diff --git a/tests/results/test_examples_comment/00_9choice_variable_multi.sh b/tests/results/test_examples_comment/00_9choice_variable_multi.sh
index 1398551d4..603dae8ab 100644
--- a/tests/results/test_examples_comment/00_9choice_variable_multi.sh
+++ b/tests/results/test_examples_comment/00_9choice_variable_multi.sh
@@ -2,13 +2,16 @@
 
 ---                                                                             
 variable1:                    # A first variable                                
-  - a_choice                                                                    
+  - val1                                                                        
+  - val2                                                                        
 
 Example with all variables modifiable
 
 ---                                                                             
 variable1:                    # A first variable                                
-  - a_choice                                                                    
+  - val1                                                                        
+  - val2                                                                        
 variable2:                    # A second variable                               
-  - a_choice                                                                    
+  - val1                                                                        
+  - val2                                                                        
 
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information.adoc b/tests/results/test_examples_comment/00_9default_calculation_information.adoc
index ad2ddecd3..0a9ce9cf9 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information.adoc
+++ b/tests/results/test_examples_comment/00_9default_calculation_information.adoc
@@ -3,5 +3,5 @@
 [,yaml]
 ----
 ---
-var: example                  # A variable
+var: value                    # A variable
 ----
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information.gitlab.md b/tests/results/test_examples_comment/00_9default_calculation_information.gitlab.md
index 050ef3121..853329696 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information.gitlab.md
+++ b/tests/results/test_examples_comment/00_9default_calculation_information.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-var: example                  # A variable
+var: value                    # A variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information.html b/tests/results/test_examples_comment/00_9default_calculation_information.html
index b4697eade..946a97742 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information.html
+++ b/tests/results/test_examples_comment/00_9default_calculation_information.html
@@ -1,3 +1,3 @@
 
    Example with all variables modifiable
    
 
-
    var: example                  # A variable
    
\ No newline at end of file
+
    var: value                    # A variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information.md b/tests/results/test_examples_comment/00_9default_calculation_information.md
index 8df9437ec..263241b06 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information.md
+++ b/tests/results/test_examples_comment/00_9default_calculation_information.md
@@ -2,5 +2,5 @@
 
 ```yaml
 ---
-var: example                  # A variable
+var: value                    # A variable
 ```
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information.sh b/tests/results/test_examples_comment/00_9default_calculation_information.sh
index ea51651ac..e518112aa 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information.sh
+++ b/tests/results/test_examples_comment/00_9default_calculation_information.sh
@@ -1,5 +1,5 @@
 Example with all variables modifiable
 
 ---                                                                             
-var: example                  # A variable                                      
+var: value                    # A variable                                      
 
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.adoc b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.adoc
index ae79637e7..bd87733ef 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.adoc
+++ b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.adoc
@@ -11,5 +11,5 @@ var1: example                 # A first variable
 ----
 ---
 var1: example                 # A first variable
-var2: example                 # A second variable
+var2: value                   # A second variable
 ----
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.gitlab.md b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.gitlab.md
index afdbb277d..fa6aee379 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.gitlab.md
+++ b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.gitlab.md
@@ -11,7 +11,7 @@ var1: example                 # A first variable
 ```yaml
 ---
 var1: example                 # A first variable
-var2: example                 # A second variable
+var2: value                   # A second variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.html b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.html
index 10397d393..d0600614c 100644
--- a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.html
+++ b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.html
@@ -3,4 +3,4 @@
 
    var1: example                 # A first variable
    Example with all variables modifiable
    
 
 
    var1: example                 # A first variable
-var2: example                 # A second variable
    
\ No newline at end of file
+var2: value                   # A second variable
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.md b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.md index fd1b7b570..56776d39e 100644 --- a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.md +++ b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.md @@ -9,5 +9,5 @@ var1: example # A first variable ```yaml --- var1: example # A first variable -var2: example # A second variable +var2: value # A second variable ``` diff --git a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.sh b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.sh index 1c013a2fa..c1e06d991 100644 --- a/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.sh +++ b/tests/results/test_examples_comment/00_9default_calculation_information_other_variable.sh @@ -7,5 +7,5 @@ ---  var1: example # A first variable  -var2: example # A second variable  +var2: value # A second variable  diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable.adoc b/tests/results/test_examples_comment/00_9default_information_other_variable.adoc index ae79637e7..bd87733ef 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable.adoc +++ b/tests/results/test_examples_comment/00_9default_information_other_variable.adoc @@ -11,5 +11,5 @@ var1: example # A first variable ---- --- var1: example # A first variable -var2: example # A second variable +var2: value # A second variable ---- diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable.gitlab.md b/tests/results/test_examples_comment/00_9default_information_other_variable.gitlab.md index afdbb277d..fa6aee379 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable.gitlab.md +++ b/tests/results/test_examples_comment/00_9default_information_other_variable.gitlab.md @@ -11,7 +11,7 @@ var1: example # A first variable ```yaml --- var1: example # A first variable -var2: example # A second variable +var2: value # A second variable ``` diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable.html b/tests/results/test_examples_comment/00_9default_information_other_variable.html index 10397d393..d0600614c 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable.html +++ b/tests/results/test_examples_comment/00_9default_information_other_variable.html @@ -3,4 +3,4 @@ 
    var1: example                 # A first variable

    Example with all variables modifiable

    var1: example                 # A first variable
-var2: example                 # A second variable
    \ No newline at end of file +var2: value # A second variable \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable.md b/tests/results/test_examples_comment/00_9default_information_other_variable.md index fd1b7b570..56776d39e 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable.md +++ b/tests/results/test_examples_comment/00_9default_information_other_variable.md @@ -9,5 +9,5 @@ var1: example # A first variable ```yaml --- var1: example # A first variable -var2: example # A second variable +var2: value # A second variable ``` diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable.sh b/tests/results/test_examples_comment/00_9default_information_other_variable.sh index 1c013a2fa..c1e06d991 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable.sh +++ b/tests/results/test_examples_comment/00_9default_information_other_variable.sh @@ -7,5 +7,5 @@ ---  var1: example # A first variable  -var2: example # A second variable  +var2: value # A second variable  diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable2.adoc b/tests/results/test_examples_comment/00_9default_information_other_variable2.adoc index ae79637e7..167774558 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable2.adoc +++ b/tests/results/test_examples_comment/00_9default_information_other_variable2.adoc @@ -4,6 +4,7 @@ ---- --- var1: example # A first variable +var2: example # A second variable ---- == Example with all variables modifiable diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable2.gitlab.md b/tests/results/test_examples_comment/00_9default_information_other_variable2.gitlab.md index afdbb277d..9618a2b26 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable2.gitlab.md +++ b/tests/results/test_examples_comment/00_9default_information_other_variable2.gitlab.md @@ -3,6 +3,7 @@ ```yaml --- var1: example # A first variable +var2: example # A second variable ``` diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable2.html b/tests/results/test_examples_comment/00_9default_information_other_variable2.html index 10397d393..6e027b079 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable2.html +++ b/tests/results/test_examples_comment/00_9default_information_other_variable2.html @@ -1,6 +1,7 @@

    Example with mandatory variables not filled in

    -
    var1: example                 # A first variable

    Example with all variables modifiable

    +
    var1: example                 # A first variable
+var2: example                 # A second variable

    Example with all variables modifiable

    var1: example                 # A first variable
 var2: example                 # A second variable
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable2.md b/tests/results/test_examples_comment/00_9default_information_other_variable2.md index fd1b7b570..01f99b79e 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable2.md +++ b/tests/results/test_examples_comment/00_9default_information_other_variable2.md @@ -3,6 +3,7 @@ ```yaml --- var1: example # A first variable +var2: example # A second variable ``` # Example with all variables modifiable diff --git a/tests/results/test_examples_comment/00_9default_information_other_variable2.sh b/tests/results/test_examples_comment/00_9default_information_other_variable2.sh index 1c013a2fa..10010cd6c 100644 --- a/tests/results/test_examples_comment/00_9default_information_other_variable2.sh +++ b/tests/results/test_examples_comment/00_9default_information_other_variable2.sh @@ -2,6 +2,7 @@ ---  var1: example # A first variable  +var2: example # A second variable  Example with all variables modifiable diff --git a/tests/results/test_examples_comment/01_6custom_multi.adoc b/tests/results/test_examples_comment/01_6custom_multi.adoc index 0a07df7a6..b2370fbd1 100644 --- a/tests/results/test_examples_comment/01_6custom_multi.adoc +++ b/tests/results/test_examples_comment/01_6custom_multi.adoc @@ -4,7 +4,7 @@ ---- --- custom1: # A first custom variable - - xxx + - example ---- == Example with all variables modifiable @@ -12,7 +12,7 @@ custom1: # A first custom variable ---- --- custom1: # A first custom variable - - xxx + - example custom2: # A second custom variable - value ---- diff --git a/tests/results/test_examples_comment/01_6custom_multi.gitlab.md b/tests/results/test_examples_comment/01_6custom_multi.gitlab.md index a114b2f00..923e21f7d 100644 --- a/tests/results/test_examples_comment/01_6custom_multi.gitlab.md +++ b/tests/results/test_examples_comment/01_6custom_multi.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- custom1: # A first custom variable - - xxx + - example ``` @@ -12,7 +12,7 @@ custom1: # A first custom variable ```yaml --- custom1: # A first custom variable - - xxx + - example custom2: # A second custom variable - value ``` diff --git a/tests/results/test_examples_comment/01_6custom_multi.html b/tests/results/test_examples_comment/01_6custom_multi.html index 0c1b59385..56755d07d 100644 --- a/tests/results/test_examples_comment/01_6custom_multi.html +++ b/tests/results/test_examples_comment/01_6custom_multi.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    custom1:                      # A first custom variable
-  - xxx

    Example with all variables modifiable

    + - example

    Example with all variables modifiable

    custom1:                      # A first custom variable
-  - xxx
+  - example
 custom2:                      # A second custom variable
   - value
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/01_6custom_multi.md b/tests/results/test_examples_comment/01_6custom_multi.md index 064792271..3770da30b 100644 --- a/tests/results/test_examples_comment/01_6custom_multi.md +++ b/tests/results/test_examples_comment/01_6custom_multi.md @@ -3,14 +3,14 @@ ```yaml --- custom1: # A first custom variable - - xxx + - example ``` # Example with all variables modifiable ```yaml --- custom1: # A first custom variable - - xxx + - example custom2: # A second custom variable - value ``` diff --git a/tests/results/test_examples_comment/01_6custom_multi.sh b/tests/results/test_examples_comment/01_6custom_multi.sh index f61583270..60cad978c 100644 --- a/tests/results/test_examples_comment/01_6custom_multi.sh +++ b/tests/results/test_examples_comment/01_6custom_multi.sh @@ -2,13 +2,13 @@ ---  custom1: # A first custom variable  - - xxx  + - example  Example with all variables modifiable ---  custom1: # A first custom variable  - - xxx  + - example  custom2: # A second custom variable   - value  diff --git a/tests/results/test_examples_comment/01_8calculation_information_multi.adoc b/tests/results/test_examples_comment/01_8calculation_information_multi.adoc index 8774ce24f..a12dff883 100644 --- a/tests/results/test_examples_comment/01_8calculation_information_multi.adoc +++ b/tests/results/test_examples_comment/01_8calculation_information_multi.adoc @@ -4,5 +4,5 @@ ---- --- variable: # A variable - - example + - value ---- diff --git a/tests/results/test_examples_comment/01_8calculation_information_multi.gitlab.md b/tests/results/test_examples_comment/01_8calculation_information_multi.gitlab.md index 05131fd3a..6bf185c91 100644 --- a/tests/results/test_examples_comment/01_8calculation_information_multi.gitlab.md +++ b/tests/results/test_examples_comment/01_8calculation_information_multi.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- variable: # A variable - - example + - value ``` diff --git a/tests/results/test_examples_comment/01_8calculation_information_multi.html b/tests/results/test_examples_comment/01_8calculation_information_multi.html index 1a4dd0610..372857777 100644 --- a/tests/results/test_examples_comment/01_8calculation_information_multi.html +++ b/tests/results/test_examples_comment/01_8calculation_information_multi.html @@ -1,4 +1,4 @@

    Example with all variables modifiable

    variable:                     # A variable
-  - example
    \ No newline at end of file + - value \ No newline at end of file diff --git a/tests/results/test_examples_comment/01_8calculation_information_multi.md b/tests/results/test_examples_comment/01_8calculation_information_multi.md index 5bbfa4e76..2077b242b 100644 --- a/tests/results/test_examples_comment/01_8calculation_information_multi.md +++ b/tests/results/test_examples_comment/01_8calculation_information_multi.md @@ -3,5 +3,5 @@ ```yaml --- variable: # A variable - - example + - value ``` diff --git a/tests/results/test_examples_comment/01_8calculation_information_multi.sh b/tests/results/test_examples_comment/01_8calculation_information_multi.sh index 4bc62444b..78bced3dc 100644 --- a/tests/results/test_examples_comment/01_8calculation_information_multi.sh +++ b/tests/results/test_examples_comment/01_8calculation_information_multi.sh @@ -2,5 +2,5 @@ ---  variable: # A variable  - - example  + - value  diff --git a/tests/results/test_examples_comment/01_9choice_variable_multi.adoc b/tests/results/test_examples_comment/01_9choice_variable_multi.adoc index 8e2d82539..f8c63d5b3 100644 --- a/tests/results/test_examples_comment/01_9choice_variable_multi.adoc +++ b/tests/results/test_examples_comment/01_9choice_variable_multi.adoc @@ -3,7 +3,7 @@ [,yaml] ---- --- -variable2: a_choice # A second variable +variable2: a # A second variable ---- == Example with all variables modifiable @@ -14,5 +14,5 @@ variable1: # A first variable - a - b - c -variable2: a_choice # A second variable +variable2: a # A second variable ---- diff --git a/tests/results/test_examples_comment/01_9choice_variable_multi.gitlab.md b/tests/results/test_examples_comment/01_9choice_variable_multi.gitlab.md index 6c4e1ddb0..3f2c87d77 100644 --- a/tests/results/test_examples_comment/01_9choice_variable_multi.gitlab.md +++ b/tests/results/test_examples_comment/01_9choice_variable_multi.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -variable2: a_choice # A second variable +variable2: a # A second variable ``` @@ -14,7 +14,7 @@ variable1: # A first variable - a - b - c -variable2: a_choice # A second variable +variable2: a # A second variable ``` diff --git a/tests/results/test_examples_comment/01_9choice_variable_multi.html b/tests/results/test_examples_comment/01_9choice_variable_multi.html index 5d853fbea..6b7c55010 100644 --- a/tests/results/test_examples_comment/01_9choice_variable_multi.html +++ b/tests/results/test_examples_comment/01_9choice_variable_multi.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    -
    variable2: a_choice           # A second variable

    Example with all variables modifiable

    +
    variable2: a                  # A second variable

    Example with all variables modifiable

    variable1:                    # A first variable
   - a
   - b
   - c
-variable2: a_choice           # A second variable
    \ No newline at end of file +variable2: a # A second variable \ No newline at end of file diff --git a/tests/results/test_examples_comment/01_9choice_variable_multi.md b/tests/results/test_examples_comment/01_9choice_variable_multi.md index cf020ad93..d03fcdf87 100644 --- a/tests/results/test_examples_comment/01_9choice_variable_multi.md +++ b/tests/results/test_examples_comment/01_9choice_variable_multi.md @@ -2,7 +2,7 @@ ```yaml --- -variable2: a_choice # A second variable +variable2: a # A second variable ``` # Example with all variables modifiable @@ -12,5 +12,5 @@ variable1: # A first variable - a - b - c -variable2: a_choice # A second variable +variable2: a # A second variable ``` diff --git a/tests/results/test_examples_comment/01_9choice_variable_multi.sh b/tests/results/test_examples_comment/01_9choice_variable_multi.sh index e5824b348..925552ef8 100644 --- a/tests/results/test_examples_comment/01_9choice_variable_multi.sh +++ b/tests/results/test_examples_comment/01_9choice_variable_multi.sh @@ -1,7 +1,7 @@ Example with mandatory variables not filled in ---  -variable2: a_choice # A second variable  +variable2: a # A second variable  Example with all variables modifiable @@ -10,5 +10,5 @@  - a   - b   - c  -variable2: a_choice # A second variable  +variable2: a # A second variable  diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden.adoc b/tests/results/test_examples_comment/04_1default_calculation_hidden.adoc index 7db54e630..97ff61d5f 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden.adoc +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden.adoc @@ -1,16 +1,8 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -var2: example # A second variable ----- == Example with all variables modifiable [,yaml] ---- --- var1: value # A first variable -var2: example # A second variable var3: value # A third variable ---- diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden.gitlab.md b/tests/results/test_examples_comment/04_1default_calculation_hidden.gitlab.md index 1bbb0b033..4da6a81a5 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden.gitlab.md +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -var2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- var1: value # A first variable -var2: example # A second variable var3: value # A third variable ```
    diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden.html b/tests/results/test_examples_comment/04_1default_calculation_hidden.html index 45501fac6..0abff3a7c 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden.html +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden.html @@ -1,7 +1,4 @@ -

    Example with mandatory variables not filled in

    - -
    var2: example                 # A second variable

    Example with all variables modifiable

    +

    Example with all variables modifiable

    var1: value                   # A first variable
-var2: example                 # A second variable
 var3: value                   # A third variable
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden.md b/tests/results/test_examples_comment/04_1default_calculation_hidden.md index 4042d67c7..adf406b25 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden.md +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden.md @@ -1,14 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -var2: example # A second variable -``` # Example with all variables modifiable ```yaml --- var1: value # A first variable -var2: example # A second variable var3: value # A third variable ``` diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden.sh b/tests/results/test_examples_comment/04_1default_calculation_hidden.sh index a6e3c938e..6f0ced894 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden.sh +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden.sh @@ -1,12 +1,6 @@ -Example with mandatory variables not filled in - ----  -var2: example # A second variable  - Example with all variables modifiable ---  var1: value # A first variable  -var2: example # A second variable  var3: value # A third variable  diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.adoc b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.adoc index 9328594f9..97ff61d5f 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.adoc +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.adoc @@ -1,16 +1,8 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -var2: example # A second variable ----- == Example with all variables modifiable [,yaml] ---- --- var1: value # A first variable -var2: example # A second variable -var3: example # A third variable +var3: value # A third variable ---- diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.gitlab.md b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.gitlab.md index 230302760..4da6a81a5 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.gitlab.md +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.gitlab.md @@ -1,18 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -var2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- var1: value # A first variable -var2: example # A second variable -var3: example # A third variable +var3: value # A third variable ```
    diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.html b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.html index b686ae1e3..0abff3a7c 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.html +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.html @@ -1,7 +1,4 @@ -

    Example with mandatory variables not filled in

    - -
    var2: example                 # A second variable

    Example with all variables modifiable

    +

    Example with all variables modifiable

    var1: value                   # A first variable
-var2: example                 # A second variable
-var3: example                 # A third variable
    \ No newline at end of file +var3: value # A third variable \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.md b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.md index 8ca52467c..adf406b25 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.md +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.md @@ -1,14 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -var2: example # A second variable -``` # Example with all variables modifiable ```yaml --- var1: value # A first variable -var2: example # A second variable -var3: example # A third variable +var3: value # A third variable ``` diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.sh b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.sh index 8242255a1..6f0ced894 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_2.sh +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_2.sh @@ -1,12 +1,6 @@ -Example with mandatory variables not filled in - ----  -var2: example # A second variable  - Example with all variables modifiable ---  var1: value # A first variable  -var2: example # A second variable  -var3: example # A third variable  +var3: value # A third variable  diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.adoc b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.adoc index ae312bab2..071798225 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.adoc +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -var3: example # A third variable ----- == Example with all variables modifiable [,yaml] ---- --- var1: value # A first variable -var3: example # A third variable ---- diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.gitlab.md b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.gitlab.md index 538896da0..6e093de3a 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.gitlab.md +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -var3: example # A third variable -``` -
    -
    Example with all variables modifiable ```yaml --- var1: value # A first variable -var3: example # A third variable ```
    diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.html b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.html index 4fa8b6b94..6201fbd6c 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.html +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    var3: example                 # A third variable

    Example with all variables modifiable

    - -
    var1: value                   # A first variable
-var3: example                 # A third variable
    \ No newline at end of file +
    var1: value                   # A first variable
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.md b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.md index 788f248b7..d1e99a81e 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.md +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -var3: example # A third variable -``` # Example with all variables modifiable ```yaml --- var1: value # A first variable -var3: example # A third variable ``` diff --git a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.sh b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.sh index a7ad663e0..5f847df8a 100644 --- a/tests/results/test_examples_comment/04_1default_calculation_hidden_5.sh +++ b/tests/results/test_examples_comment/04_1default_calculation_hidden_5.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -var3: example # A third variable  - Example with all variables modifiable ---  var1: value # A first variable  -var3: example # A third variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.adoc index 4d1295870..5930f6eb1 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.adoc @@ -4,7 +4,6 @@ ---- --- variable1: example # A first variable -variable2: example # A seconde variable ---- == Example with all variables modifiable @@ -13,5 +12,4 @@ variable2: example # A seconde variable --- condition: no # A conditional variable variable1: example # A first variable -variable2: example # A seconde variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.gitlab.md index c686933d8..d5f770c11 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.gitlab.md @@ -3,7 +3,6 @@ ```yaml --- variable1: example # A first variable -variable2: example # A seconde variable ``` @@ -13,7 +12,6 @@ variable2: example # A seconde variable --- condition: no # A conditional variable variable1: example # A first variable -variable2: example # A seconde variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.html b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.html index 121730068..7f8ec2f64 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.html @@ -1,8 +1,6 @@

    Example with mandatory variables not filled in

    -
    variable1: example            # A first variable
-variable2: example            # A seconde variable

    Example with all variables modifiable

    +
    variable1: example            # A first variable

    Example with all variables modifiable

    condition: no                 # A conditional variable
-variable1: example            # A first variable
-variable2: example            # A seconde variable
    \ No newline at end of file +variable1: example # A first variable \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.md b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.md index 8e0e34d74..77d9851b0 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.md @@ -3,7 +3,6 @@ ```yaml --- variable1: example # A first variable -variable2: example # A seconde variable ``` # Example with all variables modifiable @@ -11,5 +10,4 @@ variable2: example # A seconde variable --- condition: no # A conditional variable variable1: example # A first variable -variable2: example # A seconde variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.sh b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.sh index 4c6a234b2..bc3d69212 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_boolean.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_boolean.sh @@ -2,12 +2,10 @@ ---  variable1: example # A first variable  -variable2: example # A seconde variable  Example with all variables modifiable ---  condition: no # A conditional variable  variable1: example # A first variable  -variable2: example # A seconde variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_optional.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_optional.adoc index be2eca8cc..4b60af660 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_optional.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_optional.adoc @@ -4,6 +4,4 @@ ---- --- condition: no # A condition -var1: example # A first variable -var2: example # A second variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_optional.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_optional.gitlab.md index 6fc2a4066..112061a3a 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_optional.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_optional.gitlab.md @@ -3,8 +3,6 @@ ```yaml --- condition: no # A condition -var1: example # A first variable -var2: example # A second variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_optional.html b/tests/results/test_examples_comment/04_5disabled_calculation_optional.html index 0e298c198..9adb71ec6 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_optional.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_optional.html @@ -1,5 +1,3 @@

    Example with all variables modifiable

    -
    condition: no                 # A condition
-var1: example                 # A first variable
-var2: example                 # A second variable
    \ No newline at end of file +
    condition: no                 # A condition
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_optional.md b/tests/results/test_examples_comment/04_5disabled_calculation_optional.md index f6a5edbe2..6b458c6cf 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_optional.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_optional.md @@ -3,6 +3,4 @@ ```yaml --- condition: no # A condition -var1: example # A first variable -var2: example # A second variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_optional.sh b/tests/results/test_examples_comment/04_5disabled_calculation_optional.sh index a510fca68..3e23f996b 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_optional.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_optional.sh @@ -2,6 +2,4 @@ ---  condition: no # A condition  -var1: example # A first variable  -var2: example # A second variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.adoc index dfa55cdf2..20689dd05 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable: example # A variable ----- == Example with all variables modifiable [,yaml] ---- --- condition: true # A condition -variable: example # A variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.gitlab.md index 9d937f764..4a2b530dd 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable: example # A variable -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true # A condition -variable: example # A variable ```
    diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.html b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.html index d4753062d..ae465a3b0 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable: example             # A variable

    Example with all variables modifiable

    - -
    condition: true               # A condition
-variable: example             # A variable
    \ No newline at end of file +
    condition: true               # A condition
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.md index 8bac44904..6325df263 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable: example # A variable -``` # Example with all variables modifiable ```yaml --- condition: true # A condition -variable: example # A variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.sh b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.sh index 22aa9bcb2..69f34da13 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable10.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable10.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable: example # A variable  - Example with all variables modifiable ---  condition: true # A condition  -variable: example # A variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.adoc index dfa55cdf2..20689dd05 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable: example # A variable ----- == Example with all variables modifiable [,yaml] ---- --- condition: true # A condition -variable: example # A variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.gitlab.md index 9d937f764..4a2b530dd 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable: example # A variable -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true # A condition -variable: example # A variable ```
    diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.html b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.html index d4753062d..ae465a3b0 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable: example             # A variable

    Example with all variables modifiable

    - -
    condition: true               # A condition
-variable: example             # A variable
    \ No newline at end of file +
    condition: true               # A condition
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.md index 8bac44904..6325df263 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable: example # A variable -``` # Example with all variables modifiable ```yaml --- condition: true # A condition -variable: example # A variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.sh b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.sh index 22aa9bcb2..69f34da13 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable2.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable2.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable: example # A variable  - Example with all variables modifiable ---  condition: true # A condition  -variable: example # A variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.adoc index b422fe94b..f954a0796 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.adoc @@ -1,15 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable: example # A variable ----- == Example with all variables modifiable [,yaml] ---- --- condition: yes # A condition -variable: example # A variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.gitlab.md index 85b3ff0f4..804e2e846 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.gitlab.md @@ -1,17 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable: example # A variable -``` -
    -
    Example with all variables modifiable ```yaml --- condition: yes # A condition -variable: example # A variable ```
    diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.html b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.html index d8c693c3c..c222cfca3 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.html @@ -1,6 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable: example             # A variable

    Example with all variables modifiable

    - -
    condition: yes                # A condition
-variable: example             # A variable
    \ No newline at end of file +
    condition: yes                # A condition
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.md index 75fef5890..94d2bb445 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.md @@ -1,13 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable: example # A variable -``` # Example with all variables modifiable ```yaml --- condition: yes # A condition -variable: example # A variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.sh b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.sh index 9ff0608f5..0e41d62d3 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable3.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable3.sh @@ -1,11 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable: example # A variable  - Example with all variables modifiable ---  condition: yes # A condition  -variable: example # A variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.adoc index 1acc0cbe5..20689dd05 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.adoc @@ -1,17 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable1: example # A variable -variable2: example # A second variable ----- == Example with all variables modifiable [,yaml] ---- --- condition: true # A condition -variable1: example # A variable -variable2: example # A second variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md index 4c0259a73..4a2b530dd 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md @@ -1,19 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable1: example # A variable -variable2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true # A condition -variable1: example # A variable -variable2: example # A second variable ```
    diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.html b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.html index 869e8bd5d..ae465a3b0 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.html @@ -1,8 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable1: example            # A variable
-variable2: example            # A second variable

    Example with all variables modifiable

    - -
    condition: true               # A condition
-variable1: example            # A variable
-variable2: example            # A second variable
    \ No newline at end of file +
    condition: true               # A condition
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.md index 051d389ef..6325df263 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.md @@ -1,15 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable1: example # A variable -variable2: example # A second variable -``` # Example with all variables modifiable ```yaml --- condition: true # A condition -variable1: example # A variable -variable2: example # A second variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.sh b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.sh index 69960544a..69f34da13 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive.sh @@ -1,13 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable1: example # A variable  -variable2: example # A second variable  - Example with all variables modifiable ---  condition: true # A condition  -variable1: example # A variable  -variable2: example # A second variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc index fe59e67ad..abb63960c 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc @@ -1,10 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable2: example # A second variable ----- == Example with all variables modifiable [,yaml] @@ -12,5 +5,4 @@ variable2: example # A second variable --- condition: false # A condition variable1: disabled # A variable -variable2: example # A second variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md index 2a9de9b09..6fa5d1a43 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md @@ -1,18 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- condition: false # A condition variable1: disabled # A variable -variable2: example # A second variable ```
    diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.html b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.html index 76b08df8f..9b30a7c9a 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.html @@ -1,7 +1,4 @@ -

    Example with mandatory variables not filled in

    - -
    variable2: example            # A second variable

    Example with all variables modifiable

    +

    Example with all variables modifiable

    condition: false              # A condition
-variable1: disabled           # A variable
-variable2: example            # A second variable
    \ No newline at end of file +variable1: disabled # A variable \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.md index a736e13d0..ecf4f20fc 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.md @@ -1,14 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable2: example # A second variable -``` # Example with all variables modifiable ```yaml --- condition: false # A condition variable1: disabled # A variable -variable2: example # A second variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.sh b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.sh index d573e9a70..b27948f24 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_3.sh @@ -1,12 +1,6 @@ -Example with mandatory variables not filled in - ----  -variable2: example # A second variable  - Example with all variables modifiable ---  condition: false # A condition  variable1: disabled # A variable  -variable2: example # A second variable  diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc index 64d4b700a..20689dd05 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc @@ -1,16 +1,7 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -variable2: example # A second variable ----- == Example with all variables modifiable [,yaml] ---- --- condition: true # A condition -variable1: not_disabled # A variable -variable2: example # A second variable ---- diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md index eb6c8e36c..4a2b530dd 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md @@ -1,18 +1,8 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -variable2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- condition: true # A condition -variable1: not_disabled # A variable -variable2: example # A second variable ```
    diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.html b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.html index e252b9f9d..ae465a3b0 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.html +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.html @@ -1,7 +1,3 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    -
    variable2: example            # A second variable

    Example with all variables modifiable

    - -
    condition: true               # A condition
-variable1: not_disabled       # A variable
-variable2: example            # A second variable
    \ No newline at end of file +
    condition: true               # A condition
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.md b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.md index 44bf3e818..6325df263 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.md +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.md @@ -1,14 +1,6 @@ -# Example with mandatory variables not filled in - -```yaml ---- -variable2: example # A second variable -``` # Example with all variables modifiable ```yaml --- condition: true # A condition -variable1: not_disabled # A variable -variable2: example # A second variable ``` diff --git a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.sh b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.sh index 5f70e933a..69f34da13 100644 --- a/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.sh +++ b/tests/results/test_examples_comment/04_5disabled_calculation_variable_transitive_4.sh @@ -1,12 +1,5 @@ -Example with mandatory variables not filled in - ----  -variable2: example # A second variable  - Example with all variables modifiable ---  condition: true # A condition  -variable1: not_disabled # A variable  -variable2: example # A second variable  diff --git a/tests/results/test_examples_comment/16_2family_redefine_calculation.adoc b/tests/results/test_examples_comment/16_2family_redefine_calculation.adoc index 7d8d0bd1a..e69de29bb 100644 --- a/tests/results/test_examples_comment/16_2family_redefine_calculation.adoc +++ b/tests/results/test_examples_comment/16_2family_redefine_calculation.adoc @@ -1,16 +0,0 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -family: # family - var1: example ----- -== Example with all variables modifiable - -[,yaml] ----- ---- -family: # family - var1: example ----- diff --git a/tests/results/test_examples_comment/16_2family_redefine_calculation.gitlab.md b/tests/results/test_examples_comment/16_2family_redefine_calculation.gitlab.md index dbe2b6163..e69de29bb 100644 --- a/tests/results/test_examples_comment/16_2family_redefine_calculation.gitlab.md +++ b/tests/results/test_examples_comment/16_2family_redefine_calculation.gitlab.md @@ -1,18 +0,0 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -family: # family - var1: example -``` -
    - -
    Example with all variables modifiable - -```yaml ---- -family: # family - var1: example -``` -
    - diff --git a/tests/results/test_examples_comment/16_2family_redefine_calculation.html b/tests/results/test_examples_comment/16_2family_redefine_calculation.html index 07f02d16b..e69de29bb 100644 --- a/tests/results/test_examples_comment/16_2family_redefine_calculation.html +++ b/tests/results/test_examples_comment/16_2family_redefine_calculation.html @@ -1,7 +0,0 @@ -

    Example with mandatory variables not filled in

    - -
    family:                       # family
-  var1: example

    Example with all variables modifiable

    - -
    family:                       # family
-  var1: example
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/16_2family_redefine_calculation.md b/tests/results/test_examples_comment/16_2family_redefine_calculation.md index 80db86afa..e69de29bb 100644 --- a/tests/results/test_examples_comment/16_2family_redefine_calculation.md +++ b/tests/results/test_examples_comment/16_2family_redefine_calculation.md @@ -1,14 +0,0 @@ -# Example with mandatory variables not filled in - -```yaml ---- -family: # family - var1: example -``` -# Example with all variables modifiable - -```yaml ---- -family: # family - var1: example -``` diff --git a/tests/results/test_examples_comment/16_2family_redefine_calculation.sh b/tests/results/test_examples_comment/16_2family_redefine_calculation.sh index 09c785550..e69de29bb 100644 --- a/tests/results/test_examples_comment/16_2family_redefine_calculation.sh +++ b/tests/results/test_examples_comment/16_2family_redefine_calculation.sh @@ -1,12 +0,0 @@ -Example with mandatory variables not filled in - ----  -family: # family  - var1: example  - -Example with all variables modifiable - ----  -family: # family  - var1: example  - diff --git a/tests/results/test_examples_comment/16_3family_empty_at_ends.adoc b/tests/results/test_examples_comment/16_3family_empty_at_ends.adoc index 7d8d0bd1a..a5aaf52ce 100644 --- a/tests/results/test_examples_comment/16_3family_empty_at_ends.adoc +++ b/tests/results/test_examples_comment/16_3family_empty_at_ends.adoc @@ -3,7 +3,7 @@ [,yaml] ---- --- -family: # family +family: var1: example ---- == Example with all variables modifiable @@ -11,6 +11,6 @@ family: # family [,yaml] ---- --- -family: # family +family: var1: example ---- diff --git a/tests/results/test_examples_comment/16_3family_empty_at_ends.gitlab.md b/tests/results/test_examples_comment/16_3family_empty_at_ends.gitlab.md index dbe2b6163..a19b8647f 100644 --- a/tests/results/test_examples_comment/16_3family_empty_at_ends.gitlab.md +++ b/tests/results/test_examples_comment/16_3family_empty_at_ends.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -family: # family +family: var1: example ``` @@ -11,7 +11,7 @@ family: # family ```yaml --- -family: # family +family: var1: example ``` diff --git a/tests/results/test_examples_comment/16_3family_empty_at_ends.html b/tests/results/test_examples_comment/16_3family_empty_at_ends.html index 07f02d16b..603ee8b52 100644 --- a/tests/results/test_examples_comment/16_3family_empty_at_ends.html +++ b/tests/results/test_examples_comment/16_3family_empty_at_ends.html @@ -1,7 +1,7 @@

    Example with mandatory variables not filled in

    -
    family:                       # family
+
    family:
   var1: example
    Example with all variables modifiable
    
 
-
    family:                       # family
+
    family:
   var1: example
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/16_3family_empty_at_ends.md b/tests/results/test_examples_comment/16_3family_empty_at_ends.md
index 80db86afa..ae8b7bc9e 100644
--- a/tests/results/test_examples_comment/16_3family_empty_at_ends.md
+++ b/tests/results/test_examples_comment/16_3family_empty_at_ends.md
@@ -2,13 +2,13 @@
 
 ```yaml
 ---
-family:                       # family
+family:
   var1: example
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-family:                       # family
+family:
   var1: example
 ```
diff --git a/tests/results/test_examples_comment/16_3family_empty_at_ends.sh b/tests/results/test_examples_comment/16_3family_empty_at_ends.sh
index 09c785550..343fac9ff 100644
--- a/tests/results/test_examples_comment/16_3family_empty_at_ends.sh
+++ b/tests/results/test_examples_comment/16_3family_empty_at_ends.sh
@@ -1,12 +1,12 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-family:                       # family                                          
+family:                                                                         
   var1: example                                                                 
 
 Example with all variables modifiable
 
 ---                                                                             
-family:                       # family                                          
+family:                                                                         
   var1: example                                                                 
 
diff --git a/tests/results/test_examples_comment/16_5redefine_choice.adoc b/tests/results/test_examples_comment/16_5redefine_choice.adoc
index 804d186f8..993ec04fe 100644
--- a/tests/results/test_examples_comment/16_5redefine_choice.adoc
+++ b/tests/results/test_examples_comment/16_5redefine_choice.adoc
@@ -3,12 +3,12 @@
 [,yaml]
 ----
 ---
-variable: a_choice            # A variable
+variable: a                   # A variable
 ----
 == Example with all variables modifiable
 
 [,yaml]
 ----
 ---
-variable: a_choice            # A variable
+variable: a                   # A variable
 ----
diff --git a/tests/results/test_examples_comment/16_5redefine_choice.gitlab.md b/tests/results/test_examples_comment/16_5redefine_choice.gitlab.md
index 0d99bc981..18c545d81 100644
--- a/tests/results/test_examples_comment/16_5redefine_choice.gitlab.md
+++ b/tests/results/test_examples_comment/16_5redefine_choice.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-variable: a_choice            # A variable
+variable: a                   # A variable
 ```
 
 
@@ -10,7 +10,7 @@ variable: a_choice            # A variable
 
 ```yaml
 ---
-variable: a_choice            # A variable
+variable: a                   # A variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/16_5redefine_choice.html b/tests/results/test_examples_comment/16_5redefine_choice.html
index c0e5ebca0..75705fecd 100644
--- a/tests/results/test_examples_comment/16_5redefine_choice.html
+++ b/tests/results/test_examples_comment/16_5redefine_choice.html
@@ -1,5 +1,5 @@
 
    Example with mandatory variables not filled in
    
 
-
    variable: a_choice            # A variable
    Example with all variables modifiable
    
+
    variable: a                   # A variable
    Example with all variables modifiable
    
 
-
    variable: a_choice            # A variable
    
\ No newline at end of file
+
    variable: a                   # A variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/16_5redefine_choice.md b/tests/results/test_examples_comment/16_5redefine_choice.md
index 87aaad384..36f34a661 100644
--- a/tests/results/test_examples_comment/16_5redefine_choice.md
+++ b/tests/results/test_examples_comment/16_5redefine_choice.md
@@ -2,11 +2,11 @@
 
 ```yaml
 ---
-variable: a_choice            # A variable
+variable: a                   # A variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-variable: a_choice            # A variable
+variable: a                   # A variable
 ```
diff --git a/tests/results/test_examples_comment/16_5redefine_choice.sh b/tests/results/test_examples_comment/16_5redefine_choice.sh
index b3474372c..cc6e5db6c 100644
--- a/tests/results/test_examples_comment/16_5redefine_choice.sh
+++ b/tests/results/test_examples_comment/16_5redefine_choice.sh
@@ -1,10 +1,10 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-variable: a_choice            # A variable                                      
+variable: a                   # A variable                                      
 
 Example with all variables modifiable
 
 ---                                                                             
-variable: a_choice            # A variable                                      
+variable: a                   # A variable                                      
 
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.adoc b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.adoc
index dd9aaacd8..030eb2f4a 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.adoc
+++ b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.adoc
@@ -3,7 +3,7 @@
 [,yaml]
 ----
 ---
-my_family:                    # my_family
+my_family:
   dynamic:
     - val1
     - val2
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.gitlab.md b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.gitlab.md
index d2204ca6f..128a6395d 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.gitlab.md
+++ b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-my_family:                    # my_family
+my_family:
   dynamic:
     - val1
     - val2
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.html b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.html
index 757d9b10d..0d9822978 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.html
+++ b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.html
@@ -1,6 +1,6 @@
 
    Example with all variables modifiable
    
 
-
    my_family:                    # my_family
+
    my_family:
   dynamic:
     - val1
     - val2
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.md b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.md
index 917852aa9..8244337dd 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.md
+++ b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-my_family:                    # my_family
+my_family:
   dynamic:
     - val1
     - val2
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.sh b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.sh
index 5b7c3a8c4..f60741b2b 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_dynamic.sh
+++ b/tests/results/test_examples_comment/20_2family_looks_like_dynamic.sh
@@ -1,7 +1,7 @@
 Example with all variables modifiable
 
 ---                                                                             
-my_family:                    # my_family                                       
+my_family:                                                                      
   dynamic:                                                                      
     - val1                                                                      
     - val2                                                                      
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_variable.adoc b/tests/results/test_examples_comment/20_2family_looks_like_variable.adoc
index 9cd94f96f..883d8f2c2 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_variable.adoc
+++ b/tests/results/test_examples_comment/20_2family_looks_like_variable.adoc
@@ -3,6 +3,6 @@
 [,yaml]
 ----
 ---
-my_family:                    # my_family
+my_family:
   default: true
 ----
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_variable.gitlab.md b/tests/results/test_examples_comment/20_2family_looks_like_variable.gitlab.md
index 39c48bc65..5a15e77c6 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_variable.gitlab.md
+++ b/tests/results/test_examples_comment/20_2family_looks_like_variable.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-my_family:                    # my_family
+my_family:
   default: true
 ```
 
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_variable.html b/tests/results/test_examples_comment/20_2family_looks_like_variable.html
index ad773a517..a0397dd2d 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_variable.html
+++ b/tests/results/test_examples_comment/20_2family_looks_like_variable.html
@@ -1,4 +1,4 @@
 
    Example with all variables modifiable
    
 
-
    my_family:                    # my_family
+
    my_family:
   default: true
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_variable.md b/tests/results/test_examples_comment/20_2family_looks_like_variable.md
index 683b5a1a3..b7f43f6f8 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_variable.md
+++ b/tests/results/test_examples_comment/20_2family_looks_like_variable.md
@@ -2,6 +2,6 @@
 
 ```yaml
 ---
-my_family:                    # my_family
+my_family:
   default: true
 ```
diff --git a/tests/results/test_examples_comment/20_2family_looks_like_variable.sh b/tests/results/test_examples_comment/20_2family_looks_like_variable.sh
index 6e867d5ca..3ab278525 100644
--- a/tests/results/test_examples_comment/20_2family_looks_like_variable.sh
+++ b/tests/results/test_examples_comment/20_2family_looks_like_variable.sh
@@ -1,6 +1,6 @@
 Example with all variables modifiable
 
 ---                                                                             
-my_family:                    # my_family                                       
+my_family:                                                                      
   default: true                                                                 
 
diff --git a/tests/results/test_examples_comment/20_9default_information_parent.adoc b/tests/results/test_examples_comment/20_9default_information_parent.adoc
index 861908770..4bdbf56f6 100644
--- a/tests/results/test_examples_comment/20_9default_information_parent.adoc
+++ b/tests/results/test_examples_comment/20_9default_information_parent.adoc
@@ -3,7 +3,7 @@
 [,yaml]
 ----
 ---
-family:                       # family
+family:
   var1: example               # A first variable
 ----
 == Example with all variables modifiable
@@ -11,7 +11,7 @@ family:                       # family
 [,yaml]
 ----
 ---
-family:                       # family
+family:
   var1: example               # A first variable
-  var2: example               # A second variable
+  var2: value                 # A second variable
 ----
diff --git a/tests/results/test_examples_comment/20_9default_information_parent.gitlab.md b/tests/results/test_examples_comment/20_9default_information_parent.gitlab.md
index 433d0fad0..acb04e0c7 100644
--- a/tests/results/test_examples_comment/20_9default_information_parent.gitlab.md
+++ b/tests/results/test_examples_comment/20_9default_information_parent.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-family:                       # family
+family:
   var1: example               # A first variable
 ```
 
@@ -11,9 +11,9 @@ family:                       # family
 
 ```yaml
 ---
-family:                       # family
+family:
   var1: example               # A first variable
-  var2: example               # A second variable
+  var2: value                 # A second variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/20_9default_information_parent.html b/tests/results/test_examples_comment/20_9default_information_parent.html
index eb03ab352..136a7b7d6 100644
--- a/tests/results/test_examples_comment/20_9default_information_parent.html
+++ b/tests/results/test_examples_comment/20_9default_information_parent.html
@@ -1,8 +1,8 @@
 
    Example with mandatory variables not filled in
    
 
-
    family:                       # family
+
    family:
   var1: example               # A first variable
    Example with all variables modifiable
    
 
-
    family:                       # family
+
    family:
   var1: example               # A first variable
-  var2: example               # A second variable
    
\ No newline at end of file
+  var2: value                 # A second variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/20_9default_information_parent.md b/tests/results/test_examples_comment/20_9default_information_parent.md
index c8a20c833..89a1a632a 100644
--- a/tests/results/test_examples_comment/20_9default_information_parent.md
+++ b/tests/results/test_examples_comment/20_9default_information_parent.md
@@ -2,14 +2,14 @@
 
 ```yaml
 ---
-family:                       # family
+family:
   var1: example               # A first variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-family:                       # family
+family:
   var1: example               # A first variable
-  var2: example               # A second variable
+  var2: value                 # A second variable
 ```
diff --git a/tests/results/test_examples_comment/20_9default_information_parent.sh b/tests/results/test_examples_comment/20_9default_information_parent.sh
index 4e1feb6f6..e95b06ed7 100644
--- a/tests/results/test_examples_comment/20_9default_information_parent.sh
+++ b/tests/results/test_examples_comment/20_9default_information_parent.sh
@@ -1,13 +1,13 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-family:                       # family                                          
+family:                                                                         
   var1: example               # A first variable                                
 
 Example with all variables modifiable
 
 ---                                                                             
-family:                       # family                                          
+family:                                                                         
   var1: example               # A first variable                                
-  var2: example               # A second variable                               
+  var2: value                 # A second variable                               
 
diff --git a/tests/results/test_examples_comment/20_9family_absolute.adoc b/tests/results/test_examples_comment/20_9family_absolute.adoc
index 291f9f8c9..cefa0112a 100644
--- a/tests/results/test_examples_comment/20_9family_absolute.adoc
+++ b/tests/results/test_examples_comment/20_9family_absolute.adoc
@@ -6,6 +6,13 @@
 var1: example                 # First variable
 family:                       # A family
   var2: string6               # A second variable
+  subfamily:                  # A sub family
+    variable:                 # Third variable
+      - example
+family2:                      # A family
+  subfamily:                  # A sub family
+    variable:                 # Fourth variable
+      - example
 ----
 == Example with all variables modifiable
 
@@ -17,14 +24,11 @@ family:                       # A family
   var2: string6               # A second variable
   subfamily:                  # A sub family
     variable:                 # Third variable
-      - null
-      - null
+      - example
 family2:                      # A family
-  var2: example               # A variable2
+  var2: string6               # A variable2
   var3: string5
   subfamily:                  # A sub family
     variable:                 # Fourth variable
-      - null
-      - null
-      - string4
+      - example
 ----
diff --git a/tests/results/test_examples_comment/20_9family_absolute.gitlab.md b/tests/results/test_examples_comment/20_9family_absolute.gitlab.md
index 401dabddf..9464a20de 100644
--- a/tests/results/test_examples_comment/20_9family_absolute.gitlab.md
+++ b/tests/results/test_examples_comment/20_9family_absolute.gitlab.md
@@ -5,6 +5,13 @@
 var1: example                 # First variable
 family:                       # A family
   var2: string6               # A second variable
+  subfamily:                  # A sub family
+    variable:                 # Third variable
+      - example
+family2:                      # A family
+  subfamily:                  # A sub family
+    variable:                 # Fourth variable
+      - example
 ```
 
 
@@ -17,16 +24,13 @@ family:                       # A family
   var2: string6               # A second variable
   subfamily:                  # A sub family
     variable:                 # Third variable
-      - null
-      - null
+      - example
 family2:                      # A family
-  var2: example               # A variable2
+  var2: string6               # A variable2
   var3: string5
   subfamily:                  # A sub family
     variable:                 # Fourth variable
-      - null
-      - null
-      - string4
+      - example
 ```
 
 
diff --git a/tests/results/test_examples_comment/20_9family_absolute.html b/tests/results/test_examples_comment/20_9family_absolute.html
index 5f8df9466..f0a5d7726 100644
--- a/tests/results/test_examples_comment/20_9family_absolute.html
+++ b/tests/results/test_examples_comment/20_9family_absolute.html
@@ -1,21 +1,25 @@
 
    Example with mandatory variables not filled in
    
 
-
    var1: example                 # First variable
-family:                       # A family
-  var2: string6               # A second variable
    Example with all variables modifiable
    
-
 
    var1: example                 # First variable
 family:                       # A family
   var2: string6               # A second variable
   subfamily:                  # A sub family
     variable:                 # Third variable
-      - null
-      - null
+      - example
 family2:                      # A family
-  var2: example               # A variable2
+  subfamily:                  # A sub family
+    variable:                 # Fourth variable
+      - example
    Example with all variables modifiable
    
+
+
    var1: example                 # First variable
+family:                       # A family
+  var2: string6               # A second variable
+  subfamily:                  # A sub family
+    variable:                 # Third variable
+      - example
+family2:                      # A family
+  var2: string6               # A variable2
   var3: string5
   subfamily:                  # A sub family
     variable:                 # Fourth variable
-      - null
-      - null
-      - string4
    
\ No newline at end of file
+      - example
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/20_9family_absolute.md b/tests/results/test_examples_comment/20_9family_absolute.md
index 97ae7b777..9fb4ea309 100644
--- a/tests/results/test_examples_comment/20_9family_absolute.md
+++ b/tests/results/test_examples_comment/20_9family_absolute.md
@@ -5,6 +5,13 @@
 var1: example                 # First variable
 family:                       # A family
   var2: string6               # A second variable
+  subfamily:                  # A sub family
+    variable:                 # Third variable
+      - example
+family2:                      # A family
+  subfamily:                  # A sub family
+    variable:                 # Fourth variable
+      - example
 ```
 # Example with all variables modifiable
 
@@ -15,14 +22,11 @@ family:                       # A family
   var2: string6               # A second variable
   subfamily:                  # A sub family
     variable:                 # Third variable
-      - null
-      - null
+      - example
 family2:                      # A family
-  var2: example               # A variable2
+  var2: string6               # A variable2
   var3: string5
   subfamily:                  # A sub family
     variable:                 # Fourth variable
-      - null
-      - null
-      - string4
+      - example
 ```
diff --git a/tests/results/test_examples_comment/20_9family_absolute.sh b/tests/results/test_examples_comment/20_9family_absolute.sh
index 5c5b442ee..17cee35a4 100644
--- a/tests/results/test_examples_comment/20_9family_absolute.sh
+++ b/tests/results/test_examples_comment/20_9family_absolute.sh
@@ -4,6 +4,13 @@
 var1: example                 # First variable                                  
 family:                       # A family                                        
   var2: string6               # A second variable                               
+  subfamily:                  # A sub family                                    
+    variable:                 # Third variable                                  
+      - example                                                                 
+family2:                      # A family                                        
+  subfamily:                  # A sub family                                    
+    variable:                 # Fourth variable                                 
+      - example                                                                 
 
 Example with all variables modifiable
 
@@ -13,14 +20,11 @@
   var2: string6               # A second variable                               
   subfamily:                  # A sub family                                    
     variable:                 # Third variable                                  
-      - null                                                                    
-      - null                                                                    
+      - example                                                                 
 family2:                      # A family                                        
-  var2: example               # A variable2                                     
+  var2: string6               # A variable2                                     
   var3: string5                                                                 
   subfamily:                  # A sub family                                    
     variable:                 # Fourth variable                                 
-      - null                                                                    
-      - null                                                                    
-      - string4                                                                 
+      - example                                                                 
 
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.adoc b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.adoc
index e2f519ee1..e240648eb 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.adoc
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.adoc
@@ -4,7 +4,7 @@
 ----
 ---
 family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
 ----
 == Example with all variables modifiable
@@ -14,6 +14,6 @@ family:                       # Possibly hidden family
 ---
 condition: no                 # The variable use has condition
 family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
 ----
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md
index 88f7e0be2..98fab8a58 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
 ```
 
@@ -14,7 +14,7 @@ family:                       # Possibly hidden family
 ---
 condition: no                 # The variable use has condition
 family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
 ```
 
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.html b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.html
index 898783b1c..366694931 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.html
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.html
@@ -1,10 +1,10 @@
 
    Example with mandatory variables not filled in
    
 
 
    family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
    Example with all variables modifiable
    
 
 
    condition: no                 # The variable use has condition
 family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.md b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.md
index a92c17183..8c68efd72 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.md
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
 ```
 # Example with all variables modifiable
@@ -12,6 +12,6 @@ family:                       # Possibly hidden family
 ---
 condition: no                 # The variable use has condition
 family:                       # Possibly hidden family
-  subfamily:                  # subfamily
+  subfamily:
     var1: example             # A variable
 ```
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.sh b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.sh
index 86bbf6511..78068bb91 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.sh
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_sub_family.sh
@@ -2,7 +2,7 @@
 
 ---                                                                             
 family:                       # Possibly hidden family                          
-  subfamily:                  # subfamily                                       
+  subfamily:                                                                    
     var1: example             # A variable                                      
 
 Example with all variables modifiable
@@ -10,6 +10,6 @@
 ---                                                                             
 condition: no                 # The variable use has condition                  
 family:                       # Possibly hidden family                          
-  subfamily:                  # subfamily                                       
+  subfamily:                                                                    
     var1: example             # A variable                                      
 
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc
index 6e17dfb63..6eb5ca25d 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc
@@ -4,7 +4,4 @@
 ----
 ---
 condition: true               # The variable use has condition
-family:                       # Possibly hidden family
-  subfamily:                  # A subfamily
-    var1: example             # A variable
 ----
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md
index 83dca3a14..e0f277a01 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md
@@ -3,9 +3,6 @@
 ```yaml
 ---
 condition: true               # The variable use has condition
-family:                       # Possibly hidden family
-  subfamily:                  # A subfamily
-    var1: example             # A variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.html b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.html
index eaab2ce00..68f2754fa 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.html
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.html
@@ -1,6 +1,3 @@
 
    Example with all variables modifiable
    
 
-
    condition: true               # The variable use has condition
-family:                       # Possibly hidden family
-  subfamily:                  # A subfamily
-    var1: example             # A variable
    
\ No newline at end of file
+
    condition: true               # The variable use has condition
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.md b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.md
index 31284333b..131f76526 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.md
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.md
@@ -3,7 +3,4 @@
 ```yaml
 ---
 condition: true               # The variable use has condition
-family:                       # Possibly hidden family
-  subfamily:                  # A subfamily
-    var1: example             # A variable
 ```
diff --git a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.sh b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.sh
index 2e7104a34..64c0e9d56 100644
--- a/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.sh
+++ b/tests/results/test_examples_comment/24_0family_hidden_condition_variable_sub_family.sh
@@ -2,7 +2,4 @@
 
 ---                                                                             
 condition: true               # The variable use has condition                  
-family:                       # Possibly hidden family                          
-  subfamily:                  # A subfamily                                     
-    var1: example             # A variable                                      
 
diff --git a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.adoc b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.adoc
index c760ad25b..ff3988b9f 100644
--- a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.adoc
+++ b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.adoc
@@ -1,3 +1,10 @@
+== Example with mandatory variables not filled in
+
+[,yaml]
+----
+---
+var: example                  # A variable
+----
 == Example with all variables modifiable
 
 [,yaml]
diff --git a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.gitlab.md b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.gitlab.md
index 5a1cb5587..d3c7c4ede 100644
--- a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.gitlab.md
+++ b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.gitlab.md
@@ -1,3 +1,11 @@
+
    Example with mandatory variables not filled in
+
+```yaml
+---
+var: example                  # A variable
+```
+
    
+
 
    Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.html b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.html
index c0764775f..06c84b193 100644
--- a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.html
+++ b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.html
@@ -1,4 +1,6 @@
-
    Example with all variables modifiable
    
+
    Example with mandatory variables not filled in
    
+
+
    var: example                  # A variable
    Example with all variables modifiable
    
 
 
    condition: true               # A condition
 var: example                  # A variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.md b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.md
index d784d43fb..f41de8937 100644
--- a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.md
+++ b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.md
@@ -1,3 +1,9 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+var: example                  # A variable
+```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.sh b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.sh
index 23d9967fe..96f367f69 100644
--- a/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.sh
+++ b/tests/results/test_examples_comment/24_0family_mandatory_condition_variable.sh
@@ -1,3 +1,8 @@
+Example with mandatory variables not filled in
+
+---                                                                             
+var: example                  # A variable                                      
+
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.adoc b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.adoc
index f4b1c054d..142fd6fd5 100644
--- a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.adoc
+++ b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.adoc
@@ -3,7 +3,7 @@
 [,yaml]
 ----
 ---
-general1:                     # general1
+general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
@@ -14,9 +14,9 @@ general1:                     # general1
 [,yaml]
 ----
 ---
-general:                      # general
+general:
   mode_conteneur_actif: non   # No change
-general1:                     # general1
+general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
diff --git a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.gitlab.md b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.gitlab.md
index 0b0205bca..a42f1fe77 100644
--- a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.gitlab.md
+++ b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.gitlab.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-general1:                     # general1
+general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
@@ -14,9 +14,9 @@ general1:                     # general1
 
 ```yaml
 ---
-general:                      # general
+general:
   mode_conteneur_actif: non   # No change
-general1:                     # general1
+general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
diff --git a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.html b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.html
index 21f89e942..c886bd687 100644
--- a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.html
+++ b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.html
@@ -1,14 +1,14 @@
 
    Example with mandatory variables not filled in
    
 
-
    general1:                     # general1
+
    general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
       follower2: example      # Follower2
    Example with all variables modifiable
    
 
-
    general:                      # general
+
    general:
   mode_conteneur_actif: non   # No change
-general1:                     # general1
+general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
diff --git a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.md b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.md
index 583c55593..1adaab263 100644
--- a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.md
+++ b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.md
@@ -2,7 +2,7 @@
 
 ```yaml
 ---
-general1:                     # general1
+general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
@@ -12,9 +12,9 @@ general1:                     # general1
 
 ```yaml
 ---
-general:                      # general
+general:
   mode_conteneur_actif: non   # No change
-general1:                     # general1
+general1:
   leader:                     # Leader
     - leader: example         # Leader
       follower1: example      # Follower1
diff --git a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.sh b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.sh
index b12b2b11c..522f440be 100644
--- a/tests/results/test_examples_comment/40_0leadership_leader_not_multi.sh
+++ b/tests/results/test_examples_comment/40_0leadership_leader_not_multi.sh
@@ -1,7 +1,7 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-general1:                     # general1                                        
+general1:                                                                       
   leader:                     # Leader                                          
     - leader: example         # Leader                                          
       follower1: example      # Follower1                                       
@@ -10,9 +10,9 @@
 Example with all variables modifiable
 
 ---                                                                             
-general:                      # general                                         
+general:                                                                        
   mode_conteneur_actif: non   # No change                                       
-general1:                     # general1                                        
+general1:                                                                       
   leader:                     # Leader                                          
     - leader: example         # Leader                                          
       follower1: example      # Follower1                                       
diff --git a/tests/results/test_examples_comment/40_0leadership_reduce.adoc b/tests/results/test_examples_comment/40_0leadership_reduce.adoc
index d82ad2303..87b064ddd 100644
--- a/tests/results/test_examples_comment/40_0leadership_reduce.adoc
+++ b/tests/results/test_examples_comment/40_0leadership_reduce.adoc
@@ -7,5 +7,5 @@ leadership:                   # A leadership
   - leader: val1              # A leader
     follower: example         # A follower
   - leader: val2              # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 ----
diff --git a/tests/results/test_examples_comment/40_0leadership_reduce.gitlab.md b/tests/results/test_examples_comment/40_0leadership_reduce.gitlab.md
index 1c74f65a1..34a155277 100644
--- a/tests/results/test_examples_comment/40_0leadership_reduce.gitlab.md
+++ b/tests/results/test_examples_comment/40_0leadership_reduce.gitlab.md
@@ -6,7 +6,7 @@ leadership:                   # A leadership
   - leader: val1              # A leader
     follower: example         # A follower
   - leader: val2              # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 ```
 
    
 
diff --git a/tests/results/test_examples_comment/40_0leadership_reduce.html b/tests/results/test_examples_comment/40_0leadership_reduce.html
index 7ccc746c7..f1a2e52c8 100644
--- a/tests/results/test_examples_comment/40_0leadership_reduce.html
+++ b/tests/results/test_examples_comment/40_0leadership_reduce.html
@@ -4,4 +4,4 @@
   - leader: val1              # A leader
     follower: example         # A follower
   - leader: val2              # A leader
-    follower: example         # A follower
    
\ No newline at end of file
+    follower: example1        # A follower
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/40_0leadership_reduce.md b/tests/results/test_examples_comment/40_0leadership_reduce.md
index 168265c40..b5af97e7e 100644
--- a/tests/results/test_examples_comment/40_0leadership_reduce.md
+++ b/tests/results/test_examples_comment/40_0leadership_reduce.md
@@ -6,5 +6,5 @@ leadership:                   # A leadership
   - leader: val1              # A leader
     follower: example         # A follower
   - leader: val2              # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 ```
diff --git a/tests/results/test_examples_comment/40_0leadership_reduce.sh b/tests/results/test_examples_comment/40_0leadership_reduce.sh
index faf3eb4df..0deb942de 100644
--- a/tests/results/test_examples_comment/40_0leadership_reduce.sh
+++ b/tests/results/test_examples_comment/40_0leadership_reduce.sh
@@ -5,5 +5,5 @@
   - leader: val1              # A leader                                        
     follower: example         # A follower                                      
   - leader: val2              # A leader                                        
-    follower: example         # A follower                                      
+    follower: example1        # A follower                                      
 
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc
index ccbf49a01..5119f0b13 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc
@@ -3,12 +3,12 @@
 [,yaml]
 ----
 ---
-leader:                       # leader
+leader:
   - leader: a
     follower: example
   - leader: b
-    follower: example
+    follower: example1
 variable:
-  - null
-  - null
+  - example
+  - example1
 ----
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md
index f97ed2c2b..0692d389c 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md
@@ -2,14 +2,14 @@
 
 ```yaml
 ---
-leader:                       # leader
+leader:
   - leader: a
     follower: example
   - leader: b
-    follower: example
+    follower: example1
 variable:
-  - null
-  - null
+  - example
+  - example1
 ```
 
 
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html
index 3c6d4532d..f08b44639 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html
@@ -1,10 +1,10 @@
 
    Example with all variables modifiable
    
 
-
    leader:                       # leader
+
    leader:
   - leader: a
     follower: example
   - leader: b
-    follower: example
+    follower: example1
 variable:
-  - null
-  - null
    
\ No newline at end of file
+  - example
+  - example1
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md
index c592e434f..4d5c0aad6 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md
@@ -2,12 +2,12 @@
 
 ```yaml
 ---
-leader:                       # leader
+leader:
   - leader: a
     follower: example
   - leader: b
-    follower: example
+    follower: example1
 variable:
-  - null
-  - null
+  - example
+  - example1
 ```
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh
index 3af07fcd8..54a9eae22 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh
@@ -1,12 +1,12 @@
 Example with all variables modifiable
 
 ---                                                                             
-leader:                       # leader                                          
+leader:                                                                         
   - leader: a                                                                   
     follower: example                                                           
   - leader: b                                                                   
-    follower: example                                                           
+    follower: example1                                                          
 variable:                                                                       
-  - null                                                                        
-  - null                                                                        
+  - example                                                                     
+  - example1                                                                    
 
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc
index 56d866321..e133cd678 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc
@@ -7,10 +7,10 @@ leadership_1:                 # A leadership
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
-  - leader: null              # A leader
+  - leader: example           # A leader
     follower: val             # A follower
-  - leader: null              # A leader
+  - leader: example1          # A leader
     follower: val             # A follower
 ----
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md
index 29be9f0e4..da4d1a189 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md
@@ -6,11 +6,11 @@ leadership_1:                 # A leadership
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
-  - leader: null              # A leader
+  - leader: example           # A leader
     follower: val             # A follower
-  - leader: null              # A leader
+  - leader: example1          # A leader
     follower: val             # A follower
 ```
 
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.html b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.html
index 7a5109269..8d5fab4fe 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.html
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.html
@@ -4,9 +4,9 @@
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
-  - leader: null              # A leader
+  - leader: example           # A leader
     follower: val             # A follower
-  - leader: null              # A leader
+  - leader: example1          # A leader
     follower: val             # A follower
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.md b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.md
index d59a4d77b..2775e5001 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.md
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.md
@@ -6,10 +6,10 @@ leadership_1:                 # A leadership
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
-  - leader: null              # A leader
+  - leader: example           # A leader
     follower: val             # A follower
-  - leader: null              # A leader
+  - leader: example1          # A leader
     follower: val             # A follower
 ```
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.sh b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.sh
index a2d88bd76..35f559de4 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.sh
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower.sh
@@ -5,10 +5,10 @@
   - leader: value1            # A leader                                        
     follower: example         # A follower                                      
   - leader: value2            # A leader                                        
-    follower: example         # A follower                                      
+    follower: example1        # A follower                                      
 leadership_2:                 # A second leadership                             
-  - leader: null              # A leader                                        
+  - leader: example           # A leader                                        
     follower: val             # A follower                                      
-  - leader: null              # A leader                                        
+  - leader: example1          # A leader                                        
     follower: val             # A follower                                      
 
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc
index 720ccdbef..a9e7526e4 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc
@@ -7,7 +7,7 @@ leadership_1:                 # A leadership
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
   - leader: value1            # A leader
     follower:                 # A follower
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md
index 90a5bcc41..18e39a1a0 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md
@@ -6,7 +6,7 @@ leadership_1:                 # A leadership
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
   - leader: value1            # A leader
     follower:                 # A follower
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html
index 0536ab803..d075237f3 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html
@@ -4,7 +4,7 @@
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
   - leader: value1            # A leader
     follower:                 # A follower
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md
index e349caa5d..9bba25f78 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md
@@ -6,7 +6,7 @@ leadership_1:                 # A leadership
   - leader: value1            # A leader
     follower: example         # A follower
   - leader: value2            # A leader
-    follower: example         # A follower
+    follower: example1        # A follower
 leadership_2:                 # A second leadership
   - leader: value1            # A leader
     follower:                 # A follower
diff --git a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh
index c18a6e8d3..f1ded4a8b 100644
--- a/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh
+++ b/tests/results/test_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh
@@ -5,7 +5,7 @@
   - leader: value1            # A leader                                        
     follower: example         # A follower                                      
   - leader: value2            # A leader                                        
-    follower: example         # A follower                                      
+    follower: example1        # A follower                                      
 leadership_2:                 # A second leadership                             
   - leader: value1            # A leader                                        
     follower:                 # A follower                                      
diff --git a/tests/results/test_examples_comment/41_0choice_leader.adoc b/tests/results/test_examples_comment/41_0choice_leader.adoc
index 64a160bbe..eef3b9e53 100644
--- a/tests/results/test_examples_comment/41_0choice_leader.adoc
+++ b/tests/results/test_examples_comment/41_0choice_leader.adoc
@@ -5,5 +5,5 @@
 ---
 leader:                       # The leadership
   - leader: example           # The leader
-    follower1: a_choice       # A follower
+    follower1: a              # A follower
 ----
diff --git a/tests/results/test_examples_comment/41_0choice_leader.gitlab.md b/tests/results/test_examples_comment/41_0choice_leader.gitlab.md
index 8e9e13f7c..635df2d12 100644
--- a/tests/results/test_examples_comment/41_0choice_leader.gitlab.md
+++ b/tests/results/test_examples_comment/41_0choice_leader.gitlab.md
@@ -4,7 +4,7 @@
 ---
 leader:                       # The leadership
   - leader: example           # The leader
-    follower1: a_choice       # A follower
+    follower1: a              # A follower
 ```
 
 
diff --git a/tests/results/test_examples_comment/41_0choice_leader.html b/tests/results/test_examples_comment/41_0choice_leader.html
index 4b17b94d9..36117f509 100644
--- a/tests/results/test_examples_comment/41_0choice_leader.html
+++ b/tests/results/test_examples_comment/41_0choice_leader.html
@@ -2,4 +2,4 @@
 
 
    leader:                       # The leadership
   - leader: example           # The leader
-    follower1: a_choice       # A follower
    
\ No newline at end of file
+    follower1: a              # A follower
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/41_0choice_leader.md b/tests/results/test_examples_comment/41_0choice_leader.md
index bb1f91466..5779ef7a1 100644
--- a/tests/results/test_examples_comment/41_0choice_leader.md
+++ b/tests/results/test_examples_comment/41_0choice_leader.md
@@ -4,5 +4,5 @@
 ---
 leader:                       # The leadership
   - leader: example           # The leader
-    follower1: a_choice       # A follower
+    follower1: a              # A follower
 ```
diff --git a/tests/results/test_examples_comment/41_0choice_leader.sh b/tests/results/test_examples_comment/41_0choice_leader.sh
index 5196ea944..816401410 100644
--- a/tests/results/test_examples_comment/41_0choice_leader.sh
+++ b/tests/results/test_examples_comment/41_0choice_leader.sh
@@ -3,5 +3,5 @@
 ---                                                                             
 leader:                       # The leadership                                  
   - leader: example           # The leader                                      
-    follower1: a_choice       # A follower                                      
+    follower1: a              # A follower                                      
 
diff --git a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.adoc b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.adoc
index 56b2467fb..f52ca7e95 100644
--- a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.adoc
+++ b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.adoc
@@ -5,7 +5,6 @@
 ---
 leadership:                   # A leadership
   - leader: a                 # Aleader
-    follower: value           # A follower
   - leader: b                 # Aleader
     follower: value           # A follower
 ----
diff --git a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md
index d9df16e96..6e13f4bfa 100644
--- a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md
+++ b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md
@@ -4,7 +4,6 @@
 ---
 leadership:                   # A leadership
   - leader: a                 # Aleader
-    follower: value           # A follower
   - leader: b                 # Aleader
     follower: value           # A follower
 ```
diff --git a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.html b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.html
index e623c80b7..5edcd2557 100644
--- a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.html
+++ b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.html
@@ -2,6 +2,5 @@
 
 
    leadership:                   # A leadership
   - leader: a                 # Aleader
-    follower: value           # A follower
   - leader: b                 # Aleader
     follower: value           # A follower
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.md b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.md
index 092d45a65..36ad429a4 100644
--- a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.md
+++ b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.md
@@ -4,7 +4,6 @@
 ---
 leadership:                   # A leadership
   - leader: a                 # Aleader
-    follower: value           # A follower
   - leader: b                 # Aleader
     follower: value           # A follower
 ```
diff --git a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.sh b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.sh
index cf1036290..30be77444 100644
--- a/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.sh
+++ b/tests/results/test_examples_comment/44_4disabled_calcultion_follower_index.sh
@@ -3,7 +3,6 @@
 ---                                                                             
 leadership:                   # A leadership                                    
   - leader: a                 # Aleader                                         
-    follower: value           # A follower                                      
   - leader: b                 # Aleader                                         
     follower: value           # A follower                                      
 
diff --git a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.adoc b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.adoc
index cfe5ad23a..4b60af660 100644
--- a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.adoc
+++ b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.adoc
@@ -4,7 +4,4 @@
 ----
 ---
 condition: no                 # A condition
-leader:                       # A leadership
-  - leader: example           # A leader
-    follower: example         # A follower
 ----
diff --git a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md
index 692986dd6..112061a3a 100644
--- a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md
+++ b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md
@@ -3,9 +3,6 @@
 ```yaml
 ---
 condition: no                 # A condition
-leader:                       # A leadership
-  - leader: example           # A leader
-    follower: example         # A follower
 ```
 
 
diff --git a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.html b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.html
index cf193fa88..9adb71ec6 100644
--- a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.html
+++ b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.html
@@ -1,6 +1,3 @@
 
    Example with all variables modifiable
    
 
-
    condition: no                 # A condition
-leader:                       # A leadership
-  - leader: example           # A leader
-    follower: example         # A follower
    
\ No newline at end of file
+
    condition: no                 # A condition
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.md b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.md
index 5771295b6..6b458c6cf 100644
--- a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.md
+++ b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.md
@@ -3,7 +3,4 @@
 ```yaml
 ---
 condition: no                 # A condition
-leader:                       # A leadership
-  - leader: example           # A leader
-    follower: example         # A follower
 ```
diff --git a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.sh b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.sh
index 0321ed8e2..3e23f996b 100644
--- a/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.sh
+++ b/tests/results/test_examples_comment/44_5leadership_leader_hidden_calculation.sh
@@ -2,7 +2,4 @@
 
 ---                                                                             
 condition: no                 # A condition                                     
-leader:                       # A leadership                                    
-  - leader: example           # A leader                                        
-    follower: example         # A follower                                      
 
diff --git a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.adoc b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.adoc
index d40d3b17a..6953e96c6 100644
--- a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.adoc
+++ b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.adoc
@@ -5,7 +5,6 @@
 ---
 leader:                       # A leadership
   - leader: example           # A leader
-    follower: example         # A follower
 ----
 == Example with all variables modifiable
 
@@ -15,5 +14,4 @@ leader:                       # A leadership
 condition: yes                # A condition
 leader:                       # A leadership
   - leader: example           # A leader
-    follower: example         # A follower
 ----
diff --git a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md
index 67c04a46f..c28c9a3fd 100644
--- a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md
+++ b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md
@@ -4,7 +4,6 @@
 ---
 leader:                       # A leadership
   - leader: example           # A leader
-    follower: example         # A follower
 ```
 
 
@@ -15,7 +14,6 @@ leader:                       # A leadership
 condition: yes                # A condition
 leader:                       # A leadership
   - leader: example           # A leader
-    follower: example         # A follower
 ```
 
 
diff --git a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.html b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.html
index 6a996356f..b7c0a70a5 100644
--- a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.html
+++ b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.html
@@ -1,10 +1,8 @@
 
    Example with mandatory variables not filled in
    
 
 
    leader:                       # A leadership
-  - leader: example           # A leader
-    follower: example         # A follower
    Example with all variables modifiable
    
+  - leader: example           # A leader

    Example with all variables modifiable

    condition: yes                # A condition
 leader:                       # A leadership
-  - leader: example           # A leader
-    follower: example         # A follower
    \ No newline at end of file + - leader: example # A leader \ No newline at end of file diff --git a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.md b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.md index 0fce32821..626d3c673 100644 --- a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.md +++ b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.md @@ -4,7 +4,6 @@ --- leader: # A leadership - leader: example # A leader - follower: example # A follower ``` # Example with all variables modifiable @@ -13,5 +12,4 @@ leader: # A leadership condition: yes # A condition leader: # A leadership - leader: example # A leader - follower: example # A follower ``` diff --git a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.sh b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.sh index b8d890bd9..f5b0af042 100644 --- a/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.sh +++ b/tests/results/test_examples_comment/44_6leadership_follower_disabled_calculation.sh @@ -3,7 +3,6 @@ ---  leader: # A leadership   - leader: example # A leader  - follower: example # A follower  Example with all variables modifiable @@ -11,5 +10,4 @@ condition: yes # A condition  leader: # A leadership   - leader: example # A leader  - follower: example # A follower  diff --git a/tests/results/test_examples_comment/60_0family_dynamic_test.adoc b/tests/results/test_examples_comment/60_0family_dynamic_test.adoc index 95a3a2975..627048c0c 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_test.adoc +++ b/tests/results/test_examples_comment/60_0family_dynamic_test.adoc @@ -3,9 +3,6 @@ [,yaml] ---- --- -var: # A suffix variable - - val1 - - val2 dynval1: # A dynamic family var: example # A dynamic variable dynval2: # A dynamic family diff --git a/tests/results/test_examples_comment/60_0family_dynamic_test.gitlab.md b/tests/results/test_examples_comment/60_0family_dynamic_test.gitlab.md index f2f6bef21..7956a60f9 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_test.gitlab.md +++ b/tests/results/test_examples_comment/60_0family_dynamic_test.gitlab.md @@ -2,9 +2,6 @@ ```yaml --- -var: # A suffix variable - - val1 - - val2 dynval1: # A dynamic family var: example # A dynamic variable dynval2: # A dynamic family diff --git a/tests/results/test_examples_comment/60_0family_dynamic_test.html b/tests/results/test_examples_comment/60_0family_dynamic_test.html index e7589f34d..918d7a06f 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_test.html +++ b/tests/results/test_examples_comment/60_0family_dynamic_test.html @@ -1,9 +1,6 @@

    Example with mandatory variables not filled in

    -
    var:                          # A suffix variable
-  - val1
-  - val2
-dynval1:                      # A dynamic family
+
    dynval1:                      # A dynamic family
   var: example                # A dynamic variable
 dynval2:                      # A dynamic family
   var: example                # A dynamic variable
    Example with all variables modifiable
    
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_test.md b/tests/results/test_examples_comment/60_0family_dynamic_test.md
index 94815bd51..b51bafb35 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_test.md
+++ b/tests/results/test_examples_comment/60_0family_dynamic_test.md
@@ -2,9 +2,6 @@
 
 ```yaml
 ---
-var:                          # A suffix variable
-  - val1
-  - val2
 dynval1:                      # A dynamic family
   var: example                # A dynamic variable
 dynval2:                      # A dynamic family
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_test.sh b/tests/results/test_examples_comment/60_0family_dynamic_test.sh
index 6895269a1..8e2ecc23d 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_test.sh
+++ b/tests/results/test_examples_comment/60_0family_dynamic_test.sh
@@ -1,9 +1,6 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-var:                          # A suffix variable                               
-  - val1                                                                        
-  - val2                                                                        
 dynval1:                      # A dynamic family                                
   var: example                # A dynamic variable                              
 dynval2:                      # A dynamic family                                
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.adoc b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.adoc
index d7addc9ab..361f55be6 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.adoc
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.adoc
@@ -1,11 +1,3 @@
-== Example with mandatory variables not filled in
-
-[,yaml]
-----
----
-var:                          # A suffix variable
-  - example
-----
 == Example with all variables modifiable
 
 [,yaml]
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.gitlab.md b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.gitlab.md
index 1bba2c188..e4a407eea 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.gitlab.md
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.gitlab.md
@@ -1,12 +1,3 @@
-
    Example with mandatory variables not filled in
-
-```yaml
----
-var:                          # A suffix variable
-  - example
-```
-
    
-
 
    Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.html b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.html
index 605ae8ca9..c5395dcf0 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.html
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.html
@@ -1,7 +1,4 @@
-
    Example with mandatory variables not filled in
    
-
-
    var:                          # A suffix variable
-  - example
    Example with all variables modifiable
    
+
    Example with all variables modifiable
    
 
 
    var:                          # A suffix variable
   - example
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.md b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.md
index 896ec7e51..75f08df3f 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.md
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.md
@@ -1,10 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-var:                          # A suffix variable
-  - example
-```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.sh b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.sh
index 594e6ef6d..68ba09089 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.sh
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_empty.sh
@@ -1,9 +1,3 @@
-Example with mandatory variables not filled in
-
----                                                                             
-var:                          # A suffix variable                               
-  - example                                                                     
-
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.adoc b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.adoc
index 4e47269eb..f6c710e41 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.adoc
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.adoc
@@ -7,7 +7,7 @@ var:                          # A suffix variable
   - val1
   - val2
 dynval1:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
+  var: a value                # A dynamic variable with suffix val1
 dynval2:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
+  var: a value                # A dynamic variable with suffix val2
 ----
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md
index 777ffc52d..e2ae57f4d 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md
@@ -6,9 +6,9 @@ var:                          # A suffix variable
   - val1
   - val2
 dynval1:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
+  var: a value                # A dynamic variable with suffix val1
 dynval2:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
+  var: a value                # A dynamic variable with suffix val2
 ```
 
    
 
diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.html b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.html
index 4b8147f2b..8d4d1b30a 100644
--- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.html
+++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.html
@@ -4,6 +4,6 @@
   - val1
   - val2
 dynval1:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
+  var: a value                # A dynamic variable with suffix val1
 dynval2:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
    \ No newline at end of file + var: a value # A dynamic variable with suffix val2 \ No newline at end of file diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.md b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.md index bdc035ff7..6185a1937 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.md +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.md @@ -6,7 +6,7 @@ var: # A suffix variable - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ``` diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.sh b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.sh index 13e8d55c0..96f4061ee 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.sh +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix.sh @@ -5,7 +5,7 @@  - val1   - val2  dynval1: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val1  dynval2: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val2  diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc index 1e29784ce..f6c710e41 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc @@ -1,12 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -var: # A suffix variable - - val1 - - val2 ----- == Example with all variables modifiable [,yaml] @@ -16,7 +7,7 @@ var: # A suffix variable - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ---- diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md index 34d12c60c..e2ae57f4d 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md @@ -1,13 +1,3 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -var: # A suffix variable - - val1 - - val2 -``` -
    -
    Example with all variables modifiable ```yaml @@ -16,9 +6,9 @@ var: # A suffix variable - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ```
    diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.html b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.html index 9ab1702a0..8d4d1b30a 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.html +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.html @@ -1,13 +1,9 @@ -

    Example with mandatory variables not filled in

    - -
    var:                          # A suffix variable
-  - val1
-  - val2

    Example with all variables modifiable

    +

    Example with all variables modifiable

    var:                          # A suffix variable
   - val1
   - val2
 dynval1:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
+  var: a value                # A dynamic variable with suffix val1
 dynval2:                      # A dynamic family
-  var: a value                # A dynamic variable with suffix {{ identifier }}
    \ No newline at end of file + var: a value # A dynamic variable with suffix val2 \ No newline at end of file diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.md b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.md index 066e9abe1..6185a1937 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.md +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.md @@ -1,11 +1,3 @@ -# Example with mandatory variables not filled in - -```yaml ---- -var: # A suffix variable - - val1 - - val2 -``` # Example with all variables modifiable ```yaml @@ -14,7 +6,7 @@ var: # A suffix variable - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ``` diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.sh b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.sh index 31e2b259f..96f4061ee 100644 --- a/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.sh +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable_suffix_empty.sh @@ -1,10 +1,3 @@ -Example with mandatory variables not filled in - ----  -var: # A suffix variable  - - val1  - - val2  - Example with all variables modifiable ---  @@ -12,7 +5,7 @@  - val1   - val2  dynval1: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val1  dynval2: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val2  diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.adoc index 91d0772bb..9bcbfa4a2 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.adoc +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.adoc @@ -3,10 +3,10 @@ [,yaml] ---- --- -dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} -dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} +dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 +dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable ---- == Example with all variables modifiable @@ -14,12 +14,12 @@ var1: example # A new variable [,yaml] ---- --- -dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} -dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} +dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 +dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable var2: # A new variable - - null - - null + - example + - example ---- diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.gitlab.md index 67df28dd7..8f86eced4 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.gitlab.md +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.gitlab.md @@ -2,10 +2,10 @@ ```yaml --- -dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} -dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} +dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 +dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable ``` @@ -14,14 +14,14 @@ var1: example # A new variable ```yaml --- -dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} -dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} +dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 +dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable var2: # A new variable - - null - - null + - example + - example ``` diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.html index 3e56ae269..f623f25d5 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.html +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.html @@ -1,16 +1,16 @@

    Example with mandatory variables not filled in

    -
    dynval1:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
-dynval2:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
+
    dynval1:                      # A dynamic famify for val1
+  var: example                # A dynamic variable for val1
+dynval2:                      # A dynamic famify for val2
+  var: example                # A dynamic variable for val2
 var1: example                 # A new variable
    Example with all variables modifiable
    
 
-
    dynval1:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
-dynval2:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
+
    dynval1:                      # A dynamic famify for val1
+  var: example                # A dynamic variable for val1
+dynval2:                      # A dynamic famify for val2
+  var: example                # A dynamic variable for val2
 var1: example                 # A new variable
 var2:                         # A new variable
-  - null
-  - null
    
\ No newline at end of file
+  - example
+  - example
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.md
index 62cd15110..e5bd0e880 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.md
@@ -2,22 +2,22 @@
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
-dynval2:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
+  var: example                # A dynamic variable for val1
+dynval2:                      # A dynamic famify for val2
+  var: example                # A dynamic variable for val2
 var1: example                 # A new variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
-dynval2:                      # A dynamic famify for {{ identifier }}
-  var: example                # A dynamic variable for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
+  var: example                # A dynamic variable for val1
+dynval2:                      # A dynamic famify for val2
+  var: example                # A dynamic variable for val2
 var1: example                 # A new variable
 var2:                         # A new variable
-  - null
-  - null
+  - example
+  - example
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.sh
index cde353732..e0f93ada2 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_description.sh
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_description.sh
@@ -1,21 +1,21 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-dynval1:                      # A dynamic famify for {{ identifier }}           
-  var: example                # A dynamic variable for {{ identifier }}         
-dynval2:                      # A dynamic famify for {{ identifier }}           
-  var: example                # A dynamic variable for {{ identifier }}         
+dynval1:                      # A dynamic famify for val1                       
+  var: example                # A dynamic variable for val1                     
+dynval2:                      # A dynamic famify for val2                       
+  var: example                # A dynamic variable for val2                     
 var1: example                 # A new variable                                  
 
 Example with all variables modifiable
 
 ---                                                                             
-dynval1:                      # A dynamic famify for {{ identifier }}           
-  var: example                # A dynamic variable for {{ identifier }}         
-dynval2:                      # A dynamic famify for {{ identifier }}           
-  var: example                # A dynamic variable for {{ identifier }}         
+dynval1:                      # A dynamic famify for val1                       
+  var: example                # A dynamic variable for val1                     
+dynval2:                      # A dynamic famify for val2                       
+  var: example                # A dynamic variable for val2                     
 var1: example                 # A new variable                                  
 var2:                         # A new variable                                  
-  - null                                                                        
-  - null                                                                        
+  - example                                                                     
+  - example                                                                     
 
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.adoc
index 554e7abfd..234a22d9d 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.adoc
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.adoc
@@ -7,9 +7,9 @@ var1:                         # A suffix variable
   - val1
   - val2
 var2: val1                    # A suffix variable2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: val1                   # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: val2                   # A dynamic variable
 var3: val1                    # A variable calculated
 ----
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md
index b1516f75b..1408c6d50 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md
@@ -6,9 +6,9 @@ var1:                         # A suffix variable
   - val1
   - val2
 var2: val1                    # A suffix variable2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: val1                   # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: val2                   # A dynamic variable
 var3: val1                    # A variable calculated
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.html
index f9d65ac22..3bd8ff2ed 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.html
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.html
@@ -4,8 +4,8 @@
   - val1
   - val2
 var2: val1                    # A suffix variable2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: val1                   # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: val2                   # A dynamic variable
 var3: val1                    # A variable calculated
    \ No newline at end of file diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.md index 9454ba80a..0107207c1 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.md +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.md @@ -6,9 +6,9 @@ var1: # A suffix variable - val1 - val2 var2: val1 # A suffix variable2 -dynval1: # dyn{{ identifier }} +dynval1: var: val1 # A dynamic variable -dynval2: # dyn{{ identifier }} +dynval2: var: val2 # A dynamic variable var3: val1 # A variable calculated ``` diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.sh index 9c99bf1cd..d23b4a296 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.sh +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier.sh @@ -5,9 +5,9 @@  - val1   - val2  var2: val1 # A suffix variable2  -dynval1: # dyn{{ identifier }}  +dynval1:   var: val1 # A dynamic variable  -dynval2: # dyn{{ identifier }}  +dynval2:   var: val2 # A dynamic variable  var3: val1 # A variable calculated  diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc index 0010a7edd..13d5dccaf 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc @@ -7,10 +7,10 @@ var1: # A suffix variable - val1 - val2 var2: val1 # A suffix variable2 -dynval1: # dyn{{ identifier }} +dynval1: var: # A dynamic variable - val1 -dynval2: # dyn{{ identifier }} +dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md index 418a836a2..eb5ac5df4 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md @@ -6,10 +6,10 @@ var1: # A suffix variable - val1 - val2 var2: val1 # A suffix variable2 -dynval1: # dyn{{ identifier }} +dynval1: var: # A dynamic variable - val1 -dynval2: # dyn{{ identifier }} +dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.html index 02c6af8ff..fbee28229 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.html +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.html @@ -4,10 +4,10 @@ - val1 - val2 var2: val1 # A suffix variable2 -dynval1: # dyn{{ identifier }} +dynval1: var: # A dynamic variable - val1 -dynval2: # dyn{{ identifier }} +dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.md index 43dcf4472..604e6eacd 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.md +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.md @@ -6,10 +6,10 @@ var1: # A suffix variable - val1 - val2 var2: val1 # A suffix variable2 -dynval1: # dyn{{ identifier }} +dynval1: var: # A dynamic variable - val1 -dynval2: # dyn{{ identifier }} +dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.sh index 0b6d22ab9..a5b9cf315 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.sh +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_identifier_multi.sh @@ -5,10 +5,10 @@  - val1   - val2  var2: val1 # A suffix variable2  -dynval1: # dyn{{ identifier }}  +dynval1:   var: # A dynamic variable   - val1  -dynval2: # dyn{{ identifier }}  +dynval2:   var: # A dynamic variable   - val2  var3: # A variable calculated  diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc index bdfb33809..33db81c3d 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc @@ -3,7 +3,7 @@ [,yaml] ---- --- -dynval2: # dyn{{ identifier }} +dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -11,6 +11,6 @@ dynval2: # dyn{{ identifier }} [,yaml] ---- --- -dynval2: # dyn{{ identifier }} +dynval2: var: example # A dynamic variable ---- diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md index 14274ab89..d97414654 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -dynval2: # dyn{{ identifier }} +dynval2: var: example # A dynamic variable ``` @@ -11,7 +11,7 @@ dynval2: # dyn{{ identifier }} ```yaml --- -dynval2: # dyn{{ identifier }} +dynval2: var: example # A dynamic variable ``` diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.html index 5a0aace28..28dd3c918 100644 --- a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.html +++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.html @@ -1,7 +1,7 @@

    Example with mandatory variables not filled in

    -
    dynval2:                      # dyn{{ identifier }}
+
    dynval2:
   var: example                # A dynamic variable
    Example with all variables modifiable
    
 
-
    dynval2:                      # dyn{{ identifier }}
+
    dynval2:
   var: example                # A dynamic variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.md
index 900db45f5..ce2ad2bd2 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.md
@@ -2,13 +2,13 @@
 
 ```yaml
 ---
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh
index f31f2bce0..1285d436b 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh
@@ -1,12 +1,12 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-dynval2:                      # dyn{{ identifier }}                             
+dynval2:                                                                        
   var: example                # A dynamic variable                              
 
 Example with all variables modifiable
 
 ---                                                                             
-dynval2:                      # dyn{{ identifier }}                             
+dynval2:                                                                        
   var: example                # A dynamic variable                              
 
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.adoc
index 2451df6fc..b149c3424 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.adoc
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.adoc
@@ -3,9 +3,9 @@
 [,yaml]
 ----
 ---
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ----
 == Example with all variables modifiable
@@ -16,9 +16,9 @@ dynval2:                      # dyn{{ identifier }}
 var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
 ----
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.gitlab.md
index 2982fa984..3396441fe 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.gitlab.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.gitlab.md
@@ -2,9 +2,9 @@
 
 ```yaml
 ---
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ```
 
@@ -16,9 +16,9 @@ dynval2:                      # dyn{{ identifier }}
 var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.html
index d2e90eac2..d34ec2549 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.html
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.html
@@ -1,15 +1,15 @@
 
    Example with mandatory variables not filled in
    
 
-
    dynval1:                      # dyn{{ identifier }}
+
    dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
    Example with all variables modifiable
    
 
 
    var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.md
index f7fc3ccb9..6bb733bd0 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.md
@@ -2,9 +2,9 @@
 
 ```yaml
 ---
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ```
 # Example with all variables modifiable
@@ -14,9 +14,9 @@ dynval2:                      # dyn{{ identifier }}
 var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.sh
index 05970f8fa..e1380a9e2 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.sh
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable.sh
@@ -1,9 +1,9 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-dynval1:                      # dyn{{ identifier }}                             
+dynval1:                                                                        
   var: example                # A dynamic variable                              
-dynval2:                      # dyn{{ identifier }}                             
+dynval2:                                                                        
   var: example                # A dynamic variable                              
 
 Example with all variables modifiable
@@ -12,9 +12,9 @@
 var1:                         # A suffix variable                               
   - val1                                                                        
   - val2                                                                        
-dynval1:                      # dyn{{ identifier }}                             
+dynval1:                                                                        
   var: example                # A dynamic variable                              
-dynval2:                      # dyn{{ identifier }}                             
+dynval2:                                                                        
   var: example                # A dynamic variable                              
 var2: example                 # A variable calculated                           
 
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc
index 127480d07..cbfe4263d 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc
@@ -3,10 +3,10 @@
 [,yaml]
 ----
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
 ----
@@ -15,10 +15,10 @@ dynval2:                      # A dynamic famify for {{ identifier }}
 [,yaml]
 ----
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
 ----
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md
index 5bc4745cb..9f3169b0f 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md
@@ -2,10 +2,10 @@
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
 ```
@@ -15,10 +15,10 @@ dynval2:                      # A dynamic famify for {{ identifier }}
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.html
index e6753afef..eeb81dd1c 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.html
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.html
@@ -1,15 +1,15 @@
 
    Example with mandatory variables not filled in
    
 
-
    dynval1:                      # A dynamic famify for {{ identifier }}
+
    dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
    Example with all variables modifiable
    
 
-
    dynval1:                      # A dynamic famify for {{ identifier }}
+
    dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.md
index f44acde6a..06186113d 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.md
@@ -2,10 +2,10 @@
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
 ```
@@ -13,10 +13,10 @@ dynval2:                      # A dynamic famify for {{ identifier }}
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
   var2: example               # A new variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
   var2: example               # A new variable
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.sh
index 79f7b86c4..43bf243fd 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.sh
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled.sh
@@ -1,20 +1,20 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-dynval1:                      # A dynamic famify for {{ identifier }}           
+dynval1:                      # A dynamic famify for val1                       
   var1: example               # A dynamic variable                              
   var2: example               # A new variable                                  
-dynval2:                      # A dynamic famify for {{ identifier }}           
+dynval2:                      # A dynamic famify for val2                       
   var1: example               # A dynamic variable                              
   var2: example               # A new variable                                  
 
 Example with all variables modifiable
 
 ---                                                                             
-dynval1:                      # A dynamic famify for {{ identifier }}           
+dynval1:                      # A dynamic famify for val1                       
   var1: example               # A dynamic variable                              
   var2: example               # A new variable                                  
-dynval2:                      # A dynamic famify for {{ identifier }}           
+dynval2:                      # A dynamic famify for val2                       
   var1: example               # A dynamic variable                              
   var2: example               # A new variable                                  
 
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc
index 6cc486a6b..00edd409b 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc
@@ -3,9 +3,9 @@
 [,yaml]
 ----
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
 ----
@@ -14,9 +14,9 @@ var2: example                 # A new variable
 [,yaml]
 ----
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
 ----
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md
index aa6e4e8d8..f8a109793 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md
@@ -2,9 +2,9 @@
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
 ```
@@ -14,9 +14,9 @@ var2: example                 # A new variable
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html
index e635ea3dc..f2237f7fc 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html
@@ -1,13 +1,13 @@
 
    Example with mandatory variables not filled in
    
 
-
    dynval1:                      # A dynamic famify for {{ identifier }}
+
    dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
    Example with all variables modifiable
    
 
-
    dynval1:                      # A dynamic famify for {{ identifier }}
+
    dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md
index 097ad8c3d..376b7d72a 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md
@@ -2,9 +2,9 @@
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
 ```
@@ -12,9 +12,9 @@ var2: example                 # A new variable
 
 ```yaml
 ---
-dynval1:                      # A dynamic famify for {{ identifier }}
+dynval1:                      # A dynamic famify for val1
   var1: example               # A dynamic variable
-dynval2:                      # A dynamic famify for {{ identifier }}
+dynval2:                      # A dynamic famify for val2
   var1: example               # A dynamic variable
 var2: example                 # A new variable
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh
index bddc63e1e..059e5ee90 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh
@@ -1,18 +1,18 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-dynval1:                      # A dynamic famify for {{ identifier }}           
+dynval1:                      # A dynamic famify for val1                       
   var1: example               # A dynamic variable                              
-dynval2:                      # A dynamic famify for {{ identifier }}           
+dynval2:                      # A dynamic famify for val2                       
   var1: example               # A dynamic variable                              
 var2: example                 # A new variable                                  
 
 Example with all variables modifiable
 
 ---                                                                             
-dynval1:                      # A dynamic famify for {{ identifier }}           
+dynval1:                      # A dynamic famify for val1                       
   var1: example               # A dynamic variable                              
-dynval2:                      # A dynamic famify for {{ identifier }}           
+dynval2:                      # A dynamic famify for val2                       
   var1: example               # A dynamic variable                              
 var2: example                 # A new variable                                  
 
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.adoc b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.adoc
index 2451df6fc..b149c3424 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.adoc
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.adoc
@@ -3,9 +3,9 @@
 [,yaml]
 ----
 ---
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ----
 == Example with all variables modifiable
@@ -16,9 +16,9 @@ dynval2:                      # dyn{{ identifier }}
 var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
 ----
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md
index 2982fa984..3396441fe 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md
@@ -2,9 +2,9 @@
 
 ```yaml
 ---
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ```
 
@@ -16,9 +16,9 @@ dynval2:                      # dyn{{ identifier }}
 var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.html b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.html
index d2e90eac2..d34ec2549 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.html
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.html
@@ -1,15 +1,15 @@
 
    Example with mandatory variables not filled in
    
 
-
    dynval1:                      # dyn{{ identifier }}
+
    dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
    Example with all variables modifiable
    
 
 
    var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.md b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.md
index f7fc3ccb9..6bb733bd0 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.md
@@ -2,9 +2,9 @@
 
 ```yaml
 ---
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 ```
 # Example with all variables modifiable
@@ -14,9 +14,9 @@ dynval2:                      # dyn{{ identifier }}
 var1:                         # A suffix variable
   - val1
   - val2
-dynval1:                      # dyn{{ identifier }}
+dynval1:
   var: example                # A dynamic variable
-dynval2:                      # dyn{{ identifier }}
+dynval2:
   var: example                # A dynamic variable
 var2: example                 # A variable calculated
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.sh b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.sh
index 05970f8fa..e1380a9e2 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.sh
+++ b/tests/results/test_examples_comment/60_5family_dynamic_calc_variable_empty.sh
@@ -1,9 +1,9 @@
 Example with mandatory variables not filled in
 
 ---                                                                             
-dynval1:                      # dyn{{ identifier }}                             
+dynval1:                                                                        
   var: example                # A dynamic variable                              
-dynval2:                      # dyn{{ identifier }}                             
+dynval2:                                                                        
   var: example                # A dynamic variable                              
 
 Example with all variables modifiable
@@ -12,9 +12,9 @@
 var1:                         # A suffix variable                               
   - val1                                                                        
   - val2                                                                        
-dynval1:                      # dyn{{ identifier }}                             
+dynval1:                                                                        
   var: example                # A dynamic variable                              
-dynval2:                      # dyn{{ identifier }}                             
+dynval2:                                                                        
   var: example                # A dynamic variable                              
 var2: example                 # A variable calculated                           
 
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.adoc b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.adoc
index 70c2cc8f6..e3020bd93 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.adoc
+++ b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.adoc
@@ -7,8 +7,4 @@ dynval1:                      # A dynamic family
   var: example                # A variable
   family:                     # A family
     var: example              # A new variable
-dynval2:                      # A dynamic family
-  var: example                # A variable
-  family:                     # A family
-    var: example              # A new variable
 ----
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md
index e895f6a79..e72ebc7dc 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md
@@ -6,10 +6,6 @@ dynval1:                      # A dynamic family
   var: example                # A variable
   family:                     # A family
     var: example              # A new variable
-dynval2:                      # A dynamic family
-  var: example                # A variable
-  family:                     # A family
-    var: example              # A new variable
 ```
 
 
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.html b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.html
index 722551235..0c6e16d1a 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.html
+++ b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.html
@@ -1,10 +1,6 @@
 
    Example with all variables modifiable
    
 
 
    dynval1:                      # A dynamic family
-  var: example                # A variable
-  family:                     # A family
-    var: example              # A new variable
-dynval2:                      # A dynamic family
   var: example                # A variable
   family:                     # A family
     var: example              # A new variable
    
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.md b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.md
index 6b32eff6f..69e21cd01 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.md
+++ b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.md
@@ -6,8 +6,4 @@ dynval1:                      # A dynamic family
   var: example                # A variable
   family:                     # A family
     var: example              # A new variable
-dynval2:                      # A dynamic family
-  var: example                # A variable
-  family:                     # A family
-    var: example              # A new variable
 ```
diff --git a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.sh b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.sh
index 6d2df6d89..92f2448a5 100644
--- a/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.sh
+++ b/tests/results/test_examples_comment/60_5family_dynamic_hidden_suffix.sh
@@ -5,8 +5,4 @@
   var: example                # A variable                                      
   family:                     # A family                                        
     var: example              # A new variable                                  
-dynval2:                      # A dynamic family                                
-  var: example                # A variable                                      
-  family:                     # A family                                        
-    var: example              # A new variable                                  
 
diff --git a/tests/results/test_examples_comment/warnings_04_5validators_warnings b/tests/results/test_examples_comment/warnings_04_5validators_warnings
index 0637a088a..375f58427 100644
--- a/tests/results/test_examples_comment/warnings_04_5validators_warnings
+++ b/tests/results/test_examples_comment/warnings_04_5validators_warnings
@@ -1 +1 @@
-[]
\ No newline at end of file
+["attention, \"1000\" could be an invalid integer for \"An integer\", value is too high"]
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/warnings_16_2family_redefine_calculation b/tests/results/test_examples_comment/warnings_16_2family_redefine_calculation
index 3f9eeed42..df74ea6b7 100644
--- a/tests/results/test_examples_comment/warnings_16_2family_redefine_calculation
+++ b/tests/results/test_examples_comment/warnings_16_2family_redefine_calculation
@@ -1 +1 @@
-["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""]
\ No newline at end of file
+["\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/warnings_16_3family_empty_at_ends b/tests/results/test_examples_comment/warnings_16_3family_empty_at_ends
index 24f1e340f..1f3058183 100644
--- a/tests/results/test_examples_comment/warnings_16_3family_empty_at_ends
+++ b/tests/results/test_examples_comment/warnings_16_3family_empty_at_ends
@@ -1 +1 @@
-["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/warnings_20_2family_looks_like_dynamic b/tests/results/test_examples_comment/warnings_20_2family_looks_like_dynamic
index e707364ec..8a0a73d67 100644
--- a/tests/results/test_examples_comment/warnings_20_2family_looks_like_dynamic
+++ b/tests/results/test_examples_comment/warnings_20_2family_looks_like_dynamic
@@ -1 +1 @@
-["No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/warnings_20_2family_looks_like_variable b/tests/results/test_examples_comment/warnings_20_2family_looks_like_variable
index bac0697e5..4c3a70745 100644
--- a/tests/results/test_examples_comment/warnings_20_2family_looks_like_variable
+++ b/tests/results/test_examples_comment/warnings_20_2family_looks_like_variable
@@ -1 +1 @@
-["No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory
index cf9783a34..02c23d08a 100644
--- a/tests/results/test_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory
+++ b/tests/results/test_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory
@@ -1 +1 @@
-["No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_examples_comment/warnings_60_0family_dynamic_forbidden_char b/tests/results/test_examples_comment/warnings_60_0family_dynamic_forbidden_char
index 7d2eda8c3..2ea96ed2b 100644
--- a/tests/results/test_examples_comment/warnings_60_0family_dynamic_forbidden_char
+++ b/tests/results/test_examples_comment/warnings_60_0family_dynamic_forbidden_char
@@ -1 +1 @@
-["\"default\" is a calculation for dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""]
\ No newline at end of file
+["\"default\" is a calculation for dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/00_0version_underscore.json b/tests/results/test_namespace/00_0version_underscore.json
index d7ad5f812..62c3d0eb4 100644
--- a/tests/results/test_namespace/00_0version_underscore.json
+++ b/tests/results/test_namespace/00_0version_underscore.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "version": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.version",
-        "names": [
-          "version"
-        ],
+        "name": "version",
         "description": "A variable.",
         "properties": [
           {
@@ -31,10 +25,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_1empty_variable.json b/tests/results/test_namespace/00_1empty_variable.json
index c00fb8867..3bd256332 100644
--- a/tests/results/test_namespace/00_1empty_variable.json
+++ b/tests/results/test_namespace/00_1empty_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "empty": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.empty",
-        "names": [
-          "empty"
-        ],
+        "name": "empty",
         "properties": [
           {
             "type": "property",
@@ -30,10 +24,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_2default_calculated.json b/tests/results/test_namespace/00_2default_calculated.json
index 0bd0ba0eb..3b71d27d1 100644
--- a/tests/results/test_namespace/00_2default_calculated.json
+++ b/tests/results/test_namespace/00_2default_calculated.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "the value of var1"
-          }
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -69,13 +51,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "no"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "the value of var1"
+          }
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/00_2default_calculated_multi.json b/tests/results/test_namespace/00_2default_calculated_multi.json
index 10b51bc9a..f98e8f094 100644
--- a/tests/results/test_namespace/00_2default_calculated_multi.json
+++ b/tests/results/test_namespace/00_2default_calculated_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "no",
-            "yes",
-            "maybe"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -45,35 +31,21 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "no",
             "yes",
             "maybe"
           ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "the value of \"{0}\"",
-            "variables": [
-              {
-                "path": "rougail.var1",
-                "description": "a first variable"
-              }
-            ]
-          }
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -90,15 +62,21 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "no",
-            "yes",
-            "maybe"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "the value of \"{0}\"",
+            "variables": [
+              {
+                "path": "rougail.var1",
+                "description": "a first variable"
+              }
+            ]
+          }
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 6b676237e..9ec17ce44 100644
--- a/tests/results/test_namespace/00_2default_calculated_params_permissive.json
+++ b/tests/results/test_namespace/00_2default_calculated_params_permissive.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "a_value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_2default_calculated_variable.json b/tests/results/test_namespace/00_2default_calculated_variable.json
index 451dce52f..362367e24 100644
--- a/tests/results/test_namespace/00_2default_calculated_variable.json
+++ b/tests/results/test_namespace/00_2default_calculated_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "domainname",
-        "validators": {
-          "name": "Validators",
-          "values": [
-            "type domainname",
-            "the domain name can be an IP"
-          ]
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -44,15 +31,36 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example.net"
+        "type": "variable",
+        "variable_type": "domainname",
+        "validators": {
+          "name": "Validators",
+          "values": [
+            "type domainname",
+            "the domain name can be an IP"
           ]
-        ],
-        "mandatory_without_value": true
+        },
+        "multiple": true
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A second variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -70,33 +78,7 @@
           "name": "Validator",
           "values": "type domainname"
         },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A second variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example.net"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 0fe5cf065..779cef9db 100644
--- a/tests/results/test_namespace/00_2default_calculated_variable_description.json
+++ b/tests/results/test_namespace/00_2default_calculated_variable_description.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -31,24 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "value of a variable!"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -59,10 +41,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "value of a variable!"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 ef2971ab1..1a7d126f5 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -31,24 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "value\nof\na\nvariable!"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -59,18 +41,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "value\nof\na\nvariable!"
+          }
+        },
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A new variable.",
         "properties": [
           {
@@ -81,10 +63,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
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 a4c750158..7aa330936 100644
--- a/tests/results/test_namespace/00_2default_calculated_variable_transitive.json
+++ b/tests/results/test_namespace/00_2default_calculated_variable_transitive.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "domainname",
-        "validators": {
-          "name": "Validators",
-          "values": [
-            "type domainname",
-            "the domain name can be an IP"
-          ]
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -44,15 +31,36 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example.net"
+        "type": "variable",
+        "variable_type": "domainname",
+        "validators": {
+          "name": "Validators",
+          "values": [
+            "type domainname",
+            "the domain name can be an IP"
           ]
-        ],
-        "mandatory_without_value": true
+        },
+        "multiple": true
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A second variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -73,33 +81,7 @@
             "the domain name can be an IP"
           ]
         },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A second variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example.net"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/00_4load_subfolder.json b/tests/results/test_namespace/00_4load_subfolder.json
index 1ccddf5e7..e5175eaa4 100644
--- a/tests/results/test_namespace/00_4load_subfolder.json
+++ b/tests/results/test_namespace/00_4load_subfolder.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A variable.",
         "properties": [
           {
@@ -31,18 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable.",
         "properties": [
           {
@@ -53,10 +41,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_5load_notype.json b/tests/results/test_namespace/00_5load_notype.json
index 69333da38..b1ec36bcd 100644
--- a/tests/results/test_namespace/00_5load_notype.json
+++ b/tests/results/test_namespace/00_5load_notype.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "without_type": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "non"
-        },
-        "variable_type": "string",
         "path": "rougail.without_type",
-        "names": [
-          "without_type"
-        ],
+        "name": "without_type",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "non"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "non"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6boolean.json b/tests/results/test_namespace/00_6boolean.json
index 8ddcdc5ac..d37ea69a7 100644
--- a/tests/results/test_namespace/00_6boolean.json
+++ b/tests/results/test_namespace/00_6boolean.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": true
         },
-        "variable_type": "boolean",
+        "variable_type": "boolean"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -61,22 +45,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": true
         },
-        "variable_type": "boolean",
+        "variable_type": "boolean"
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -87,22 +65,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
-      },
-      "var4": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": false
+          "values": true
         },
-        "variable_type": "boolean",
+        "variable_type": "boolean"
+      },
+      "var4": {
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [
           {
@@ -113,22 +85,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": false
         },
-        "variable_type": "boolean",
+        "variable_type": "boolean"
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -139,22 +105,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": false
         },
-        "variable_type": "boolean",
+        "variable_type": "boolean"
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -165,10 +125,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": false
+        },
+        "variable_type": "boolean"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6boolean_no_mandatory.json b/tests/results/test_namespace/00_6boolean_no_mandatory.json
index 9156ad6a5..922a70a48 100644
--- a/tests/results/test_namespace/00_6boolean_no_mandatory.json
+++ b/tests/results/test_namespace/00_6boolean_no_mandatory.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,23 +13,17 @@
     },
     "children": {
       "variable": {
+        "path": "rougail.variable",
+        "name": "variable",
+        "description": "A variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
           "values": true
         },
-        "variable_type": "boolean",
-        "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
-        "description": "A variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "variable_type": "boolean"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6choice.json b/tests/results/test_namespace/00_6choice.json
index c35c7c36a..9f8386a40 100644
--- a/tests/results/test_namespace/00_6choice.json
+++ b/tests/results/test_namespace/00_6choice.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "choice",
-        "choices": {
-          "name": "Choices",
-          "values": [
-            "a",
-            "b",
-            "c"
-          ]
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -39,12 +25,6 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": true
-      },
-      "var2": {
         "type": "variable",
         "variable_type": "choice",
         "choices": {
@@ -54,11 +34,11 @@
             "b",
             "c"
           ]
-        },
+        }
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -69,12 +49,23 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "choice",
+        "choices": {
+          "name": "Choices",
+          "values": [
+            "a",
+            "b",
+            "c"
+          ]
+        }
       },
       "var3": {
+        "path": "rougail.var3",
+        "name": "var3",
+        "description": "The third variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "variable_type": "choice",
         "choices": {
@@ -85,20 +76,14 @@
             "c",
             null
           ]
-        },
-        "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
-        "description": "The third variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var4": {
+        "path": "rougail.var4",
+        "name": "var4",
+        "description": "The forth variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "variable_type": "choice",
         "choices": {
@@ -108,20 +93,21 @@
             "b",
             "c"
           ]
-        },
-        "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
-        "description": "The forth variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var5": {
+        "path": "rougail.var5",
+        "name": "var5",
+        "description": "The fifth variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -135,12 +121,12 @@
             "b",
             "c"
           ]
-        },
-        "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
-        "description": "The fifth variable.",
+        }
+      },
+      "var6": {
+        "path": "rougail.var6",
+        "name": "var6",
+        "description": "The sixth variable.",
         "properties": [
           {
             "type": "property",
@@ -150,12 +136,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "a"
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -169,25 +149,7 @@
             2,
             3
           ]
-        },
-        "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
-        "description": "The sixth variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          1
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6choice_calculation.json b/tests/results/test_namespace/00_6choice_calculation.json
index b56159059..8880d4b73 100644
--- a/tests/results/test_namespace/00_6choice_calculation.json
+++ b/tests/results/test_namespace/00_6choice_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "var": {
+        "path": "rougail.var",
+        "name": "var",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -26,25 +36,7 @@
           "values": {
             "description": "choices is 0 to 9"
           }
-        },
-        "path": "rougail.var",
-        "names": [
-          "var"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          9
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6choice_link.json b/tests/results/test_namespace/00_6choice_link.json
index d4e2a66ee..ae3761115 100644
--- a/tests/results/test_namespace/00_6choice_link.json
+++ b/tests/results/test_namespace/00_6choice_link.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "choice",
-        "choices": {
-          "name": "Choices",
-          "values": [
-            "a",
-            "b",
-            "c"
-          ]
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -39,12 +25,30 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "choice",
+        "choices": {
+          "name": "Choices",
+          "values": [
+            "a",
+            "b",
+            "c"
+          ]
+        }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "The second variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -65,25 +69,7 @@
             "b",
             "c"
           ]
-        },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "The second variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6choice_variable.json b/tests/results/test_namespace/00_6choice_variable.json
index 8b90e050c..0e73717bd 100644
--- a/tests/results/test_namespace/00_6choice_variable.json
+++ b/tests/results/test_namespace/00_6choice_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "a",
-            "b",
-            "c"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A second variable.",
         "properties": [
           {
@@ -45,17 +31,31 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "a",
             "b",
             "c"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A first variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -72,25 +72,7 @@
             },
             "description": "A second variable"
           }
-        },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A first variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "a"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6choice_variable_link.json b/tests/results/test_namespace/00_6choice_variable_link.json
index a1eee6635..3857046bf 100644
--- a/tests/results/test_namespace/00_6choice_variable_link.json
+++ b/tests/results/test_namespace/00_6choice_variable_link.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "a",
-            "b",
-            "c"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A second variable.",
         "properties": [
           {
@@ -45,17 +31,31 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "a",
             "b",
             "c"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A first variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -72,12 +72,12 @@
             },
             "description": "A second variable"
           }
-        },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A first variable.",
+        }
+      },
+      "var3": {
+        "path": "rougail.var3",
+        "name": "var3",
+        "description": "A third variable.",
         "properties": [
           {
             "type": "property",
@@ -87,12 +87,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "a"
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -116,25 +110,7 @@
             },
             "description": "A second variable"
           }
-        },
-        "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
-        "description": "A third variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "a"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6choice_variable_link2.json b/tests/results/test_namespace/00_6choice_variable_link2.json
index bcae39453..3c807385f 100644
--- a/tests/results/test_namespace/00_6choice_variable_link2.json
+++ b/tests/results/test_namespace/00_6choice_variable_link2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "a",
-            "b",
-            "c"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A second variable.",
         "properties": [
           {
@@ -45,17 +31,31 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "a",
             "b",
             "c"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A first variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -72,39 +72,31 @@
             },
             "description": "A second variable"
           }
-        },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A first variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "a"
-        ],
-        "mandatory_without_value": false
+        }
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "family",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "var3": {
+            "path": "rougail.family.var3",
+            "name": "var3",
+            "description": "A third variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
+            ],
+            "mode": "standard",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -128,25 +120,7 @@
                 },
                 "description": "A second variable"
               }
-            },
-            "path": "rougail.family.var3",
-            "names": [
-              "var3"
-            ],
-            "description": "A third variable.",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "a"
-            ],
-            "mandatory_without_value": false
+            }
           }
         }
       }
diff --git a/tests/results/test_namespace/00_6custom.json b/tests/results/test_namespace/00_6custom.json
index 46d8faa4f..c50b31cac 100644
--- a/tests/results/test_namespace/00_6custom.json
+++ b/tests/results/test_namespace/00_6custom.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "custom1": {
-        "type": "variable",
-        "variable_type": "custom",
         "path": "rougail.custom1",
-        "names": [
-          "custom1"
-        ],
+        "name": "custom1",
         "description": "The first variable.",
         "properties": [
           {
@@ -31,22 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "xxx"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "custom"
       },
       "custom2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "custom",
         "path": "rougail.custom2",
-        "names": [
-          "custom2"
-        ],
+        "name": "custom2",
         "description": "The seconf variable.",
         "properties": [
           {
@@ -57,10 +41,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "custom"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6domainname.json b/tests/results/test_namespace/00_6domainname.json
index 6da2ae434..68ea3c09e 100644
--- a/tests/results/test_namespace/00_6domainname.json
+++ b/tests/results/test_namespace/00_6domainname.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "my.domain.name"
-        },
-        "variable_type": "domainname",
-        "validators": {
-          "name": "Validator",
-          "values": "type domainname"
-        },
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A domain name variable.",
         "properties": [
           {
@@ -39,10 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "my.domain.name"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "my.domain.name"
+        },
+        "variable_type": "domainname",
+        "validators": {
+          "name": "Validator",
+          "values": "type domainname"
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6domainname_params.json b/tests/results/test_namespace/00_6domainname_params.json
index c717b2509..62c326724 100644
--- a/tests/results/test_namespace/00_6domainname_params.json
+++ b/tests/results/test_namespace/00_6domainname_params.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "variable": {
+        "path": "rougail.variable",
+        "name": "variable",
+        "description": "A domain name variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -27,25 +37,7 @@
             "type domainname",
             "the domain name can be an IP"
           ]
-        },
-        "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
-        "description": "A domain name variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "my.domain.name"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6float.json b/tests/results/test_namespace/00_6float.json
index 3674d4f7b..4edb0a062 100644
--- a/tests/results/test_namespace/00_6float.json
+++ b/tests/results/test_namespace/00_6float.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": 0.0
-        },
-        "variable_type": "float",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0.0
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 0.0
         },
-        "variable_type": "float",
+        "variable_type": "float"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -61,22 +45,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0.0
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 0.0
         },
-        "variable_type": "float",
+        "variable_type": "float"
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -87,22 +65,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0.0
-        ],
-        "mandatory_without_value": false
-      },
-      "var4": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": 10.1
+          "values": 0.0
         },
-        "variable_type": "float",
+        "variable_type": "float"
+      },
+      "var4": {
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [
           {
@@ -113,22 +85,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10.1
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 10.1
         },
-        "variable_type": "float",
+        "variable_type": "float"
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -139,22 +105,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10.1
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 10.1
         },
-        "variable_type": "float",
+        "variable_type": "float"
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -165,10 +125,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10.1
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": 10.1
+        },
+        "variable_type": "float"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6integer.json b/tests/results/test_namespace/00_6integer.json
index edcd2ba16..1f0e09c9e 100644
--- a/tests/results/test_namespace/00_6integer.json
+++ b/tests/results/test_namespace/00_6integer.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": 0
-        },
-        "variable_type": "integer",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 0
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -61,22 +45,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 0
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -87,22 +65,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0
-        ],
-        "mandatory_without_value": false
-      },
-      "var4": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": 10
+          "values": 0
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var4": {
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "This forth variable.",
         "properties": [
           {
@@ -113,22 +85,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 10
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -139,22 +105,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 10
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -165,10 +125,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": 10
+        },
+        "variable_type": "integer"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6ip.adoc b/tests/results/test_namespace/00_6ip.adoc
index 3732916f7..06b114e80 100644
--- a/tests/results/test_namespace/00_6ip.adoc
+++ b/tests/results/test_namespace/00_6ip.adoc
@@ -22,7 +22,7 @@ This family is a namespace. +
 * reserved IP are allowed
 
 **Default**: 1.1.1.1/24 +
-**Example**: 192.168.0.128/25               
+**Example**: 192.168.0.129/25               
 | **rougail.var3** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[CIDR]` `standard` `mandatory`            | An IP in CIDR format with obsolete CIDR type. +
 **Validator**: IP must be in CIDR format +
diff --git a/tests/results/test_namespace/00_6ip.gitlab.md b/tests/results/test_namespace/00_6ip.gitlab.md
index 011617424..e49088303 100644
--- a/tests/results/test_namespace/00_6ip.gitlab.md
+++ b/tests/results/test_namespace/00_6ip.gitlab.md
@@ -8,7 +8,7 @@
 | Variable                                                                                                                                                                  | Description                                                                                                                                                                      |
 |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **rougail.var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`   | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1                                                                                                       |
-| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`   | An IP in CIDR format.
    **Validators**: 
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 |
+| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`   | An IP in CIDR format.
    **Validators**: 
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 |
 | **rougail.var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24                                                           |
 
 
diff --git a/tests/results/test_namespace/00_6ip.html b/tests/results/test_namespace/00_6ip.html
index c47f8e74f..4d23767bb 100644
--- a/tests/results/test_namespace/00_6ip.html
+++ b/tests/results/test_namespace/00_6ip.html
@@ -13,7 +13,7 @@ This family is a namespace.
 
 rougail.var1
    IP standard mandatory  An IP.
    Validator: reserved IP are allowed
    Default: 1.1.1.1                                            
 rougail.var2
    IP standard mandatory  An IP in CIDR format.
    Validators: 
    • IP must be in CIDR format
      • 
-
    • reserved IP are allowed

    Default: 1.1.1.1/24
    Example: 192.168.0.128/25                                                                                                                             
+
  • reserved IP are allowed

    • Default: 1.1.1.1/24
    Example: 192.168.0.129/25                                                                                                                             
 rougail.var3
    CIDR standard mandatoryAn IP in CIDR format with obsolete CIDR type.
    Validator: IP must be in CIDR format
    Default: 1.1.1.1/24
 
 
diff --git a/tests/results/test_namespace/00_6ip.json b/tests/results/test_namespace/00_6ip.json
index a69af22a3..5cbc8b4b2 100644
--- a/tests/results/test_namespace/00_6ip.json
+++ b/tests/results/test_namespace/00_6ip.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "1.1.1.1"
-        },
-        "variable_type": "IP",
-        "validators": {
-          "name": "Validator",
-          "values": "reserved IP are allowed"
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "An IP.",
         "properties": [
           {
@@ -39,12 +25,30 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "1.1.1.1"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "1.1.1.1"
+        },
+        "variable_type": "IP",
+        "validators": {
+          "name": "Validator",
+          "values": "reserved IP are allowed"
+        }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "An IP in CIDR format.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -58,44 +62,14 @@
             "reserved IP are allowed"
           ]
         },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "An IP in CIDR format.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
         "examples": {
           "name": "Example",
-          "values": "192.168.0.128/25"
-        },
-        "gen_examples": [
-          "192.168.0.128/25"
-        ],
-        "mandatory_without_value": false
+          "values": "192.168.0.129/25"
+        }
       },
       "var3": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "1.1.1.1/24"
-        },
-        "variable_type": "CIDR",
-        "validators": {
-          "name": "Validator",
-          "values": "IP must be in CIDR format"
-        },
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "An IP in CIDR format with obsolete CIDR type.",
         "properties": [
           {
@@ -106,10 +80,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "1.1.1.1/24"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "1.1.1.1/24"
+        },
+        "variable_type": "CIDR",
+        "validators": {
+          "name": "Validator",
+          "values": "IP must be in CIDR format"
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6ip.md b/tests/results/test_namespace/00_6ip.md
index 2d016ef97..b10fda1ad 100644
--- a/tests/results/test_namespace/00_6ip.md
+++ b/tests/results/test_namespace/00_6ip.md
@@ -9,6 +9,6 @@
 | Variable                                                                                                                                                                  | Description                                                                                                                                                                      |
 |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **rougail.var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`   | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1                                                                                                       |
-| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`   | An IP in CIDR format.
    **Validators**: 
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 |
+| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`   | An IP in CIDR format.
    **Validators**: 
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 |
 | **rougail.var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24                                                           |
 
diff --git a/tests/results/test_namespace/00_6ip.sh b/tests/results/test_namespace/00_6ip.sh
index 9987f8ef8..840f01e1e 100644
--- a/tests/results/test_namespace/00_6ip.sh
+++ b/tests/results/test_namespace/00_6ip.sh
@@ -18,7 +18,7 @@
 │                                       │ • IP must be in CIDR format          │
 │                                       │ • reserved IP are allowed            │
 │                                       │ Default: 1.1.1.1/24                  │
-│                                       │ Example: 192.168.0.128/25            │
+│                                       │ Example: 192.168.0.129/25            │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ rougail.var3                          │ An IP in CIDR format with obsolete   │
 │  CIDR   standard   mandatory          │ CIDR type.                           │
diff --git a/tests/results/test_namespace/00_6network.json b/tests/results/test_namespace/00_6network.json
index 473d8b658..77f467613 100644
--- a/tests/results/test_namespace/00_6network.json
+++ b/tests/results/test_namespace/00_6network.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "1.1.1.0"
-        },
-        "variable_type": "network",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "An network.",
         "properties": [
           {
@@ -35,26 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "1.1.1.0"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "1.1.1.0/24"
-        },
-        "variable_type": "network",
-        "validators": {
-          "name": "Validator",
-          "values": "network must be in CIDR format"
+          "values": "1.1.1.0"
         },
+        "variable_type": "network"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "An network in CIDR format.",
         "properties": [
           {
@@ -65,26 +45,20 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "1.1.1.0/24"
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "1.1.1.0/24"
         },
-        "variable_type": "network CIDR",
+        "variable_type": "network",
         "validators": {
           "name": "Validator",
           "values": "network must be in CIDR format"
-        },
+        }
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "An network in CIDR format with obsolete CIDR type.",
         "properties": [
           {
@@ -95,10 +69,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "1.1.1.0/24"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "1.1.1.0/24"
+        },
+        "variable_type": "network CIDR",
+        "validators": {
+          "name": "Validator",
+          "values": "network must be in CIDR format"
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6number.json b/tests/results/test_namespace/00_6number.json
index edcd2ba16..1f0e09c9e 100644
--- a/tests/results/test_namespace/00_6number.json
+++ b/tests/results/test_namespace/00_6number.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": 0
-        },
-        "variable_type": "integer",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 0
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -61,22 +45,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 0
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -87,22 +65,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          0
-        ],
-        "mandatory_without_value": false
-      },
-      "var4": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": 10
+          "values": 0
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var4": {
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "This forth variable.",
         "properties": [
           {
@@ -113,22 +85,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 10
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -139,22 +105,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": 10
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -165,10 +125,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": 10
+        },
+        "variable_type": "integer"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6port.json b/tests/results/test_namespace/00_6port.json
index cf2a3e4fe..72e6464aa 100644
--- a/tests/results/test_namespace/00_6port.json
+++ b/tests/results/test_namespace/00_6port.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,20 +13,8 @@
     },
     "children": {
       "variable1": {
-        "type": "variable",
-        "variable_type": "port",
-        "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"
-          ]
-        },
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A port variable.",
         "properties": [
           {
@@ -39,17 +25,7 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "111"
-        ],
-        "mandatory_without_value": true
-      },
-      "variable2": {
         "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "8080"
-        },
         "variable_type": "port",
         "validators": {
           "name": "Validators",
@@ -58,11 +34,11 @@
             "registred ports (1024 to 49151) are allowed",
             "private ports (greater than 49152) are allowed"
           ]
-        },
+        }
+      },
+      "variable2": {
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A port variable with default value.",
         "properties": [
           {
@@ -73,12 +49,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "8080"
-        ],
-        "mandatory_without_value": false
-      },
-      "variable3": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -92,11 +62,11 @@
             "registred ports (1024 to 49151) are allowed",
             "private ports (greater than 49152) are allowed"
           ]
-        },
+        }
+      },
+      "variable3": {
         "path": "rougail.variable3",
-        "names": [
-          "variable3"
-        ],
+        "name": "variable3",
         "description": "A port variable with integer default value.",
         "properties": [
           {
@@ -107,10 +77,20 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "8080"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "8080"
+        },
+        "variable_type": "port",
+        "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"
+          ]
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6regexp.json b/tests/results/test_namespace/00_6regexp.json
index b19a531a0..8085a9611 100644
--- a/tests/results/test_namespace/00_6regexp.json
+++ b/tests/results/test_namespace/00_6regexp.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "#a1a1a1"
-        },
-        "variable_type": "regexp",
-        "validators": {
-          "name": "Validator",
-          "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\""
-        },
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A first variable.",
         "properties": [
           {
@@ -39,17 +25,23 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "#a1a1a1"
+        },
+        "variable_type": "regexp",
+        "validators": {
+          "name": "Validator",
+          "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\""
+        },
         "examples": {
           "name": "Examples",
           "values": [
             "#b1b1b1",
             "#b2b2b2"
           ]
-        },
-        "gen_examples": [
-          "#b1b1b1"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6regexp_link.json b/tests/results/test_namespace/00_6regexp_link.json
index 1c1da58e2..afdf46bd4 100644
--- a/tests/results/test_namespace/00_6regexp_link.json
+++ b/tests/results/test_namespace/00_6regexp_link.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,20 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "#a1a1a1"
-        },
-        "variable_type": "regexp",
-        "validators": {
-          "name": "Validator",
-          "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\""
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -39,19 +25,37 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "#a1a1a1"
+        },
+        "variable_type": "regexp",
+        "validators": {
+          "name": "Validator",
+          "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\""
+        },
         "examples": {
           "name": "Examples",
           "values": [
             "#b1b1b1",
             "#b2b2b2"
           ]
-        },
-        "gen_examples": [
-          "#b1b1b1"
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A second variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -69,31 +73,13 @@
           "name": "Validator",
           "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\""
         },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A second variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
         "examples": {
           "name": "Examples",
           "values": [
             "#b2b1b1",
             "#b3b2b2"
           ]
-        },
-        "gen_examples": [
-          "#b2b1b1"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6secret.json b/tests/results/test_namespace/00_6secret.json
index b6a628dc3..73a977a8b 100644
--- a/tests/results/test_namespace/00_6secret.json
+++ b/tests/results/test_namespace/00_6secret.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "secret1": {
-        "type": "variable",
-        "variable_type": "secret",
         "path": "rougail.secret1",
-        "names": [
-          "secret1"
-        ],
+        "name": "secret1",
         "description": "The first variable.",
         "properties": [
           {
@@ -31,22 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "secrets"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "secret"
       },
       "secret2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "secret",
         "path": "rougail.secret2",
-        "names": [
-          "secret2"
-        ],
+        "name": "secret2",
         "description": "The second variable.",
         "properties": [
           {
@@ -57,10 +41,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "secret"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6secret_param.adoc b/tests/results/test_namespace/00_6secret_param.adoc
index 5e7345ebd..b5a061c64 100644
--- a/tests/results/test_namespace/00_6secret_param.adoc
+++ b/tests/results/test_namespace/00_6secret_param.adoc
@@ -12,7 +12,8 @@ This family is a namespace. +
 | Variable   | Description   
 | **rougail.secret1** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `basic` `mandatory`            | The first variable. +
-**Validator**: minimum length for the secret is 10 characters               
+**Validator**: minimum length for the secret is 10 characters +
+**Example**: ALongS4cr4t               
 | **rougail.secret2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `standard` `mandatory`            | The second variable. +
 **Validators**: 
diff --git a/tests/results/test_namespace/00_6secret_param.gitlab.md b/tests/results/test_namespace/00_6secret_param.gitlab.md
index 79e1be06e..fcddae02e 100644
--- a/tests/results/test_namespace/00_6secret_param.gitlab.md
+++ b/tests/results/test_namespace/00_6secret_param.gitlab.md
@@ -7,7 +7,7 @@
 
 | Variable                                                                                                                                                                             | Description                                                                                                                                                             |
 |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory`    | The first variable.
    **Validator**: minimum length for the secret is 10 characters                                                                                   |
+| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory`    | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t                                                      |
 | **rougail.secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**: 
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value |
 | **rougail.secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**: 
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value          |
 
diff --git a/tests/results/test_namespace/00_6secret_param.html b/tests/results/test_namespace/00_6secret_param.html
index 70fe161f2..c5f0e6155 100644
--- a/tests/results/test_namespace/00_6secret_param.html
+++ b/tests/results/test_namespace/00_6secret_param.html
@@ -8,14 +8,14 @@ This family is a namespace.
 
 
-
+
-
+
+
  • 'forbidden characters: "$" and "^"'

    • Default: value                                                                                                                         
+
  • 'forbidden characters: "$"'

    • Default: value                                                                                                                         
    
 
    Variable                                                                                                                                                                        Description                                                                             
    Variable                                                                                                                                                                        Description                                                                                                             
    
     
 
    rougail.secret1
    secret basic mandatory       		The first variable.
    Validator: minimum length for the secret is 10 characters
    rougail.secret1
    secret basic mandatory       		The first variable.
    Validator: minimum length for the secret is 10 characters
    Example: ALongS4cr4t
    
 
    rougail.secret2
    secret standard mandatory    		The second variable.
    Validators: 
    • maximum length for the secret is 10 characters
      • 
-
    • 'forbidden characters: "$" and "^"'

    Default: value                                                                                         
    
 
    rougail.secret3
    secret standard mandatory    		The third variable.
    Validators: 
    • maximum length for the secret is 10 characters
      • 
-
    • 'forbidden characters: "$"'

    Default: value                                                                                         
    
     
 
    
 
diff --git a/tests/results/test_namespace/00_6secret_param.json b/tests/results/test_namespace/00_6secret_param.json
index 0af8035b8..2b0d78c98 100644
--- a/tests/results/test_namespace/00_6secret_param.json
+++ b/tests/results/test_namespace/00_6secret_param.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "secret1": {
-        "type": "variable",
-        "variable_type": "secret",
-        "validators": {
-          "name": "Validator",
-          "values": "minimum length for the secret is 10 characters"
-        },
         "path": "rougail.secret1",
-        "names": [
-          "secret1"
-        ],
+        "name": "secret1",
         "description": "The first variable.",
         "properties": [
           {
@@ -35,12 +25,30 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "secrets"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "secret",
+        "validators": {
+          "name": "Validator",
+          "values": "minimum length for the secret is 10 characters"
+        },
+        "examples": {
+          "name": "Example",
+          "values": "ALongS4cr4t"
+        }
       },
       "secret2": {
+        "path": "rougail.secret2",
+        "name": "secret2",
+        "description": "The second variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -53,12 +61,12 @@
             "maximum length for the secret is 10 characters",
             "forbidden characters: \"$\" and \"^\""
           ]
-        },
-        "path": "rougail.secret2",
-        "names": [
-          "secret2"
-        ],
-        "description": "The second variable.",
+        }
+      },
+      "secret3": {
+        "path": "rougail.secret3",
+        "name": "secret3",
+        "description": "The third variable.",
         "properties": [
           {
             "type": "property",
@@ -68,12 +76,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
-      },
-      "secret3": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -86,25 +88,7 @@
             "maximum length for the secret is 10 characters",
             "forbidden characters: \"$\""
           ]
-        },
-        "path": "rougail.secret3",
-        "names": [
-          "secret3"
-        ],
-        "description": "The third variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_6secret_param.md b/tests/results/test_namespace/00_6secret_param.md
index d6862298f..316e27565 100644
--- a/tests/results/test_namespace/00_6secret_param.md
+++ b/tests/results/test_namespace/00_6secret_param.md
@@ -8,7 +8,7 @@
 
 | Variable                                                                                                                                                                             | Description                                                                                                                                                             |
 |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory`    | The first variable.
    **Validator**: minimum length for the secret is 10 characters                                                                                   |
+| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory`    | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t                                                      |
 | **rougail.secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**: 
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value |
 | **rougail.secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**: 
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value          |
 
diff --git a/tests/results/test_namespace/00_6secret_param.sh b/tests/results/test_namespace/00_6secret_param.sh
index 4c8f63cc1..f48d81337 100644
--- a/tests/results/test_namespace/00_6secret_param.sh
+++ b/tests/results/test_namespace/00_6secret_param.sh
@@ -12,6 +12,7 @@
 │ rougail.secret1                       │ The first variable.                  │
 │  secret   basic   mandatory           │ Validator: minimum length for the    │
 │                                       │ secret is 10 characters              │
+│                                       │ Example: ALongS4cr4t                 │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ rougail.secret2                       │ The second variable.                 │
 │  secret   standard   mandatory        │ Validators:                          │
diff --git a/tests/results/test_namespace/00_6string.json b/tests/results/test_namespace/00_6string.json
index 24f758d19..c3cf531d8 100644
--- a/tests/results/test_namespace/00_6string.json
+++ b/tests/results/test_namespace/00_6string.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -31,18 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -53,18 +41,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -75,22 +57,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var4": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "string",
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [
           {
@@ -101,22 +73,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "value"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -127,22 +93,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "value"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -153,22 +113,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
-      },
-      "var7": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "8080"
+          "values": "value"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var7": {
         "path": "rougail.var7",
-        "names": [
-          "var7"
-        ],
+        "name": "var7",
         "description": "The seventh variable.",
         "properties": [
           {
@@ -179,22 +133,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "8080"
-        ],
-        "mandatory_without_value": false
-      },
-      "var8": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "true"
+          "values": "8080"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var8": {
         "path": "rougail.var8",
-        "names": [
-          "var8"
-        ],
+        "name": "var8",
         "description": "The height variable.",
         "properties": [
           {
@@ -205,10 +153,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "true"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "true"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7choice_quote.json b/tests/results/test_namespace/00_7choice_quote.json
index 7c3269f2f..532b48ff8 100644
--- a/tests/results/test_namespace/00_7choice_quote.json
+++ b/tests/results/test_namespace/00_7choice_quote.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "var": {
+        "path": "rougail.var",
+        "name": "var",
+        "description": "A choice.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -28,25 +38,7 @@
             "quote\"",
             "quote\"'"
           ]
-        },
-        "path": "rougail.var",
-        "names": [
-          "var"
-        ],
-        "description": "A choice.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "quote'"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7help.json b/tests/results/test_namespace/00_7help.json
index 88d85d90f..2de586c97 100644
--- a/tests/results/test_namespace/00_7help.json
+++ b/tests/results/test_namespace/00_7help.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "help": [
           "Multi line\n\nHelp\n\nWith useful information."
@@ -34,18 +28,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "help": [
           "Multi line\nHelp\nWith useful information."
@@ -59,10 +47,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7help_quote.json b/tests/results/test_namespace/00_7help_quote.json
index 9dded2bed..37b075e4f 100644
--- a/tests/results/test_namespace/00_7help_quote.json
+++ b/tests/results/test_namespace/00_7help_quote.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "help": [
           "Message with '."
@@ -34,18 +28,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "help": [
           "Message with \"."
@@ -59,10 +47,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7help_sup.json b/tests/results/test_namespace/00_7help_sup.json
index ec9fd047f..c8c0260a4 100644
--- a/tests/results/test_namespace/00_7help_sup.json
+++ b/tests/results/test_namespace/00_7help_sup.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first .",
         "help": [
           "Multi line\n\n\n\nWith useful information."
@@ -34,18 +28,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second .",
         "help": [
           "Multi line\n\nWith useful information."
@@ -59,10 +47,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7value_doublequote.json b/tests/results/test_namespace/00_7value_doublequote.json
index adf63671a..9c9a9e905 100644
--- a/tests/results/test_namespace/00_7value_doublequote.json
+++ b/tests/results/test_namespace/00_7value_doublequote.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "quote\""
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "quote\""
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "quote\""
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7value_doublequote2.json b/tests/results/test_namespace/00_7value_doublequote2.json
index 60cf64ce4..2db2ef36a 100644
--- a/tests/results/test_namespace/00_7value_doublequote2.json
+++ b/tests/results/test_namespace/00_7value_doublequote2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "quote'\""
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "quote'\""
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "quote'\""
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7value_doublequote3.json b/tests/results/test_namespace/00_7value_doublequote3.json
index ce8929630..02f9e1ad6 100644
--- a/tests/results/test_namespace/00_7value_doublequote3.json
+++ b/tests/results/test_namespace/00_7value_doublequote3.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "quote\\\"\\'"
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "quote\\\"\\'"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "quote\\\"\\'"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_7value_quote.json b/tests/results/test_namespace/00_7value_quote.json
index 8ba3f5733..7b09502d1 100644
--- a/tests/results/test_namespace/00_7value_quote.json
+++ b/tests/results/test_namespace/00_7value_quote.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "quote'"
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "quote'"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "quote'"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_8calculation_information.json b/tests/results/test_namespace/00_8calculation_information.json
index de0b2fb3a..665547703 100644
--- a/tests/results/test_namespace/00_8calculation_information.json
+++ b/tests/results/test_namespace/00_8calculation_information.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "get information test_information"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -37,10 +25,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "get information test_information"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_8calculation_namespace.json b/tests/results/test_namespace/00_8calculation_namespace.json
index d1b778054..d241e12d8 100644
--- a/tests/results/test_namespace/00_8calculation_namespace.json
+++ b/tests/results/test_namespace/00_8calculation_namespace.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,23 +13,17 @@
     },
     "children": {
       "variable": {
+        "path": "rougail.variable",
+        "name": "variable",
+        "description": "A variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "the value of the namespace"
         },
-        "variable_type": "string",
-        "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
-        "description": "A variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "Rougail"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_8calculation_param_namespace.json b/tests/results/test_namespace/00_8calculation_param_namespace.json
index a123807ce..431b80f16 100644
--- a/tests/results/test_namespace/00_8calculation_param_namespace.json
+++ b/tests/results/test_namespace/00_8calculation_param_namespace.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,23 +13,17 @@
     },
     "children": {
       "variable": {
+        "path": "rougail.variable",
+        "name": "variable",
+        "description": "A variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "depends on a calculation"
         },
-        "variable_type": "string",
-        "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
-        "description": "A variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "Rougail"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_8test.json b/tests/results/test_namespace/00_8test.json
index fd7ca3621..b5b172ab5 100644
--- a/tests/results/test_namespace/00_8test.json
+++ b/tests/results/test_namespace/00_8test.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -31,26 +25,16 @@
           }
         ],
         "mode": "basic",
+        "type": "variable",
+        "variable_type": "string",
         "examples": {
           "name": "Example",
           "values": "test"
-        },
-        "gen_examples": [
-          "test"
-        ],
-        "mandatory_without_value": true
+        }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -61,22 +45,20 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "string",
         "examples": {
           "name": "Example",
           "values": "test"
-        },
-        "gen_examples": [
-          "test"
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var3": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -87,28 +69,24 @@
           }
         ],
         "mode": "basic",
+        "type": "variable",
+        "variable_type": "string",
         "examples": {
           "name": "Examples",
           "values": [
             "test1",
             "test2"
           ]
-        },
-        "gen_examples": [
-          "test1"
-        ],
-        "mandatory_without_value": true
+        }
       },
       "var4": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "examples": {
           "name": "Examples",
           "values": [
@@ -116,23 +94,11 @@
             "test1",
             "test2"
           ]
-        },
-        "gen_examples": [
-          null
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var5": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -143,22 +109,20 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": true
+        },
+        "variable_type": "boolean",
         "examples": {
           "name": "Example",
           "values": false
-        },
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var6": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -175,6 +139,8 @@
           }
         ],
         "mode": "basic",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -182,14 +148,7 @@
             "test1",
             "test2"
           ]
-        },
-        "gen_examples": [
-          [
-            "test1",
-            "test2"
-          ]
-        ],
-        "mandatory_without_value": true
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9choice_variable_multi.json b/tests/results/test_namespace/00_9choice_variable_multi.json
index d12373ce6..631250e1d 100644
--- a/tests/results/test_namespace/00_9choice_variable_multi.json
+++ b/tests/results/test_namespace/00_9choice_variable_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "variable1": {
-        "type": "variable",
-        "variable_type": "choice",
-        "choices": {
-          "name": "Choices",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A first variable.",
         "properties": [
           {
@@ -44,15 +31,6 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "a_choice"
-          ]
-        ],
-        "mandatory_without_value": true
-      },
-      "variable2": {
         "type": "variable",
         "variable_type": "choice",
         "choices": {
@@ -62,10 +40,11 @@
             "val2"
           ]
         },
+        "multiple": true
+      },
+      "variable2": {
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A second variable.",
         "properties": [
           {
@@ -76,13 +55,16 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "a_choice"
+        "type": "variable",
+        "variable_type": "choice",
+        "choices": {
+          "name": "Choices",
+          "values": [
+            "val1",
+            "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9choice_variables.json b/tests/results/test_namespace/00_9choice_variables.json
index 82aa174f7..dc120fe54 100644
--- a/tests/results/test_namespace/00_9choice_variables.json
+++ b/tests/results/test_namespace/00_9choice_variables.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "source_variable_1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "val1"
-        },
-        "variable_type": "string",
         "path": "rougail.source_variable_1",
-        "names": [
-          "source_variable_1"
-        ],
+        "name": "source_variable_1",
         "description": "The first source variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
-      },
-      "source_variable_2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "val2"
+          "values": "val1"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "source_variable_2": {
         "path": "rougail.source_variable_2",
-        "names": [
-          "source_variable_2"
-        ],
+        "name": "source_variable_2",
         "description": "The second source variable.",
         "properties": [
           {
@@ -61,12 +45,26 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val2"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "val2"
+        },
+        "variable_type": "string"
       },
       "my_variable": {
+        "path": "rougail.my_variable",
+        "name": "my_variable",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -93,25 +91,7 @@
               "description": "The second source variable"
             }
           ]
-        },
-        "path": "rougail.my_variable",
-        "names": [
-          "my_variable"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9default_calculation.json b/tests/results/test_namespace/00_9default_calculation.json
index ef8ed90c6..e9b9f08fd 100644
--- a/tests/results/test_namespace/00_9default_calculation.json
+++ b/tests/results/test_namespace/00_9default_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "concat all parameters"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -37,10 +25,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "string_1_True_"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "concat all parameters"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9default_calculation_information.json b/tests/results/test_namespace/00_9default_calculation_information.json
index f0e9b8e30..32411e326 100644
--- a/tests/results/test_namespace/00_9default_calculation_information.json
+++ b/tests/results/test_namespace/00_9default_calculation_information.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "returns the information"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A variable.",
         "properties": [
           {
@@ -37,10 +25,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "returns the information"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 50ce0fc21..3f320c5a1 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -31,22 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -57,10 +41,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
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 5a8de09fb..acd4e1533 100644
--- a/tests/results/test_namespace/00_9default_calculation_multi_optional.json
+++ b/tests/results/test_namespace/00_9default_calculation_multi_optional.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "my_variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "val1"
-        },
-        "variable_type": "string",
         "path": "rougail.my_variable",
-        "names": [
-          "my_variable"
-        ],
+        "name": "my_variable",
         "properties": [
           {
             "type": "property",
@@ -34,31 +24,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
-      },
-      "my_calculated_variable": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": [
-            {
-              "message": "the value of the variable \"{0}\" if it is defined",
-              "path": {
-                "path": "rougail.my_variable",
-                "type": "variable"
-              },
-              "description": "My_variable"
-            }
-          ]
+          "values": "val1"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "my_calculated_variable": {
         "path": "rougail.my_calculated_variable",
-        "names": [
-          "my_calculated_variable"
-        ],
+        "name": "my_calculated_variable",
         "properties": [
           {
             "type": "property",
@@ -74,13 +49,22 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1"
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
+            {
+              "message": "the value of the variable \"{0}\" if it is defined",
+              "path": {
+                "path": "rougail.my_variable",
+                "type": "variable"
+              },
+              "description": "My_variable"
+            }
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 5a8de09fb..acd4e1533 100644
--- a/tests/results/test_namespace/00_9default_calculation_multi_optional2.json
+++ b/tests/results/test_namespace/00_9default_calculation_multi_optional2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "my_variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "val1"
-        },
-        "variable_type": "string",
         "path": "rougail.my_variable",
-        "names": [
-          "my_variable"
-        ],
+        "name": "my_variable",
         "properties": [
           {
             "type": "property",
@@ -34,31 +24,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
-      },
-      "my_calculated_variable": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": [
-            {
-              "message": "the value of the variable \"{0}\" if it is defined",
-              "path": {
-                "path": "rougail.my_variable",
-                "type": "variable"
-              },
-              "description": "My_variable"
-            }
-          ]
+          "values": "val1"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "my_calculated_variable": {
         "path": "rougail.my_calculated_variable",
-        "names": [
-          "my_calculated_variable"
-        ],
+        "name": "my_calculated_variable",
         "properties": [
           {
             "type": "property",
@@ -74,13 +49,22 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1"
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
+            {
+              "message": "the value of the variable \"{0}\" if it is defined",
+              "path": {
+                "path": "rougail.my_variable",
+                "type": "variable"
+              },
+              "description": "My_variable"
+            }
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9default_calculation_multi_optional_default.json b/tests/results/test_namespace/00_9default_calculation_multi_optional_default.json
index 54c19f185..acd4e1533 100644
--- a/tests/results/test_namespace/00_9default_calculation_multi_optional_default.json
+++ b/tests/results/test_namespace/00_9default_calculation_multi_optional_default.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "my_variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "val1"
-        },
-        "variable_type": "string",
         "path": "rougail.my_variable",
-        "names": [
-          "my_variable"
-        ],
+        "name": "my_variable",
         "properties": [
           {
             "type": "property",
@@ -34,31 +24,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
-      },
-      "my_calculated_variable": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": [
-            {
-              "message": "the value of the variable \"{0}\" if it is defined",
-              "path": {
-                "path": "rougail.my_variable",
-                "type": "variable"
-              },
-              "description": "My_variable"
-            }
-          ]
+          "values": "val1"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "my_calculated_variable": {
         "path": "rougail.my_calculated_variable",
-        "names": [
-          "my_calculated_variable"
-        ],
+        "name": "my_calculated_variable",
         "properties": [
           {
             "type": "property",
@@ -74,14 +49,22 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "value"
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
+            {
+              "message": "the value of the variable \"{0}\" if it is defined",
+              "path": {
+                "path": "rougail.my_variable",
+                "type": "variable"
+              },
+              "description": "My_variable"
+            }
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9default_calculation_optional.json b/tests/results/test_namespace/00_9default_calculation_optional.json
index b1462964f..265dd8f1d 100644
--- a/tests/results/test_namespace/00_9default_calculation_optional.json
+++ b/tests/results/test_namespace/00_9default_calculation_optional.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "my_calculated_variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.my_calculated_variable",
-        "names": [
-          "my_calculated_variable"
-        ],
+        "name": "my_calculated_variable",
         "properties": [
           {
             "type": "property",
@@ -36,13 +30,9 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 49cb305ff..918a9d6b6 100644
--- a/tests/results/test_namespace/00_9default_calculation_optional_exists.json
+++ b/tests/results/test_namespace/00_9default_calculation_optional_exists.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "my_variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.my_variable",
-        "names": [
-          "my_variable"
-        ],
+        "name": "my_variable",
         "properties": [
           {
             "type": "property",
@@ -43,16 +30,35 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "my_calculated_variable": {
+        "path": "rougail.my_calculated_variable",
+        "name": "my_calculated_variable",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -66,33 +72,7 @@
           }
         },
         "variable_type": "string",
-        "path": "rougail.my_calculated_variable",
-        "names": [
-          "my_calculated_variable"
-        ],
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 061e14f48..a95f9bb35 100644
--- a/tests/results/test_namespace/00_9default_calculation_param_optional.json
+++ b/tests/results/test_namespace/00_9default_calculation_param_optional.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,11 @@
     },
     "children": {
       "var1": {
+        "path": "rougail.var1",
+        "name": "var1",
+        "description": "A first variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -22,30 +25,11 @@
             "description": "returns a value"
           }
         },
-        "variable_type": "string",
-        "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
-        "description": "A first variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -56,10 +40,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       }
     }
   }
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 de38e96e9..652f12d3f 100644
--- a/tests/results/test_namespace/00_9default_information_other_variable.json
+++ b/tests/results/test_namespace/00_9default_information_other_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -31,22 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "the value of the information \"test_information\" of the variable \"rougail.var1\""
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -57,10 +41,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "the value of the information \"test_information\" of the variable \"rougail.var1\""
+        },
+        "variable_type": "string"
       }
     }
   }
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 de38e96e9..652f12d3f 100644
--- a/tests/results/test_namespace/00_9default_information_other_variable2.json
+++ b/tests/results/test_namespace/00_9default_information_other_variable2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -31,22 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "the value of the information \"test_information\" of the variable \"rougail.var1\""
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -57,10 +41,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "the value of the information \"test_information\" of the variable \"rougail.var1\""
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9default_integer.json b/tests/results/test_namespace/00_9default_integer.json
index 35105f7ad..ee6c871a4 100644
--- a/tests/results/test_namespace/00_9default_integer.json
+++ b/tests/results/test_namespace/00_9default_integer.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "var": {
+        "path": "rougail.var",
+        "name": "var",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -26,25 +36,7 @@
           "values": {
             "description": "choice for 0 to 9"
           }
-        },
-        "path": "rougail.var",
-        "names": [
-          "var"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          9
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9default_number.json b/tests/results/test_namespace/00_9default_number.json
index 35105f7ad..ee6c871a4 100644
--- a/tests/results/test_namespace/00_9default_number.json
+++ b/tests/results/test_namespace/00_9default_number.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "var": {
+        "path": "rougail.var",
+        "name": "var",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -26,25 +36,7 @@
           "values": {
             "description": "choice for 0 to 9"
           }
-        },
-        "path": "rougail.var",
-        "names": [
-          "var"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          9
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9extra.json b/tests/results/test_namespace/00_9extra.json
index 9115e805e..79510ad35 100644
--- a/tests/results/test_namespace/00_9extra.json
+++ b/tests/results/test_namespace/00_9extra.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "rougail"
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "rougail"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "rougail"
+        },
+        "variable_type": "string"
       }
     }
   },
@@ -46,9 +38,7 @@
     "type": "namespace",
     "informations": {
       "path": "extra",
-      "names": [
-        "extra"
-      ],
+      "name": "extra",
       "description": "Extra",
       "properties": [],
       "mode": "standard",
@@ -58,18 +48,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "return no"
-          }
-        },
-        "variable_type": "string",
         "path": "extra.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -80,10 +60,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "return no"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9extra_calculation.json b/tests/results/test_namespace/00_9extra_calculation.json
index 53672bed8..c85093a37 100644
--- a/tests/results/test_namespace/00_9extra_calculation.json
+++ b/tests/results/test_namespace/00_9extra_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "string"
       }
     }
   },
@@ -46,9 +38,7 @@
     "type": "namespace",
     "informations": {
       "path": "extra",
-      "names": [
-        "extra"
-      ],
+      "name": "extra",
       "description": "Extra",
       "properties": [],
       "mode": "standard",
@@ -58,6 +48,18 @@
     },
     "children": {
       "variable1": {
+        "path": "extra.variable1",
+        "name": "variable1",
+        "description": "A first variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -70,39 +72,11 @@
             "description": "A variable"
           }
         },
-        "variable_type": "string",
-        "path": "extra.variable1",
-        "names": [
-          "variable1"
-        ],
-        "description": "A first variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       },
       "variable2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "copy the value of rougail.variable"
-          }
-        },
-        "variable_type": "string",
         "path": "extra.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A second variable.",
         "properties": [
           {
@@ -113,12 +87,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
-      },
-      "variable3": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -126,11 +94,11 @@
             "description": "copy the value of rougail.variable"
           }
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "variable3": {
         "path": "extra.variable3",
-        "names": [
-          "variable3"
-        ],
+        "name": "variable3",
         "description": "A third variable.",
         "properties": [
           {
@@ -141,10 +109,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "copy the value of rougail.variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/00_9extra_ouside.json b/tests/results/test_namespace/00_9extra_ouside.json
index 603d52fb3..c0301d59d 100644
--- a/tests/results/test_namespace/00_9extra_ouside.json
+++ b/tests/results/test_namespace/00_9extra_ouside.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "variable": {
+        "path": "rougail.variable",
+        "name": "variable",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -27,25 +37,7 @@
             "description": "A variable"
           }
         },
-        "variable_type": "string",
-        "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "value in extra"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   },
@@ -53,9 +45,7 @@
     "type": "namespace",
     "informations": {
       "path": "extra",
-      "names": [
-        "extra"
-      ],
+      "name": "extra",
       "description": "Extra",
       "properties": [],
       "mode": "standard",
@@ -65,16 +55,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value in extra"
-        },
-        "variable_type": "string",
         "path": "extra.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -85,10 +67,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value in extra"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value in extra"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6boolean_multi.json b/tests/results/test_namespace/01_6boolean_multi.json
index 996189070..def98e456 100644
--- a/tests/results/test_namespace/01_6boolean_multi.json
+++ b/tests/results/test_namespace/01_6boolean_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            true
-          ]
-        },
-        "variable_type": "boolean",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -43,15 +31,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            true
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -60,10 +39,11 @@
           ]
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -80,15 +60,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            true
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -97,10 +68,11 @@
           ]
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -117,27 +89,19 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            true
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var4": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": [
-            false
+            true
           ]
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "var4": {
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [
           {
@@ -154,15 +118,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            false
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -171,10 +126,11 @@
           ]
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -191,15 +147,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            false
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -208,10 +155,11 @@
           ]
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -228,27 +176,19 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            false
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var7": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": [
-            true
+            false
           ]
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "var7": {
         "path": "rougail.var7",
-        "names": [
-          "var7"
-        ],
+        "name": "var7",
         "description": "The seventh variable.",
         "properties": [
           {
@@ -265,15 +205,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            true
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var8": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -282,10 +213,11 @@
           ]
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "var8": {
         "path": "rougail.var8",
-        "names": [
-          "var8"
-        ],
+        "name": "var8",
         "description": "The eighth variable.",
         "properties": [
           {
@@ -302,13 +234,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             true
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "boolean",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6custom_multi.json b/tests/results/test_namespace/01_6custom_multi.json
index f258d7427..adfeac206 100644
--- a/tests/results/test_namespace/01_6custom_multi.json
+++ b/tests/results/test_namespace/01_6custom_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "custom1": {
-        "type": "variable",
-        "variable_type": "custom",
         "path": "rougail.custom1",
-        "names": [
-          "custom1"
-        ],
+        "name": "custom1",
         "description": "A first custom variable.",
         "properties": [
           {
@@ -37,27 +31,13 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "xxx"
-          ]
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "custom",
+        "multiple": true
       },
       "custom2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "value"
-          ]
-        },
-        "variable_type": "custom",
         "path": "rougail.custom2",
-        "names": [
-          "custom2"
-        ],
+        "name": "custom2",
         "description": "A second custom variable.",
         "properties": [
           {
@@ -74,13 +54,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "value"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "custom",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6float_multi.json b/tests/results/test_namespace/01_6float_multi.json
index 006ccbd2c..97a3f345e 100644
--- a/tests/results/test_namespace/01_6float_multi.json
+++ b/tests/results/test_namespace/01_6float_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            0.0
-          ]
-        },
-        "variable_type": "float",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -43,15 +31,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0.0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -60,10 +39,11 @@
           ]
         },
         "variable_type": "float",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -80,15 +60,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0.0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -97,10 +68,11 @@
           ]
         },
         "variable_type": "float",
+        "multiple": true
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -117,27 +89,19 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0.0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var4": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": [
-            10.1
+            0.0
           ]
         },
         "variable_type": "float",
+        "multiple": true
+      },
+      "var4": {
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [
           {
@@ -154,15 +118,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            10.1
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -171,10 +126,11 @@
           ]
         },
         "variable_type": "float",
+        "multiple": true
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -191,15 +147,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            10.1
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -208,10 +155,11 @@
           ]
         },
         "variable_type": "float",
+        "multiple": true
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -228,27 +176,19 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            10.1
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var7": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": [
-            0.0
+            10.1
           ]
         },
         "variable_type": "float",
+        "multiple": true
+      },
+      "var7": {
         "path": "rougail.var7",
-        "names": [
-          "var7"
-        ],
+        "name": "var7",
         "description": "The seventh variable.",
         "properties": [
           {
@@ -265,15 +205,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0.0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var8": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -282,10 +213,11 @@
           ]
         },
         "variable_type": "float",
+        "multiple": true
+      },
+      "var8": {
         "path": "rougail.var8",
-        "names": [
-          "var8"
-        ],
+        "name": "var8",
         "description": "The eighth variable.",
         "properties": [
           {
@@ -302,13 +234,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             0.0
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "float",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6integer_multi.json b/tests/results/test_namespace/01_6integer_multi.json
index 365f8e4e6..b12fb02cc 100644
--- a/tests/results/test_namespace/01_6integer_multi.json
+++ b/tests/results/test_namespace/01_6integer_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            0
-          ]
-        },
-        "variable_type": "integer",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -43,15 +31,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -60,10 +39,11 @@
           ]
         },
         "variable_type": "integer",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -80,15 +60,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -97,10 +68,11 @@
           ]
         },
         "variable_type": "integer",
+        "multiple": true
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -117,27 +89,19 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var4": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": [
-            10
+            0
           ]
         },
         "variable_type": "integer",
+        "multiple": true
+      },
+      "var4": {
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [
           {
@@ -154,15 +118,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            10
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -171,10 +126,11 @@
           ]
         },
         "variable_type": "integer",
+        "multiple": true
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -191,15 +147,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            10
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -208,10 +155,11 @@
           ]
         },
         "variable_type": "integer",
+        "multiple": true
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -228,27 +176,19 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            10
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var7": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": [
-            0
+            10
           ]
         },
         "variable_type": "integer",
+        "multiple": true
+      },
+      "var7": {
         "path": "rougail.var7",
-        "names": [
-          "var7"
-        ],
+        "name": "var7",
         "description": "The seventh variable.",
         "properties": [
           {
@@ -265,15 +205,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            0
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var8": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -282,10 +213,11 @@
           ]
         },
         "variable_type": "integer",
+        "multiple": true
+      },
+      "var8": {
         "path": "rougail.var8",
-        "names": [
-          "var8"
-        ],
+        "name": "var8",
         "description": "The eighth variable.",
         "properties": [
           {
@@ -302,13 +234,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             0
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "integer",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6integer_multi_mandatory.json b/tests/results/test_namespace/01_6integer_multi_mandatory.json
index d96186d61..704474a7c 100644
--- a/tests/results/test_namespace/01_6integer_multi_mandatory.json
+++ b/tests/results/test_namespace/01_6integer_multi_mandatory.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "integer",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "The first variable.",
         "properties": [
           {
@@ -37,13 +31,9 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            42
-          ]
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "integer",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6string_empty.json b/tests/results/test_namespace/01_6string_empty.json
index c772cbc1f..21cf68902 100644
--- a/tests/results/test_namespace/01_6string_empty.json
+++ b/tests/results/test_namespace/01_6string_empty.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "value",
-            null
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The second variable.",
         "properties": [
           {
@@ -44,14 +31,16 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "value",
             null
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6string_multi.json b/tests/results/test_namespace/01_6string_multi.json
index 9a04ed5e3..5a4ce4580 100644
--- a/tests/results/test_namespace/01_6string_multi.json
+++ b/tests/results/test_namespace/01_6string_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -37,21 +31,13 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
-      },
-      "var2": {
         "type": "variable",
         "variable_type": "string",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -68,21 +54,13 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
-      },
-      "var3": {
         "type": "variable",
         "variable_type": "string",
+        "multiple": true
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "The third variable.",
         "properties": [
           {
@@ -99,27 +77,13 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string",
+        "multiple": true
       },
       "var4": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "value"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "The forth variable.",
         "properties": [
           {
@@ -136,15 +100,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "value"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var5": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -153,10 +108,11 @@
           ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var5": {
         "path": "rougail.var5",
-        "names": [
-          "var5"
-        ],
+        "name": "var5",
         "description": "The fifth variable.",
         "properties": [
           {
@@ -173,15 +129,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "value"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var6": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -190,10 +137,11 @@
           ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var6": {
         "path": "rougail.var6",
-        "names": [
-          "var6"
-        ],
+        "name": "var6",
         "description": "The sixth variable.",
         "properties": [
           {
@@ -210,15 +158,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "value"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var7": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -227,10 +166,11 @@
           ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var7": {
         "path": "rougail.var7",
-        "names": [
-          "var7"
-        ],
+        "name": "var7",
         "description": "The seventh variable.",
         "properties": [
           {
@@ -247,15 +187,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "value"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var8": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -264,10 +195,11 @@
           ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var8": {
         "path": "rougail.var8",
-        "names": [
-          "var8"
-        ],
+        "name": "var8",
         "description": "The eighth variable.",
         "properties": [
           {
@@ -284,13 +216,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "value"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_6string_multi_length.json b/tests/results/test_namespace/01_6string_multi_length.json
index 84907b675..5aaf45de4 100644
--- a/tests/results/test_namespace/01_6string_multi_length.json
+++ b/tests/results/test_namespace/01_6string_multi_length.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,26 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2",
-            "val3"
-          ]
-        },
-        "variable_type": "string",
-        "validators": {
-          "name": "Validator",
-          "values": {
-            "description": "needs exactly 3 values"
-          }
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The variable.",
         "properties": [
           {
@@ -51,17 +31,43 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2",
             "val3"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "validators": {
+          "name": "Validator",
+          "values": {
+            "description": "needs exactly 3 values"
+          }
+        },
+        "multiple": true
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "The variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -82,34 +88,7 @@
             }
           ]
         },
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "The variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val4",
-            "val5"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_7value_multi_doublequote.json b/tests/results/test_namespace/01_7value_multi_doublequote.json
index e7012a38d..7c739eabe 100644
--- a/tests/results/test_namespace/01_7value_multi_doublequote.json
+++ b/tests/results/test_namespace/01_7value_multi_doublequote.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "quote\""
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -43,13 +31,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "quote\""
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_7value_multi_doublequote2.json b/tests/results/test_namespace/01_7value_multi_doublequote2.json
index fab3ba5a7..8f9646b0f 100644
--- a/tests/results/test_namespace/01_7value_multi_doublequote2.json
+++ b/tests/results/test_namespace/01_7value_multi_doublequote2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "quote'\""
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -43,13 +31,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "quote'\""
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_7value_multi_quote.json b/tests/results/test_namespace/01_7value_multi_quote.json
index 35c0f9765..1e5d40bf0 100644
--- a/tests/results/test_namespace/01_7value_multi_quote.json
+++ b/tests/results/test_namespace/01_7value_multi_quote.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "quote'"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -43,13 +31,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "quote'"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_8calculation_information_multi.json b/tests/results/test_namespace/01_8calculation_information_multi.json
index 3cdffc876..959803cb9 100644
--- a/tests/results/test_namespace/01_8calculation_information_multi.json
+++ b/tests/results/test_namespace/01_8calculation_information_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "get information test_information"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -43,13 +31,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "get information test_information"
+          }
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/01_9choice_variable_multi.json b/tests/results/test_namespace/01_9choice_variable_multi.json
index 69b049634..d618d4aff 100644
--- a/tests/results/test_namespace/01_9choice_variable_multi.json
+++ b/tests/results/test_namespace/01_9choice_variable_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,20 +13,8 @@
     },
     "children": {
       "variable1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "a",
-            "b",
-            "c"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A first variable.",
         "properties": [
           {
@@ -45,17 +31,31 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "a",
             "b",
             "c"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "variable2": {
+        "path": "rougail.variable2",
+        "name": "variable2",
+        "description": "A second variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "basic",
         "type": "variable",
         "variable_type": "choice",
         "choices": {
@@ -68,25 +68,7 @@
             },
             "description": "A first variable"
           }
-        },
-        "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
-        "description": "A second variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "basic",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": true
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/01_9choice_variable_optional.json b/tests/results/test_namespace/01_9choice_variable_optional.json
index b279cdfee..90fb0dac4 100644
--- a/tests/results/test_namespace/01_9choice_variable_optional.json
+++ b/tests/results/test_namespace/01_9choice_variable_optional.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "variable": {
+        "path": "rougail.variable",
+        "name": "variable",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -28,25 +38,7 @@
             "b",
             "c"
           ]
-        },
-        "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "c"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/02_0tags.json b/tests/results/test_namespace/02_0tags.json
index 1f70f8d42..deba63f5a 100644
--- a/tests/results/test_namespace/02_0tags.json
+++ b/tests/results/test_namespace/02_0tags.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "The first variable.",
         "properties": [
           {
@@ -31,22 +25,16 @@
           }
         ],
         "mode": "basic",
+        "type": "variable",
+        "variable_type": "string",
         "tags": {
           "name": "Tag",
           "values": "one_tag"
-        },
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        }
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "The second variable.",
         "properties": [
           {
@@ -57,17 +45,15 @@
           }
         ],
         "mode": "basic",
+        "type": "variable",
+        "variable_type": "string",
         "tags": {
           "name": "Tags",
           "values": [
             "one_tag",
             "second_tag"
           ]
-        },
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/04_0type_param.json b/tests/results/test_namespace/04_0type_param.json
index b58ce959b..37fa5819f 100644
--- a/tests/results/test_namespace/04_0type_param.json
+++ b/tests/results/test_namespace/04_0type_param.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "int": {
+        "path": "rougail.int",
+        "name": "int",
+        "description": "A limited number.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -27,25 +37,7 @@
             "the minimum value is 0",
             "the maximum value is 100"
           ]
-        },
-        "path": "rougail.int",
-        "names": [
-          "int"
-        ],
-        "description": "A limited number.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/04_0type_param_integer.json b/tests/results/test_namespace/04_0type_param_integer.json
index d5ef12271..651fe9a89 100644
--- a/tests/results/test_namespace/04_0type_param_integer.json
+++ b/tests/results/test_namespace/04_0type_param_integer.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "int": {
+        "path": "rougail.int",
+        "name": "int",
+        "description": "A limited integer.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -27,25 +37,7 @@
             "the minimum value is 0",
             "the maximum value is 100"
           ]
-        },
-        "path": "rougail.int",
-        "names": [
-          "int"
-        ],
-        "description": "A limited integer.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          10
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/04_1auto_save.json b/tests/results/test_namespace/04_1auto_save.json
index 14dcd701a..76d059f41 100644
--- a/tests/results/test_namespace/04_1auto_save.json
+++ b/tests/results/test_namespace/04_1auto_save.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "An auto save variable.",
         "properties": [
           {
@@ -41,10 +31,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       }
     }
   }
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 976886b5f..245ac3ed2 100644
--- a/tests/results/test_namespace/04_1auto_save_and_calculated.json
+++ b/tests/results/test_namespace/04_1auto_save_and_calculated.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,29 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\"",
-            "path": {
-              "path": "rougail.var1",
-              "type": "variable"
-            },
-            "description": "A first variable"
-          }
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -74,10 +51,19 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\"",
+            "path": {
+              "path": "rougail.var1",
+              "type": "variable"
+            },
+            "description": "A first variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 6441cb3c8..e9d5124a8 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "the value is always yes"
-          }
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -78,10 +60,14 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "the value is always yes"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_1default_calculation_hidden.json b/tests/results/test_namespace/04_1default_calculation_hidden.json
index bb7ebb35c..c14601b76 100644
--- a/tests/results/test_namespace/04_1default_calculation_hidden.json
+++ b/tests/results/test_namespace/04_1default_calculation_hidden.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -70,22 +58,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -96,10 +74,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
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 f6cc5d6df..c14601b76 100644
--- a/tests/results/test_namespace/04_1default_calculation_hidden_2.json
+++ b/tests/results/test_namespace/04_1default_calculation_hidden_2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -70,22 +58,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -96,10 +74,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
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 477de914e..0adc970ed 100644
--- a/tests/results/test_namespace/04_1default_calculation_hidden_3.json
+++ b/tests/results/test_namespace/04_1default_calculation_hidden_3.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var3": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
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 12944120c..7d95b3db7 100644
--- a/tests/results/test_namespace/04_1default_calculation_hidden_4.json
+++ b/tests/results/test_namespace/04_1default_calculation_hidden_4.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -31,22 +25,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -57,10 +41,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
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 2cc35cdbb..17ed6711a 100644
--- a/tests/results/test_namespace/04_1default_calculation_hidden_5.json
+++ b/tests/results/test_namespace/04_1default_calculation_hidden_5.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -64,10 +52,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
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 2cc35cdbb..17ed6711a 100644
--- a/tests/results/test_namespace/04_1default_calculation_hidden_6.json
+++ b/tests/results/test_namespace/04_1default_calculation_hidden_6.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "value"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "value"
+        },
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -64,10 +52,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation.json b/tests/results/test_namespace/04_5disabled_calculation.json
index 307d9b914..d45924421 100644
--- a/tests/results/test_namespace/04_5disabled_calculation.json
+++ b/tests/results/test_namespace/04_5disabled_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A conditional variable.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "variable1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A first variable.",
         "properties": [
           {
@@ -66,18 +54,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "variable2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A second variable.",
         "properties": [
           {
@@ -97,10 +79,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_boolean.json b/tests/results/test_namespace/04_5disabled_calculation_boolean.json
index 52eca57b4..c7dfcf598 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_boolean.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_boolean.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A conditional variable.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "variable1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A first variable.",
         "properties": [
           {
@@ -66,18 +54,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "variable2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A seconde variable.",
         "properties": [
           {
@@ -97,10 +79,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_default.json b/tests/results/test_namespace/04_5disabled_calculation_default.json
index 91937c438..9ee93f78e 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_default.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_default.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var1": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "the value of condition"
-          }
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var1": {
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -72,12 +54,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -85,11 +61,11 @@
             "description": "the value of condition"
           }
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -109,10 +85,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "the value of condition"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_multi.json b/tests/results/test_namespace/04_5disabled_calculation_multi.json
index 9dd400768..7b1997eaf 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_multi.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A conditional variable.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "variable1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A first variable.",
         "properties": [
           {
@@ -72,21 +60,13 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
-      },
-      "variable2": {
         "type": "variable",
         "variable_type": "string",
+        "multiple": true
+      },
+      "variable2": {
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A second variable.",
         "properties": [
           {
@@ -112,13 +92,9 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_optional.json b/tests/results/test_namespace/04_5disabled_calculation_optional.json
index d4acc88e7..623dbdafd 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_optional.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_optional.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -60,18 +48,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -85,10 +67,8 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_optional_default.json b/tests/results/test_namespace/04_5disabled_calculation_optional_default.json
index db5e327d6..a1b750670 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_optional_default.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_optional_default.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,33 +25,25 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": false
+        },
+        "variable_type": "boolean"
       },
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string"
       },
       "var3": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A second variable.",
         "properties": [
           {
@@ -79,18 +61,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string"
       },
       "var4": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var4",
-        "names": [
-          "var4"
-        ],
+        "name": "var4",
         "description": "A forth variable.",
         "properties": [
           {
@@ -108,10 +84,8 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable.json b/tests/results/test_namespace/04_5disabled_calculation_variable.json
index ec86923ff..a3e69c1cc 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": false
+        },
+        "variable_type": "boolean"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -70,10 +58,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable10.json b/tests/results/test_namespace/04_5disabled_calculation_variable10.json
index 41418494a..c9d2883f4 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable10.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable10.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": true
+        },
+        "variable_type": "boolean"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -70,10 +58,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable2.json b/tests/results/test_namespace/04_5disabled_calculation_variable2.json
index 41418494a..c9d2883f4 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable2.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": true
+        },
+        "variable_type": "boolean"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -70,10 +58,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable3.json b/tests/results/test_namespace/04_5disabled_calculation_variable3.json
index 00ff3c121..aa434af50 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable3.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable3.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "yes"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "yes"
+        },
+        "variable_type": "string"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -70,10 +58,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable4.json b/tests/results/test_namespace/04_5disabled_calculation_variable4.json
index c81fc8b13..8ab82e05e 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable4.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable4.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "yes"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "yes"
+        },
+        "variable_type": "string"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -70,10 +58,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable5.json b/tests/results/test_namespace/04_5disabled_calculation_variable5.json
index 50b0266f0..474b778b5 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable5.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable5.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -31,10 +25,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable6.json b/tests/results/test_namespace/04_5disabled_calculation_variable6.json
index 50b0266f0..474b778b5 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable6.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable6.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -31,10 +25,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable7.json b/tests/results/test_namespace/04_5disabled_calculation_variable7.json
index ec86923ff..a3e69c1cc 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable7.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable7.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": false
+        },
+        "variable_type": "boolean"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -70,10 +58,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable9.json b/tests/results/test_namespace/04_5disabled_calculation_variable9.json
index 50b0266f0..474b778b5 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable9.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable9.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -31,10 +25,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
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 91ccf05d9..c49665da1 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": false
+        },
+        "variable_type": "boolean"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -76,13 +64,9 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable_transitive.json b/tests/results/test_namespace/04_5disabled_calculation_variable_transitive.json
index 8ae6b8f96..917e0dd75 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable_transitive.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable_transitive.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": true
+        },
+        "variable_type": "boolean"
       },
       "variable1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A variable.",
         "properties": [
           {
@@ -70,18 +58,12 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "variable2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A second variable.",
         "properties": [
           {
@@ -105,10 +87,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_3.json b/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_3.json
index 2d23bf1c5..a0d5f0af0 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_3.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_3.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
-      },
-      "variable1": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "disabled"
+          "values": false
         },
-        "variable_type": "string",
+        "variable_type": "boolean"
+      },
+      "variable1": {
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A variable.",
         "properties": [
           {
@@ -74,18 +58,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "disabled"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "disabled"
+        },
+        "variable_type": "string"
       },
       "variable2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A second variable.",
         "properties": [
           {
@@ -109,10 +91,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_4.json b/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_4.json
index 82862e88d..e786c43d4 100644
--- a/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_4.json
+++ b/tests/results/test_namespace/04_5disabled_calculation_variable_transitive_4.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
-      },
-      "variable1": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "not_disabled"
+          "values": true
         },
-        "variable_type": "string",
+        "variable_type": "boolean"
+      },
+      "variable1": {
         "path": "rougail.variable1",
-        "names": [
-          "variable1"
-        ],
+        "name": "variable1",
         "description": "A variable.",
         "properties": [
           {
@@ -74,18 +58,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "not_disabled"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "not_disabled"
+        },
+        "variable_type": "string"
       },
       "variable2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable2",
-        "names": [
-          "variable2"
-        ],
+        "name": "variable2",
         "description": "A second variable.",
         "properties": [
           {
@@ -109,10 +91,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5hidden_calculation.json b/tests/results/test_namespace/04_5hidden_calculation.json
index 958304289..23627ffc0 100644
--- a/tests/results/test_namespace/04_5hidden_calculation.json
+++ b/tests/results/test_namespace/04_5hidden_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "The condition.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var1": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var1": {
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -70,22 +54,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -105,10 +83,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5hidden_calculation2.json b/tests/results/test_namespace/04_5hidden_calculation2.json
index 0e517d9d8..de3f41556 100644
--- a/tests/results/test_namespace/04_5hidden_calculation2.json
+++ b/tests/results/test_namespace/04_5hidden_calculation2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var1": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "the value of condition"
-          }
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var1": {
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -72,12 +54,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -85,11 +61,11 @@
             "description": "the value of condition"
           }
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -109,10 +85,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "the value of condition"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 436cf2f11..6712841a7 100644
--- a/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json
+++ b/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var1": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "returns the condition value"
-          }
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var1": {
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -72,12 +54,6 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -85,11 +61,11 @@
             "description": "returns the condition value"
           }
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -109,10 +85,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "returns the condition value"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5validators.json b/tests/results/test_namespace/04_5validators.json
index 4205930ed..fc45b7907 100644
--- a/tests/results/test_namespace/04_5validators.json
+++ b/tests/results/test_namespace/04_5validators.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,18 +13,8 @@
     },
     "children": {
       "int": {
-        "type": "variable",
-        "variable_type": "integer",
-        "validators": {
-          "name": "Validator",
-          "values": {
-            "description": "the max value is 100"
-          }
-        },
         "path": "rougail.int",
-        "names": [
-          "int"
-        ],
+        "name": "int",
         "description": "An integer.",
         "properties": [
           {
@@ -37,10 +25,14 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          42
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "integer",
+        "validators": {
+          "name": "Validator",
+          "values": {
+            "description": "the max value is 100"
+          }
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5validators_differ.json b/tests/results/test_namespace/04_5validators_differ.json
index 76cafa964..5e6188142 100644
--- a/tests/results/test_namespace/04_5validators_differ.json
+++ b/tests/results/test_namespace/04_5validators_differ.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "var1": {
+        "path": "rougail.var1",
+        "name": "var1",
+        "description": "A first variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -27,40 +37,14 @@
             "description": "var1 must be different than var2"
           }
         },
-        "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
-        "description": "A first variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
         "examples": {
           "name": "Example",
           "values": "another_value"
-        },
-        "gen_examples": [
-          "another_value"
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -71,10 +55,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5validators_multi.json b/tests/results/test_namespace/04_5validators_multi.json
index 348b32010..e34a007f4 100644
--- a/tests/results/test_namespace/04_5validators_multi.json
+++ b/tests/results/test_namespace/04_5validators_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,25 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "no",
-            "yes"
-          ]
-        },
-        "variable_type": "string",
-        "validators": {
-          "name": "Validator",
-          "values": {
-            "description": "check length is less than 10"
-          }
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A second variable.",
         "properties": [
           {
@@ -50,14 +31,22 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "no",
             "yes"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "validators": {
+          "name": "Validator",
+          "values": {
+            "description": "check length is less than 10"
+          }
+        },
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5validators_multi2.json b/tests/results/test_namespace/04_5validators_multi2.json
index d221316e1..6444bc57d 100644
--- a/tests/results/test_namespace/04_5validators_multi2.json
+++ b/tests/results/test_namespace/04_5validators_multi2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,25 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "no",
-            "yes"
-          ]
-        },
-        "variable_type": "string",
-        "validators": {
-          "name": "Validator",
-          "values": {
-            "description": "check length is less than 3"
-          }
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A second variable.",
         "properties": [
           {
@@ -50,6 +31,21 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
+            "no",
+            "yes"
+          ]
+        },
+        "variable_type": "string",
+        "validators": {
+          "name": "Validator",
+          "values": {
+            "description": "check length is less than 3"
+          }
+        },
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -57,14 +53,7 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5validators_multi3.json b/tests/results/test_namespace/04_5validators_multi3.json
index 541dc4a96..1d27bb2bd 100644
--- a/tests/results/test_namespace/04_5validators_multi3.json
+++ b/tests/results/test_namespace/04_5validators_multi3.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,26 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            0,
-            1,
-            2
-          ]
-        },
-        "variable_type": "integer",
-        "validators": {
-          "name": "Validator",
-          "values": {
-            "description": "value must be equal to index"
-          }
-        },
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A second variable.",
         "properties": [
           {
@@ -51,17 +31,27 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
+            0,
+            1,
+            2
+          ]
+        },
+        "variable_type": "integer",
+        "validators": {
+          "name": "Validator",
+          "values": {
+            "description": "value must be equal to index"
+          }
+        },
         "multiple": true,
         "examples": {
           "name": "Example",
           "values": 0
-        },
-        "gen_examples": [
-          [
-            0
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5validators_warnings.json b/tests/results/test_namespace/04_5validators_warnings.json
index ba1835bac..583a54691 100644
--- a/tests/results/test_namespace/04_5validators_warnings.json
+++ b/tests/results/test_namespace/04_5validators_warnings.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "int": {
+        "path": "rougail.int",
+        "name": "int",
+        "description": "An integer.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -26,25 +36,7 @@
           "values": {
             "description": "the max value is 100"
           }
-        },
-        "path": "rougail.int",
-        "names": [
-          "int"
-        ],
-        "description": "An integer.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          1000
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/04_5validators_warnings_all.json b/tests/results/test_namespace/04_5validators_warnings_all.json
index 9a65c78cb..179b2343f 100644
--- a/tests/results/test_namespace/04_5validators_warnings_all.json
+++ b/tests/results/test_namespace/04_5validators_warnings_all.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "int": {
+        "path": "rougail.int",
+        "name": "int",
+        "description": "An integer.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -27,25 +37,7 @@
             "the minimum value is 10",
             "the maximum value is 100"
           ]
-        },
-        "path": "rougail.int",
-        "names": [
-          "int"
-        ],
-        "description": "An integer.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          1000
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/05_0multi_not_uniq.json b/tests/results/test_namespace/05_0multi_not_uniq.json
index 794eb3d77..bce63cf5e 100644
--- a/tests/results/test_namespace/05_0multi_not_uniq.json
+++ b/tests/results/test_namespace/05_0multi_not_uniq.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "non"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A variable.",
         "properties": [
           {
@@ -37,13 +25,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "non"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/05_0multi_uniq.json b/tests/results/test_namespace/05_0multi_uniq.json
index bd5fd8a72..cfc3b47bd 100644
--- a/tests/results/test_namespace/05_0multi_uniq.json
+++ b/tests/results/test_namespace/05_0multi_uniq.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "non"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -43,13 +31,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "non"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/12_1auto_save_expert.json b/tests/results/test_namespace/12_1auto_save_expert.json
index c6832d013..5002a068a 100644
--- a/tests/results/test_namespace/12_1auto_save_expert.json
+++ b/tests/results/test_namespace/12_1auto_save_expert.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "advanced",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A variable.",
         "properties": [
           {
@@ -41,10 +31,12 @@
           }
         ],
         "mode": "advanced",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_0redefine_description.json b/tests/results/test_namespace/16_0redefine_description.json
index 547eab734..70e47ad7f 100644
--- a/tests/results/test_namespace/16_0redefine_description.json
+++ b/tests/results/test_namespace/16_0redefine_description.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "Redefined.",
         "properties": [
           {
@@ -31,10 +25,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_2family_redefine_calculation.json b/tests/results/test_namespace/16_2family_redefine_calculation.json
index c75e73d18..c84725572 100644
--- a/tests/results/test_namespace/16_2family_redefine_calculation.json
+++ b/tests/results/test_namespace/16_2family_redefine_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "family",
           "properties": [
             {
@@ -35,12 +31,8 @@
         },
         "children": {
           "var1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.var1",
-            "names": [
-              "var1"
-            ],
+            "name": "var1",
             "properties": [
               {
                 "type": "property",
@@ -50,10 +42,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/16_3family_empty_at_ends.json b/tests/results/test_namespace/16_3family_empty_at_ends.json
index 141e39ad0..6410e7577 100644
--- a/tests/results/test_namespace/16_3family_empty_at_ends.json
+++ b/tests/results/test_namespace/16_3family_empty_at_ends.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,21 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "family",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "var1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.var1",
-            "names": [
-              "var1"
-            ],
+            "name": "var1",
             "properties": [
               {
                 "type": "property",
@@ -42,10 +34,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/16_5exists_nonexists.json b/tests/results/test_namespace/16_5exists_nonexists.json
index 954e44f88..b5c04ce09 100644
--- a/tests/results/test_namespace/16_5exists_nonexists.json
+++ b/tests/results/test_namespace/16_5exists_nonexists.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "yes"
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A new variable.",
         "properties": [
           {
@@ -61,10 +45,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "yes"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_5redefine_calculation.json b/tests/results/test_namespace/16_5redefine_calculation.json
index bd799eae2..9e5532320 100644
--- a/tests/results/test_namespace/16_5redefine_calculation.json
+++ b/tests/results/test_namespace/16_5redefine_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "returns yes"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -37,10 +25,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "returns yes"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_5redefine_choice.json b/tests/results/test_namespace/16_5redefine_choice.json
index 7d15a65e3..cde00964e 100644
--- a/tests/results/test_namespace/16_5redefine_choice.json
+++ b/tests/results/test_namespace/16_5redefine_choice.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "variable_type": "choice",
-        "choices": {
-          "name": "Choices",
-          "values": [
-            "a",
-            "b"
-          ]
-        },
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -38,10 +25,15 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "a_choice"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "choice",
+        "choices": {
+          "name": "Choices",
+          "values": [
+            "a",
+            "b"
+          ]
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/16_5redefine_default.json b/tests/results/test_namespace/16_5redefine_default.json
index 2602f0daf..63417f6b3 100644
--- a/tests/results/test_namespace/16_5redefine_default.json
+++ b/tests/results/test_namespace/16_5redefine_default.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "yes"
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -35,10 +25,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "yes"
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_5redefine_default_calculation.json b/tests/results/test_namespace/16_5redefine_default_calculation.json
index 50b0266f0..474b778b5 100644
--- a/tests/results/test_namespace/16_5redefine_default_calculation.json
+++ b/tests/results/test_namespace/16_5redefine_default_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -31,10 +25,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_5redefine_family.json b/tests/results/test_namespace/16_5redefine_family.json
index d8a8f8ab5..cf9495833 100644
--- a/tests/results/test_namespace/16_5redefine_family.json
+++ b/tests/results/test_namespace/16_5redefine_family.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,21 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "New description",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "variable": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.variable",
-            "names": [
-              "variable"
-            ],
+            "name": "variable",
             "description": "A variable.",
             "properties": [
               {
@@ -43,10 +35,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/16_5redefine_help.json b/tests/results/test_namespace/16_5redefine_help.json
index 3fe38cd47..c175f7920 100644
--- a/tests/results/test_namespace/16_5redefine_help.json
+++ b/tests/results/test_namespace/16_5redefine_help.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "help": [
             "Redefine help family ok."
@@ -30,12 +26,8 @@
         },
         "children": {
           "variable": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.variable",
-            "names": [
-              "variable"
-            ],
+            "name": "variable",
             "description": "Redefine help.",
             "help": [
               "Redefine help ok."
@@ -49,10 +41,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/16_5redefine_multi.json b/tests/results/test_namespace/16_5redefine_multi.json
index bd5fd8a72..cfc3b47bd 100644
--- a/tests/results/test_namespace/16_5redefine_multi.json
+++ b/tests/results/test_namespace/16_5redefine_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "non"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -43,13 +31,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "non"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 5cbcf07e1..2e8935edc 100644
--- a/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json
+++ b/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -57,10 +45,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_5test_redefine.json b/tests/results/test_namespace/16_5test_redefine.json
index 2852a5c9f..43c72d1db 100644
--- a/tests/results/test_namespace/16_5test_redefine.json
+++ b/tests/results/test_namespace/16_5test_redefine.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,26 +25,20 @@
           }
         ],
         "mode": "standard",
-        "examples": {
-          "name": "Example",
-          "values": "test1"
-        },
-        "gen_examples": [
-          "test1"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "non"
+          "values": "no"
         },
         "variable_type": "string",
+        "examples": {
+          "name": "Example",
+          "values": "test1"
+        }
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -65,22 +49,20 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "non"
+        },
+        "variable_type": "string",
         "examples": {
           "name": "Example",
           "values": "test1"
-        },
-        "gen_examples": [
-          "test1"
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var3": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -91,10 +73,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/16_6choice_redefine.json b/tests/results/test_namespace/16_6choice_redefine.json
index 49989e73b..ab6f65eda 100644
--- a/tests/results/test_namespace/16_6choice_redefine.json
+++ b/tests/results/test_namespace/16_6choice_redefine.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,18 @@
     },
     "children": {
       "var": {
+        "path": "rougail.var",
+        "name": "var",
+        "description": "A choice.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -27,25 +37,7 @@
             "a",
             "c"
           ]
-        },
-        "path": "rougail.var",
-        "names": [
-          "var"
-        ],
-        "description": "A choice.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "c"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/16_6exists_redefine_family.json b/tests/results/test_namespace/16_6exists_redefine_family.json
index 4a855e690..9d76adc29 100644
--- a/tests/results/test_namespace/16_6exists_redefine_family.json
+++ b/tests/results/test_namespace/16_6exists_redefine_family.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,21 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.family1",
-          "names": [
-            "family1"
-          ],
+          "name": "family1",
           "description": "New description",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "variable1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family1.variable1",
-            "names": [
-              "variable1"
-            ],
+            "name": "variable1",
             "description": "A variable.",
             "properties": [
               {
@@ -43,10 +35,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
@@ -54,21 +44,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.family2",
-          "names": [
-            "family2"
-          ],
+          "name": "family2",
           "description": "A second family",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "variable2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family2.variable2",
-            "names": [
-              "variable2"
-            ],
+            "name": "variable2",
             "description": "A second variable.",
             "properties": [
               {
@@ -79,10 +63,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/16exists_exists.json b/tests/results/test_namespace/16exists_exists.json
index ca95cb1a5..639f57003 100644
--- a/tests/results/test_namespace/16exists_exists.json
+++ b/tests/results/test_namespace/16exists_exists.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "Description.",
         "properties": [
           {
@@ -31,10 +25,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/20_0family_append.json b/tests/results/test_namespace/20_0family_append.json
index 98013fc5e..1c0ed59e9 100644
--- a/tests/results/test_namespace/20_0family_append.json
+++ b/tests/results/test_namespace/20_0family_append.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,21 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "var1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.var1",
-            "names": [
-              "var1"
-            ],
+            "name": "var1",
             "description": "The first variable.",
             "properties": [
               {
@@ -43,18 +35,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "var2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.var2",
-            "names": [
-              "var2"
-            ],
+            "name": "var2",
             "description": "The second variable.",
             "properties": [
               {
@@ -65,10 +51,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/20_0multi_family.json b/tests/results/test_namespace/20_0multi_family.json
index cfa57bda3..c943a9e90 100644
--- a/tests/results/test_namespace/20_0multi_family.json
+++ b/tests/results/test_namespace/20_0multi_family.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [],
           "mode": "standard"
@@ -30,28 +26,20 @@
             "type": "family",
             "informations": {
               "path": "rougail.family.subfamily",
-              "names": [
-                "subfamily"
-              ],
+              "name": "subfamily",
               "description": "A sub family",
               "properties": [],
               "mode": "standard"
             },
             "children": {
               "variable": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.family.subfamily.variable",
-                "names": [
-                  "variable"
-                ],
+                "name": "variable",
                 "description": "A variable.",
                 "properties": [],
                 "mode": "standard",
-                "gen_examples": [
-                  "example"
-                ],
-                "mandatory_without_value": false
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
diff --git a/tests/results/test_namespace/20_0multi_family_basic.json b/tests/results/test_namespace/20_0multi_family_basic.json
index 81dd4989c..99c9b30dc 100644
--- a/tests/results/test_namespace/20_0multi_family_basic.json
+++ b/tests/results/test_namespace/20_0multi_family_basic.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [],
           "mode": "basic"
@@ -30,21 +26,15 @@
             "type": "family",
             "informations": {
               "path": "rougail.family.subfamily",
-              "names": [
-                "subfamily"
-              ],
+              "name": "subfamily",
               "description": "A sub family",
               "properties": [],
               "mode": "basic"
             },
             "children": {
               "variable": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.family.subfamily.variable",
-                "names": [
-                  "variable"
-                ],
+                "name": "variable",
                 "description": "A variable.",
                 "properties": [
                   {
@@ -55,10 +45,8 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  "example"
-                ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
diff --git a/tests/results/test_namespace/20_0multi_family_expert.json b/tests/results/test_namespace/20_0multi_family_expert.json
index f59b44641..ce730049a 100644
--- a/tests/results/test_namespace/20_0multi_family_expert.json
+++ b/tests/results/test_namespace/20_0multi_family_expert.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "advanced",
@@ -18,9 +16,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [],
           "mode": "advanced"
@@ -30,28 +26,20 @@
             "type": "family",
             "informations": {
               "path": "rougail.family.subfamily",
-              "names": [
-                "subfamily"
-              ],
+              "name": "subfamily",
               "description": "A sub family",
               "properties": [],
               "mode": "advanced"
             },
             "children": {
               "variable": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.family.subfamily.variable",
-                "names": [
-                  "variable"
-                ],
+                "name": "variable",
                 "description": "A variable.",
                 "properties": [],
                 "mode": "advanced",
-                "gen_examples": [
-                  "example"
-                ],
-                "mandatory_without_value": false
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
diff --git a/tests/results/test_namespace/20_0multi_family_order.json b/tests/results/test_namespace/20_0multi_family_order.json
index e0cee2f60..e5696af2d 100644
--- a/tests/results/test_namespace/20_0multi_family_order.json
+++ b/tests/results/test_namespace/20_0multi_family_order.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "variable": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
+        "name": "variable",
         "description": "A variable.",
         "properties": [
           {
@@ -31,30 +25,22 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "variable1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.variable1",
-            "names": [
-              "variable1"
-            ],
+            "name": "variable1",
             "description": "A first variable.",
             "properties": [
               {
@@ -65,30 +51,22 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "subfamily": {
             "type": "family",
             "informations": {
               "path": "rougail.family.subfamily",
-              "names": [
-                "subfamily"
-              ],
+              "name": "subfamily",
               "description": "A sub family",
               "properties": [],
               "mode": "basic"
             },
             "children": {
               "variable": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.family.subfamily.variable",
-                "names": [
-                  "variable"
-                ],
+                "name": "variable",
                 "description": "A variable.",
                 "properties": [
                   {
@@ -99,20 +77,14 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  "example"
-                ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           },
           "variable2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.variable2",
-            "names": [
-              "variable2"
-            ],
+            "name": "variable2",
             "description": "A second variable.",
             "properties": [
               {
@@ -123,10 +95,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/20_0validators_differ_redefine.json b/tests/results/test_namespace/20_0validators_differ_redefine.json
index 01f56277c..c8907b33e 100644
--- a/tests/results/test_namespace/20_0validators_differ_redefine.json
+++ b/tests/results/test_namespace/20_0validators_differ_redefine.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -61,12 +45,26 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "var3": {
+        "path": "rougail.var3",
+        "name": "var3",
+        "description": "A third variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -79,28 +77,10 @@
             "description": "var3 must be different than var2"
           }
         },
-        "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
-        "description": "A third variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
         "examples": {
           "name": "Example",
           "values": "yes"
-        },
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        }
       }
     }
   }
diff --git a/tests/results/test_namespace/20_2family_looks_like_dynamic.json b/tests/results/test_namespace/20_2family_looks_like_dynamic.json
index 5d173ac17..8bf0ba81b 100644
--- a/tests/results/test_namespace/20_2family_looks_like_dynamic.json
+++ b/tests/results/test_namespace/20_2family_looks_like_dynamic.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,28 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.my_family",
-          "names": [
-            "my_family"
-          ],
+          "name": "my_family",
           "description": "my_family",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "dynamic": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "val1",
-                "val2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.my_family.dynamic",
-            "names": [
-              "dynamic"
-            ],
+            "name": "dynamic",
             "properties": [
               {
                 "type": "property",
@@ -55,26 +40,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "val1",
-                "val2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "var": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": true
+              "values": [
+                "val1",
+                "val2"
+              ]
             },
-            "variable_type": "boolean",
+            "variable_type": "string",
+            "multiple": true
+          },
+          "var": {
             "path": "rougail.my_family.var",
-            "names": [
-              "var"
-            ],
+            "name": "var",
             "description": "A variable.",
             "properties": [
               {
@@ -85,10 +64,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              true
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": true
+            },
+            "variable_type": "boolean"
           }
         }
       }
diff --git a/tests/results/test_namespace/20_2family_looks_like_variable.json b/tests/results/test_namespace/20_2family_looks_like_variable.json
index 665697830..1ea58d3b4 100644
--- a/tests/results/test_namespace/20_2family_looks_like_variable.json
+++ b/tests/results/test_namespace/20_2family_looks_like_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,25 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.my_family",
-          "names": [
-            "my_family"
-          ],
+          "name": "my_family",
           "description": "my_family",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "default": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": true
-            },
-            "variable_type": "boolean",
             "path": "rougail.my_family.default",
-            "names": [
-              "default"
-            ],
+            "name": "default",
             "properties": [
               {
                 "type": "property",
@@ -46,10 +34,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              true
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": true
+            },
+            "variable_type": "boolean"
           }
         }
       }
diff --git a/tests/results/test_namespace/20_7help_family.json b/tests/results/test_namespace/20_7help_family.json
index 54014c6ea..9769591f9 100644
--- a/tests/results/test_namespace/20_7help_family.json
+++ b/tests/results/test_namespace/20_7help_family.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.family1",
-          "names": [
-            "family1"
-          ],
+          "name": "family1",
           "description": "The first family",
           "help": [
             "Multi line\n\nHelp\n\nWith useful information."
@@ -30,12 +26,8 @@
         },
         "children": {
           "var": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family1.var",
-            "names": [
-              "var"
-            ],
+            "name": "var",
             "properties": [
               {
                 "type": "property",
@@ -45,10 +37,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
@@ -56,9 +46,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.family2",
-          "names": [
-            "family2"
-          ],
+          "name": "family2",
           "description": "The second family",
           "help": [
             "Multi line\nHelp\nWith useful information."
@@ -68,12 +56,8 @@
         },
         "children": {
           "var": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family2.var",
-            "names": [
-              "var"
-            ],
+            "name": "var",
             "properties": [
               {
                 "type": "property",
@@ -83,10 +67,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/20_9default_information_parent.json b/tests/results/test_namespace/20_9default_information_parent.json
index 67ecd5dba..3a99a29f0 100644
--- a/tests/results/test_namespace/20_9default_information_parent.json
+++ b/tests/results/test_namespace/20_9default_information_parent.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,21 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "family",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "var1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.var1",
-            "names": [
-              "var1"
-            ],
+            "name": "var1",
             "description": "A first variable.",
             "properties": [
               {
@@ -43,22 +35,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "var2": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the information \"test_information\" of the variable \"rougail.family\""
-            },
-            "variable_type": "string",
             "path": "rougail.family.var2",
-            "names": [
-              "var2"
-            ],
+            "name": "var2",
             "description": "A second variable.",
             "properties": [
               {
@@ -69,10 +51,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the information \"test_information\" of the variable \"rougail.family\""
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/24_0family_hidden_condition.json b/tests/results/test_namespace/24_0family_hidden_condition.json
index 13616a766..4d3d83b04 100644
--- a/tests/results/test_namespace/24_0family_hidden_condition.json
+++ b/tests/results/test_namespace/24_0family_hidden_condition.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "The variable use has condition.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "Possibly hidden family",
           "properties": [
             {
@@ -63,12 +53,8 @@
         },
         "children": {
           "var1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.var1",
-            "names": [
-              "var1"
-            ],
+            "name": "var1",
             "description": "A variable.",
             "properties": [
               {
@@ -79,10 +65,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 7e300338e..7f8c082a1 100644
--- a/tests/results/test_namespace/24_0family_hidden_condition_boolean.json
+++ b/tests/results/test_namespace/24_0family_hidden_condition_boolean.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A conditional variable.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": false
+        },
+        "variable_type": "boolean"
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [
             {
@@ -63,19 +53,13 @@
         },
         "children": {
           "variable": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.variable",
-            "names": [
-              "variable"
-            ],
+            "name": "variable",
             "description": "A variable.",
             "properties": [],
             "mode": "standard",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 8434e086f..e802a9340 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "The variable use has condition.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "Possibly hidden family",
           "properties": [
             {
@@ -66,21 +56,15 @@
             "type": "family",
             "informations": {
               "path": "rougail.family.subfamily",
-              "names": [
-                "subfamily"
-              ],
+              "name": "subfamily",
               "description": "subfamily",
               "properties": [],
               "mode": "basic"
             },
             "children": {
               "var1": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.family.subfamily.var1",
-                "names": [
-                  "var1"
-                ],
+                "name": "var1",
                 "description": "A variable.",
                 "properties": [
                   {
@@ -91,10 +75,8 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  "example"
-                ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
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 e631633d5..ac827c09a 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "The variable use has condition.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": true
+        },
+        "variable_type": "boolean"
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "Possibly hidden family",
           "properties": [
             {
@@ -70,28 +60,20 @@
             "type": "family",
             "informations": {
               "path": "rougail.family.subfamily",
-              "names": [
-                "subfamily"
-              ],
+              "name": "subfamily",
               "description": "A subfamily",
               "properties": [],
               "mode": "standard"
             },
             "children": {
               "var1": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.family.subfamily.var1",
-                "names": [
-                  "var1"
-                ],
+                "name": "var1",
                 "description": "A variable.",
                 "properties": [],
                 "mode": "standard",
-                "gen_examples": [
-                  "example"
-                ],
-                "mandatory_without_value": false
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
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 4955b1d3b..b52941617 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition1",
-        "names": [
-          "condition1"
-        ],
+        "name": "condition1",
         "description": "A first conditional variable.",
         "properties": [
           {
@@ -35,22 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
-      },
-      "condition2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": false
         },
-        "variable_type": "boolean",
+        "variable_type": "boolean"
+      },
+      "condition2": {
         "path": "rougail.condition2",
-        "names": [
-          "condition2"
-        ],
+        "name": "condition2",
         "description": "A second conditional variable.",
         "properties": [
           {
@@ -61,18 +45,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": false
+        },
+        "variable_type": "boolean"
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [
             {
@@ -89,12 +73,8 @@
         },
         "children": {
           "variable": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.family.variable",
-            "names": [
-              "variable"
-            ],
+            "name": "variable",
             "description": "A variable.",
             "properties": [
               {
@@ -108,10 +88,8 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "example"
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 d7a048c07..2edce40fd 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "The variable use has condition.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "family": {
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "Possibly hidden family",
           "properties": [
             {
@@ -66,21 +56,15 @@
             "type": "family",
             "informations": {
               "path": "rougail.family.sub_family",
-              "names": [
-                "sub_family"
-              ],
+              "name": "sub_family",
               "description": "A subfamily",
               "properties": [],
               "mode": "basic"
             },
             "children": {
               "var1": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.family.sub_family.var1",
-                "names": [
-                  "var1"
-                ],
+                "name": "var1",
                 "description": "A variable.",
                 "properties": [
                   {
@@ -91,10 +75,8 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  "example"
-                ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
diff --git a/tests/results/test_namespace/24_0family_mandatory_condition.json b/tests/results/test_namespace/24_0family_mandatory_condition.json
index 885458ec7..85f0048cb 100644
--- a/tests/results/test_namespace/24_0family_mandatory_condition.json
+++ b/tests/results/test_namespace/24_0family_mandatory_condition.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A variable.",
         "properties": [
           {
@@ -60,10 +48,8 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
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 b2c89fcb2..1ae22f741 100644
--- a/tests/results/test_namespace/24_0family_mandatory_condition_variable.json
+++ b/tests/results/test_namespace/24_0family_mandatory_condition_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": true
+        },
+        "variable_type": "boolean"
       },
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A variable.",
         "properties": [
           {
@@ -64,10 +52,8 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/24_7validators_variable_optional.json b/tests/results/test_namespace/24_7validators_variable_optional.json
index e0ecc7a09..419c40042 100644
--- a/tests/results/test_namespace/24_7validators_variable_optional.json
+++ b/tests/results/test_namespace/24_7validators_variable_optional.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,15 +16,25 @@
         "type": "family",
         "informations": {
           "path": "rougail.general",
-          "names": [
-            "general"
-          ],
+          "name": "general",
           "description": "A family",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "int": {
+            "path": "rougail.general.int",
+            "name": "int",
+            "description": "A first integer.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
+            ],
+            "mode": "basic",
             "type": "variable",
             "variable_type": "integer",
             "validators": {
@@ -40,40 +48,14 @@
                 }
               ]
             },
-            "path": "rougail.general.int",
-            "names": [
-              "int"
-            ],
-            "description": "A first integer.",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "basic",
             "examples": {
               "name": "Example",
               "values": 5
-            },
-            "gen_examples": [
-              5
-            ],
-            "mandatory_without_value": true
+            }
           },
           "int2": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": 1
-            },
-            "variable_type": "integer",
             "path": "rougail.general.int2",
-            "names": [
-              "int2"
-            ],
+            "name": "int2",
             "description": "A second integer.",
             "properties": [
               {
@@ -84,10 +66,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              1
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": 1
+            },
+            "variable_type": "integer"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_0leadership.json b/tests/results/test_namespace/40_0leadership.json
index 96eae850b..9eb491f58 100644
--- a/tests/results/test_namespace/40_0leadership.json
+++ b/tests/results/test_namespace/40_0leadership.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -52,21 +44,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
-          },
-          "follower1": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -77,20 +61,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "follower2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -101,12 +77,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_0leadership_diff_name.json b/tests/results/test_namespace/40_0leadership_diff_name.json
index 0d994707f..1caf9618f 100644
--- a/tests/results/test_namespace/40_0leadership_diff_name.json
+++ b/tests/results/test_namespace/40_0leadership_diff_name.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership",
-          "names": [
-            "leadership"
-          ],
+          "name": "leadership",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leadership.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -52,21 +44,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
-          },
-          "follower1": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leadership.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -77,20 +61,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "follower2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leadership.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -101,12 +77,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 72e2ecfb3..cc018f7d1 100644
--- a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json
+++ b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -52,25 +44,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string",
+            "multiple": true
           },
           "follower1": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "value"
-            },
-            "variable_type": "string",
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -81,26 +61,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "value"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": {
-                "description": "returns follower1 value"
-              }
+              "values": "value"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "A second follower.",
             "properties": [
               {
@@ -111,12 +81,14 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "value"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "returns follower1 value"
+              }
+            },
+            "variable_type": "string"
           }
         }
       }
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 e424e2a34..853d5c461 100644
--- a/tests/results/test_namespace/40_0leadership_follower_default_submulti.json
+++ b/tests/results/test_namespace/40_0leadership_follower_default_submulti.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,18 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "leader"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -58,27 +44,19 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "leader"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
               "values": [
-                "value"
+                "leader"
               ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower1.",
             "properties": [
               {
@@ -95,30 +73,19 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value"
-                ]
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
               "values": [
-                "value1",
-                "value2"
+                "value"
               ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "A follower2.",
             "properties": [
               {
@@ -135,16 +102,16 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value1",
-                  "value2"
-                ]
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
+                "value1",
+                "value2"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           }
         }
       }
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 6ae155768..7c9105d39 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,18 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "leader"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "The leader.",
             "properties": [
               {
@@ -58,27 +44,19 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "leader"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
               "values": [
-                "value"
+                "leader"
               ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "The follower1.",
             "properties": [
               {
@@ -95,34 +73,19 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value"
-                ]
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": {
-                "message": "the value of the variable \"{0}\"",
-                "path": {
-                  "path": "rougail.leader.follower1",
-                  "type": "variable"
-                },
-                "description": "The follower1"
-              }
+              "values": [
+                "value"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "The follower2.",
             "properties": [
               {
@@ -139,15 +102,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value"
-                ]
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "message": "the value of the variable \"{0}\"",
+                "path": {
+                  "path": "rougail.leader.follower1",
+                  "type": "variable"
+                },
+                "description": "The follower1"
+              }
+            },
+            "variable_type": "string",
+            "multiple": true
           }
         }
       }
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 544355536..adc1dfcae 100644
--- a/tests/results/test_namespace/40_0leadership_follower_default_value.json
+++ b/tests/results/test_namespace/40_0leadership_follower_default_value.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -46,25 +38,13 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string",
+            "multiple": true
           },
           "follower1": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "value"
-            },
-            "variable_type": "string",
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower with default value.",
             "properties": [
               {
@@ -75,12 +55,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "value"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "value"
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_0leadership_leader_follower.json b/tests/results/test_namespace/40_0leadership_leader_follower.json
index 30bc3edba..fc11df1bc 100644
--- a/tests/results/test_namespace/40_0leadership_leader_follower.json
+++ b/tests/results/test_namespace/40_0leadership_leader_follower.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership",
-          "names": [
-            "leadership"
-          ],
+          "name": "leadership",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,16 +44,30 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "value1",
                 "value2"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower": {
+            "path": "rougail.leadership.follower",
+            "name": "follower",
+            "description": "A follower.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
+            ],
+            "mode": "standard",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -81,28 +80,7 @@
                 "description": "A leader"
               }
             },
-            "variable_type": "string",
-            "path": "rougail.leadership.follower",
-            "names": [
-              "follower"
-            ],
-            "description": "A follower.",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 f1b21db2e..cf92c2b55 100644
--- a/tests/results/test_namespace/40_0leadership_leader_not_multi.json
+++ b/tests/results/test_namespace/40_0leadership_leader_not_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,25 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.general",
-          "names": [
-            "general"
-          ],
+          "name": "general",
           "description": "general",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "mode_conteneur_actif": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "non"
-            },
-            "variable_type": "string",
             "path": "rougail.general.mode_conteneur_actif",
-            "names": [
-              "mode_conteneur_actif"
-            ],
+            "name": "mode_conteneur_actif",
             "description": "No change.",
             "properties": [
               {
@@ -47,10 +35,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "non"
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "non"
+            },
+            "variable_type": "string"
           }
         }
       },
@@ -58,9 +48,7 @@
         "type": "family",
         "informations": {
           "path": "rougail.general1",
-          "names": [
-            "general1"
-          ],
+          "name": "general1",
           "description": "general1",
           "properties": [],
           "mode": "basic"
@@ -70,9 +58,7 @@
             "type": "leadership",
             "informations": {
               "path": "rougail.general1.leader",
-              "names": [
-                "leader"
-              ],
+              "name": "leader",
               "description": "Leader",
               "properties": [],
               "mode": "basic",
@@ -82,12 +68,8 @@
             },
             "children": {
               "leader": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.general1.leader.leader",
-                "names": [
-                  "leader"
-                ],
+                "name": "leader",
                 "description": "Leader.",
                 "properties": [
                   {
@@ -104,21 +86,13 @@
                   }
                 ],
                 "mode": "basic",
-                "multiple": true,
-                "gen_examples": [
-                  [
-                    "example"
-                  ]
-                ],
-                "mandatory_without_value": true
-              },
-              "follower1": {
                 "type": "variable",
                 "variable_type": "string",
+                "multiple": true
+              },
+              "follower1": {
                 "path": "rougail.general1.leader.follower1",
-                "names": [
-                  "follower1"
-                ],
+                "name": "follower1",
                 "description": "Follower1.",
                 "properties": [
                   {
@@ -129,20 +103,12 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  [
-                    "example"
-                  ]
-                ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               },
               "follower2": {
-                "type": "variable",
-                "variable_type": "string",
                 "path": "rougail.general1.leader.follower2",
-                "names": [
-                  "follower2"
-                ],
+                "name": "follower2",
                 "description": "Follower2.",
                 "properties": [
                   {
@@ -153,12 +119,8 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  [
-                    "example"
-                  ]
-                ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
diff --git a/tests/results/test_namespace/40_0leadership_reduce.json b/tests/results/test_namespace/40_0leadership_reduce.json
index bee7d8a24..6478a1f88 100644
--- a/tests/results/test_namespace/40_0leadership_reduce.json
+++ b/tests/results/test_namespace/40_0leadership_reduce.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership",
-          "names": [
-            "leadership"
-          ],
+          "name": "leadership",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,20 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value_1",
-                "value_2",
-                "value_3"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -60,6 +44,16 @@
               }
             ],
             "mode": "standard",
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
+                "value_1",
+                "value_2",
+                "value_3"
+              ]
+            },
+            "variable_type": "string",
             "multiple": true,
             "examples": {
               "name": "Examples",
@@ -67,22 +61,11 @@
                 "val1",
                 "val2"
               ]
-            },
-            "gen_examples": [
-              [
-                "val1",
-                "val2"
-              ]
-            ],
-            "mandatory_without_value": false
+            }
           },
           "follower": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leadership.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -93,13 +76,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example",
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_1leadership_append_follower.json b/tests/results/test_namespace/40_1leadership_append_follower.json
index 9c6cfad76..87d8d43a5 100644
--- a/tests/results/test_namespace/40_1leadership_append_follower.json
+++ b/tests/results/test_namespace/40_1leadership_append_follower.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "The leader.",
             "properties": [
               {
@@ -52,21 +44,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
-          },
-          "follower1": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "The follower1.",
             "properties": [
               {
@@ -77,20 +61,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "follower2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "The follower2.",
             "properties": [
               {
@@ -101,20 +77,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "follower3": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower3",
-            "names": [
-              "follower3"
-            ],
+            "name": "follower3",
             "description": "The follower3.",
             "properties": [
               {
@@ -125,12 +93,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_2leadership_calculation_index.json b/tests/results/test_namespace/40_2leadership_calculation_index.json
index ef9676831..3900f6e94 100644
--- a/tests/results/test_namespace/40_2leadership_calculation_index.json
+++ b/tests/results/test_namespace/40_2leadership_calculation_index.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,20 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a",
-                "b",
-                "c"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -60,27 +44,21 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "a",
                 "b",
                 "c"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower1": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the index"
-            },
-            "variable_type": "integer",
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -91,14 +69,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                0,
-                1,
-                2
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the index"
+            },
+            "variable_type": "integer"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_2leadership_calculation_index_2.json b/tests/results/test_namespace/40_2leadership_calculation_index_2.json
index ef9676831..3900f6e94 100644
--- a/tests/results/test_namespace/40_2leadership_calculation_index_2.json
+++ b/tests/results/test_namespace/40_2leadership_calculation_index_2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,20 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a",
-                "b",
-                "c"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -60,27 +44,21 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "a",
                 "b",
                 "c"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower1": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the index"
-            },
-            "variable_type": "integer",
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -91,14 +69,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                0,
-                1,
-                2
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the index"
+            },
+            "variable_type": "integer"
           }
         }
       }
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 dc474eece..9e444e11c 100644
--- a/tests/results/test_namespace/40_2leadership_calculation_param_index.json
+++ b/tests/results/test_namespace/40_2leadership_calculation_param_index.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "Leadership",
           "properties": [],
           "mode": "standard",
@@ -30,20 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a",
-                "b",
-                "c"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -60,29 +44,21 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "a",
                 "b",
                 "c"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower1": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "description": "returns index"
-              }
-            },
-            "variable_type": "integer",
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -93,14 +69,14 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                0,
-                1,
-                2
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "returns index"
+              }
+            },
+            "variable_type": "integer"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_2leadership_leader_calculation.json b/tests/results/test_namespace/40_2leadership_leader_calculation.json
index 76810c349..dd856e0f2 100644
--- a/tests/results/test_namespace/40_2leadership_leader_calculation.json
+++ b/tests/results/test_namespace/40_2leadership_leader_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,18 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "description": "returns val1 and val2"
-              }
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -58,22 +44,19 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "val1",
-                "val2"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "returns val1 and val2"
+              }
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower1": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A first follower.",
             "properties": [
               {
@@ -84,21 +67,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example",
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           },
           "follower2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "A second follower.",
             "properties": [
               {
@@ -109,13 +83,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example",
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/40_6leadership_follower_multi.json b/tests/results/test_namespace/40_6leadership_follower_multi.json
index 86043202f..e9ed06b95 100644
--- a/tests/results/test_namespace/40_6leadership_follower_multi.json
+++ b/tests/results/test_namespace/40_6leadership_follower_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership",
-          "names": [
-            "leadership"
-          ],
+          "name": "leadership",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leadership.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "The leader.",
             "properties": [
               {
@@ -52,21 +44,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
-          },
-          "follower1": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leadership.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "The first follower.",
             "properties": [
               {
@@ -83,29 +67,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "example"
-                ]
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string",
+            "multiple": true
           },
           "follower2": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "The second follower.",
             "properties": [
               {
@@ -122,15 +90,15 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value"
-                ]
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
+                "value"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           }
         }
       }
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 1b445751f..080c7e3bb 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership",
-          "names": [
-            "leadership"
-          ],
+          "name": "leadership",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leadership.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "The leader.",
             "properties": [
               {
@@ -46,21 +38,13 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leadership.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "The first follower.",
             "properties": [
               {
@@ -77,29 +61,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "example"
-                ]
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string",
+            "multiple": true
           },
           "follower2": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "The second follower.",
             "properties": [
               {
@@ -116,15 +84,15 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value"
-                ]
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
+                "value"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           }
         }
       }
diff --git a/tests/results/test_namespace/40_8calculation_boolean.json b/tests/results/test_namespace/40_8calculation_boolean.json
index c5a8b541d..064ba4755 100644
--- a/tests/results/test_namespace/40_8calculation_boolean.json
+++ b/tests/results/test_namespace/40_8calculation_boolean.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "bool": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.bool",
-        "names": [
-          "bool"
-        ],
+        "name": "bool",
         "description": "A boolean variable.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
-      },
-      "multi1": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "a calculation"
-          }
+          "values": false
         },
-        "variable_type": "boolean",
+        "variable_type": "boolean"
+      },
+      "multi1": {
         "path": "rougail.multi1",
-        "names": [
-          "multi1"
-        ],
+        "name": "multi1",
         "description": "A first multi variable.",
         "properties": [
           {
@@ -69,15 +51,6 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            false
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "multi2": {
         "type": "variable",
         "default": {
           "name": "Default",
@@ -86,10 +59,11 @@
           }
         },
         "variable_type": "boolean",
+        "multiple": true
+      },
+      "multi2": {
         "path": "rougail.multi2",
-        "names": [
-          "multi2"
-        ],
+        "name": "multi2",
         "description": "A second multi variable.",
         "properties": [
           {
@@ -106,14 +80,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            true,
-            false
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "a calculation"
+          }
+        },
+        "variable_type": "boolean",
+        "multiple": true
       }
     }
   }
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 dd21a3622..ca3989b19 100644
--- a/tests/results/test_namespace/40_8calculation_boolean_return_none.json
+++ b/tests/results/test_namespace/40_8calculation_boolean_return_none.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "yes"
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A first variable.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "return false if the value of var1 is \"no\""
-          }
+          "values": "yes"
         },
-        "variable_type": "boolean",
+        "variable_type": "string"
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -63,10 +45,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "xxx"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "return false if the value of var1 is \"no\""
+          }
+        },
+        "variable_type": "boolean"
       }
     }
   }
diff --git a/tests/results/test_namespace/40_8calculation_integer.json b/tests/results/test_namespace/40_8calculation_integer.json
index 47961b460..6a4b990fb 100644
--- a/tests/results/test_namespace/40_8calculation_integer.json
+++ b/tests/results/test_namespace/40_8calculation_integer.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "bool": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": false
-        },
-        "variable_type": "boolean",
         "path": "rougail.bool",
-        "names": [
-          "bool"
-        ],
+        "name": "bool",
         "description": "A boolean variable.",
         "properties": [
           {
@@ -35,24 +25,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          false
-        ],
-        "mandatory_without_value": false
-      },
-      "int1": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "description": "if bool returns 1 otherwise return 2"
-          }
+          "values": false
         },
-        "variable_type": "integer",
+        "variable_type": "boolean"
+      },
+      "int1": {
         "path": "rougail.int1",
-        "names": [
-          "int1"
-        ],
+        "name": "int1",
         "description": "First integer variable.",
         "properties": [
           {
@@ -63,24 +45,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          2
-        ],
-        "mandatory_without_value": false
-      },
-      "int2": {
         "type": "variable",
         "default": {
           "name": "Default",
           "values": {
-            "description": "if bool returns 3 otherwise return 4"
+            "description": "if bool returns 1 otherwise return 2"
           }
         },
-        "variable_type": "integer",
+        "variable_type": "integer"
+      },
+      "int2": {
         "path": "rougail.int2",
-        "names": [
-          "int2"
-        ],
+        "name": "int2",
         "description": "Second integer variable.",
         "properties": [
           {
@@ -91,10 +67,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          3
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "if bool returns 3 otherwise return 4"
+          }
+        },
+        "variable_type": "integer"
       }
     }
   }
diff --git a/tests/results/test_namespace/40_8calculation_multi_variable.json b/tests/results/test_namespace/40_8calculation_multi_variable.json
index f57fbe409..de0f39798 100644
--- a/tests/results/test_namespace/40_8calculation_multi_variable.json
+++ b/tests/results/test_namespace/40_8calculation_multi_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,24 @@
     },
     "children": {
       "var": {
+        "path": "rougail.var",
+        "name": "var",
+        "description": "A first variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -38,46 +54,11 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var",
-        "names": [
-          "var"
-        ],
-        "description": "A first variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "no",
-            "yes"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -88,22 +69,16 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
-      },
-      "var3": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "yes"
+          "values": "no"
         },
-        "variable_type": "string",
+        "variable_type": "string"
+      },
+      "var3": {
         "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
+        "name": "var3",
         "description": "A third variable.",
         "properties": [
           {
@@ -114,10 +89,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "yes"
+        },
+        "variable_type": "string"
       }
     }
   }
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 5b754a2d1..c7fee67b0 100644
--- a/tests/results/test_namespace/40_8calculation_multi_variable_parent.json
+++ b/tests/results/test_namespace/40_8calculation_multi_variable_parent.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A variable.",
         "properties": [
           {
@@ -35,24 +25,36 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "fam1": {
         "type": "family",
         "informations": {
           "path": "rougail.fam1",
-          "names": [
-            "fam1"
-          ],
+          "name": "fam1",
           "description": "A family",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "var": {
+            "path": "rougail.fam1.var",
+            "name": "var",
+            "description": "A calculated variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
+            ],
+            "mode": "standard",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -65,25 +67,7 @@
                 "description": "A variable"
               }
             },
-            "variable_type": "string",
-            "path": "rougail.fam1.var",
-            "names": [
-              "var"
-            ],
-            "description": "A calculated variable.",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "no"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 74a6fdb04..4faf429ff 100644
--- a/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json
+++ b/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,25 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.fam1",
-          "names": [
-            "fam1"
-          ],
+          "name": "fam1",
           "description": "First family",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "var": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "no"
-            },
-            "variable_type": "string",
             "path": "rougail.fam1.var",
-            "names": [
-              "var"
-            ],
+            "name": "var",
             "description": "A variable.",
             "properties": [
               {
@@ -47,10 +35,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "no"
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "no"
+            },
+            "variable_type": "string"
           }
         }
       },
@@ -58,15 +48,25 @@
         "type": "family",
         "informations": {
           "path": "rougail.fam2",
-          "names": [
-            "fam2"
-          ],
+          "name": "fam2",
           "description": "Second family",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "var": {
+            "path": "rougail.fam2.var",
+            "name": "var",
+            "description": "A variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
+            ],
+            "mode": "standard",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -79,25 +79,7 @@
                 "description": "A variable"
               }
             },
-            "variable_type": "string",
-            "path": "rougail.fam2.var",
-            "names": [
-              "var"
-            ],
-            "description": "A variable.",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "no"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 2b3d73a35..b8b67a280 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership",
-          "names": [
-            "leadership"
-          ],
+          "name": "leadership",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,35 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower": {
             "type": "variable",
             "default": {
               "name": "Default",
               "values": [
-                {
-                  "message": "the value of the variable \"{0}\"",
-                  "path": {
-                    "path": "rougail.leadership.leader",
-                    "type": "variable"
-                  },
-                  "description": "A leader"
-                }
+                "value1",
+                "value2"
               ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower": {
             "path": "rougail.leadership.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -104,18 +74,22 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value1"
-                ],
-                [
-                  "value2"
-                ]
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
+                {
+                  "message": "the value of the variable \"{0}\"",
+                  "path": {
+                    "path": "rougail.leadership.leader",
+                    "type": "variable"
+                  },
+                  "description": "A leader"
+                }
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           }
         }
       }
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 3ff7d9c7e..4ce06f39c 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,26 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val11"
+              "values": [
+                "value1",
+                "value2"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -89,25 +68,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val11",
-                "val11"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val21"
+              "values": "val11"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -118,27 +88,18 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val21",
-                "val21"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val21"
+            },
+            "variable_type": "string"
           }
         }
       },
       "calculate": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.calculate",
-        "names": [
-          "calculate"
-        ],
+        "name": "calculate",
         "description": "A calculated variable.",
         "properties": [
           {
@@ -149,13 +110,13 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val11"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 3ff7d9c7e..4ce06f39c 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,26 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val11"
+              "values": [
+                "value1",
+                "value2"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -89,25 +68,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val11",
-                "val11"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val21"
+              "values": "val11"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -118,27 +88,18 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val21",
-                "val21"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val21"
+            },
+            "variable_type": "string"
           }
         }
       },
       "calculate": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.calculate",
-        "names": [
-          "calculate"
-        ],
+        "name": "calculate",
         "description": "A calculated variable.",
         "properties": [
           {
@@ -149,13 +110,13 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val11"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 194538446..51fb02a2b 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "leader",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a",
-                "b"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "properties": [
               {
                 "type": "property",
@@ -58,35 +43,39 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "a",
                 "b"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "properties": [],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "example",
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "variable": {
+        "path": "rougail.variable",
+        "name": "variable",
+        "properties": [
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -100,27 +89,7 @@
           }
         },
         "variable_type": "string",
-        "path": "rougail.variable",
-        "names": [
-          "variable"
-        ],
-        "properties": [
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            null,
-            null
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 872fd8323..c342283c8 100644
--- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json
+++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,26 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val11"
+              "values": [
+                "value1",
+                "value2"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -89,25 +68,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val11",
-                "val11"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val21"
+              "values": "val11"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -118,17 +88,28 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val21",
-                "val21"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val21"
+            },
+            "variable_type": "string"
           }
         }
       },
       "calculate": {
+        "path": "rougail.calculate",
+        "name": "calculate",
+        "description": "A calculated variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -142,28 +123,7 @@
           }
         },
         "variable_type": "string",
-        "path": "rougail.calculate",
-        "names": [
-          "calculate"
-        ],
-        "description": "A calculated variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val11",
-            "val11"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 30acf8d19..41ca119ed 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,26 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val11"
+              "values": [
+                "value1",
+                "value2"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -89,25 +68,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val11",
-                "val11"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val21"
+              "values": "val11"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -118,27 +88,18 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val21",
-                "val21"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val21"
+            },
+            "variable_type": "string"
           }
         }
       },
       "calculate": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.calculate",
-        "names": [
-          "calculate"
-        ],
+        "name": "calculate",
         "description": "A calculated variable.",
         "properties": [
           {
@@ -149,10 +110,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value1"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
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 0f5e7f3e6..41ca119ed 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,26 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val11"
+              "values": [
+                "value1",
+                "value2"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -89,25 +68,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val11",
-                "val11"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val21"
+              "values": "val11"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -118,27 +88,18 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val21",
-                "val21"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val21"
+            },
+            "variable_type": "string"
           }
         }
       },
       "calculate": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.calculate",
-        "names": [
-          "calculate"
-        ],
+        "name": "calculate",
         "description": "A calculated variable.",
         "properties": [
           {
@@ -149,10 +110,12 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "value2"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string"
       }
     }
   }
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 c49c2c2d5..8e9f57e29 100644
--- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json
+++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,26 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val11"
+              "values": [
+                "value1",
+                "value2"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -89,25 +68,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val11",
-                "val11"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val21"
+              "values": "val11"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -118,34 +88,18 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val21",
-                "val21"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val21"
+            },
+            "variable_type": "string"
           }
         }
       },
       "calculate": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\"",
-            "path": {
-              "path": "rougail.leader.leader",
-              "type": "variable"
-            },
-            "description": "A leader"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.calculate",
-        "names": [
-          "calculate"
-        ],
+        "name": "calculate",
         "description": "A calculated variable.",
         "properties": [
           {
@@ -162,14 +116,20 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "value1",
-            "value2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\"",
+            "path": {
+              "path": "rougail.leader.leader",
+              "type": "variable"
+            },
+            "description": "A leader"
+          }
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable.json b/tests/results/test_namespace/40_9leadership-calculation-variable.json
index dcd54db13..ac764b79b 100644
--- a/tests/results/test_namespace/40_9leadership-calculation-variable.json
+++ b/tests/results/test_namespace/40_9leadership-calculation-variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "calculate": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "value1",
-            "value2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.calculate",
-        "names": [
-          "calculate"
-        ],
+        "name": "calculate",
         "description": "A calculated variable.",
         "properties": [
           {
@@ -44,22 +31,22 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "value1",
             "value2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "leader": {
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -69,23 +56,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "message": "the value of the variable \"{0}\"",
-                "path": {
-                  "path": "rougail.calculate",
-                  "type": "variable"
-                },
-                "description": "A calculated variable"
-              }
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -102,26 +74,24 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "value1",
-                "value2"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val11"
+              "values": {
+                "message": "the value of the variable \"{0}\"",
+                "path": {
+                  "path": "rougail.calculate",
+                  "type": "variable"
+                },
+                "description": "A calculated variable"
+              }
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -132,25 +102,16 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val11",
-                "val11"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower2": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "val21"
+              "values": "val11"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "follower2": {
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "An other follower.",
             "properties": [
               {
@@ -161,13 +122,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val21",
-                "val21"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val21"
+            },
+            "variable_type": "string"
           }
         }
       }
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 ecde50e5b..d7f097081 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership_1",
-          "names": [
-            "leadership_1"
-          ],
+          "name": "leadership_1",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership_1.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,22 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "value1",
                 "value2"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leadership_1.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -85,13 +68,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example",
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
@@ -99,9 +77,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership_2",
-          "names": [
-            "leadership_2"
-          ],
+          "name": "leadership_2",
           "description": "A second leadership",
           "properties": [],
           "mode": "standard",
@@ -111,6 +87,24 @@
         },
         "children": {
           "leader": {
+            "path": "rougail.leadership_2.leader",
+            "name": "leader",
+            "description": "A leader.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              },
+              {
+                "type": "property",
+                "name": "unique",
+                "ori_name": "unique",
+                "access_control": false
+              }
+            ],
+            "mode": "standard",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -124,46 +118,11 @@
               }
             },
             "variable_type": "string",
-            "path": "rougail.leadership_2.leader",
-            "names": [
-              "leader"
-            ],
-            "description": "A leader.",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              },
-              {
-                "type": "property",
-                "name": "unique",
-                "ori_name": "unique",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                null,
-                null
-              ]
-            ],
-            "mandatory_without_value": false
+            "multiple": true
           },
           "follower": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "path": "rougail.leadership_2.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -174,13 +133,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "val",
-                "val"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       }
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 0854a1a16..217d6b8b5 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership_1",
-          "names": [
-            "leadership_1"
-          ],
+          "name": "leadership_1",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership_1.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,22 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "value1",
                 "value2"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leadership_1.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -85,13 +68,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example",
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
@@ -99,9 +77,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership_2",
-          "names": [
-            "leadership_2"
-          ],
+          "name": "leadership_2",
           "description": "A second leadership",
           "properties": [],
           "mode": "standard",
@@ -111,19 +87,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "value1",
-                "value2"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership_2.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -140,16 +105,36 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "value1",
                 "value2"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower": {
+            "path": "rougail.leadership_2.follower",
+            "name": "follower",
+            "description": "A follower.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              },
+              {
+                "type": "property",
+                "name": "unique",
+                "ori_name": "unique",
+                "access_control": false
+              }
+            ],
+            "mode": "standard",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -163,40 +148,7 @@
               }
             },
             "variable_type": "string",
-            "path": "rougail.leadership_2.follower",
-            "names": [
-              "follower"
-            ],
-            "description": "A follower.",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              },
-              {
-                "type": "property",
-                "name": "unique",
-                "ori_name": "unique",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                [
-                  "value1",
-                  "value2"
-                ],
-                [
-                  "value1",
-                  "value2"
-                ]
-              ]
-            ],
-            "mandatory_without_value": false
+            "multiple": true
           }
         }
       }
diff --git a/tests/results/test_namespace/41_0choice_leader.json b/tests/results/test_namespace/41_0choice_leader.json
index 374bd36ce..65c3e8237 100644
--- a/tests/results/test_namespace/41_0choice_leader.json
+++ b/tests/results/test_namespace/41_0choice_leader.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "The leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "The leader.",
             "properties": [
               {
@@ -46,29 +38,13 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string",
+            "multiple": true
           },
           "follower1": {
-            "type": "variable",
-            "variable_type": "choice",
-            "choices": {
-              "name": "Choices",
-              "values": [
-                "a",
-                "b",
-                "c"
-              ]
-            },
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [
               {
@@ -79,12 +55,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "a_choice"
+            "type": "variable",
+            "variable_type": "choice",
+            "choices": {
+              "name": "Choices",
+              "values": [
+                "a",
+                "b",
+                "c"
               ]
-            ],
-            "mandatory_without_value": true
+            }
           }
         }
       }
diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower.json b/tests/results/test_namespace/44_4disabled_calcultion_follower.json
index 50f6c8ad8..efaefbc3a 100644
--- a/tests/results/test_namespace/44_4disabled_calcultion_follower.json
+++ b/tests/results/test_namespace/44_4disabled_calcultion_follower.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": true
-        },
-        "variable_type": "boolean",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": true
+        },
+        "variable_type": "boolean"
       },
       "leader": {
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -56,18 +46,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "Aleader.",
             "properties": [
               {
@@ -84,21 +64,19 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "a"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "follower": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -118,12 +96,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json
index b46b9be49..e2d94dac3 100644
--- a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json
+++ b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leadership",
-          "names": [
-            "leadership"
-          ],
+          "name": "leadership",
           "description": "A leadership",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a",
-                "b"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leadership.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "Aleader.",
             "properties": [
               {
@@ -59,26 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "a",
-                "b"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": "value"
+              "values": [
+                "a",
+                "b"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower": {
             "path": "rougail.leadership.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -96,13 +75,12 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "value",
-                "value"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "value"
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/44_4leadership_mandatory.json b/tests/results/test_namespace/44_4leadership_mandatory.json
index 1afa1d588..609b277ce 100644
--- a/tests/results/test_namespace/44_4leadership_mandatory.json
+++ b/tests/results/test_namespace/44_4leadership_mandatory.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -52,30 +44,18 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
-          },
-          "follower1": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower.",
             "properties": [],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/44_4leadership_mandatory_follower.json b/tests/results/test_namespace/44_4leadership_mandatory_follower.json
index 0c0970c2f..333350f84 100644
--- a/tests/results/test_namespace/44_4leadership_mandatory_follower.json
+++ b/tests/results/test_namespace/44_4leadership_mandatory_follower.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -46,21 +38,13 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower": {
             "path": "rougail.leader.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -71,12 +55,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 0219ec174..31aa486a0 100644
--- a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json
+++ b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "no"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "no"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "no"
+        },
+        "variable_type": "string"
       },
       "leader": {
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [
             {
@@ -66,12 +56,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -82,21 +68,13 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower": {
             "path": "rougail.leader.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -107,12 +85,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 6efe8c79e..750f4c7c9 100644
--- a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json
+++ b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "condition": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "yes"
-        },
-        "variable_type": "string",
         "path": "rougail.condition",
-        "names": [
-          "condition"
-        ],
+        "name": "condition",
         "description": "A condition.",
         "properties": [
           {
@@ -35,18 +25,18 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "yes"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "yes"
+        },
+        "variable_type": "string"
       },
       "leader": {
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -56,12 +46,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -78,21 +64,13 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
-          },
-          "follower": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower": {
             "path": "rougail.leader.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -112,12 +90,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 f0834e9fc..9b3b67d1e 100644
--- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json
+++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "Leader",
           "properties": [],
           "mode": "standard",
@@ -30,19 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a",
-                "b"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -59,33 +44,20 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "a",
-                "b"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower": {
             "type": "variable",
             "default": {
               "name": "Default",
-              "values": {
-                "message": "the value of the variable \"{0}\"",
-                "path": {
-                  "path": "rougail.leader.leader",
-                  "type": "variable"
-                },
-                "description": "A leader"
-              }
+              "values": [
+                "a",
+                "b"
+              ]
             },
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower": {
             "path": "rougail.leader.follower",
-            "names": [
-              "follower"
-            ],
+            "name": "follower",
             "description": "A follower.",
             "properties": [
               {
@@ -111,13 +83,19 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "a",
-                "b"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "message": "the value of the variable \"{0}\"",
+                "path": {
+                  "path": "rougail.leader.leader",
+                  "type": "variable"
+                },
+                "description": "A leader"
+              }
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_dynamic.json b/tests/results/test_namespace/60_0family_dynamic.json
index 9e145e924..4bd6ec1a2 100644
--- a/tests/results/test_namespace/60_0family_dynamic.json
+++ b/tests/results/test_namespace/60_0family_dynamic.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,29 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,11 +86,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 d88ecc091..194af17ca 100644
--- a/tests/results/test_namespace/60_0family_dynamic_1_0.json
+++ b/tests/results/test_namespace/60_0family_dynamic_1_0.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,17 +70,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
+            "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
+            "description": "Dynamic variable.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -100,17 +87,8 @@
                 "val2"
               ]
             ],
-            "path": "rougail.dyn{{ identifier }}.vardyn",
-            "description": "Dynamic variable.",
             "type": "variable",
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "example",
-              "example"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 c3fa68d86..bac6f9bff 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,17 +64,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
+            "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
+            "description": "Dynamic variable.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -94,17 +81,8 @@
                 "val2"
               ]
             ],
-            "path": "rougail.dyn{{ identifier }}.vardyn",
-            "description": "Dynamic variable.",
             "type": "variable",
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "example",
-              "example"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 a8ed96a8e..93be1afa2 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,29 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
             "description": "A dyn variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,11 +86,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 9235d910b..7e44bf34a 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,29 +64,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
             "description": "A dyn variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -107,11 +80,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 dd7002017..e84d5ac08 100644
--- a/tests/results/test_namespace/60_0family_dynamic_1_1.json
+++ b/tests/results/test_namespace/60_0family_dynamic_1_1.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,29 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,11 +86,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 6a5890f6f..fdb76f23d 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,29 +64,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -107,11 +80,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_dynamic_empty.json b/tests/results/test_namespace/60_0family_dynamic_empty.json
index 9a13312c4..ca0a82b86 100644
--- a/tests/results/test_namespace/60_0family_dynamic_empty.json
+++ b/tests/results/test_namespace/60_0family_dynamic_empty.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,29 +25,26 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynexample"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "example"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -63,25 +54,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var"
-            ],
-            "identifiers": [
-              [
-                "example"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -91,10 +70,13 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
+            "identifiers": [
+              [
+                "example"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 6241c288b..deb35dc89 100644
--- a/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json
+++ b/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val.1",
-            "val.2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val.1",
             "val.2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval_1",
-            "dynval_2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val.1"
@@ -68,10 +58,9 @@
               "val.2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,17 +70,22 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var1": {
-            "names": [
-              "var1",
-              "var1"
+            "path": "rougail.dyn{{ identifier }}.var1",
+            "name": "var1",
+            "description": "A dynamic variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val.1"
@@ -100,14 +94,17 @@
                 "val.2"
               ]
             ],
-            "path": "rougail.dyn{{ identifier }}.var1",
-            "description": "A dynamic variable.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "var2": {
+            "path": "rougail.dyn{{ identifier }}.var2",
+            "name": "var2",
+            "description": "A dynamic variable.",
             "properties": [
               {
                 "type": "property",
@@ -117,17 +114,6 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val.1",
-              "val.2"
-            ],
-            "mandatory_without_value": false
-          },
-          "var2": {
-            "names": [
-              "var2",
-              "var2"
-            ],
             "identifiers": [
               [
                 "val.1"
@@ -136,28 +122,12 @@
                 "val.2"
               ]
             ],
-            "path": "rougail.dyn{{ identifier }}.var2",
-            "description": "A dynamic variable.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "depends on a calculation"
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val.1",
-              "val.2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.json b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.json
index abdd39f83..8d42d83a0 100644
--- a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.json
+++ b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "integer",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "integer",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             1,
             2
           ]
-        },
-        "gen_examples": [
-          [
-            1,
-            2
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyn1",
-            "dyn2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               1
@@ -62,10 +52,9 @@
               2
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,33 +64,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                1
-              ],
-              [
-                2
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A variable inside dynamic family.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -111,15 +80,36 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                1
+              ],
+              [
+                2
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -136,25 +126,7 @@
             ]
           }
         },
-        "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "val"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
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 5f64d17e8..7180c7e33 100644
--- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json
+++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            1,
-            2
-          ]
-        },
-        "variable_type": "integer",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             1,
             2
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "integer",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyn1",
-            "dyn2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               1
@@ -68,10 +58,9 @@
               2
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,33 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                1
-              ],
-              [
-                2
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A variable inside dynamic family.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -117,15 +86,36 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                1
+              ],
+              [
+                2
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -142,25 +132,7 @@
             ]
           }
         },
-        "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "val"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
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 724ebe330..90f307aa7 100644
--- a/tests/results/test_namespace/60_0family_dynamic_no_description.json
+++ b/tests/results/test_namespace/60_0family_dynamic_no_description.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,28 +70,12 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
-            "type": "variable",
-            "variable_type": "string",
+            "name": "var",
             "properties": [
               {
                 "type": "property",
@@ -112,11 +85,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 bad6dbd29..4b97ec9f8 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,28 +64,12 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
-            "type": "variable",
-            "variable_type": "string",
+            "name": "var",
             "properties": [
               {
                 "type": "property",
@@ -106,11 +79,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_dynamic_source_hidden.json b/tests/results/test_namespace/60_0family_dynamic_source_hidden.json
index 616436b7d..b83de73bb 100644
--- a/tests/results/test_namespace/60_0family_dynamic_source_hidden.json
+++ b/tests/results/test_namespace/60_0family_dynamic_source_hidden.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -17,10 +15,11 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -29,10 +28,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "submessage": "(from an undocumented variable)",
@@ -41,29 +39,13 @@
                 "val2"
               ]
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -73,11 +55,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_dynamic_static.json b/tests/results/test_namespace/60_0family_dynamic_static.json
index a8c55cb42..2413ef6b8 100644
--- a/tests/results/test_namespace/60_0family_dynamic_static.json
+++ b/tests/results/test_namespace/60_0family_dynamic_static.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -17,10 +15,11 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -29,36 +28,19 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             "val1",
             "val2"
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A variable inside a dynamic family.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -68,11 +50,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_dynamic_test.json b/tests/results/test_namespace/60_0family_dynamic_test.json
index 1bcffce7d..18ff20bf4 100644
--- a/tests/results/test_namespace/60_0family_dynamic_test.json
+++ b/tests/results/test_namespace/60_0family_dynamic_test.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -37,6 +31,8 @@
           }
         ],
         "mode": "basic",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -44,22 +40,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": true
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,29 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,11 +86,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 86ed161a0..a4431ec91 100644
--- a/tests/results/test_namespace/60_0family_dynamic_upper_char.json
+++ b/tests/results/test_namespace/60_0family_dynamic_upper_char.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "Val1",
-            "VAL2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "Val1",
             "VAL2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "Val1"
@@ -68,10 +58,9 @@
               "VAL2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,29 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "Val1"
-              ],
-              [
-                "VAL2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,11 +86,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "Val1"
+              ],
+              [
+                "VAL2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 fd15f9a68..e0bad4c8d 100644
--- a/tests/results/test_namespace/60_0family_dynamic_variable_empty.json
+++ b/tests/results/test_namespace/60_0family_dynamic_variable_empty.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -37,29 +31,26 @@
           }
         ],
         "mode": "basic",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "example"
-          ]
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynexample"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "example"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -69,29 +60,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var"
-            ],
-            "identifiers": [
-              [
-                "example"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A variable inside dynamic family.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -101,10 +76,17 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val"
+            "identifiers": [
+              [
+                "example"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_optional.json b/tests/results/test_namespace/60_0family_dynamic_variable_optional.json
index cda1b3661..e89874908 100644
--- a/tests/results/test_namespace/60_0family_dynamic_variable_optional.json
+++ b/tests/results/test_namespace/60_0family_dynamic_variable_optional.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -17,10 +15,11 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyna",
-            "dynb"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "a"
@@ -29,40 +28,19 @@
               "b"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             "a",
             "b"
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "a"
-              ],
-              [
-                "b"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A variable inside dynamic family.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -72,11 +50,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                "a"
+              ],
+              [
+                "b"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       }
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 2dad33543..f47bbc05b 100644
--- a/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json
+++ b/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,33 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable with suffix {{ identifier }}.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "a value"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -117,11 +86,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "a value",
-              "a value"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "a value"
+            },
+            "variable_type": "string"
           }
         }
       }
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 7b53af715..bb3530a2f 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -37,6 +31,8 @@
           }
         ],
         "mode": "basic",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -44,22 +40,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": true
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,33 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable with suffix {{ identifier }}.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "a value"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -117,11 +86,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "a value",
-              "a value"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "a value"
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_0family_mode.json b/tests/results/test_namespace/60_0family_mode.json
index 37d440ae4..c2f4fdaed 100644
--- a/tests/results/test_namespace/60_0family_mode.json
+++ b/tests/results/test_namespace/60_0family_mode.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,25 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.family",
-          "names": [
-            "family"
-          ],
+          "name": "family",
           "description": "A family",
           "properties": [],
           "mode": "basic"
         },
         "children": {
           "var": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "non"
-            },
-            "variable_type": "string",
             "path": "rougail.family.var",
-            "names": [
-              "var"
-            ],
+            "name": "var",
             "description": "A variable.",
             "properties": [
               {
@@ -47,10 +35,12 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "non"
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "non"
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_1family_dynamic_jinja.json b/tests/results/test_namespace/60_1family_dynamic_jinja.json
index 728f50068..9d84b5fc7 100644
--- a/tests/results/test_namespace/60_1family_dynamic_jinja.json
+++ b/tests/results/test_namespace/60_1family_dynamic_jinja.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyn1",
-            "dyn2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "1"
@@ -68,41 +58,20 @@
               "2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "description": "index of suffix value"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "1"
-              ],
-              [
-                "2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -112,11 +81,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                "1"
+              ],
+              [
+                "2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       }
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 093c44a98..f589c14f8 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,19 +70,17 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "family": {
             "type": "family",
             "informations": {
-              "names": [
-                "family",
-                "family"
-              ],
+              "path": "rougail.dyn{{ identifier }}.family",
+              "name": "family",
+              "description": "A family",
+              "properties": [],
+              "mode": "basic",
               "identifiers": [
                 [
                   "val1"
@@ -101,30 +88,13 @@
                 [
                   "val2"
                 ]
-              ],
-              "path": "rougail.dyn{{ identifier }}.family",
-              "description": "A family",
-              "properties": [],
-              "mode": "basic"
+              ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var"
-                ],
-                "identifiers": [
-                  [
-                    "val1"
-                  ],
-                  [
-                    "val2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.family.var",
+                "name": "var",
                 "description": "With a variable.",
-                "type": "variable",
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -134,17 +104,34 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  "example",
-                  "example"
+                "identifiers": [
+                  [
+                    "val1"
+                  ],
+                  [
+                    "val2"
+                  ]
                 ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A second variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -161,25 +148,7 @@
             ]
           }
         },
-        "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A second variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
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 252fa198c..b1b72c240 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,19 +70,17 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "family": {
             "type": "family",
             "informations": {
-              "names": [
-                "family",
-                "family"
-              ],
+              "path": "rougail.dyn{{ identifier }}.family",
+              "name": "family",
+              "description": "A family inside dynamic family",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1"
@@ -101,34 +88,13 @@
                 [
                   "val2"
                 ]
-              ],
-              "path": "rougail.dyn{{ identifier }}.family",
-              "description": "A family inside dynamic family",
-              "properties": [],
-              "mode": "standard"
+              ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var"
-                ],
-                "identifiers": [
-                  [
-                    "val1"
-                  ],
-                  [
-                    "val2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.family.var",
+                "name": "var",
                 "description": "A dynamic variable.",
-                "type": "variable",
-                "default": {
-                  "name": "Default",
-                  "values": "the value of the identifier"
-                },
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -138,29 +104,28 @@
                   }
                 ],
                 "mode": "standard",
-                "gen_examples": [
-                  "val1",
-                  "val2"
+                "identifiers": [
+                  [
+                    "val1"
+                  ],
+                  [
+                    "val2"
+                  ]
                 ],
-                "mandatory_without_value": false
+                "type": "variable",
+                "default": {
+                  "name": "Default",
+                  "values": "the value of the identifier"
+                },
+                "variable_type": "string"
               }
             }
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "the value of var"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A varible outside dynamic family.",
         "properties": [
           {
@@ -171,10 +136,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "the value of var"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 79e3170d6..37afb644d 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,19 +64,17 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "family": {
             "type": "family",
             "informations": {
-              "names": [
-                "family",
-                "family"
-              ],
+              "path": "rougail.dyn{{ identifier }}.family",
+              "name": "family",
+              "description": "A family inside dynamic family",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1"
@@ -95,34 +82,13 @@
                 [
                   "val2"
                 ]
-              ],
-              "path": "rougail.dyn{{ identifier }}.family",
-              "description": "A family inside dynamic family",
-              "properties": [],
-              "mode": "standard"
+              ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var"
-                ],
-                "identifiers": [
-                  [
-                    "val1"
-                  ],
-                  [
-                    "val2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.family.var",
+                "name": "var",
                 "description": "A dynamic variable.",
-                "type": "variable",
-                "default": {
-                  "name": "Default",
-                  "values": "the value of the identifier"
-                },
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -132,17 +98,31 @@
                   }
                 ],
                 "mode": "standard",
-                "gen_examples": [
-                  "val1",
-                  "val2"
+                "identifiers": [
+                  [
+                    "val1"
+                  ],
+                  [
+                    "val2"
+                  ]
                 ],
-                "mandatory_without_value": false
+                "type": "variable",
+                "default": {
+                  "name": "Default",
+                  "values": "the value of the identifier"
+                },
+                "variable_type": "string"
               }
             }
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A varible outside dynamic family.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -150,18 +130,7 @@
             "description": "the value of var"
           }
         },
-        "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A varible outside dynamic family.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
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 ee9f3b99a..e6edec72c 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,19 +64,17 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "family": {
             "type": "family",
             "informations": {
-              "names": [
-                "family",
-                "family"
-              ],
+              "path": "rougail.dyn{{ identifier }}.family",
+              "name": "family",
+              "description": "A family",
+              "properties": [],
+              "mode": "basic",
               "identifiers": [
                 [
                   "val1"
@@ -95,30 +82,13 @@
                 [
                   "val2"
                 ]
-              ],
-              "path": "rougail.dyn{{ identifier }}.family",
-              "description": "A family",
-              "properties": [],
-              "mode": "basic"
+              ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var"
-                ],
-                "identifiers": [
-                  [
-                    "val1"
-                  ],
-                  [
-                    "val2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.family.var",
+                "name": "var",
                 "description": "With a variable.",
-                "type": "variable",
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -128,17 +98,27 @@
                   }
                 ],
                 "mode": "basic",
-                "gen_examples": [
-                  "example",
-                  "example"
+                "identifiers": [
+                  [
+                    "val1"
+                  ],
+                  [
+                    "val2"
+                  ]
                 ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string"
               }
             }
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A second variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -146,18 +126,7 @@
             "description": "the value of var"
           }
         },
-        "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A second variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
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 48ebcda9a..c74701eb0 100644
--- a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json
+++ b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffx variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,33 +70,13 @@
               },
               "description": "A suffx variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -117,27 +86,26 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       },
       "newvar": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "description": "the value of var"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.newvar",
-        "names": [
-          "newvar"
-        ],
+        "name": "newvar",
         "description": "A second variable.",
         "properties": [
           {
@@ -148,10 +116,14 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "description": "the value of var"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 eb162c7a3..2669899af 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffx variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,33 +64,13 @@
               },
               "description": "A suffx variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -111,15 +80,29 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       },
       "newvar": {
+        "path": "rougail.newvar",
+        "name": "newvar",
+        "description": "A second variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -127,18 +110,7 @@
             "description": "the value of var"
           }
         },
-        "variable_type": "string",
-        "path": "rougail.newvar",
-        "names": [
-          "newvar"
-        ],
-        "description": "A second variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "val"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc2.json b/tests/results/test_namespace/60_5family_dynamic_calc2.json
index 5679d5dd8..ca8abd24f 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc2.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,20 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -70,27 +55,14 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
-          "identifiers": [
-            [
-              "val1"
-            ],
-            [
-              "val2"
-            ]
-          ],
           "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
           "description": "A dynamic family",
           "properties": [
             {
@@ -104,6 +76,17 @@
             }
           ],
           "mode": "standard",
+          "identifiers": [
+            [
+              "val1"
+            ],
+            [
+              "val2"
+            ]
+          ],
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -113,33 +96,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -149,11 +112,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       }
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 b9c1f6f07..b5cc14906 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,11 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A second variable.",
         "properties": [
           {
@@ -64,27 +49,14 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
-          "identifiers": [
-            [
-              "val1"
-            ],
-            [
-              "val2"
-            ]
-          ],
           "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
           "description": "A dynamic family",
           "properties": [
             {
@@ -98,6 +70,17 @@
             }
           ],
           "mode": "standard",
+          "identifiers": [
+            [
+              "val1"
+            ],
+            [
+              "val2"
+            ]
+          ],
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -107,33 +90,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "val"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -143,11 +106,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val",
-              "val"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "val"
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_description.json b/tests/results/test_namespace/60_5family_dynamic_calc_description.json
index 9644eb867..b8b898556 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_description.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_description.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -17,10 +15,11 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic famify for {{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -29,36 +28,19 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic famify for {{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             "val1",
             "val2"
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable for {{ identifier }}.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -68,21 +50,22 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A new variable.",
         "properties": [
           {
@@ -109,12 +92,22 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A new variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -142,28 +135,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A new variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            null,
-            null
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_identifier.json b/tests/results/test_namespace/60_5family_dynamic_calc_identifier.json
index 4d5905896..cc222830c 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_identifier.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_identifier.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,26 +31,20 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "val1"
+          "values": [
+            "val1",
+            "val2"
+          ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A suffix variable2.",
         "properties": [
           {
@@ -74,18 +55,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "val1"
+        },
+        "variable_type": "string"
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -94,10 +78,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -107,33 +90,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the identifier"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -143,15 +106,36 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the identifier"
+            },
+            "variable_type": "string"
           }
         }
       },
       "var3": {
+        "path": "rougail.var3",
+        "name": "var3",
+        "description": "A variable calculated.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -178,25 +162,7 @@
             }
           ]
         },
-        "variable_type": "string",
-        "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
-        "description": "A variable calculated.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_identifier_multi.json b/tests/results/test_namespace/60_5family_dynamic_calc_identifier_multi.json
index ed7753ed6..590ad7042 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_identifier_multi.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_identifier_multi.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,26 +31,20 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": "val1"
+          "values": [
+            "val1",
+            "val2"
+          ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A suffix variable2.",
         "properties": [
           {
@@ -74,18 +55,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "val1"
+        },
+        "variable_type": "string"
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -94,10 +78,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -107,35 +90,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "the value of the identifier"
-              ]
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -151,8 +112,7 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
+            "identifiers": [
               [
                 "val1"
               ],
@@ -160,11 +120,37 @@
                 "val2"
               ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
+                "the value of the identifier"
+              ]
+            },
+            "variable_type": "string",
+            "multiple": true
           }
         }
       },
       "var3": {
+        "path": "rougail.var3",
+        "name": "var3",
+        "description": "A variable calculated.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -192,33 +178,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var3",
-        "names": [
-          "var3"
-        ],
-        "description": "A variable calculated.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 827fc0e6e..9792fa34e 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,29 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,35 +86,22 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\"",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -152,10 +112,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\"",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 511da2780..43ecd093a 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,33 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "Suffix has value.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the identifier"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -117,11 +86,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the identifier"
+            },
+            "variable_type": "string"
           }
         }
       }
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 f413604cc..580345fa0 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,33 +64,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "Suffix has value.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the identifier"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -111,11 +80,20 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the identifier"
+            },
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled.json
index e2d1bf981..f1a7f92f0 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -17,10 +15,11 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -29,32 +28,19 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             "val1",
             "val2"
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -71,11 +57,13 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.adoc b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.adoc
index 436e43f88..53d64f3b3 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.adoc
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.adoc
@@ -18,6 +18,6 @@ This family is a namespace. +
 * val2               
 | **rougail.var2** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | A variable calculated. +
-**Default**: depends on an undocumented variable               
+**Default**: the value of an undocumented variable               
 |====
 
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.gitlab.md b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.gitlab.md
index 46424ea4f..61c9cb269 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.gitlab.md
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.gitlab.md
@@ -5,10 +5,10 @@
 > **Path**: rougail\
 > `basic`
 
-| Variable                                                                                                                                                                            | Description                                                                 |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
-| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**: 
    • val1
    • val2       |
-| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`         | A variable calculated.
    **Default**: depends on an undocumented variable |
+| Variable                                                                                                                                                                            | Description                                                                   |
+|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|
+| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**: 
    • val1
    • val2         |
+| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`         | A variable calculated.
    **Default**: the value of an undocumented variable |
 
 
 
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.html b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.html
index d6ff45dc3..b3e7e8a4f 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.html
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.html
@@ -8,12 +8,12 @@ This family is a namespace.
 
 
-
+
-
+
  • val2
    • 
+
    
 
    Variable                                                                                                                                                                                        Description                                                                   
    Variable                                                                                                                                                                                        Description                                                                     
    
     
 
 
    rougail.var1
    string multiple standard unique    		A suffix variable.
    Examples: 
    • val1
      • 
-
    • val2
                                                                                   
    rougail.var2
    string standard mandatory                       		A variable calculated.
    Default: depends on an undocumented variable
                                                                                     
    rougail.var2
    string standard mandatory                       		A variable calculated.
    Default: the value of an undocumented variable
    
     
 
    
 
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 0189e09a0..ff207b2f7 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,36 +34,11 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "depends on an undocumented variable",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -78,10 +49,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of an undocumented variable",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.md b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.md
index 043081cab..def4b5416 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.md
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.md
@@ -6,8 +6,8 @@
 > **Path**: rougail\
 > `basic`
 
-| Variable                                                                                                                                                                            | Description                                                                 |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
-| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**: 
    • val1
    • val2       |
-| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`         | A variable calculated.
    **Default**: depends on an undocumented variable |
+| Variable                                                                                                                                                                            | Description                                                                   |
+|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|
+| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**: 
    • val1
    • val2         |
+| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`         | A variable calculated.
    **Default**: the value of an undocumented variable |
 
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.sh b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.sh
index c1d724450..aada6297e 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.sh
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.sh
@@ -15,7 +15,7 @@
 │                                       │ • val2                               │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
 │ rougail.var2                          │ A variable calculated.               │
-│  string   standard   mandatory        │ Default: depends on an undocumented  │
-│                                       │ variable                             │
+│  string   standard   mandatory        │ Default: the value of an             │
+│                                       │ undocumented 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 f7a049114..ed6066bfd 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,29 +64,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -107,35 +80,22 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\" if it is defined",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -146,10 +106,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\" if it is defined",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 7ea1444cf..29e75991f 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,33 +25,30 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Example",
           "values": "val1"
-        },
-        "gen_examples": [
-          [
-            "val1"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -67,25 +58,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -95,34 +74,19 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\" if it is defined",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -133,10 +97,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\" if it is defined",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 1a2f3a487..55f44f852 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,26 +13,8 @@
     },
     "children": {
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\" if it is defined",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -45,18 +25,25 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\" if it is defined",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       },
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -67,6 +54,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -74,22 +63,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -98,10 +81,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -111,29 +93,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -143,11 +109,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 b1adf406b..7b05a4fee 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -38,36 +25,20 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "message": "a value (from an undocumented variable)",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
+          "values": [
+            "val1",
+            "val2"
+          ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -78,10 +49,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "a value"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "a value (from an undocumented variable)",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 9d8575e6f..cc3eb99f9 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -38,36 +25,20 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "message": "true (from an undocumented variable)",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
+          "values": [
+            "val1",
+            "val2"
+          ]
         },
-        "variable_type": "boolean",
+        "variable_type": "string",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -78,10 +49,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          true
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "true (from an undocumented variable)",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "boolean"
       }
     }
   }
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 1c5feaf42..c3452ba09 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -38,32 +25,20 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
-      },
-      "var2": {
         "type": "variable",
         "default": {
           "name": "Default",
-          "values": {
-            "submessage": "(from an undocumented variable)",
-            "values": [
-              "a value",
-              "a second value"
-            ]
-          }
+          "values": [
+            "val1",
+            "val2"
+          ]
         },
         "variable_type": "string",
+        "multiple": true
+      },
+      "var2": {
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -80,14 +55,19 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "a value",
-            "a second value"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "submessage": "(from an undocumented variable)",
+            "values": [
+              "a value",
+              "a second value"
+            ]
+          }
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 840be0749..316b49250 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,35 +70,13 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "description": "from suffix"
-              }
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -119,11 +86,22 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "from suffix"
+              }
+            },
+            "variable_type": "string"
           }
         }
       }
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 e7c6d718a..38a72040b 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,35 +64,13 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "description": "from suffix"
-              }
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,11 +80,22 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "from suffix"
+              }
+            },
+            "variable_type": "string"
           }
         }
       }
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 827fc0e6e..9792fa34e 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_variable.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_variable.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,29 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -113,35 +86,22 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\"",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -152,10 +112,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\"",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled.json b/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled.json
index 714ee3a83..fc0dc9b05 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -17,10 +15,11 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic famify for {{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -29,36 +28,19 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic famify for {{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             "val1",
             "val2"
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var1": {
-            "names": [
-              "var1",
-              "var1"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var1",
+            "name": "var1",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -68,17 +50,6 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
-            ],
-            "mandatory_without_value": true
-          },
-          "var2": {
-            "names": [
-              "var2",
-              "var2"
-            ],
             "identifiers": [
               [
                 "val1"
@@ -87,10 +58,13 @@
                 "val2"
               ]
             ],
-            "path": "rougail.dyn{{ identifier }}.var2",
-            "description": "A new variable.",
             "type": "variable",
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "var2": {
+            "path": "rougail.dyn{{ identifier }}.var2",
+            "name": "var2",
+            "description": "A new variable.",
             "properties": [
               {
                 "type": "property",
@@ -128,11 +102,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled_outside.json b/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled_outside.json
index ff42a2ce5..07a048d86 100644
--- a/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled_outside.json
+++ b/tests/results/test_namespace/60_5family_dynamic_calc_variable_disabled_outside.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -17,10 +15,11 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic famify for {{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -29,36 +28,19 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic famify for {{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             "val1",
             "val2"
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var1": {
-            "names": [
-              "var1",
-              "var1"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var1",
+            "name": "var1",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -68,21 +50,22 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A new variable.",
         "properties": [
           {
@@ -109,10 +92,8 @@
           }
         ],
         "mode": "basic",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": true
+        "type": "variable",
+        "variable_type": "string"
       }
     }
   }
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 f7a049114..ed6066bfd 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,29 +64,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -107,35 +80,22 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\" if it is defined",
-            "path": {
-              "path": "rougail.dyn{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A dynamic variable"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable calculated.",
         "properties": [
           {
@@ -146,10 +106,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "example"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\" if it is defined",
+            "path": {
+              "path": "rougail.dyn{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A dynamic variable"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json b/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json
index b72db9adc..ca07872e7 100644
--- a/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json
+++ b/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -17,19 +15,8 @@
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
-          "identifiers": [
-            [
-              "val1"
-            ],
-            [
-              "val2"
-            ]
-          ],
           "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
           "description": "A dynamic family",
           "properties": [
             {
@@ -43,20 +30,29 @@
             }
           ],
           "mode": "standard",
-          "identifier": [
-            "val1",
-            "val2"
+          "identifiers": [
+            [
+              "val1"
+            ],
+            [
+              "val2"
+            ]
           ],
           "help": [
             "This family builds families dynamically"
+          ],
+          "identifier": [
+            "val1",
+            "val2"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -65,25 +61,17 @@
                 "val2"
               ]
             ],
-            "path": "rougail.dyn{{ identifier }}.var",
-            "description": "A variable.",
             "type": "variable",
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "example",
-              "example"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "family": {
             "type": "family",
             "informations": {
-              "names": [
-                "family",
-                "family"
-              ],
+              "path": "rougail.dyn{{ identifier }}.family",
+              "name": "family",
+              "description": "A family",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1"
@@ -91,18 +79,15 @@
                 [
                   "val2"
                 ]
-              ],
-              "path": "rougail.dyn{{ identifier }}.family",
-              "description": "A family",
-              "properties": [],
-              "mode": "standard"
+              ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var"
-                ],
+                "path": "rougail.dyn{{ identifier }}.family.var",
+                "name": "var",
+                "description": "A new variable.",
+                "properties": [],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1"
@@ -111,17 +96,8 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.family.var",
-                "description": "A new variable.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [],
-                "mode": "standard",
-                "gen_examples": [
-                  "example",
-                  "example"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
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 39c75a73c..3f95a908e 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -40,26 +36,16 @@
             "val3",
             "val4"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2",
-            "val3",
-            "val4"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "{{ identifier }}_dyn": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "val1_dyn",
-            "val2_dyn",
-            "val3_dyn",
-            "val4_dyn"
-          ],
+          "path": "rougail.{{ identifier }}_dyn",
+          "name": "{{ identifier }}_dyn",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -74,10 +60,9 @@
               "val4"
             ]
           ],
-          "path": "rougail.{{ identifier }}_dyn",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -87,19 +72,22 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var1": {
-            "names": [
-              "var1",
-              "var1",
-              "var1",
-              "var1"
+            "path": "rougail.{{ identifier }}_dyn.var1",
+            "name": "var1",
+            "description": "A variable 1.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -114,38 +102,26 @@
                 "val4"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var1",
-            "description": "A variable 1.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2",
-              "val3",
-              "val4"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "var2": {
-            "names": [
-              "var2",
-              "var2",
-              "var2",
-              "var2"
+            "path": "rougail.{{ identifier }}_dyn.var2",
+            "name": "var2",
+            "description": "A variable 2.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -160,8 +136,6 @@
                 "val4"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var2",
-            "description": "A variable 2.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -208,31 +182,21 @@
                 }
               ]
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2",
-              "val3",
-              "val4"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "var3": {
-            "names": [
-              "var3",
-              "var3",
-              "var3",
-              "var3"
+            "path": "rougail.{{ identifier }}_dyn.var3",
+            "name": "var3",
+            "description": "A variable 3.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -247,8 +211,6 @@
                 "val4"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var3",
-            "description": "A variable 3.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -295,63 +257,12 @@
                 }
               ]
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2",
-              "val3",
-              "val4"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "var4": {
-            "names": [
-              "var4",
-              "var4",
-              "var4",
-              "var4"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ],
-              [
-                "val3"
-              ],
-              [
-                "val4"
-              ]
-            ],
             "path": "rougail.{{ identifier }}_dyn.var4",
+            "name": "var4",
             "description": "A variable 4.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "message": "the value of the variable \"{0}\"",
-                "path": {
-                  "path": "rougail.{{ identifier }}_dyn.var1",
-                  "identifiers": [
-                    "val4"
-                  ],
-                  "type": "variable"
-                },
-                "description": "A variable 1"
-              }
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -368,13 +279,35 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val4",
-              "val4",
-              "val4",
-              "val4"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ],
+              [
+                "val3"
+              ],
+              [
+                "val4"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "message": "the value of the variable \"{0}\"",
+                "path": {
+                  "path": "rougail.{{ identifier }}_dyn.var1",
+                  "identifiers": [
+                    "val4"
+                  ]
+                },
+                "description": "A variable 1"
+              }
+            },
+            "variable_type": "string"
           }
         }
       }
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 9a246bc00..22278dd0b 100644
--- a/tests/results/test_namespace/60_5family_dynamic_variable_outside.json
+++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,17 +70,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.my_dyn_family_{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable inside a dynamic family.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -100,25 +87,34 @@
                 "val2"
               ]
             ],
-            "path": "rougail.my_dyn_family_{{ identifier }}.var",
-            "description": "A variable inside a dynamic family.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -146,34 +142,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 b177b6514..de019795f 100644
--- a/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json
+++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,24 @@
     },
     "children": {
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -42,49 +58,11 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       },
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -101,22 +79,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -125,10 +106,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -138,17 +118,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.my_dyn_family_{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable inside a dynamic family.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -157,21 +135,12 @@
                 "val2"
               ]
             ],
-            "path": "rougail.my_dyn_family_{{ identifier }}.var",
-            "description": "A variable inside a dynamic family.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 99bb0861e..5afbd94c2 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,6 +13,24 @@
     },
     "children": {
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -42,42 +58,11 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       },
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -88,6 +73,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -95,22 +82,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -119,10 +100,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -132,17 +112,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.my_dyn_family_{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable inside a dynamic family.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -151,21 +129,12 @@
                 "val2"
               ]
             ],
-            "path": "rougail.my_dyn_family_{{ identifier }}.var",
-            "description": "A variable inside a dynamic family.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 9a246bc00..22278dd0b 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,17 +70,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.my_dyn_family_{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable inside a dynamic family.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -100,25 +87,34 @@
                 "val2"
               ]
             ],
-            "path": "rougail.my_dyn_family_{{ identifier }}.var",
-            "description": "A variable inside a dynamic family.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -146,34 +142,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 c518dc652..e2b4845bf 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,17 +64,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.my_dyn_family_{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable inside a dynamic family.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -94,25 +81,34 @@
                 "val2"
               ]
             ],
-            "path": "rougail.my_dyn_family_{{ identifier }}.var",
-            "description": "A variable inside a dynamic family.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          },
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -140,34 +136,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          },
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 7a79f2c8d..825649f27 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,17 +70,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.my_dyn_family_{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable inside a dynamic family.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -100,35 +87,18 @@
                 "val2"
               ]
             ],
-            "path": "rougail.my_dyn_family_{{ identifier }}.var",
-            "description": "A variable inside a dynamic family.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable.",
         "properties": [
           {
@@ -145,14 +115,13 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 4aded0e48..647b18568 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,17 +64,15 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
+            "path": "rougail.my_dyn_family_{{ identifier }}.var",
+            "name": "var",
+            "description": "A variable inside a dynamic family.",
+            "properties": [],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -94,35 +81,18 @@
                 "val2"
               ]
             ],
-            "path": "rougail.my_dyn_family_{{ identifier }}.var",
-            "description": "A variable inside a dynamic family.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "depends on a calculation"
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable.",
         "properties": [
           {
@@ -139,14 +109,13 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "depends on a calculation"
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   }
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 e62214d19..ab39333b5 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "my_dyn_family_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "my_dyn_family_val1",
-            "my_dyn_family_val2"
-          ],
+          "path": "rougail.my_dyn_family_{{ identifier }}",
+          "name": "my_dyn_family_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.my_dyn_family_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,21 +64,17 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "subdyn_{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "subdyn_val1",
-                "subdyn_val2",
-                "subdyn_val1",
-                "subdyn_val2"
-              ],
+              "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}",
+              "name": "subdyn_{{ identifier }}",
+              "description": "A sub dynamic family",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1",
@@ -108,10 +93,9 @@
                   "val2"
                 ]
               ],
-              "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}",
-              "description": "A sub dynamic family",
-              "properties": [],
-              "mode": "standard",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -121,19 +105,22 @@
                   },
                   "description": "A suffix variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var",
-                  "var",
-                  "var"
+                "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}.var",
+                "name": "var",
+                "description": "A variable inside a sub dynamic family.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1",
@@ -152,36 +139,30 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}.var",
-                "description": "A variable inside a sub dynamic family.",
                 "type": "variable",
                 "default": {
                   "name": "Default",
                   "values": "the value of the identifier"
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "val1",
-                  "val2",
-                  "val1",
-                  "val2"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "unique",
+            "ori_name": "unique",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -211,28 +192,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "unique",
-            "ori_name": "unique",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 eddb991da..f3bfe27e0 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyn_val1",
-            "dyn_val2"
-          ],
+          "path": "rougail.dyn_{{ identifier }}",
+          "name": "dyn_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,33 +70,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn_{{ identifier }}.var",
+            "name": "var",
             "description": "A variable inside dynamic family.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the identifier"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -117,35 +86,26 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the identifier"
+            },
+            "variable_type": "string"
           }
         }
       },
       "var2": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": {
-            "message": "the value of the variable \"{0}\"",
-            "path": {
-              "path": "rougail.dyn_{{ identifier }}.var",
-              "identifiers": [
-                "val1"
-              ],
-              "type": "variable"
-            },
-            "description": "A variable inside dynamic family"
-          }
-        },
-        "variable_type": "string",
         "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
+        "name": "var2",
         "description": "A variable.",
         "properties": [
           {
@@ -156,10 +116,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": {
+            "message": "the value of the variable \"{0}\"",
+            "path": {
+              "path": "rougail.dyn_{{ identifier }}.var",
+              "identifiers": [
+                "val1"
+              ]
+            },
+            "description": "A variable inside dynamic family"
+          }
+        },
+        "variable_type": "string"
       }
     }
   }
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 87e96c108..434b7ed5f 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "Asuffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyn_val1",
-            "dyn_val2"
-          ],
+          "path": "rougail.dyn_{{ identifier }}",
+          "name": "dyn_{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn_{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,33 +64,13 @@
               },
               "description": "Asuffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn_{{ identifier }}.var",
+            "name": "var",
             "description": "A variable inside dynamic family.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": "the value of the identifier"
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -111,15 +80,29 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": "the value of the identifier"
+            },
+            "variable_type": "string"
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable.",
+        "properties": [],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -129,24 +112,12 @@
               "path": "rougail.dyn_{{ identifier }}.var",
               "identifiers": [
                 "val1"
-              ],
-              "type": "variable"
+              ]
             },
             "description": "A variable inside dynamic family"
           }
         },
-        "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable.",
-        "properties": [],
-        "mode": "standard",
-        "gen_examples": [
-          "val1"
-        ],
-        "mandatory_without_value": false
+        "variable_type": "string"
       }
     }
   }
diff --git a/tests/results/test_namespace/60_6family_dynamic_inside.json b/tests/results/test_namespace/60_6family_dynamic_inside.json
index c1ff39c88..8a66521e3 100644
--- a/tests/results/test_namespace/60_6family_dynamic_inside.json
+++ b/tests/results/test_namespace/60_6family_dynamic_inside.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "{{ identifier }}_dyn": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "val1_dyn",
-            "val2_dyn"
-          ],
+          "path": "rougail.{{ identifier }}_dyn",
+          "name": "{{ identifier }}_dyn",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.{{ identifier }}_dyn",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,17 +70,22 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var1": {
-            "names": [
-              "var1",
-              "var1"
+            "path": "rougail.{{ identifier }}_dyn.var1",
+            "name": "var1",
+            "description": "Value is suffix.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -100,34 +94,26 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var1",
-            "description": "Value is suffix.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "var2": {
-            "names": [
-              "var2",
-              "var2"
+            "path": "rougail.{{ identifier }}_dyn.var2",
+            "name": "var2",
+            "description": "Value is first variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -136,8 +122,6 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var2",
-            "description": "Value is first variable.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -164,27 +148,21 @@
                 }
               ]
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "var3": {
-            "names": [
-              "var3",
-              "var3"
+            "path": "rougail.{{ identifier }}_dyn.var3",
+            "name": "var3",
+            "description": "Value is relative first variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -193,8 +171,6 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var3",
-            "description": "Value is relative first variable.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -221,7 +197,12 @@
                 }
               ]
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "var4": {
+            "path": "rougail.{{ identifier }}_dyn.var4",
+            "name": "var4",
+            "description": "Value is first variable of val1.",
             "properties": [
               {
                 "type": "property",
@@ -231,17 +212,6 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
-          },
-          "var4": {
-            "names": [
-              "var4",
-              "var4"
-            ],
             "identifiers": [
               [
                 "val1"
@@ -250,8 +220,6 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var4",
-            "description": "Value is first variable of val1.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -261,27 +229,12 @@
                   "path": "rougail.{{ identifier }}_dyn.var1",
                   "identifiers": [
                     "val1"
-                  ],
-                  "type": "variable"
+                  ]
                 },
                 "description": "Value is suffix"
               }
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val1"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
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 c27d0d803..ac7fc9766 100644
--- a/tests/results/test_namespace/60_6family_dynamic_inside_empty.json
+++ b/tests/results/test_namespace/60_6family_dynamic_inside_empty.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "{{ identifier }}_dyn": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "val1_dyn",
-            "val2_dyn"
-          ],
+          "path": "rougail.{{ identifier }}_dyn",
+          "name": "{{ identifier }}_dyn",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.{{ identifier }}_dyn",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,17 +64,22 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var1": {
-            "names": [
-              "var1",
-              "var1"
+            "path": "rougail.{{ identifier }}_dyn.var1",
+            "name": "var1",
+            "description": "Value is suffix.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -94,34 +88,26 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var1",
-            "description": "Value is suffix.",
             "type": "variable",
             "default": {
               "name": "Default",
               "values": "the value of the identifier"
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "var2": {
-            "names": [
-              "var2",
-              "var2"
+            "path": "rougail.{{ identifier }}_dyn.var2",
+            "name": "var2",
+            "description": "Value is first variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -130,8 +116,6 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var2",
-            "description": "Value is first variable.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -158,27 +142,21 @@
                 }
               ]
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           },
           "var3": {
-            "names": [
-              "var3",
-              "var3"
+            "path": "rougail.{{ identifier }}_dyn.var3",
+            "name": "var3",
+            "description": "Value is relative first variable.",
+            "properties": [
+              {
+                "type": "property",
+                "name": "mandatory",
+                "ori_name": "mandatory",
+                "access_control": false
+              }
             ],
+            "mode": "standard",
             "identifiers": [
               [
                 "val1"
@@ -187,8 +165,6 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var3",
-            "description": "Value is relative first variable.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -215,7 +191,12 @@
                 }
               ]
             },
-            "variable_type": "string",
+            "variable_type": "string"
+          },
+          "var4": {
+            "path": "rougail.{{ identifier }}_dyn.var4",
+            "name": "var4",
+            "description": "Value is first variable of val1.",
             "properties": [
               {
                 "type": "property",
@@ -225,17 +206,6 @@
               }
             ],
             "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val2"
-            ],
-            "mandatory_without_value": false
-          },
-          "var4": {
-            "names": [
-              "var4",
-              "var4"
-            ],
             "identifiers": [
               [
                 "val1"
@@ -244,8 +214,6 @@
                 "val2"
               ]
             ],
-            "path": "rougail.{{ identifier }}_dyn.var4",
-            "description": "Value is first variable of val1.",
             "type": "variable",
             "default": {
               "name": "Default",
@@ -255,27 +223,12 @@
                   "path": "rougail.{{ identifier }}_dyn.var1",
                   "identifiers": [
                     "val1"
-                  ],
-                  "type": "variable"
+                  ]
                 },
                 "description": "Value is suffix"
               }
             },
-            "variable_type": "string",
-            "properties": [
-              {
-                "type": "property",
-                "name": "mandatory",
-                "ori_name": "mandatory",
-                "access_control": false
-              }
-            ],
-            "mode": "standard",
-            "gen_examples": [
-              "val1",
-              "val1"
-            ],
-            "mandatory_without_value": false
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership.json b/tests/results/test_namespace/60_6family_dynamic_leadership.json
index 444449f74..1e68de79d 100644
--- a/tests/results/test_namespace/60_6family_dynamic_leadership.json
+++ b/tests/results/test_namespace/60_6family_dynamic_leadership.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,19 +70,17 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "leadership": {
             "type": "leadership",
             "informations": {
-              "names": [
-                "leadership",
-                "leadership"
-              ],
+              "path": "rougail.dyn{{ identifier }}.leadership",
+              "name": "leadership",
+              "description": "A leadership",
+              "properties": [],
+              "mode": "basic",
               "identifiers": [
                 [
                   "val1"
@@ -102,32 +89,15 @@
                   "val2"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.leadership",
-              "description": "A leadership",
-              "properties": [],
-              "mode": "basic",
               "help": [
                 "This family contains lists of variable blocks"
               ]
             },
             "children": {
               "leader": {
-                "names": [
-                  "leader",
-                  "leader"
-                ],
-                "identifiers": [
-                  [
-                    "val1"
-                  ],
-                  [
-                    "val2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.leadership.leader",
+                "name": "leader",
                 "description": "A leader.",
-                "type": "variable",
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -143,22 +113,24 @@
                   }
                 ],
                 "mode": "basic",
-                "multiple": true,
-                "gen_examples": [
+                "identifiers": [
                   [
-                    "example"
+                    "val1"
                   ],
                   [
-                    "example"
+                    "val2"
                   ]
                 ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string",
+                "multiple": true
               },
               "follower1": {
-                "names": [
-                  "follower1",
-                  "follower1"
-                ],
+                "path": "rougail.dyn{{ identifier }}.leadership.follower1",
+                "name": "follower1",
+                "description": "A follower1.",
+                "properties": [],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1"
@@ -167,27 +139,15 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.leadership.follower1",
-                "description": "A follower1.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [],
-                "mode": "standard",
-                "gen_examples": [
-                  [
-                    "example"
-                  ],
-                  [
-                    "example"
-                  ]
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               },
               "follower2": {
-                "names": [
-                  "follower2",
-                  "follower2"
-                ],
+                "path": "rougail.dyn{{ identifier }}.leadership.follower2",
+                "name": "follower2",
+                "description": "A follower2.",
+                "properties": [],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1"
@@ -196,21 +156,8 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.leadership.follower2",
-                "description": "A follower2.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [],
-                "mode": "standard",
-                "gen_examples": [
-                  [
-                    "example"
-                  ],
-                  [
-                    "example"
-                  ]
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
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 adf77f984..a1d4dc498 100644
--- a/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json
+++ b/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,19 +64,17 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "leadership": {
             "type": "leadership",
             "informations": {
-              "names": [
-                "leadership",
-                "leadership"
-              ],
+              "path": "rougail.dyn{{ identifier }}.leadership",
+              "name": "leadership",
+              "description": "A leadership",
+              "properties": [],
+              "mode": "basic",
               "identifiers": [
                 [
                   "val1"
@@ -96,32 +83,15 @@
                   "val2"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.leadership",
-              "description": "A leadership",
-              "properties": [],
-              "mode": "basic",
               "help": [
                 "This family contains lists of variable blocks"
               ]
             },
             "children": {
               "leader": {
-                "names": [
-                  "leader",
-                  "leader"
-                ],
-                "identifiers": [
-                  [
-                    "val1"
-                  ],
-                  [
-                    "val2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.leadership.leader",
+                "name": "leader",
                 "description": "A leader.",
-                "type": "variable",
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -137,22 +107,24 @@
                   }
                 ],
                 "mode": "basic",
-                "multiple": true,
-                "gen_examples": [
+                "identifiers": [
                   [
-                    "example"
+                    "val1"
                   ],
                   [
-                    "example"
+                    "val2"
                   ]
                 ],
-                "mandatory_without_value": true
+                "type": "variable",
+                "variable_type": "string",
+                "multiple": true
               },
               "follower1": {
-                "names": [
-                  "follower1",
-                  "follower1"
-                ],
+                "path": "rougail.dyn{{ identifier }}.leadership.follower1",
+                "name": "follower1",
+                "description": "A follower1.",
+                "properties": [],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1"
@@ -161,27 +133,15 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.leadership.follower1",
-                "description": "A follower1.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [],
-                "mode": "standard",
-                "gen_examples": [
-                  [
-                    "example"
-                  ],
-                  [
-                    "example"
-                  ]
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               },
               "follower2": {
-                "names": [
-                  "follower2",
-                  "follower2"
-                ],
+                "path": "rougail.dyn{{ identifier }}.leadership.follower2",
+                "name": "follower2",
+                "description": "A follower2.",
+                "properties": [],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1"
@@ -190,21 +150,8 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.leadership.follower2",
-                "description": "A follower2.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [],
-                "mode": "standard",
-                "gen_examples": [
-                  [
-                    "example"
-                  ],
-                  [
-                    "example"
-                  ]
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
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 abf8ddb83..22c80e069 100644
--- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json
+++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,35 +70,13 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "description": "add 't' to each var value"
-              }
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -125,28 +92,32 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
+            "identifiers": [
               [
-                "tval1",
-                "tval2"
+                "val1"
               ],
               [
-                "tval1",
-                "tval2"
+                "val2"
               ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "add 't' to each var value"
+              }
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "dyn_{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "dyn_tval1",
-                "dyn_tval2",
-                "dyn_tval1",
-                "dyn_tval2"
-              ],
+              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
+              "name": "dyn_{{ identifier }}",
+              "description": "A Second dynamic variable",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1",
@@ -165,10 +136,9 @@
                   "tval2"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
-              "description": "A Second dynamic variable",
-              "properties": [],
-              "mode": "standard",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -190,19 +160,22 @@
                   },
                   "description": "A dynamic variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var",
-                  "var",
-                  "var"
+                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
+                "name": "var",
+                "description": "A variable dynamic.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1",
@@ -221,64 +194,17 @@
                     "tval2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
-                "description": "A variable dynamic.",
                 "type": "variable",
                 "default": {
                   "name": "Default",
                   "values": "the value of the identifier"
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "tval1",
-                  "tval2",
-                  "tval1",
-                  "tval2"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               },
               "var_identifier": {
-                "names": [
-                  "var_identifier",
-                  "var_identifier",
-                  "var_identifier",
-                  "var_identifier"
-                ],
-                "identifiers": [
-                  [
-                    "val1",
-                    "tval1"
-                  ],
-                  [
-                    "val1",
-                    "tval2"
-                  ],
-                  [
-                    "val2",
-                    "tval1"
-                  ],
-                  [
-                    "val2",
-                    "tval2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier",
+                "name": "var_identifier",
                 "description": "Identifier from first family.",
-                "type": "variable",
-                "default": {
-                  "name": "Default",
-                  "values": "the value of the identifier"
-                },
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -288,21 +214,6 @@
                   }
                 ],
                 "mode": "standard",
-                "gen_examples": [
-                  "val1",
-                  "val1",
-                  "val2",
-                  "val2"
-                ],
-                "mandatory_without_value": false
-              },
-              "var_identifiers": {
-                "names": [
-                  "var_identifiers",
-                  "var_identifiers",
-                  "var_identifiers",
-                  "var_identifiers"
-                ],
                 "identifiers": [
                   [
                     "val1",
@@ -321,8 +232,44 @@
                     "tval2"
                   ]
                 ],
+                "type": "variable",
+                "default": {
+                  "name": "Default",
+                  "values": "the value of the identifier"
+                },
+                "variable_type": "string"
+              },
+              "var_identifiers": {
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers",
+                "name": "var_identifiers",
                 "description": "Merge identifiers.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
+                ],
+                "mode": "standard",
+                "identifiers": [
+                  [
+                    "val1",
+                    "tval1"
+                  ],
+                  [
+                    "val1",
+                    "tval2"
+                  ],
+                  [
+                    "val2",
+                    "tval1"
+                  ],
+                  [
+                    "val2",
+                    "tval2"
+                  ]
+                ],
                 "type": "variable",
                 "default": {
                   "name": "Default",
@@ -330,23 +277,7 @@
                     "description": "join identifier 1 and identifier 2"
                   }
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "val1-tval1",
-                  "val1-tval2",
-                  "val2-tval1",
-                  "val2-tval2"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
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 abf8ddb83..22c80e069 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,35 +70,13 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "description": "add 't' to each var value"
-              }
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -125,28 +92,32 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
+            "identifiers": [
               [
-                "tval1",
-                "tval2"
+                "val1"
               ],
               [
-                "tval1",
-                "tval2"
+                "val2"
               ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "add 't' to each var value"
+              }
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "dyn_{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "dyn_tval1",
-                "dyn_tval2",
-                "dyn_tval1",
-                "dyn_tval2"
-              ],
+              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
+              "name": "dyn_{{ identifier }}",
+              "description": "A Second dynamic variable",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1",
@@ -165,10 +136,9 @@
                   "tval2"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
-              "description": "A Second dynamic variable",
-              "properties": [],
-              "mode": "standard",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -190,19 +160,22 @@
                   },
                   "description": "A dynamic variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var",
-                  "var",
-                  "var"
+                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
+                "name": "var",
+                "description": "A variable dynamic.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1",
@@ -221,64 +194,17 @@
                     "tval2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
-                "description": "A variable dynamic.",
                 "type": "variable",
                 "default": {
                   "name": "Default",
                   "values": "the value of the identifier"
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "tval1",
-                  "tval2",
-                  "tval1",
-                  "tval2"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               },
               "var_identifier": {
-                "names": [
-                  "var_identifier",
-                  "var_identifier",
-                  "var_identifier",
-                  "var_identifier"
-                ],
-                "identifiers": [
-                  [
-                    "val1",
-                    "tval1"
-                  ],
-                  [
-                    "val1",
-                    "tval2"
-                  ],
-                  [
-                    "val2",
-                    "tval1"
-                  ],
-                  [
-                    "val2",
-                    "tval2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier",
+                "name": "var_identifier",
                 "description": "Identifier from first family.",
-                "type": "variable",
-                "default": {
-                  "name": "Default",
-                  "values": "the value of the identifier"
-                },
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -288,21 +214,6 @@
                   }
                 ],
                 "mode": "standard",
-                "gen_examples": [
-                  "val1",
-                  "val1",
-                  "val2",
-                  "val2"
-                ],
-                "mandatory_without_value": false
-              },
-              "var_identifiers": {
-                "names": [
-                  "var_identifiers",
-                  "var_identifiers",
-                  "var_identifiers",
-                  "var_identifiers"
-                ],
                 "identifiers": [
                   [
                     "val1",
@@ -321,8 +232,44 @@
                     "tval2"
                   ]
                 ],
+                "type": "variable",
+                "default": {
+                  "name": "Default",
+                  "values": "the value of the identifier"
+                },
+                "variable_type": "string"
+              },
+              "var_identifiers": {
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers",
+                "name": "var_identifiers",
                 "description": "Merge identifiers.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
+                ],
+                "mode": "standard",
+                "identifiers": [
+                  [
+                    "val1",
+                    "tval1"
+                  ],
+                  [
+                    "val1",
+                    "tval2"
+                  ],
+                  [
+                    "val2",
+                    "tval1"
+                  ],
+                  [
+                    "val2",
+                    "tval2"
+                  ]
+                ],
                 "type": "variable",
                 "default": {
                   "name": "Default",
@@ -330,23 +277,7 @@
                     "description": "join identifier 1 and identifier 2"
                   }
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "val1-tval1",
-                  "val1-tval2",
-                  "val2-tval1",
-                  "val2-tval2"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
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 593f5b24f..c0f3d4480 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "val1",
-            "val2"
-          ],
+          "path": "rougail.{{ identifier }}",
+          "name": "{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,21 +70,17 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "val1",
-                "val2",
-                "val1",
-                "val2"
-              ],
+              "path": "rougail.{{ identifier }}.{{ identifier }}",
+              "name": "{{ identifier }}",
+              "description": "A dynamic family",
+              "properties": [],
+              "mode": "basic",
               "identifiers": [
                 [
                   "val1",
@@ -114,10 +99,9 @@
                   "val2"
                 ]
               ],
-              "path": "rougail.{{ identifier }}.{{ identifier }}",
-              "description": "A dynamic family",
-              "properties": [],
-              "mode": "basic",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -127,19 +111,22 @@
                   },
                   "description": "A identifier variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var",
-                  "var",
-                  "var"
+                "path": "rougail.{{ identifier }}.{{ identifier }}.var",
+                "name": "var",
+                "description": "A dynamic variable.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "basic",
                 "identifiers": [
                   [
                     "val1",
@@ -158,26 +145,8 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.{{ identifier }}.{{ identifier }}.var",
-                "description": "A dynamic variable.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "basic",
-                "gen_examples": [
-                  "example",
-                  "example",
-                  "example",
-                  "example"
-                ],
-                "mandatory_without_value": true
+                "variable_type": "string"
               }
             }
           }
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 6dbec8790..fb69b5abe 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,12 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -31,6 +25,8 @@
           }
         ],
         "mode": "standard",
+        "type": "variable",
+        "variable_type": "string",
         "multiple": true,
         "examples": {
           "name": "Examples",
@@ -38,22 +34,16 @@
             "val1",
             "val2"
           ]
-        },
-        "gen_examples": [
-          [
-            "val1",
-            "val2"
-          ]
-        ],
-        "mandatory_without_value": false
+        }
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,35 +64,13 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": {
-                "description": "add 't' to each var value"
-              }
-            },
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -119,28 +86,32 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
+            "identifiers": [
               [
-                "tval1",
-                "tval2"
+                "val1"
               ],
               [
-                "tval1",
-                "tval2"
+                "val2"
               ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": {
+                "description": "add 't' to each var value"
+              }
+            },
+            "variable_type": "string",
+            "multiple": true
           },
           "dyn_{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "dyn_tval1",
-                "dyn_tval2",
-                "dyn_tval1",
-                "dyn_tval2"
-              ],
+              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
+              "name": "dyn_{{ identifier }}",
+              "description": "A Second dynamic variable",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1",
@@ -159,10 +130,9 @@
                   "tval2"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
-              "description": "A Second dynamic variable",
-              "properties": [],
-              "mode": "standard",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -184,19 +154,22 @@
                   },
                   "description": "A dynamic variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var",
-                  "var",
-                  "var"
+                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
+                "name": "var",
+                "description": "A variable dynamic.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1",
@@ -215,64 +188,17 @@
                     "tval2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
-                "description": "A variable dynamic.",
                 "type": "variable",
                 "default": {
                   "name": "Default",
                   "values": "the value of the identifier"
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "tval1",
-                  "tval2",
-                  "tval1",
-                  "tval2"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               },
               "var_identifier": {
-                "names": [
-                  "var_identifier",
-                  "var_identifier",
-                  "var_identifier",
-                  "var_identifier"
-                ],
-                "identifiers": [
-                  [
-                    "val1",
-                    "tval1"
-                  ],
-                  [
-                    "val1",
-                    "tval2"
-                  ],
-                  [
-                    "val2",
-                    "tval1"
-                  ],
-                  [
-                    "val2",
-                    "tval2"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier",
+                "name": "var_identifier",
                 "description": "Identifier from first family.",
-                "type": "variable",
-                "default": {
-                  "name": "Default",
-                  "values": "the value of the identifier"
-                },
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -282,21 +208,6 @@
                   }
                 ],
                 "mode": "standard",
-                "gen_examples": [
-                  "val1",
-                  "val1",
-                  "val2",
-                  "val2"
-                ],
-                "mandatory_without_value": false
-              },
-              "var_identifiers": {
-                "names": [
-                  "var_identifiers",
-                  "var_identifiers",
-                  "var_identifiers",
-                  "var_identifiers"
-                ],
                 "identifiers": [
                   [
                     "val1",
@@ -315,8 +226,44 @@
                     "tval2"
                   ]
                 ],
+                "type": "variable",
+                "default": {
+                  "name": "Default",
+                  "values": "the value of the identifier"
+                },
+                "variable_type": "string"
+              },
+              "var_identifiers": {
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers",
+                "name": "var_identifiers",
                 "description": "Merge identifiers.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
+                ],
+                "mode": "standard",
+                "identifiers": [
+                  [
+                    "val1",
+                    "tval1"
+                  ],
+                  [
+                    "val1",
+                    "tval2"
+                  ],
+                  [
+                    "val2",
+                    "tval1"
+                  ],
+                  [
+                    "val2",
+                    "tval2"
+                  ]
+                ],
                 "type": "variable",
                 "default": {
                   "name": "Default",
@@ -324,23 +271,7 @@
                     "description": "join identifier 1 and identifier 2"
                   }
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "val1-tval1",
-                  "val1-tval2",
-                  "val2-tval1",
-                  "val2-tval2"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
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 0b2415dc2..691b00bbf 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A identifier variable.",
         "properties": [
           {
@@ -38,22 +25,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "standard",
           "identifiers": [
             [
               "val1"
@@ -62,10 +52,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "standard",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -75,29 +64,13 @@
               },
               "description": "A identifier variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var",
-              "var"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.var",
+            "name": "var",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -107,24 +80,26 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
+            "identifiers": [
               [
-                "example"
+                "val1"
               ],
               [
-                "example"
+                "val2"
               ]
             ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string",
+            "multiple": true
           },
           "dyn_{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "dyn_example",
-                "dyn_example"
-              ],
+              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
+              "name": "dyn_{{ identifier }}",
+              "description": "A Second dynamic variable",
+              "properties": [],
+              "mode": "standard",
               "identifiers": [
                 [
                   "val1",
@@ -135,10 +110,9 @@
                   "example"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}",
-              "description": "A Second dynamic variable",
-              "properties": [],
-              "mode": "standard",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -160,17 +134,22 @@
                   },
                   "description": "A dynamic variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var"
+                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
+                "name": "var",
+                "description": "A variable dynamic.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "standard",
                 "identifiers": [
                   [
                     "val1",
@@ -181,52 +160,17 @@
                     "example"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var",
-                "description": "A variable dynamic.",
                 "type": "variable",
                 "default": {
                   "name": "Default",
                   "values": "the value of the identifier"
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "example",
-                  "example"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               },
               "var_identifier": {
-                "names": [
-                  "var_identifier",
-                  "var_identifier"
-                ],
-                "identifiers": [
-                  [
-                    "val1",
-                    "example"
-                  ],
-                  [
-                    "val2",
-                    "example"
-                  ]
-                ],
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier",
+                "name": "var_identifier",
                 "description": "Identifier from first family.",
-                "type": "variable",
-                "default": {
-                  "name": "Default",
-                  "values": "the value of the identifier"
-                },
-                "variable_type": "string",
                 "properties": [
                   {
                     "type": "property",
@@ -236,17 +180,6 @@
                   }
                 ],
                 "mode": "standard",
-                "gen_examples": [
-                  "val1",
-                  "val2"
-                ],
-                "mandatory_without_value": false
-              },
-              "var_identifiers": {
-                "names": [
-                  "var_identifiers",
-                  "var_identifiers"
-                ],
                 "identifiers": [
                   [
                     "val1",
@@ -257,8 +190,36 @@
                     "example"
                   ]
                 ],
+                "type": "variable",
+                "default": {
+                  "name": "Default",
+                  "values": "the value of the identifier"
+                },
+                "variable_type": "string"
+              },
+              "var_identifiers": {
                 "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers",
+                "name": "var_identifiers",
                 "description": "Merge identifiers.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
+                ],
+                "mode": "standard",
+                "identifiers": [
+                  [
+                    "val1",
+                    "example"
+                  ],
+                  [
+                    "val2",
+                    "example"
+                  ]
+                ],
                 "type": "variable",
                 "default": {
                   "name": "Default",
@@ -266,21 +227,7 @@
                     "description": "join identifier 1 and identifier 2"
                   }
                 },
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "standard",
-                "gen_examples": [
-                  "val1-example",
-                  "val2-example"
-                ],
-                "mandatory_without_value": false
+                "variable_type": "string"
               }
             }
           }
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 7815102ee..cc14f03a8 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,21 +70,17 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "dyn{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "dynval1",
-                "dynval2",
-                "dynval1",
-                "dynval2"
-              ],
+              "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}",
+              "name": "dyn{{ identifier }}",
+              "description": "dyn{{ identifier }}",
+              "properties": [],
+              "mode": "basic",
               "identifiers": [
                 [
                   "val1",
@@ -114,10 +99,9 @@
                   "val2"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}",
-              "description": "dyn{{ identifier }}",
-              "properties": [],
-              "mode": "basic",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -127,19 +111,22 @@
                   },
                   "description": "A suffix variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var",
-                  "var",
-                  "var"
+                "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var",
+                "name": "var",
+                "description": "A dynamic variable.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "basic",
                 "identifiers": [
                   [
                     "val1",
@@ -158,32 +145,26 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var",
-                "description": "A dynamic variable.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "basic",
-                "gen_examples": [
-                  "example",
-                  "example",
-                  "example",
-                  "example"
-                ],
-                "mandatory_without_value": true
+                "variable_type": "string"
               }
             }
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable calculated.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -213,28 +194,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable calculated.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            null,
-            null
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
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 f7cfee1ca..c61a8f1e3 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
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,19 +13,8 @@
     },
     "children": {
       "var1": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "val1",
-            "val2"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var1",
-        "names": [
-          "var1"
-        ],
+        "name": "var1",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -44,22 +31,25 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "val1",
             "val2"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "dyn{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -68,10 +58,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "dyn{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -81,21 +70,17 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "dyn{{ identifier }}": {
             "type": "dynamic",
             "informations": {
-              "names": [
-                "dynval1",
-                "dynval2",
-                "dynval1",
-                "dynval2"
-              ],
+              "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}",
+              "name": "dyn{{ identifier }}",
+              "description": "dyn{{ identifier }}",
+              "properties": [],
+              "mode": "basic",
               "identifiers": [
                 [
                   "val1",
@@ -114,10 +99,9 @@
                   "val2"
                 ]
               ],
-              "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}",
-              "description": "dyn{{ identifier }}",
-              "properties": [],
-              "mode": "basic",
+              "help": [
+                "This family builds families dynamically"
+              ],
               "identifier": [
                 {
                   "message": "the value of the variable \"{0}\"",
@@ -127,19 +111,22 @@
                   },
                   "description": "A suffix variable"
                 }
-              ],
-              "help": [
-                "This family builds families dynamically"
               ]
             },
             "children": {
               "var": {
-                "names": [
-                  "var",
-                  "var",
-                  "var",
-                  "var"
+                "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var",
+                "name": "var",
+                "description": "A dynamic variable.",
+                "properties": [
+                  {
+                    "type": "property",
+                    "name": "mandatory",
+                    "ori_name": "mandatory",
+                    "access_control": false
+                  }
                 ],
+                "mode": "basic",
                 "identifiers": [
                   [
                     "val1",
@@ -158,32 +145,26 @@
                     "val2"
                   ]
                 ],
-                "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var",
-                "description": "A dynamic variable.",
                 "type": "variable",
-                "variable_type": "string",
-                "properties": [
-                  {
-                    "type": "property",
-                    "name": "mandatory",
-                    "ori_name": "mandatory",
-                    "access_control": false
-                  }
-                ],
-                "mode": "basic",
-                "gen_examples": [
-                  "example",
-                  "example",
-                  "example",
-                  "example"
-                ],
-                "mandatory_without_value": true
+                "variable_type": "string"
               }
             }
           }
         }
       },
       "var2": {
+        "path": "rougail.var2",
+        "name": "var2",
+        "description": "A variable calculated.",
+        "properties": [
+          {
+            "type": "property",
+            "name": "mandatory",
+            "ori_name": "mandatory",
+            "access_control": false
+          }
+        ],
+        "mode": "standard",
         "type": "variable",
         "default": {
           "name": "Default",
@@ -213,28 +194,7 @@
           ]
         },
         "variable_type": "string",
-        "path": "rougail.var2",
-        "names": [
-          "var2"
-        ],
-        "description": "A variable calculated.",
-        "properties": [
-          {
-            "type": "property",
-            "name": "mandatory",
-            "ori_name": "mandatory",
-            "access_control": false
-          }
-        ],
-        "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
-            null,
-            null
-          ]
-        ],
-        "mandatory_without_value": false
+        "multiple": true
       }
     }
   }
diff --git a/tests/results/test_namespace/60_9extra_dynamic.json b/tests/results/test_namespace/60_9extra_dynamic.json
index f6bf85ba0..e107b2869 100644
--- a/tests/results/test_namespace/60_9extra_dynamic.json
+++ b/tests/results/test_namespace/60_9extra_dynamic.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -15,18 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "a"
-          ]
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A variable.",
         "properties": [
           {
@@ -43,13 +31,15 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "a"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       }
     }
   },
@@ -57,9 +47,7 @@
     "type": "namespace",
     "informations": {
       "path": "extra",
-      "names": [
-        "extra"
-      ],
+      "name": "extra",
       "description": "Extra",
       "properties": [],
       "mode": "basic",
@@ -71,18 +59,19 @@
       "dyn_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyn_a"
-          ],
+          "path": "extra.dyn_{{ identifier }}",
+          "name": "dyn_{{ identifier }}",
+          "description": "dyn_{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "a"
             ]
           ],
-          "path": "extra.dyn_{{ identifier }}",
-          "description": "dyn_{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -92,24 +81,12 @@
               },
               "description": "A variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var"
-            ],
-            "identifiers": [
-              [
-                "a"
-              ]
-            ],
             "path": "extra.dyn_{{ identifier }}.var",
-            "type": "variable",
-            "variable_type": "string",
+            "name": "var",
             "properties": [
               {
                 "type": "property",
@@ -119,10 +96,13 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
+            "identifiers": [
+              [
+                "a"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/60_9extra_dynamic_extra.json b/tests/results/test_namespace/60_9extra_dynamic_extra.json
index de3391a1b..0c08391e1 100644
--- a/tests/results/test_namespace/60_9extra_dynamic_extra.json
+++ b/tests/results/test_namespace/60_9extra_dynamic_extra.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "standard",
@@ -18,27 +16,15 @@
         "type": "family",
         "informations": {
           "path": "rougail.general",
-          "names": [
-            "general"
-          ],
+          "name": "general",
           "description": "Général",
           "properties": [],
           "mode": "standard"
         },
         "children": {
           "varname": {
-            "type": "variable",
-            "default": {
-              "name": "Default",
-              "values": [
-                "a"
-              ]
-            },
-            "variable_type": "string",
             "path": "rougail.general.varname",
-            "names": [
-              "varname"
-            ],
+            "name": "varname",
             "description": "No change.",
             "properties": [
               {
@@ -55,13 +41,15 @@
               }
             ],
             "mode": "standard",
-            "multiple": true,
-            "gen_examples": [
-              [
+            "type": "variable",
+            "default": {
+              "name": "Default",
+              "values": [
                 "a"
               ]
-            ],
-            "mandatory_without_value": false
+            },
+            "variable_type": "string",
+            "multiple": true
           }
         }
       }
@@ -71,9 +59,7 @@
     "type": "namespace",
     "informations": {
       "path": "extra",
-      "names": [
-        "extra"
-      ],
+      "name": "extra",
       "description": "Extra",
       "properties": [],
       "mode": "basic",
@@ -83,18 +69,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": [
-            "a"
-          ]
-        },
-        "variable_type": "string",
         "path": "extra.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A variable.",
         "properties": [
           {
@@ -111,29 +87,32 @@
           }
         ],
         "mode": "standard",
-        "multiple": true,
-        "gen_examples": [
-          [
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": [
             "a"
           ]
-        ],
-        "mandatory_without_value": false
+        },
+        "variable_type": "string",
+        "multiple": true
       },
       "dyn_{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dyn_a"
-          ],
+          "path": "extra.dyn_{{ identifier }}",
+          "name": "dyn_{{ identifier }}",
+          "description": "dyn_{{ identifier }}",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "a"
             ]
           ],
-          "path": "extra.dyn_{{ identifier }}",
-          "description": "dyn_{{ identifier }}",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             {
               "message": "the value of the variable \"{0}\"",
@@ -143,24 +122,12 @@
               },
               "description": "A variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "var": {
-            "names": [
-              "var"
-            ],
-            "identifiers": [
-              [
-                "a"
-              ]
-            ],
             "path": "extra.dyn_{{ identifier }}.var",
-            "type": "variable",
-            "variable_type": "string",
+            "name": "var",
             "properties": [
               {
                 "type": "property",
@@ -170,10 +137,13 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example"
+            "identifiers": [
+              [
+                "a"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
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 28eb2c9c5..bdfbe4696 100644
--- a/tests/results/test_namespace/60_9family_dynamic_calc_both.json
+++ b/tests/results/test_namespace/60_9family_dynamic_calc_both.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -15,16 +13,8 @@
     },
     "children": {
       "var": {
-        "type": "variable",
-        "default": {
-          "name": "Default",
-          "values": "val2"
-        },
-        "variable_type": "string",
         "path": "rougail.var",
-        "names": [
-          "var"
-        ],
+        "name": "var",
         "description": "A suffix variable.",
         "properties": [
           {
@@ -35,18 +25,21 @@
           }
         ],
         "mode": "standard",
-        "gen_examples": [
-          "val2"
-        ],
-        "mandatory_without_value": false
+        "type": "variable",
+        "default": {
+          "name": "Default",
+          "values": "val2"
+        },
+        "variable_type": "string"
       },
       "dyn{{ identifier }}": {
         "type": "dynamic",
         "informations": {
-          "names": [
-            "dynval1",
-            "dynval2"
-          ],
+          "path": "rougail.dyn{{ identifier }}",
+          "name": "dyn{{ identifier }}",
+          "description": "A dynamic family",
+          "properties": [],
+          "mode": "basic",
           "identifiers": [
             [
               "val1"
@@ -55,10 +48,9 @@
               "val2"
             ]
           ],
-          "path": "rougail.dyn{{ identifier }}",
-          "description": "A dynamic family",
-          "properties": [],
-          "mode": "basic",
+          "help": [
+            "This family builds families dynamically"
+          ],
           "identifier": [
             "val1",
             {
@@ -69,29 +61,13 @@
               },
               "description": "A suffix variable"
             }
-          ],
-          "help": [
-            "This family builds families dynamically"
           ]
         },
         "children": {
           "vardyn": {
-            "names": [
-              "vardyn",
-              "vardyn"
-            ],
-            "identifiers": [
-              [
-                "val1"
-              ],
-              [
-                "val2"
-              ]
-            ],
             "path": "rougail.dyn{{ identifier }}.vardyn",
+            "name": "vardyn",
             "description": "A dynamic variable.",
-            "type": "variable",
-            "variable_type": "string",
             "properties": [
               {
                 "type": "property",
@@ -101,11 +77,16 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              "example",
-              "example"
+            "identifiers": [
+              [
+                "val1"
+              ],
+              [
+                "val2"
+              ]
             ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/68_0family_leadership_mode.json b/tests/results/test_namespace/68_0family_leadership_mode.json
index 793fd1d3b..10accd09c 100644
--- a/tests/results/test_namespace/68_0family_leadership_mode.json
+++ b/tests/results/test_namespace/68_0family_leadership_mode.json
@@ -3,9 +3,7 @@
     "type": "namespace",
     "informations": {
       "path": "rougail",
-      "names": [
-        "rougail"
-      ],
+      "name": "rougail",
       "description": "Rougail",
       "properties": [],
       "mode": "basic",
@@ -18,9 +16,7 @@
         "type": "leadership",
         "informations": {
           "path": "rougail.leader",
-          "names": [
-            "leader"
-          ],
+          "name": "leader",
           "description": "A leadership",
           "properties": [],
           "mode": "basic",
@@ -30,12 +26,8 @@
         },
         "children": {
           "leader": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.leader",
-            "names": [
-              "leader"
-            ],
+            "name": "leader",
             "description": "A leader.",
             "properties": [
               {
@@ -46,38 +38,22 @@
               }
             ],
             "mode": "basic",
-            "multiple": true,
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
-          },
-          "follower1": {
             "type": "variable",
             "variable_type": "string",
+            "multiple": true
+          },
+          "follower1": {
             "path": "rougail.leader.follower1",
-            "names": [
-              "follower1"
-            ],
+            "name": "follower1",
             "description": "A follower1.",
             "properties": [],
             "mode": "standard",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": false
+            "type": "variable",
+            "variable_type": "string"
           },
           "follower2": {
-            "type": "variable",
-            "variable_type": "string",
             "path": "rougail.leader.follower2",
-            "names": [
-              "follower2"
-            ],
+            "name": "follower2",
             "description": "A follower2.",
             "properties": [
               {
@@ -88,12 +64,8 @@
               }
             ],
             "mode": "basic",
-            "gen_examples": [
-              [
-                "example"
-              ]
-            ],
-            "mandatory_without_value": true
+            "type": "variable",
+            "variable_type": "string"
           }
         }
       }
diff --git a/tests/results/test_namespace/warnings_16_2family_redefine_calculation b/tests/results/test_namespace/warnings_16_2family_redefine_calculation
index d766e2d00..8c8b5fa6c 100644
--- a/tests/results/test_namespace/warnings_16_2family_redefine_calculation
+++ b/tests/results/test_namespace/warnings_16_2family_redefine_calculation
@@ -1 +1 @@
-["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""]
\ No newline at end of file
+["\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_16_3family_empty_at_ends b/tests/results/test_namespace/warnings_16_3family_empty_at_ends
index e7619cd3b..d48ef4869 100644
--- a/tests/results/test_namespace/warnings_16_3family_empty_at_ends
+++ b/tests/results/test_namespace/warnings_16_3family_empty_at_ends
@@ -1 +1 @@
-["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_20_2family_looks_like_dynamic b/tests/results/test_namespace/warnings_20_2family_looks_like_dynamic
index 7ac2fbe7f..27fd375f3 100644
--- a/tests/results/test_namespace/warnings_20_2family_looks_like_dynamic
+++ b/tests/results/test_namespace/warnings_20_2family_looks_like_dynamic
@@ -1 +1 @@
-["No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_20_2family_looks_like_variable b/tests/results/test_namespace/warnings_20_2family_looks_like_variable
index f688a53bb..c210375a8 100644
--- a/tests/results/test_namespace/warnings_20_2family_looks_like_variable
+++ b/tests/results/test_namespace/warnings_20_2family_looks_like_variable
@@ -1 +1 @@
-["No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test_namespace/warnings_40_9leadership-calculation-outside-follower-no-mandatory
index 3abb0f5e7..6d6e0f98d 100644
--- a/tests/results/test_namespace/warnings_40_9leadership-calculation-outside-follower-no-mandatory
+++ b/tests/results/test_namespace/warnings_40_9leadership-calculation-outside-follower-no-mandatory
@@ -1 +1 @@
-["No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_0family_dynamic_forbidden_char b/tests/results/test_namespace/warnings_60_0family_dynamic_forbidden_char
index d3aeda8b6..03f145898 100644
--- a/tests/results/test_namespace/warnings_60_0family_dynamic_forbidden_char
+++ b/tests/results/test_namespace/warnings_60_0family_dynamic_forbidden_char
@@ -1 +1 @@
-["\"default\" is a calculation for rougail.dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""]
\ No newline at end of file
+["\"default\" is a calculation for rougail.dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_disabled2 b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_disabled2
index 0637a088a..decb99275 100644
--- a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_disabled2
+++ b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_disabled2
@@ -1 +1 @@
-[]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden
index 0637a088a..ca62c55c1 100644
--- a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden
+++ b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden
@@ -1 +1 @@
-[]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_boolean b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_boolean
index 0637a088a..aae5574da 100644
--- a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_boolean
+++ b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_boolean
@@ -1 +1 @@
-[]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_boolean/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_multi b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_multi
index 0637a088a..fc2a53c8a 100644
--- a/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_multi
+++ b/tests/results/test_namespace/warnings_60_5family_dynamic_calc_suffix_hidden_multi
@@ -1 +1 @@
-[]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_multi/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_5family_dynamic_unknown_suffix_empty b/tests/results/test_namespace/warnings_60_5family_dynamic_unknown_suffix_empty
index e8a78f126..eeba5b344 100644
--- a/tests/results/test_namespace/warnings_60_5family_dynamic_unknown_suffix_empty
+++ b/tests/results/test_namespace/warnings_60_5family_dynamic_unknown_suffix_empty
@@ -1 +1 @@
-["\"disabled\" is a calculation for rougail.val1_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""]
\ No newline at end of file
+["\"disabled\" is a calculation for rougail.{{ identifier }}_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi b/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi
index b29a00ee6..5867be67f 100644
--- a/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi
+++ b/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi
@@ -1 +1 @@
-["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi2 b/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi2
index 77b1a877a..e329e6758 100644
--- a/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi2
+++ b/tests/results/test_namespace/warnings_60_6family_dynamic_suffix_auto_multi2
@@ -1 +1 @@
-["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_9extra_dynamic b/tests/results/test_namespace/warnings_60_9extra_dynamic
index 88aca57fe..282cd0554 100644
--- a/tests/results/test_namespace/warnings_60_9extra_dynamic
+++ b/tests/results/test_namespace/warnings_60_9extra_dynamic
@@ -1 +1 @@
-["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace/warnings_60_9extra_dynamic_extra b/tests/results/test_namespace/warnings_60_9extra_dynamic_extra
index 649dabe67..b7b2cef9f 100644
--- a/tests/results/test_namespace/warnings_60_9extra_dynamic_extra
+++ b/tests/results/test_namespace/warnings_60_9extra_dynamic_extra
@@ -1 +1 @@
-["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""]
\ No newline at end of file
+["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""]
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples/00_6choice.adoc b/tests/results/test_namespace_examples/00_6choice.adoc
index d2d2707ce..639a6317c 100644
--- a/tests/results/test_namespace_examples/00_6choice.adoc
+++ b/tests/results/test_namespace_examples/00_6choice.adoc
@@ -4,8 +4,8 @@
 ----
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
+  var1: a
+  var2: a
 ----
 == Example with all variables modifiable
 
@@ -13,10 +13,10 @@ rougail:
 ----
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
-  var3: a_choice
-  var4: a_choice
+  var1: a
+  var2: a
+  var3: a
+  var4: b
   var5: a
   var6: 1
 ----
diff --git a/tests/results/test_namespace_examples/00_6choice.gitlab.md b/tests/results/test_namespace_examples/00_6choice.gitlab.md
index 9176e9cf2..c98f447ef 100644
--- a/tests/results/test_namespace_examples/00_6choice.gitlab.md
+++ b/tests/results/test_namespace_examples/00_6choice.gitlab.md
@@ -3,8 +3,8 @@
 ```yaml
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
+  var1: a
+  var2: a
 ```
 
 
@@ -13,10 +13,10 @@ rougail:
 ```yaml
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
-  var3: a_choice
-  var4: a_choice
+  var1: a
+  var2: a
+  var3: a
+  var4: b
   var5: a
   var6: 1
 ```
diff --git a/tests/results/test_namespace_examples/00_6choice.html b/tests/results/test_namespace_examples/00_6choice.html
index bfeab5db0..97eb97f68 100644
--- a/tests/results/test_namespace_examples/00_6choice.html
+++ b/tests/results/test_namespace_examples/00_6choice.html
@@ -1,13 +1,13 @@
 
    Example with mandatory variables not filled in
    
 
 
    rougail:
-  var1: a_choice
-  var2: a_choice
    Example with all variables modifiable
    
+  var1: a
+  var2: a
    Example with all variables modifiable
    
 
 
    rougail:
-  var1: a_choice
-  var2: a_choice
-  var3: a_choice
-  var4: a_choice
+  var1: a
+  var2: a
+  var3: a
+  var4: b
   var5: a
   var6: 1
    
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples/00_6choice.md b/tests/results/test_namespace_examples/00_6choice.md
index 7d259b266..152dea4b9 100644
--- a/tests/results/test_namespace_examples/00_6choice.md
+++ b/tests/results/test_namespace_examples/00_6choice.md
@@ -3,18 +3,18 @@
 ```yaml
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
+  var1: a
+  var2: a
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
-  var3: a_choice
-  var4: a_choice
+  var1: a
+  var2: a
+  var3: a
+  var4: b
   var5: a
   var6: 1
 ```
diff --git a/tests/results/test_namespace_examples/00_6choice.sh b/tests/results/test_namespace_examples/00_6choice.sh
index 1cf10b5df..54dc995f8 100644
--- a/tests/results/test_namespace_examples/00_6choice.sh
+++ b/tests/results/test_namespace_examples/00_6choice.sh
@@ -2,17 +2,17 @@
 
 ---                                                                             
 rougail:                                                                        
-  var1: a_choice                                                                
-  var2: a_choice                                                                
+  var1: a                                                                       
+  var2: a                                                                       
 
 Example with all variables modifiable
 
 ---                                                                             
 rougail:                                                                        
-  var1: a_choice                                                                
-  var2: a_choice                                                                
-  var3: a_choice                                                                
-  var4: a_choice                                                                
+  var1: a                                                                       
+  var2: a                                                                       
+  var3: a                                                                       
+  var4: b                                                                       
   var5: a                                                                       
   var6: 1                                                                       
 
diff --git a/tests/results/test_namespace_examples/00_6choice_link.adoc b/tests/results/test_namespace_examples/00_6choice_link.adoc
index 77fe54433..bdbf3f071 100644
--- a/tests/results/test_namespace_examples/00_6choice_link.adoc
+++ b/tests/results/test_namespace_examples/00_6choice_link.adoc
@@ -4,7 +4,7 @@
 ----
 ---
 rougail:
-  var1: a_choice
+  var1: a
 ----
 == Example with all variables modifiable
 
@@ -12,6 +12,6 @@ rougail:
 ----
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
+  var1: a
+  var2: a
 ----
diff --git a/tests/results/test_namespace_examples/00_6choice_link.gitlab.md b/tests/results/test_namespace_examples/00_6choice_link.gitlab.md
index 4a50f7240..adb73974f 100644
--- a/tests/results/test_namespace_examples/00_6choice_link.gitlab.md
+++ b/tests/results/test_namespace_examples/00_6choice_link.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:
-  var1: a_choice
+  var1: a
 ```
 
 
@@ -12,8 +12,8 @@ rougail:
 ```yaml
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
+  var1: a
+  var2: a
 ```
 
 
diff --git a/tests/results/test_namespace_examples/00_6choice_link.html b/tests/results/test_namespace_examples/00_6choice_link.html
index 2d11003a6..37dc1cd0e 100644
--- a/tests/results/test_namespace_examples/00_6choice_link.html
+++ b/tests/results/test_namespace_examples/00_6choice_link.html
@@ -1,8 +1,8 @@
 
    Example with mandatory variables not filled in
    
 
 
    rougail:
-  var1: a_choice
    Example with all variables modifiable
    
+  var1: a
    Example with all variables modifiable
    
 
 
    rougail:
-  var1: a_choice
-  var2: a_choice
    
\ No newline at end of file
+  var1: a
+  var2: a
    
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples/00_6choice_link.md b/tests/results/test_namespace_examples/00_6choice_link.md
index dd808a9ca..80c96622c 100644
--- a/tests/results/test_namespace_examples/00_6choice_link.md
+++ b/tests/results/test_namespace_examples/00_6choice_link.md
@@ -3,13 +3,13 @@
 ```yaml
 ---
 rougail:
-  var1: a_choice
+  var1: a
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
 rougail:
-  var1: a_choice
-  var2: a_choice
+  var1: a
+  var2: a
 ```
diff --git a/tests/results/test_namespace_examples/00_6choice_link.sh b/tests/results/test_namespace_examples/00_6choice_link.sh
index f774be4c9..8daa29100 100644
--- a/tests/results/test_namespace_examples/00_6choice_link.sh
+++ b/tests/results/test_namespace_examples/00_6choice_link.sh
@@ -2,12 +2,12 @@
 
 ---                                                                             
 rougail:                                                                        
-  var1: a_choice                                                                
+  var1: a                                                                       
 
 Example with all variables modifiable
 
 ---                                                                             
 rougail:                                                                        
-  var1: a_choice                                                                
-  var2: a_choice                                                                
+  var1: a                                                                       
+  var2: a                                                                       
 
diff --git a/tests/results/test_namespace_examples/00_6custom.adoc b/tests/results/test_namespace_examples/00_6custom.adoc
index 531e1f1b3..68b8681c2 100644
--- a/tests/results/test_namespace_examples/00_6custom.adoc
+++ b/tests/results/test_namespace_examples/00_6custom.adoc
@@ -4,7 +4,7 @@
 ----
 ---
 rougail:
-  custom1: xxx
+  custom1: example
 ----
 == Example with all variables modifiable
 
@@ -12,6 +12,6 @@ rougail:
 ----
 ---
 rougail:
-  custom1: xxx
+  custom1: example
   custom2: value
 ----
diff --git a/tests/results/test_namespace_examples/00_6custom.gitlab.md b/tests/results/test_namespace_examples/00_6custom.gitlab.md
index 8531a21b1..0f4ca7f59 100644
--- a/tests/results/test_namespace_examples/00_6custom.gitlab.md
+++ b/tests/results/test_namespace_examples/00_6custom.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:
-  custom1: xxx
+  custom1: example
 ```
 
 
@@ -12,7 +12,7 @@ rougail:
 ```yaml
 ---
 rougail:
-  custom1: xxx
+  custom1: example
   custom2: value
 ```
 
diff --git a/tests/results/test_namespace_examples/00_6custom.html b/tests/results/test_namespace_examples/00_6custom.html
index 706337757..c76062682 100644
--- a/tests/results/test_namespace_examples/00_6custom.html
+++ b/tests/results/test_namespace_examples/00_6custom.html
@@ -1,8 +1,8 @@
 
    Example with mandatory variables not filled in
    
 
 
    rougail:
-  custom1: xxx
    Example with all variables modifiable
    
+  custom1: example
    Example with all variables modifiable
    
 
 
    rougail:
-  custom1: xxx
+  custom1: example
   custom2: value
    
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples/00_6custom.md b/tests/results/test_namespace_examples/00_6custom.md
index 81b4ed7d3..42f14fc08 100644
--- a/tests/results/test_namespace_examples/00_6custom.md
+++ b/tests/results/test_namespace_examples/00_6custom.md
@@ -3,13 +3,13 @@
 ```yaml
 ---
 rougail:
-  custom1: xxx
+  custom1: example
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
 rougail:
-  custom1: xxx
+  custom1: example
   custom2: value
 ```
diff --git a/tests/results/test_namespace_examples/00_6custom.sh b/tests/results/test_namespace_examples/00_6custom.sh
index 1e833cecc..7896af275 100644
--- a/tests/results/test_namespace_examples/00_6custom.sh
+++ b/tests/results/test_namespace_examples/00_6custom.sh
@@ -2,12 +2,12 @@
 
 ---                                                                             
 rougail:                                                                        
-  custom1: xxx                                                                  
+  custom1: example                                                              
 
 Example with all variables modifiable
 
 ---                                                                             
 rougail:                                                                        
-  custom1: xxx                                                                  
+  custom1: example                                                              
   custom2: value                                                                
 
diff --git a/tests/results/test_namespace_examples/00_6ip.adoc b/tests/results/test_namespace_examples/00_6ip.adoc
index 2d1683c30..296f9c444 100644
--- a/tests/results/test_namespace_examples/00_6ip.adoc
+++ b/tests/results/test_namespace_examples/00_6ip.adoc
@@ -5,6 +5,6 @@
 ---
 rougail:
   var1: 1.1.1.1
-  var2: 192.168.0.128/25
+  var2: 192.168.0.129/25
   var3: 1.1.1.1/24
 ----
diff --git a/tests/results/test_namespace_examples/00_6ip.gitlab.md b/tests/results/test_namespace_examples/00_6ip.gitlab.md
index 8e9830a83..93caf9316 100644
--- a/tests/results/test_namespace_examples/00_6ip.gitlab.md
+++ b/tests/results/test_namespace_examples/00_6ip.gitlab.md
@@ -4,7 +4,7 @@
 ---
 rougail:
   var1: 1.1.1.1
-  var2: 192.168.0.128/25
+  var2: 192.168.0.129/25
   var3: 1.1.1.1/24
 ```
 
diff --git a/tests/results/test_namespace_examples/00_6ip.html b/tests/results/test_namespace_examples/00_6ip.html
index 6a3735756..da26f197a 100644
--- a/tests/results/test_namespace_examples/00_6ip.html
+++ b/tests/results/test_namespace_examples/00_6ip.html
@@ -2,5 +2,5 @@
 
 
    rougail:
   var1: 1.1.1.1
-  var2: 192.168.0.128/25
+  var2: 192.168.0.129/25
   var3: 1.1.1.1/24
    
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples/00_6ip.md b/tests/results/test_namespace_examples/00_6ip.md
index c7537a3d5..da8c44705 100644
--- a/tests/results/test_namespace_examples/00_6ip.md
+++ b/tests/results/test_namespace_examples/00_6ip.md
@@ -4,6 +4,6 @@
 ---
 rougail:
   var1: 1.1.1.1
-  var2: 192.168.0.128/25
+  var2: 192.168.0.129/25
   var3: 1.1.1.1/24
 ```
diff --git a/tests/results/test_namespace_examples/00_6ip.sh b/tests/results/test_namespace_examples/00_6ip.sh
index c19ca79a2..b6456152d 100644
--- a/tests/results/test_namespace_examples/00_6ip.sh
+++ b/tests/results/test_namespace_examples/00_6ip.sh
@@ -3,6 +3,6 @@
 ---                                                                             
 rougail:                                                                        
   var1: 1.1.1.1                                                                 
-  var2: 192.168.0.128/25                                                        
+  var2: 192.168.0.129/25                                                        
   var3: 1.1.1.1/24                                                              
 
diff --git a/tests/results/test_namespace_examples/00_6secret_param.adoc b/tests/results/test_namespace_examples/00_6secret_param.adoc
index 5657a6de3..d8ae12184 100644
--- a/tests/results/test_namespace_examples/00_6secret_param.adoc
+++ b/tests/results/test_namespace_examples/00_6secret_param.adoc
@@ -4,7 +4,7 @@
 ----
 ---
 rougail:
-  secret1: secrets
+  secret1: ALongS4cr4t
 ----
 == Example with all variables modifiable
 
@@ -12,7 +12,7 @@ rougail:
 ----
 ---
 rougail:
-  secret1: secrets
+  secret1: ALongS4cr4t
   secret2: value
   secret3: value
 ----
diff --git a/tests/results/test_namespace_examples/00_6secret_param.gitlab.md b/tests/results/test_namespace_examples/00_6secret_param.gitlab.md
index 7527502bd..6623951a7 100644
--- a/tests/results/test_namespace_examples/00_6secret_param.gitlab.md
+++ b/tests/results/test_namespace_examples/00_6secret_param.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:
-  secret1: secrets
+  secret1: ALongS4cr4t
 ```
 
 
@@ -12,7 +12,7 @@ rougail:
 ```yaml
 ---
 rougail:
-  secret1: secrets
+  secret1: ALongS4cr4t
   secret2: value
   secret3: value
 ```
diff --git a/tests/results/test_namespace_examples/00_6secret_param.html b/tests/results/test_namespace_examples/00_6secret_param.html
index 4e636edf4..cc60d1e49 100644
--- a/tests/results/test_namespace_examples/00_6secret_param.html
+++ b/tests/results/test_namespace_examples/00_6secret_param.html
@@ -1,9 +1,9 @@
 
    Example with mandatory variables not filled in
    
 
 
    rougail:
-  secret1: secrets
    Example with all variables modifiable
    
+  secret1: ALongS4cr4t
    Example with all variables modifiable
    
 
 
    rougail:
-  secret1: secrets
+  secret1: ALongS4cr4t
   secret2: value
   secret3: value
    
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples/00_6secret_param.md b/tests/results/test_namespace_examples/00_6secret_param.md
index ab0e61ba7..ab00601fa 100644
--- a/tests/results/test_namespace_examples/00_6secret_param.md
+++ b/tests/results/test_namespace_examples/00_6secret_param.md
@@ -3,14 +3,14 @@
 ```yaml
 ---
 rougail:
-  secret1: secrets
+  secret1: ALongS4cr4t
 ```
 # Example with all variables modifiable
 
 ```yaml
 ---
 rougail:
-  secret1: secrets
+  secret1: ALongS4cr4t
   secret2: value
   secret3: value
 ```
diff --git a/tests/results/test_namespace_examples/00_6secret_param.sh b/tests/results/test_namespace_examples/00_6secret_param.sh
index f64de93bb..710d45a33 100644
--- a/tests/results/test_namespace_examples/00_6secret_param.sh
+++ b/tests/results/test_namespace_examples/00_6secret_param.sh
@@ -2,13 +2,13 @@
 
 ---                                                                             
 rougail:                                                                        
-  secret1: secrets                                                              
+  secret1: ALongS4cr4t                                                          
 
 Example with all variables modifiable
 
 ---                                                                             
 rougail:                                                                        
-  secret1: secrets                                                              
+  secret1: ALongS4cr4t                                                          
   secret2: value                                                                
   secret3: value                                                                
 
diff --git a/tests/results/test_namespace_examples/00_8calculation_information.adoc b/tests/results/test_namespace_examples/00_8calculation_information.adoc
index 033f9ec0e..399eb3bd7 100644
--- a/tests/results/test_namespace_examples/00_8calculation_information.adoc
+++ b/tests/results/test_namespace_examples/00_8calculation_information.adoc
@@ -4,5 +4,5 @@
 ----
 ---
 rougail:
-  variable: example
+  variable: value
 ----
diff --git a/tests/results/test_namespace_examples/00_8calculation_information.gitlab.md b/tests/results/test_namespace_examples/00_8calculation_information.gitlab.md
index a806176cb..db637dd83 100644
--- a/tests/results/test_namespace_examples/00_8calculation_information.gitlab.md
+++ b/tests/results/test_namespace_examples/00_8calculation_information.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:
-  variable: example
+  variable: value
 ```
 
 
diff --git a/tests/results/test_namespace_examples/00_8calculation_information.html b/tests/results/test_namespace_examples/00_8calculation_information.html
index 5a8f20cd3..b57f218be 100644
--- a/tests/results/test_namespace_examples/00_8calculation_information.html
+++ b/tests/results/test_namespace_examples/00_8calculation_information.html
@@ -1,4 +1,4 @@
 
    Example with all variables modifiable
    
 
 
    rougail:
-  variable: example
    
\ No newline at end of file
+  variable: value
    
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples/00_8calculation_information.md b/tests/results/test_namespace_examples/00_8calculation_information.md
index 7ad300190..81588f681 100644
--- a/tests/results/test_namespace_examples/00_8calculation_information.md
+++ b/tests/results/test_namespace_examples/00_8calculation_information.md
@@ -3,5 +3,5 @@
 ```yaml
 ---
 rougail:
-  variable: example
+  variable: value
 ```
diff --git a/tests/results/test_namespace_examples/00_8calculation_information.sh b/tests/results/test_namespace_examples/00_8calculation_information.sh
index 4669a58ed..973461333 100644
--- a/tests/results/test_namespace_examples/00_8calculation_information.sh
+++ b/tests/results/test_namespace_examples/00_8calculation_information.sh
@@ -2,5 +2,5 @@
 
 ---                                                                             
 rougail:                                                                        
-  variable: example                                                             
+  variable: value                                                               
 
diff --git a/tests/results/test_namespace_examples/00_8test.adoc b/tests/results/test_namespace_examples/00_8test.adoc
index 3ae34288d..982539293 100644
--- a/tests/results/test_namespace_examples/00_8test.adoc
+++ b/tests/results/test_namespace_examples/00_8test.adoc
@@ -19,7 +19,7 @@ rougail:
   var1: test
   var2: test
   var3: test1
-  var4: null
+  var4: example
   var5: false
   var6:
     - test1
diff --git a/tests/results/test_namespace_examples/00_8test.gitlab.md b/tests/results/test_namespace_examples/00_8test.gitlab.md
index 152bdcb6f..c3eb8c29f 100644
--- a/tests/results/test_namespace_examples/00_8test.gitlab.md
+++ b/tests/results/test_namespace_examples/00_8test.gitlab.md
@@ -19,7 +19,7 @@ rougail:
   var1: test
   var2: test
   var3: test1
-  var4: null
+  var4: example
   var5: false
   var6:
     - test1
diff --git a/tests/results/test_namespace_examples/00_8test.html b/tests/results/test_namespace_examples/00_8test.html
index 43b6ef392..e2530fcae 100644
--- a/tests/results/test_namespace_examples/00_8test.html
+++ b/tests/results/test_namespace_examples/00_8test.html
@@ -11,7 +11,7 @@
   var1: test
   var2: test
   var3: test1
-  var4: null
+  var4: example
   var5: false
   var6:
     - test1
diff --git a/tests/results/test_namespace_examples/00_8test.md b/tests/results/test_namespace_examples/00_8test.md
index 3a92f6326..594df6eb3 100644
--- a/tests/results/test_namespace_examples/00_8test.md
+++ b/tests/results/test_namespace_examples/00_8test.md
@@ -17,7 +17,7 @@ rougail:
   var1: test
   var2: test
   var3: test1
-  var4: null
+  var4: example
   var5: false
   var6:
     - test1
diff --git a/tests/results/test_namespace_examples/00_8test.sh b/tests/results/test_namespace_examples/00_8test.sh
index 3728cf41b..be0cd9ad6 100644
--- a/tests/results/test_namespace_examples/00_8test.sh
+++ b/tests/results/test_namespace_examples/00_8test.sh
@@ -15,7 +15,7 @@
   var1: test                                                                    
   var2: test                                                                    
   var3: test1                                                                   
-  var4: null                                                                    
+  var4: example                                                                 
   var5: false                                                                   
   var6:                                                                         
     - test1                                                                     
diff --git a/tests/results/test_namespace_examples/00_9choice_variable_multi.adoc b/tests/results/test_namespace_examples/00_9choice_variable_multi.adoc
index 027d52e27..8aee84f2c 100644
--- a/tests/results/test_namespace_examples/00_9choice_variable_multi.adoc
+++ b/tests/results/test_namespace_examples/00_9choice_variable_multi.adoc
@@ -5,7 +5,8 @@
 ---
 rougail:
   variable1:
-    - a_choice
+    - val1
+    - val2
 ----
 == Example with all variables modifiable
 
@@ -14,7 +15,9 @@ rougail:
 ---
 rougail:
   variable1:
-    - a_choice
+    - val1
+    - val2
   variable2:
-    - a_choice
+    - val1
+    - val2
 ----
diff --git a/tests/results/test_namespace_examples/00_9choice_variable_multi.gitlab.md b/tests/results/test_namespace_examples/00_9choice_variable_multi.gitlab.md
index 3870a244a..d802f9380 100644
--- a/tests/results/test_namespace_examples/00_9choice_variable_multi.gitlab.md
+++ b/tests/results/test_namespace_examples/00_9choice_variable_multi.gitlab.md
@@ -4,7 +4,8 @@
 ---
 rougail:
   variable1:
-    - a_choice
+    - val1
+    - val2
 ```
 
 
@@ -14,9 +15,11 @@ rougail:
 ---
 rougail:
   variable1:
-    - a_choice
+    - val1
+    - val2
   variable2:
-    - a_choice
+    - val1
+    - val2
 ```
 
 
diff --git a/tests/results/test_namespace_examples/00_9choice_variable_multi.html b/tests/results/test_namespace_examples/00_9choice_variable_multi.html
index 6e0803090..84ae9765a 100644
--- a/tests/results/test_namespace_examples/00_9choice_variable_multi.html
+++ b/tests/results/test_namespace_examples/00_9choice_variable_multi.html
@@ -2,10 +2,13 @@
 
 
    rougail:
   variable1:
-    - a_choice
    Example with all variables modifiable
    
+    - val1
+    - val2
    Example with all variables modifiable
    
 
 
    rougail:
   variable1:
-    - a_choice
+    - val1
+    - val2
   variable2:
-    - a_choice
    
\ No newline at end of file
+    - val1
+    - val2
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples/00_9choice_variable_multi.md b/tests/results/test_namespace_examples/00_9choice_variable_multi.md index 6e2d33104..93e018b65 100644 --- a/tests/results/test_namespace_examples/00_9choice_variable_multi.md +++ b/tests/results/test_namespace_examples/00_9choice_variable_multi.md @@ -4,7 +4,8 @@ --- rougail: variable1: - - a_choice + - val1 + - val2 ``` # Example with all variables modifiable @@ -12,7 +13,9 @@ rougail: --- rougail: variable1: - - a_choice + - val1 + - val2 variable2: - - a_choice + - val1 + - val2 ``` diff --git a/tests/results/test_namespace_examples/00_9choice_variable_multi.sh b/tests/results/test_namespace_examples/00_9choice_variable_multi.sh index 2269ba89e..5c9c3616f 100644 --- a/tests/results/test_namespace_examples/00_9choice_variable_multi.sh +++ b/tests/results/test_namespace_examples/00_9choice_variable_multi.sh @@ -3,14 +3,17 @@ ---  rougail:   variable1:  - - a_choice  + - val1  + - val2  Example with all variables modifiable ---  rougail:   variable1:  - - a_choice  + - val1  + - val2   variable2:  - - a_choice  + - val1  + - val2  diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information.adoc b/tests/results/test_namespace_examples/00_9default_calculation_information.adoc index ce3eaf48a..7acc313d7 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information.adoc +++ b/tests/results/test_namespace_examples/00_9default_calculation_information.adoc @@ -4,5 +4,5 @@ ---- --- rougail: - var: example + var: value ---- diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information.gitlab.md b/tests/results/test_namespace_examples/00_9default_calculation_information.gitlab.md index 0de80aae1..0bcf75420 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information.gitlab.md +++ b/tests/results/test_namespace_examples/00_9default_calculation_information.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: - var: example + var: value ``` diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information.html b/tests/results/test_namespace_examples/00_9default_calculation_information.html index 1ed4d660a..87d6fb20a 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information.html +++ b/tests/results/test_namespace_examples/00_9default_calculation_information.html @@ -1,4 +1,4 @@

    Example with all variables modifiable

    rougail:
-  var: example
    \ No newline at end of file + var: value \ No newline at end of file diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information.md b/tests/results/test_namespace_examples/00_9default_calculation_information.md index 3fe6aa09a..c60ef3dae 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information.md +++ b/tests/results/test_namespace_examples/00_9default_calculation_information.md @@ -3,5 +3,5 @@ ```yaml --- rougail: - var: example + var: value ``` diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information.sh b/tests/results/test_namespace_examples/00_9default_calculation_information.sh index 5aee04b80..78172677b 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information.sh +++ b/tests/results/test_namespace_examples/00_9default_calculation_information.sh @@ -2,5 +2,5 @@ ---  rougail:  - var: example  + var: value  diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.adoc b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.adoc index ca248e479..d0d192958 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.adoc +++ b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.adoc @@ -13,5 +13,5 @@ rougail: --- rougail: var1: example - var2: example + var2: value ---- diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.gitlab.md b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.gitlab.md index f0182cd76..047e344bd 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.gitlab.md +++ b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.gitlab.md @@ -13,7 +13,7 @@ rougail: --- rougail: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.html b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.html index 0b0370b58..42c3626d5 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.html +++ b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.html @@ -5,4 +5,4 @@ 
    rougail:
   var1: example
-  var2: example
    \ No newline at end of file + var2: value \ No newline at end of file diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.md b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.md index 8808b073d..dba1910e2 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.md +++ b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.md @@ -11,5 +11,5 @@ rougail: --- rougail: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.sh b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.sh index 5950dc76b..d6a3eda13 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.sh +++ b/tests/results/test_namespace_examples/00_9default_calculation_information_other_variable.sh @@ -9,5 +9,5 @@ ---  rougail:   var1: example  - var2: example  + var2: value  diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable.adoc b/tests/results/test_namespace_examples/00_9default_information_other_variable.adoc index ca248e479..d0d192958 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable.adoc +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable.adoc @@ -13,5 +13,5 @@ rougail: --- rougail: var1: example - var2: example + var2: value ---- diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable.gitlab.md b/tests/results/test_namespace_examples/00_9default_information_other_variable.gitlab.md index f0182cd76..047e344bd 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable.gitlab.md +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable.gitlab.md @@ -13,7 +13,7 @@ rougail: --- rougail: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable.html b/tests/results/test_namespace_examples/00_9default_information_other_variable.html index 0b0370b58..42c3626d5 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable.html +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable.html @@ -5,4 +5,4 @@ 
    rougail:
   var1: example
-  var2: example
    \ No newline at end of file + var2: value \ No newline at end of file diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable.md b/tests/results/test_namespace_examples/00_9default_information_other_variable.md index 8808b073d..dba1910e2 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable.md +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable.md @@ -11,5 +11,5 @@ rougail: --- rougail: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable.sh b/tests/results/test_namespace_examples/00_9default_information_other_variable.sh index 5950dc76b..d6a3eda13 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable.sh +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable.sh @@ -9,5 +9,5 @@ ---  rougail:   var1: example  - var2: example  + var2: value  diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable2.adoc b/tests/results/test_namespace_examples/00_9default_information_other_variable2.adoc index ca248e479..4dd3bf50c 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable2.adoc +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable2.adoc @@ -5,6 +5,7 @@ --- rougail: var1: example + var2: example ---- == Example with all variables modifiable diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable2.gitlab.md b/tests/results/test_namespace_examples/00_9default_information_other_variable2.gitlab.md index f0182cd76..e0fd12138 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable2.gitlab.md +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable2.gitlab.md @@ -4,6 +4,7 @@ --- rougail: var1: example + var2: example ``` diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable2.html b/tests/results/test_namespace_examples/00_9default_information_other_variable2.html index 0b0370b58..8324ee308 100644 --- a/tests/results/test_namespace_examples/00_9default_information_other_variable2.html +++ b/tests/results/test_namespace_examples/00_9default_information_other_variable2.html @@ -1,7 +1,8 @@

    Example with mandatory variables not filled in

    rougail:
-  var1: example

    Example with all variables modifiable

    + var1: example + var2: example

    Example with all variables modifiable

    rougail:
   var1: example
diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable2.md b/tests/results/test_namespace_examples/00_9default_information_other_variable2.md
index 8808b073d..c32cf7293 100644
--- a/tests/results/test_namespace_examples/00_9default_information_other_variable2.md
+++ b/tests/results/test_namespace_examples/00_9default_information_other_variable2.md
@@ -4,6 +4,7 @@
 ---
 rougail:
   var1: example
+  var2: example
 ```
 # Example with all variables modifiable
 
diff --git a/tests/results/test_namespace_examples/00_9default_information_other_variable2.sh b/tests/results/test_namespace_examples/00_9default_information_other_variable2.sh
index 5950dc76b..3144faa0c 100644
--- a/tests/results/test_namespace_examples/00_9default_information_other_variable2.sh
+++ b/tests/results/test_namespace_examples/00_9default_information_other_variable2.sh
@@ -3,6 +3,7 @@
 ---                                                                             
 rougail:                                                                        
   var1: example                                                                 
+  var2: example                                                                 
 
 Example with all variables modifiable
 
diff --git a/tests/results/test_namespace_examples/01_6custom_multi.adoc b/tests/results/test_namespace_examples/01_6custom_multi.adoc
index fe7215109..6c2a06229 100644
--- a/tests/results/test_namespace_examples/01_6custom_multi.adoc
+++ b/tests/results/test_namespace_examples/01_6custom_multi.adoc
@@ -5,7 +5,7 @@
 ---
 rougail:
   custom1:
-    - xxx
+    - example
 ----
 == Example with all variables modifiable
 
@@ -14,7 +14,7 @@ rougail:
 ---
 rougail:
   custom1:
-    - xxx
+    - example
   custom2:
     - value
 ----
diff --git a/tests/results/test_namespace_examples/01_6custom_multi.gitlab.md b/tests/results/test_namespace_examples/01_6custom_multi.gitlab.md
index 984919ad4..6e9db9b57 100644
--- a/tests/results/test_namespace_examples/01_6custom_multi.gitlab.md
+++ b/tests/results/test_namespace_examples/01_6custom_multi.gitlab.md
@@ -4,7 +4,7 @@
 ---
 rougail:
   custom1:
-    - xxx
+    - example
 ```
 
 
@@ -14,7 +14,7 @@ rougail:
 ---
 rougail:
   custom1:
-    - xxx
+    - example
   custom2:
     - value
 ```
diff --git a/tests/results/test_namespace_examples/01_6custom_multi.html b/tests/results/test_namespace_examples/01_6custom_multi.html
index 37504de37..51512c175 100644
--- a/tests/results/test_namespace_examples/01_6custom_multi.html
+++ b/tests/results/test_namespace_examples/01_6custom_multi.html
@@ -2,10 +2,10 @@
 
 
    rougail:
   custom1:
-    - xxx
    Example with all variables modifiable
    
+    - example

    Example with all variables modifiable

    rougail:
   custom1:
-    - xxx
+    - example
   custom2:
     - value
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples/01_6custom_multi.md b/tests/results/test_namespace_examples/01_6custom_multi.md index 9fdb1c485..5a8c138c7 100644 --- a/tests/results/test_namespace_examples/01_6custom_multi.md +++ b/tests/results/test_namespace_examples/01_6custom_multi.md @@ -4,7 +4,7 @@ --- rougail: custom1: - - xxx + - example ``` # Example with all variables modifiable @@ -12,7 +12,7 @@ rougail: --- rougail: custom1: - - xxx + - example custom2: - value ``` diff --git a/tests/results/test_namespace_examples/01_6custom_multi.sh b/tests/results/test_namespace_examples/01_6custom_multi.sh index fba5d05fd..12fb20e41 100644 --- a/tests/results/test_namespace_examples/01_6custom_multi.sh +++ b/tests/results/test_namespace_examples/01_6custom_multi.sh @@ -3,14 +3,14 @@ ---  rougail:   custom1:  - - xxx  + - example  Example with all variables modifiable ---  rougail:   custom1:  - - xxx  + - example   custom2:   - value  diff --git a/tests/results/test_namespace_examples/01_8calculation_information_multi.adoc b/tests/results/test_namespace_examples/01_8calculation_information_multi.adoc index 90fdfa657..7b2282aed 100644 --- a/tests/results/test_namespace_examples/01_8calculation_information_multi.adoc +++ b/tests/results/test_namespace_examples/01_8calculation_information_multi.adoc @@ -5,5 +5,5 @@ --- rougail: variable: - - example + - value ---- diff --git a/tests/results/test_namespace_examples/01_8calculation_information_multi.gitlab.md b/tests/results/test_namespace_examples/01_8calculation_information_multi.gitlab.md index 4fdbdeb89..c5829a751 100644 --- a/tests/results/test_namespace_examples/01_8calculation_information_multi.gitlab.md +++ b/tests/results/test_namespace_examples/01_8calculation_information_multi.gitlab.md @@ -4,7 +4,7 @@ --- rougail: variable: - - example + - value ``` diff --git a/tests/results/test_namespace_examples/01_8calculation_information_multi.html b/tests/results/test_namespace_examples/01_8calculation_information_multi.html index 8f7cc2863..860424cf6 100644 --- a/tests/results/test_namespace_examples/01_8calculation_information_multi.html +++ b/tests/results/test_namespace_examples/01_8calculation_information_multi.html @@ -2,4 +2,4 @@ 
    rougail:
   variable:
-    - example
    \ No newline at end of file + - value \ No newline at end of file diff --git a/tests/results/test_namespace_examples/01_8calculation_information_multi.md b/tests/results/test_namespace_examples/01_8calculation_information_multi.md index a1601e1c0..60104c697 100644 --- a/tests/results/test_namespace_examples/01_8calculation_information_multi.md +++ b/tests/results/test_namespace_examples/01_8calculation_information_multi.md @@ -4,5 +4,5 @@ --- rougail: variable: - - example + - value ``` diff --git a/tests/results/test_namespace_examples/01_8calculation_information_multi.sh b/tests/results/test_namespace_examples/01_8calculation_information_multi.sh index d8f56a2bb..f2f245fcf 100644 --- a/tests/results/test_namespace_examples/01_8calculation_information_multi.sh +++ b/tests/results/test_namespace_examples/01_8calculation_information_multi.sh @@ -3,5 +3,5 @@ ---  rougail:   variable:  - - example  + - value  diff --git a/tests/results/test_namespace_examples/01_9choice_variable_multi.adoc b/tests/results/test_namespace_examples/01_9choice_variable_multi.adoc index d792d3ac7..bee20df42 100644 --- a/tests/results/test_namespace_examples/01_9choice_variable_multi.adoc +++ b/tests/results/test_namespace_examples/01_9choice_variable_multi.adoc @@ -4,7 +4,7 @@ ---- --- rougail: - variable2: a_choice + variable2: a ---- == Example with all variables modifiable @@ -16,5 +16,5 @@ rougail: - a - b - c - variable2: a_choice + variable2: a ---- diff --git a/tests/results/test_namespace_examples/01_9choice_variable_multi.gitlab.md b/tests/results/test_namespace_examples/01_9choice_variable_multi.gitlab.md index cfb843b17..99c99f79a 100644 --- a/tests/results/test_namespace_examples/01_9choice_variable_multi.gitlab.md +++ b/tests/results/test_namespace_examples/01_9choice_variable_multi.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: - variable2: a_choice + variable2: a ``` @@ -16,7 +16,7 @@ rougail: - a - b - c - variable2: a_choice + variable2: a ``` diff --git a/tests/results/test_namespace_examples/01_9choice_variable_multi.html b/tests/results/test_namespace_examples/01_9choice_variable_multi.html index 9d5b52971..ad9f05598 100644 --- a/tests/results/test_namespace_examples/01_9choice_variable_multi.html +++ b/tests/results/test_namespace_examples/01_9choice_variable_multi.html @@ -1,11 +1,11 @@

    Example with mandatory variables not filled in

    rougail:
-  variable2: a_choice

    Example with all variables modifiable

    + variable2: a

    Example with all variables modifiable

    rougail:
   variable1:
     - a
     - b
     - c
-  variable2: a_choice
    \ No newline at end of file + variable2: a \ No newline at end of file diff --git a/tests/results/test_namespace_examples/01_9choice_variable_multi.md b/tests/results/test_namespace_examples/01_9choice_variable_multi.md index d022c6a29..f13f52007 100644 --- a/tests/results/test_namespace_examples/01_9choice_variable_multi.md +++ b/tests/results/test_namespace_examples/01_9choice_variable_multi.md @@ -3,7 +3,7 @@ ```yaml --- rougail: - variable2: a_choice + variable2: a ``` # Example with all variables modifiable @@ -14,5 +14,5 @@ rougail: - a - b - c - variable2: a_choice + variable2: a ``` diff --git a/tests/results/test_namespace_examples/01_9choice_variable_multi.sh b/tests/results/test_namespace_examples/01_9choice_variable_multi.sh index 48c5c7578..6ff4bfdc4 100644 --- a/tests/results/test_namespace_examples/01_9choice_variable_multi.sh +++ b/tests/results/test_namespace_examples/01_9choice_variable_multi.sh @@ -2,7 +2,7 @@ ---  rougail:  - variable2: a_choice  + variable2: a  Example with all variables modifiable @@ -12,5 +12,5 @@  - a   - b   - c  - variable2: a_choice  + variable2: a  diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden.adoc b/tests/results/test_namespace_examples/04_1default_calculation_hidden.adoc index fa7087f44..3bf416f9f 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden.adoc +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - var2: example ----- == Example with all variables modifiable [,yaml] @@ -13,6 +5,5 @@ rougail: --- rougail: var1: value - var2: example var3: value ---- diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden.gitlab.md b/tests/results/test_namespace_examples/04_1default_calculation_hidden.gitlab.md index c2352df6d..ac0613b0b 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden.gitlab.md +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - var2: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: var1: value - var2: example var3: value ```
    diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden.html b/tests/results/test_namespace_examples/04_1default_calculation_hidden.html index e7cf1884c..3a797243b 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden.html +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden.html @@ -1,9 +1,5 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:
-  var2: example

    Example with all variables modifiable

    +

    Example with all variables modifiable

    rougail:
   var1: value
-  var2: example
   var3: value
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden.md b/tests/results/test_namespace_examples/04_1default_calculation_hidden.md index 6060f29c7..62f96a958 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden.md +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden.md @@ -1,16 +1,8 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - var2: example -``` # Example with all variables modifiable ```yaml --- rougail: var1: value - var2: example var3: value ``` diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden.sh b/tests/results/test_namespace_examples/04_1default_calculation_hidden.sh index 78d4704e3..0900b138c 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden.sh +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden.sh @@ -1,14 +1,7 @@ -Example with mandatory variables not filled in - ----  -rougail:  - var2: example  - Example with all variables modifiable ---  rougail:   var1: value  - var2: example   var3: value  diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.adoc b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.adoc index 80d74e2d0..3bf416f9f 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.adoc +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - var2: example ----- == Example with all variables modifiable [,yaml] @@ -13,6 +5,5 @@ rougail: --- rougail: var1: value - var2: example - var3: example + var3: value ---- diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.gitlab.md b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.gitlab.md index 231fc5524..ac0613b0b 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.gitlab.md +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.gitlab.md @@ -1,20 +1,10 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - var2: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: var1: value - var2: example - var3: example + var3: value ```
    diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.html b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.html index 15b6f5752..3a797243b 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.html +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.html @@ -1,9 +1,5 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:
-  var2: example

    Example with all variables modifiable

    +

    Example with all variables modifiable

    rougail:
   var1: value
-  var2: example
-  var3: example
    \ No newline at end of file + var3: value \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.md b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.md index a2f3caa8c..62f96a958 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.md +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.md @@ -1,16 +1,8 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - var2: example -``` # Example with all variables modifiable ```yaml --- rougail: var1: value - var2: example - var3: example + var3: value ``` diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.sh b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.sh index f3361c5ce..0900b138c 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.sh +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_2.sh @@ -1,14 +1,7 @@ -Example with mandatory variables not filled in - ----  -rougail:  - var2: example  - Example with all variables modifiable ---  rougail:   var1: value  - var2: example  - var3: example  + var3: value  diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.adoc b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.adoc index 3a4c4c020..6a803032d 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.adoc +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - var3: example ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: --- rougail: var1: value - var3: example ---- diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.gitlab.md b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.gitlab.md index 3a90916ec..e56d01acd 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.gitlab.md +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - var3: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: var1: value - var3: example ```
    diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.html b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.html index 9dab4fada..fe5c6e008 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.html +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:
-  var3: example

    Example with all variables modifiable

    - -
    rougail:
-  var1: value
-  var3: example
    \ No newline at end of file + var1: value \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.md b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.md index 34dbe31f5..2d0b9c352 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.md +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - var3: example -``` # Example with all variables modifiable ```yaml --- rougail: var1: value - var3: example ``` diff --git a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.sh b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.sh index 6cb1f1608..6b1087caa 100644 --- a/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.sh +++ b/tests/results/test_namespace_examples/04_1default_calculation_hidden_5.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail:  - var3: example  - Example with all variables modifiable ---  rougail:   var1: value  - var3: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.adoc index 09731974f..fcbf269ee 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.adoc @@ -5,7 +5,6 @@ --- rougail: variable1: example - variable2: example ---- == Example with all variables modifiable @@ -15,5 +14,4 @@ rougail: rougail: condition: no variable1: example - variable2: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.gitlab.md index d2a397c21..913ba42bc 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.gitlab.md @@ -4,7 +4,6 @@ --- rougail: variable1: example - variable2: example ``` @@ -15,7 +14,6 @@ rougail: rougail: condition: no variable1: example - variable2: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.html b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.html index ee847f956..a33fb3e68 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.html @@ -1,10 +1,8 @@

    Example with mandatory variables not filled in

    rougail:
-  variable1: example
-  variable2: example

    Example with all variables modifiable

    + variable1: example

    Example with all variables modifiable

    rougail:
   condition: no
-  variable1: example
-  variable2: example
    \ No newline at end of file + variable1: example \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.md b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.md index bda98aca6..380202161 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.md @@ -4,7 +4,6 @@ --- rougail: variable1: example - variable2: example ``` # Example with all variables modifiable @@ -13,5 +12,4 @@ rougail: rougail: condition: no variable1: example - variable2: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.sh index 37ef7223e..e316dbea2 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_boolean.sh @@ -3,7 +3,6 @@ ---  rougail:   variable1: example  - variable2: example  Example with all variables modifiable @@ -11,5 +10,4 @@ rougail:   condition: no   variable1: example  - variable2: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.adoc index 122087c01..adaf2ca03 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.adoc @@ -5,6 +5,4 @@ --- rougail: condition: no - var1: example - var2: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.gitlab.md index a575ce1cb..6287575ac 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.gitlab.md @@ -4,8 +4,6 @@ --- rougail: condition: no - var1: example - var2: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.html b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.html index b55915f45..3322b2e5f 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.html @@ -1,6 +1,4 @@

    Example with all variables modifiable

    rougail:
-  condition: no
-  var1: example
-  var2: example
    \ No newline at end of file + condition: no \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.md b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.md index f71573905..7708dd8da 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.md @@ -4,6 +4,4 @@ --- rougail: condition: no - var1: example - var2: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.sh index 857c77c44..78921a2e6 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_optional.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_optional.sh @@ -3,6 +3,4 @@ ---  rougail:   condition: no  - var1: example  - var2: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.adoc index d18efa59a..ca285b5e1 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - variable: example ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: --- rougail: condition: true - variable: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.gitlab.md index 19a2977e7..46ffa3d72 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: condition: true - variable: example ```
    diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.html b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.html index 55a85bc59..51fe0cdaf 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:
-  variable: example

    Example with all variables modifiable

    - -
    rougail:
-  condition: true
-  variable: example
    \ No newline at end of file + condition: true \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.md index d8f27c8f9..add3b77f3 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable: example -``` # Example with all variables modifiable ```yaml --- rougail: condition: true - variable: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.sh index aecc966b8..d3f7ca1af 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable10.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail:  - variable: example  - Example with all variables modifiable ---  rougail:   condition: true  - variable: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.adoc index d18efa59a..ca285b5e1 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - variable: example ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: --- rougail: condition: true - variable: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.gitlab.md index 19a2977e7..46ffa3d72 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: condition: true - variable: example ```
    diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.html b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.html index 55a85bc59..51fe0cdaf 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:
-  variable: example

    Example with all variables modifiable

    - -
    rougail:
-  condition: true
-  variable: example
    \ No newline at end of file + condition: true \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.md index d8f27c8f9..add3b77f3 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable: example -``` # Example with all variables modifiable ```yaml --- rougail: condition: true - variable: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.sh index aecc966b8..d3f7ca1af 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable2.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail:  - variable: example  - Example with all variables modifiable ---  rougail:   condition: true  - variable: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.adoc index 7c6fffe08..b775dc60b 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - variable: example ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: --- rougail: condition: yes - variable: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.gitlab.md index 9e2dacd72..f68b8199a 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: condition: yes - variable: example ```
    diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.html b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.html index 7922b28bc..541c7a2e9 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:
-  variable: example

    Example with all variables modifiable

    - -
    rougail:
-  condition: yes
-  variable: example
    \ No newline at end of file + condition: yes \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.md index 6eb90e7d7..c2103f3d1 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable: example -``` # Example with all variables modifiable ```yaml --- rougail: condition: yes - variable: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.sh index 321c570c9..4a39c1792 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable3.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail:  - variable: example  - Example with all variables modifiable ---  rougail:   condition: yes  - variable: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.adoc index 821767aa5..ca285b5e1 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.adoc @@ -1,12 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - variable1: example - variable2: example ----- == Example with all variables modifiable [,yaml] @@ -14,6 +5,4 @@ rougail: --- rougail: condition: true - variable1: example - variable2: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.gitlab.md index 8d134d4d9..46ffa3d72 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.gitlab.md @@ -1,21 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable1: example - variable2: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: condition: true - variable1: example - variable2: example ```
    diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.html b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.html index 2d4d4aac6..51fe0cdaf 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.html @@ -1,10 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:
-  variable1: example
-  variable2: example

    Example with all variables modifiable

    - -
    rougail:
-  condition: true
-  variable1: example
-  variable2: example
    \ No newline at end of file + condition: true \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.md index d38aa2a5f..add3b77f3 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.md @@ -1,17 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable1: example - variable2: example -``` # Example with all variables modifiable ```yaml --- rougail: condition: true - variable1: example - variable2: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.sh index bec914733..d3f7ca1af 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive.sh @@ -1,15 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail:  - variable1: example  - variable2: example  - Example with all variables modifiable ---  rougail:   condition: true  - variable1: example  - variable2: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.adoc index b2162baa5..c6951405d 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - variable2: example ----- == Example with all variables modifiable [,yaml] @@ -14,5 +6,4 @@ rougail: rougail: condition: false variable1: disabled - variable2: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md index 5ba4d4a0b..ec3734757 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.gitlab.md @@ -1,12 +1,3 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable2: example -``` -
    -
    Example with all variables modifiable ```yaml @@ -14,7 +5,6 @@ rougail: rougail: condition: false variable1: disabled - variable2: example ```
    diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.html b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.html index eabe8300a..10ece85f8 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.html @@ -1,9 +1,5 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:
-  variable2: example

    Example with all variables modifiable

    +

    Example with all variables modifiable

    rougail:
   condition: false
-  variable1: disabled
-  variable2: example
    \ No newline at end of file + variable1: disabled \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.md index 5b23155ce..eb8accda1 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.md @@ -1,10 +1,3 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable2: example -``` # Example with all variables modifiable ```yaml @@ -12,5 +5,4 @@ rougail: rougail: condition: false variable1: disabled - variable2: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.sh index 9eb6616f5..f6f04bb4f 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_3.sh @@ -1,14 +1,7 @@ -Example with mandatory variables not filled in - ----  -rougail:  - variable2: example  - Example with all variables modifiable ---  rougail:   condition: false   variable1: disabled  - variable2: example  diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.adoc b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.adoc index 216a2e530..ca285b5e1 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.adoc +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - variable2: example ----- == Example with all variables modifiable [,yaml] @@ -13,6 +5,4 @@ rougail: --- rougail: condition: true - variable1: not_disabled - variable2: example ---- diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md index 4f5b49f5f..46ffa3d72 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.gitlab.md @@ -1,20 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable2: example -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: condition: true - variable1: not_disabled - variable2: example ```
    diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.html b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.html index 4558e11b5..51fe0cdaf 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.html +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.html @@ -1,9 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:
-  variable2: example

    Example with all variables modifiable

    - -
    rougail:
-  condition: true
-  variable1: not_disabled
-  variable2: example
    \ No newline at end of file + condition: true \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.md b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.md index 40dc941aa..add3b77f3 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.md +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.md @@ -1,16 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - variable2: example -``` # Example with all variables modifiable ```yaml --- rougail: condition: true - variable1: not_disabled - variable2: example ``` diff --git a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.sh b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.sh index dc127ccb3..d3f7ca1af 100644 --- a/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.sh +++ b/tests/results/test_namespace_examples/04_5disabled_calculation_variable_transitive_4.sh @@ -1,14 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail:  - variable2: example  - Example with all variables modifiable ---  rougail:   condition: true  - variable1: not_disabled  - variable2: example  diff --git a/tests/results/test_namespace_examples/04_5hidden_calculation2.adoc b/tests/results/test_namespace_examples/04_5hidden_calculation2.adoc index 4a2ddabb8..adaf2ca03 100644 --- a/tests/results/test_namespace_examples/04_5hidden_calculation2.adoc +++ b/tests/results/test_namespace_examples/04_5hidden_calculation2.adoc @@ -5,6 +5,4 @@ --- rougail: condition: no - var1: no - var2: no ---- diff --git a/tests/results/test_namespace_examples/04_5hidden_calculation2.gitlab.md b/tests/results/test_namespace_examples/04_5hidden_calculation2.gitlab.md index a8af0c042..6287575ac 100644 --- a/tests/results/test_namespace_examples/04_5hidden_calculation2.gitlab.md +++ b/tests/results/test_namespace_examples/04_5hidden_calculation2.gitlab.md @@ -4,8 +4,6 @@ --- rougail: condition: no - var1: no - var2: no ``` diff --git a/tests/results/test_namespace_examples/04_5hidden_calculation2.html b/tests/results/test_namespace_examples/04_5hidden_calculation2.html index 081756556..3322b2e5f 100644 --- a/tests/results/test_namespace_examples/04_5hidden_calculation2.html +++ b/tests/results/test_namespace_examples/04_5hidden_calculation2.html @@ -1,6 +1,4 @@

    Example with all variables modifiable

    rougail:
-  condition: no
-  var1: no
-  var2: no
    \ No newline at end of file + condition: no \ No newline at end of file diff --git a/tests/results/test_namespace_examples/04_5hidden_calculation2.md b/tests/results/test_namespace_examples/04_5hidden_calculation2.md index e4629d954..7708dd8da 100644 --- a/tests/results/test_namespace_examples/04_5hidden_calculation2.md +++ b/tests/results/test_namespace_examples/04_5hidden_calculation2.md @@ -4,6 +4,4 @@ --- rougail: condition: no - var1: no - var2: no ``` diff --git a/tests/results/test_namespace_examples/04_5hidden_calculation2.sh b/tests/results/test_namespace_examples/04_5hidden_calculation2.sh index 6cda49b46..78921a2e6 100644 --- a/tests/results/test_namespace_examples/04_5hidden_calculation2.sh +++ b/tests/results/test_namespace_examples/04_5hidden_calculation2.sh @@ -3,6 +3,4 @@ ---  rougail:   condition: no  - var1: no  - var2: no  diff --git a/tests/results/test_namespace_examples/16_2family_redefine_calculation.adoc b/tests/results/test_namespace_examples/16_2family_redefine_calculation.adoc index 6f66ce9f2..e69de29bb 100644 --- a/tests/results/test_namespace_examples/16_2family_redefine_calculation.adoc +++ b/tests/results/test_namespace_examples/16_2family_redefine_calculation.adoc @@ -1,18 +0,0 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: - family: - var1: example ----- -== Example with all variables modifiable - -[,yaml] ----- ---- -rougail: - family: - var1: example ----- diff --git a/tests/results/test_namespace_examples/16_2family_redefine_calculation.gitlab.md b/tests/results/test_namespace_examples/16_2family_redefine_calculation.gitlab.md index d6d0c4106..e69de29bb 100644 --- a/tests/results/test_namespace_examples/16_2family_redefine_calculation.gitlab.md +++ b/tests/results/test_namespace_examples/16_2family_redefine_calculation.gitlab.md @@ -1,20 +0,0 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: - family: - var1: example -``` -
    - -
    Example with all variables modifiable - -```yaml ---- -rougail: - family: - var1: example -``` -
    - diff --git a/tests/results/test_namespace_examples/16_2family_redefine_calculation.html b/tests/results/test_namespace_examples/16_2family_redefine_calculation.html index 643f6c678..e69de29bb 100644 --- a/tests/results/test_namespace_examples/16_2family_redefine_calculation.html +++ b/tests/results/test_namespace_examples/16_2family_redefine_calculation.html @@ -1,9 +0,0 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:
-  family:
-    var1: example

    Example with all variables modifiable

    - -
    rougail:
-  family:
-    var1: example
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples/16_2family_redefine_calculation.md b/tests/results/test_namespace_examples/16_2family_redefine_calculation.md index ce6431e46..e69de29bb 100644 --- a/tests/results/test_namespace_examples/16_2family_redefine_calculation.md +++ b/tests/results/test_namespace_examples/16_2family_redefine_calculation.md @@ -1,16 +0,0 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: - family: - var1: example -``` -# Example with all variables modifiable - -```yaml ---- -rougail: - family: - var1: example -``` diff --git a/tests/results/test_namespace_examples/16_2family_redefine_calculation.sh b/tests/results/test_namespace_examples/16_2family_redefine_calculation.sh index 78628e639..e69de29bb 100644 --- a/tests/results/test_namespace_examples/16_2family_redefine_calculation.sh +++ b/tests/results/test_namespace_examples/16_2family_redefine_calculation.sh @@ -1,14 +0,0 @@ -Example with mandatory variables not filled in - ----  -rougail:  - family:  - var1: example  - -Example with all variables modifiable - ----  -rougail:  - family:  - var1: example  - diff --git a/tests/results/test_namespace_examples/16_5redefine_choice.adoc b/tests/results/test_namespace_examples/16_5redefine_choice.adoc index 6772eafb7..d0b548fba 100644 --- a/tests/results/test_namespace_examples/16_5redefine_choice.adoc +++ b/tests/results/test_namespace_examples/16_5redefine_choice.adoc @@ -4,7 +4,7 @@ ---- --- rougail: - variable: a_choice + variable: a ---- == Example with all variables modifiable @@ -12,5 +12,5 @@ rougail: ---- --- rougail: - variable: a_choice + variable: a ---- diff --git a/tests/results/test_namespace_examples/16_5redefine_choice.gitlab.md b/tests/results/test_namespace_examples/16_5redefine_choice.gitlab.md index 01014cc83..f0b187c28 100644 --- a/tests/results/test_namespace_examples/16_5redefine_choice.gitlab.md +++ b/tests/results/test_namespace_examples/16_5redefine_choice.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: - variable: a_choice + variable: a ``` @@ -12,7 +12,7 @@ rougail: ```yaml --- rougail: - variable: a_choice + variable: a ``` diff --git a/tests/results/test_namespace_examples/16_5redefine_choice.html b/tests/results/test_namespace_examples/16_5redefine_choice.html index b16b86c9b..9ffe8230f 100644 --- a/tests/results/test_namespace_examples/16_5redefine_choice.html +++ b/tests/results/test_namespace_examples/16_5redefine_choice.html @@ -1,7 +1,7 @@

    Example with mandatory variables not filled in

    rougail:
-  variable: a_choice

    Example with all variables modifiable

    + variable: a

    Example with all variables modifiable

    rougail:
-  variable: a_choice
    \ No newline at end of file + variable: a \ No newline at end of file diff --git a/tests/results/test_namespace_examples/16_5redefine_choice.md b/tests/results/test_namespace_examples/16_5redefine_choice.md index b6e07adcc..2182b8f26 100644 --- a/tests/results/test_namespace_examples/16_5redefine_choice.md +++ b/tests/results/test_namespace_examples/16_5redefine_choice.md @@ -3,12 +3,12 @@ ```yaml --- rougail: - variable: a_choice + variable: a ``` # Example with all variables modifiable ```yaml --- rougail: - variable: a_choice + variable: a ``` diff --git a/tests/results/test_namespace_examples/16_5redefine_choice.sh b/tests/results/test_namespace_examples/16_5redefine_choice.sh index 6016cf56e..d1d41d9d1 100644 --- a/tests/results/test_namespace_examples/16_5redefine_choice.sh +++ b/tests/results/test_namespace_examples/16_5redefine_choice.sh @@ -2,11 +2,11 @@ ---  rougail:  - variable: a_choice  + variable: a  Example with all variables modifiable ---  rougail:  - variable: a_choice  + variable: a  diff --git a/tests/results/test_namespace_examples/20_9default_information_parent.adoc b/tests/results/test_namespace_examples/20_9default_information_parent.adoc index de074535d..8d62d188c 100644 --- a/tests/results/test_namespace_examples/20_9default_information_parent.adoc +++ b/tests/results/test_namespace_examples/20_9default_information_parent.adoc @@ -15,5 +15,5 @@ rougail: rougail: family: var1: example - var2: example + var2: value ---- diff --git a/tests/results/test_namespace_examples/20_9default_information_parent.gitlab.md b/tests/results/test_namespace_examples/20_9default_information_parent.gitlab.md index 8740ec0bd..83880c7c4 100644 --- a/tests/results/test_namespace_examples/20_9default_information_parent.gitlab.md +++ b/tests/results/test_namespace_examples/20_9default_information_parent.gitlab.md @@ -15,7 +15,7 @@ rougail: rougail: family: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_namespace_examples/20_9default_information_parent.html b/tests/results/test_namespace_examples/20_9default_information_parent.html index eaad2728d..4309a90b1 100644 --- a/tests/results/test_namespace_examples/20_9default_information_parent.html +++ b/tests/results/test_namespace_examples/20_9default_information_parent.html @@ -7,4 +7,4 @@ 
    rougail:
   family:
     var1: example
-    var2: example
    \ No newline at end of file + var2: value \ No newline at end of file diff --git a/tests/results/test_namespace_examples/20_9default_information_parent.md b/tests/results/test_namespace_examples/20_9default_information_parent.md index 9d75d4b46..f5c5068af 100644 --- a/tests/results/test_namespace_examples/20_9default_information_parent.md +++ b/tests/results/test_namespace_examples/20_9default_information_parent.md @@ -13,5 +13,5 @@ rougail: rougail: family: var1: example - var2: example + var2: value ``` diff --git a/tests/results/test_namespace_examples/20_9default_information_parent.sh b/tests/results/test_namespace_examples/20_9default_information_parent.sh index 498a0dcd0..1ae03f6d5 100644 --- a/tests/results/test_namespace_examples/20_9default_information_parent.sh +++ b/tests/results/test_namespace_examples/20_9default_information_parent.sh @@ -11,5 +11,5 @@ rougail:   family:   var1: example  - var2: example  + var2: value  diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.adoc b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.adoc index 59cd0ceda..c67061858 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.adoc +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.adoc @@ -5,6 +5,4 @@ --- rougail: condition: false - family: - variable: example ---- diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.gitlab.md b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.gitlab.md index aa311a8be..e19daa777 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.gitlab.md +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.gitlab.md @@ -4,8 +4,6 @@ --- rougail: condition: false - family: - variable: example ``` diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.html b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.html index f57392c1f..f3f5f534e 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.html +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.html @@ -1,6 +1,4 @@

    Example with all variables modifiable

    rougail:
-  condition: false
-  family:
-    variable: example
    \ No newline at end of file + condition: false \ No newline at end of file diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.md b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.md index 0f670fc85..9be2918a5 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.md +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.md @@ -4,6 +4,4 @@ --- rougail: condition: false - family: - variable: example ``` diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.sh b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.sh index 706ab0ddc..a31edce2d 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.sh +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_boolean.sh @@ -3,6 +3,4 @@ ---  rougail:   condition: false  - family:  - variable: example  diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.adoc b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.adoc index edc8a28b5..ca285b5e1 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.adoc +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.adoc @@ -5,7 +5,4 @@ --- rougail: condition: true - family: - subfamily: - var1: example ---- diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md index d5c20a2a6..46ffa3d72 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.gitlab.md @@ -4,9 +4,6 @@ --- rougail: condition: true - family: - subfamily: - var1: example ``` diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.html b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.html index 535965fc6..51fe0cdaf 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.html +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.html @@ -1,7 +1,4 @@

    Example with all variables modifiable

    rougail:
-  condition: true
-  family:
-    subfamily:
-      var1: example
    \ No newline at end of file + condition: true \ No newline at end of file diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.md b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.md index 14bd2fd52..add3b77f3 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.md +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.md @@ -4,7 +4,4 @@ --- rougail: condition: true - family: - subfamily: - var1: example ``` diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.sh b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.sh index 56b332b8c..d3f7ca1af 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.sh +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_variable_sub_family.sh @@ -3,7 +3,4 @@ ---  rougail:   condition: true  - family:  - subfamily:  - var1: example  diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.adoc b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.adoc index 499fe0052..ef055f4ae 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.adoc +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.adoc @@ -6,6 +6,4 @@ rougail: condition1: false condition2: false - family: - variable: example ---- diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.gitlab.md b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.gitlab.md index 38833d430..769de60e2 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.gitlab.md +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.gitlab.md @@ -5,8 +5,6 @@ rougail: condition1: false condition2: false - family: - variable: example ``` diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.html b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.html index 693bd4fe9..b30a5ae95 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.html +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.html @@ -2,6 +2,4 @@ 
    rougail:
   condition1: false
-  condition2: false
-  family:
-    variable: example
    \ No newline at end of file + condition2: false \ No newline at end of file diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.md b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.md index 760454eca..00ccf125a 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.md +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.md @@ -5,6 +5,4 @@ rougail: condition1: false condition2: false - family: - variable: example ``` diff --git a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.sh b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.sh index 7c55f8250..ef6e975b3 100644 --- a/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.sh +++ b/tests/results/test_namespace_examples/24_0family_hidden_condition_with_variable.sh @@ -4,6 +4,4 @@ rougail:   condition1: false   condition2: false  - family:  - variable: example  diff --git a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.adoc b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.adoc index ce167fa70..37a7cc5a0 100644 --- a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.adoc +++ b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.adoc @@ -1,3 +1,11 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: + var: example +---- == Example with all variables modifiable [,yaml] diff --git a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.gitlab.md b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.gitlab.md index 30a28882a..40aab8064 100644 --- a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.gitlab.md +++ b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.gitlab.md @@ -1,3 +1,12 @@ +
    Example with mandatory variables not filled in + +```yaml +--- +rougail: + var: example +``` +
    +
    Example with all variables modifiable ```yaml diff --git a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.html b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.html index 7d19d26e4..f5f6264a4 100644 --- a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.html +++ b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.html @@ -1,4 +1,7 @@ -

    Example with all variables modifiable

    +

    Example with mandatory variables not filled in

    + +
    rougail:
+  var: example

    Example with all variables modifiable

    rougail:
   condition: true
diff --git a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.md b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.md
index b8645e2d0..6ab70669b 100644
--- a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.md
+++ b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.md
@@ -1,3 +1,10 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+  var: example
+```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.sh b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.sh
index f0998c51d..538b0d917 100644
--- a/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.sh
+++ b/tests/results/test_namespace_examples/24_0family_mandatory_condition_variable.sh
@@ -1,3 +1,9 @@
+Example with mandatory variables not filled in
+
+---                                                                             
+rougail:                                                                        
+  var: example                                                                  
+
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_namespace_examples/40_0leadership_reduce.adoc b/tests/results/test_namespace_examples/40_0leadership_reduce.adoc
index 26a199336..a8e272c45 100644
--- a/tests/results/test_namespace_examples/40_0leadership_reduce.adoc
+++ b/tests/results/test_namespace_examples/40_0leadership_reduce.adoc
@@ -8,5 +8,5 @@ rougail:
     - leader: val1
       follower: example
     - leader: val2
-      follower: example
+      follower: example1
 ----
diff --git a/tests/results/test_namespace_examples/40_0leadership_reduce.gitlab.md b/tests/results/test_namespace_examples/40_0leadership_reduce.gitlab.md
index f42a84393..fb0269217 100644
--- a/tests/results/test_namespace_examples/40_0leadership_reduce.gitlab.md
+++ b/tests/results/test_namespace_examples/40_0leadership_reduce.gitlab.md
@@ -7,7 +7,7 @@ rougail:
     - leader: val1
       follower: example
     - leader: val2
-      follower: example
+      follower: example1
 ```
    diff --git a/tests/results/test_namespace_examples/40_0leadership_reduce.html b/tests/results/test_namespace_examples/40_0leadership_reduce.html index f6ccb84bf..930731311 100644 --- a/tests/results/test_namespace_examples/40_0leadership_reduce.html +++ b/tests/results/test_namespace_examples/40_0leadership_reduce.html @@ -5,4 +5,4 @@ - leader: val1 follower: example - leader: val2 - follower: example \ No newline at end of file + follower: example1 \ No newline at end of file diff --git a/tests/results/test_namespace_examples/40_0leadership_reduce.md b/tests/results/test_namespace_examples/40_0leadership_reduce.md index 2e7237699..b4341d016 100644 --- a/tests/results/test_namespace_examples/40_0leadership_reduce.md +++ b/tests/results/test_namespace_examples/40_0leadership_reduce.md @@ -7,5 +7,5 @@ rougail: - leader: val1 follower: example - leader: val2 - follower: example + follower: example1 ``` diff --git a/tests/results/test_namespace_examples/40_0leadership_reduce.sh b/tests/results/test_namespace_examples/40_0leadership_reduce.sh index 44f786c5d..0602ac732 100644 --- a/tests/results/test_namespace_examples/40_0leadership_reduce.sh +++ b/tests/results/test_namespace_examples/40_0leadership_reduce.sh @@ -6,5 +6,5 @@  - leader: val1   follower: example   - leader: val2  - follower: example  + follower: example1  diff --git a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.adoc b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.adoc index e9d6f594f..c76c1af06 100644 --- a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.adoc +++ b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.adoc @@ -9,6 +9,6 @@ rougail: follower1: example follower2: example - leader: val2 - follower1: example - follower2: example + follower1: example1 + follower2: example1 ---- diff --git a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.gitlab.md b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.gitlab.md index 54aeb1768..4dadf9bde 100644 --- a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.gitlab.md +++ b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.gitlab.md @@ -8,8 +8,8 @@ rougail: follower1: example follower2: example - leader: val2 - follower1: example - follower2: example + follower1: example1 + follower2: example1 ``` diff --git a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.html b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.html index 2b84ee526..847839943 100644 --- a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.html +++ b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.html @@ -6,5 +6,5 @@ follower1: example follower2: example - leader: val2 - follower1: example - follower2: example \ No newline at end of file + follower1: example1 + follower2: example1 \ No newline at end of file diff --git a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.md b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.md index 9fbeb16ad..106c03e39 100644 --- a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.md +++ b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.md @@ -8,6 +8,6 @@ rougail: follower1: example follower2: example - leader: val2 - follower1: example - follower2: example + follower1: example1 + follower2: example1 ``` diff --git a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.sh b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.sh index 541c0a8ca..321c33451 100644 --- a/tests/results/test_namespace_examples/40_2leadership_leader_calculation.sh +++ b/tests/results/test_namespace_examples/40_2leadership_leader_calculation.sh @@ -7,6 +7,6 @@  follower1: example   follower2: example   - leader: val2  - follower1: example  - follower2: example  + follower1: example1  + follower2: example1  diff --git a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.adoc b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.adoc index e1c76d01a..3bfe98ea9 100644 --- a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.adoc +++ b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.adoc @@ -1,3 +1,11 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: + var2: true +---- == Example with all variables modifiable [,yaml] @@ -5,5 +13,5 @@ --- rougail: var1: yes - var2: xxx + var2: true ---- diff --git a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.gitlab.md b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.gitlab.md index af4c34ff5..401898d96 100644 --- a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.gitlab.md +++ b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.gitlab.md @@ -1,10 +1,19 @@ +
    Example with mandatory variables not filled in + +```yaml +--- +rougail: + var2: true +``` +
    +
    Example with all variables modifiable ```yaml --- rougail: var1: yes - var2: xxx + var2: true ```
    diff --git a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.html b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.html index f672c0946..5b611715a 100644 --- a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.html +++ b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.html @@ -1,5 +1,8 @@ -

    Example with all variables modifiable

    +

    Example with mandatory variables not filled in

    + +
    rougail:
+  var2: true

    Example with all variables modifiable

    rougail:
   var1: yes
-  var2: xxx
    \ No newline at end of file + var2: true \ No newline at end of file diff --git a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.md b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.md index 62e44bf90..056cfc09c 100644 --- a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.md +++ b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.md @@ -1,8 +1,15 @@ +# Example with mandatory variables not filled in + +```yaml +--- +rougail: + var2: true +``` # Example with all variables modifiable ```yaml --- rougail: var1: yes - var2: xxx + var2: true ``` diff --git a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.sh b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.sh index b13b19ca3..7b923f879 100644 --- a/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.sh +++ b/tests/results/test_namespace_examples/40_8calculation_boolean_return_none.sh @@ -1,7 +1,13 @@ +Example with mandatory variables not filled in + +---  +rougail:  + var2: true  + Example with all variables modifiable ---  rougail:   var1: yes  - var2: xxx  + var2: true  diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc index 7b223a3f6..6bf7abc20 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.adoc @@ -8,8 +8,8 @@ rougail: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ---- diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md index 91eb01514..f18465496 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md @@ -7,10 +7,10 @@ rougail: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ``` diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.html b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.html index aa5bdda32..4caa2cf42 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.html +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.html @@ -5,7 +5,7 @@ - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null \ No newline at end of file + - example + - example1 \ No newline at end of file diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.md b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.md index c64c72b0a..a37d0c86b 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.md +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.md @@ -7,8 +7,8 @@ rougail: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ``` diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh index 181a85b2a..6057a56b8 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-outside-follower-no-mandatory.sh @@ -6,8 +6,8 @@  - leader: a   follower: example   - leader: b  - follower: example  + follower: example1   variable:  - - null  - - null  + - example  + - example1  diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.adoc b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.adoc index a54b75061..ebf318faf 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.adoc +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.adoc @@ -8,10 +8,10 @@ rougail: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val ---- diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md index 927165e86..ce64bcc0d 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.gitlab.md @@ -7,11 +7,11 @@ rougail: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val ``` diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.html b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.html index 8d8862508..e3e6299a7 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.html +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.html @@ -5,9 +5,9 @@ - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val \ No newline at end of file diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.md b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.md index ff59dbbe3..5994f4066 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.md +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.md @@ -7,10 +7,10 @@ rougail: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - - leader: null + - leader: example follower: val - - leader: null + - leader: example1 follower: val ``` diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.sh b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.sh index 32150a531..7fc37f973 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.sh +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower.sh @@ -6,10 +6,10 @@  - leader: value1   follower: example   - leader: value2  - follower: example  + follower: example1   leadership_2:  - - leader: null  + - leader: example   follower: val  - - leader: null  + - leader: example1   follower: val  diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc index 10065c1c9..487058da4 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.adoc @@ -8,7 +8,7 @@ rougail: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md index 2ae417102..3fb9b828b 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md @@ -7,7 +7,7 @@ rougail: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.html b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.html index 7792c894a..c321205df 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.html +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.html @@ -5,7 +5,7 @@ - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.md b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.md index 4d5c54be2..44402d616 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.md +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.md @@ -7,7 +7,7 @@ rougail: - leader: value1 follower: example - leader: value2 - follower: example + follower: example1 leadership_2: - leader: value1 follower: diff --git a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh index d97771f67..d7f1aaaee 100644 --- a/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh +++ b/tests/results/test_namespace_examples/40_9leadership-calculation-variable_leader_follower_not_same.sh @@ -6,7 +6,7 @@  - leader: value1   follower: example   - leader: value2  - follower: example  + follower: example1   leadership_2:   - leader: value1   follower:  diff --git a/tests/results/test_namespace_examples/41_0choice_leader.adoc b/tests/results/test_namespace_examples/41_0choice_leader.adoc index abfe6503a..9de6eafee 100644 --- a/tests/results/test_namespace_examples/41_0choice_leader.adoc +++ b/tests/results/test_namespace_examples/41_0choice_leader.adoc @@ -6,5 +6,5 @@ rougail: leader: - leader: example - follower1: a_choice + follower1: a ---- diff --git a/tests/results/test_namespace_examples/41_0choice_leader.gitlab.md b/tests/results/test_namespace_examples/41_0choice_leader.gitlab.md index a9905035b..f910db693 100644 --- a/tests/results/test_namespace_examples/41_0choice_leader.gitlab.md +++ b/tests/results/test_namespace_examples/41_0choice_leader.gitlab.md @@ -5,7 +5,7 @@ rougail: leader: - leader: example - follower1: a_choice + follower1: a ``` diff --git a/tests/results/test_namespace_examples/41_0choice_leader.html b/tests/results/test_namespace_examples/41_0choice_leader.html index 02e1b4e9c..5c6d2414b 100644 --- a/tests/results/test_namespace_examples/41_0choice_leader.html +++ b/tests/results/test_namespace_examples/41_0choice_leader.html @@ -3,4 +3,4 @@ 
    rougail:
   leader:
     - leader: example
-      follower1: a_choice
    \ No newline at end of file + follower1: a \ No newline at end of file diff --git a/tests/results/test_namespace_examples/41_0choice_leader.md b/tests/results/test_namespace_examples/41_0choice_leader.md index e4a281ae4..ec0d3023f 100644 --- a/tests/results/test_namespace_examples/41_0choice_leader.md +++ b/tests/results/test_namespace_examples/41_0choice_leader.md @@ -5,5 +5,5 @@ rougail: leader: - leader: example - follower1: a_choice + follower1: a ``` diff --git a/tests/results/test_namespace_examples/41_0choice_leader.sh b/tests/results/test_namespace_examples/41_0choice_leader.sh index 3caf2eb38..d0e2f4330 100644 --- a/tests/results/test_namespace_examples/41_0choice_leader.sh +++ b/tests/results/test_namespace_examples/41_0choice_leader.sh @@ -4,5 +4,5 @@ rougail:   leader:   - leader: example  - follower1: a_choice  + follower1: a  diff --git a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.adoc b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.adoc index 1b6fe9577..1fa2f6bf8 100644 --- a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.adoc +++ b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.adoc @@ -6,7 +6,6 @@ rougail: leadership: - leader: a - follower: value - leader: b follower: value ---- diff --git a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.gitlab.md b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.gitlab.md index ffa40c1a5..233fd61df 100644 --- a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.gitlab.md +++ b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.gitlab.md @@ -5,7 +5,6 @@ rougail: leadership: - leader: a - follower: value - leader: b follower: value ``` diff --git a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.html b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.html index 89eb10e3e..2acd326d6 100644 --- a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.html +++ b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.html @@ -3,6 +3,5 @@ 
    rougail:
   leadership:
     - leader: a
-      follower: value
     - leader: b
       follower: value
    \ 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 index 560e105c3..0f6e5b9a9 100644 --- a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.md +++ b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.md @@ -5,7 +5,6 @@ rougail: leadership: - leader: a - follower: value - leader: b follower: value ``` diff --git a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.sh b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.sh index 3cef4cdc0..e7b51fe57 100644 --- a/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.sh +++ b/tests/results/test_namespace_examples/44_4disabled_calcultion_follower_index.sh @@ -4,7 +4,6 @@ rougail:   leadership:   - leader: a  - follower: value   - leader: b   follower: value  diff --git a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.adoc b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.adoc index c58727048..adaf2ca03 100644 --- a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.adoc +++ b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.adoc @@ -5,7 +5,4 @@ --- rougail: condition: no - leader: - - leader: example - follower: example ---- diff --git a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.gitlab.md b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.gitlab.md index 30354adc1..6287575ac 100644 --- a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.gitlab.md +++ b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.gitlab.md @@ -4,9 +4,6 @@ --- rougail: condition: no - leader: - - leader: example - follower: example ``` diff --git a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.html b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.html index 431073edc..3322b2e5f 100644 --- a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.html +++ b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.html @@ -1,7 +1,4 @@

    Example with all variables modifiable

    rougail:
-  condition: no
-  leader:
-    - leader: example
-      follower: example
    \ No newline at end of file + condition: no \ No newline at end of file diff --git a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.md b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.md index efe7424ee..7708dd8da 100644 --- a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.md +++ b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.md @@ -4,7 +4,4 @@ --- rougail: condition: no - leader: - - leader: example - follower: example ``` diff --git a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.sh b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.sh index 74f5c9109..78921a2e6 100644 --- a/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.sh +++ b/tests/results/test_namespace_examples/44_5leadership_leader_hidden_calculation.sh @@ -3,7 +3,4 @@ ---  rougail:   condition: no  - leader:  - - leader: example  - follower: example  diff --git a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.adoc b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.adoc index 205ea1528..171d02f37 100644 --- a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.adoc +++ b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.adoc @@ -6,7 +6,6 @@ rougail: leader: - leader: example - follower: example ---- == Example with all variables modifiable @@ -17,5 +16,4 @@ rougail: condition: yes leader: - leader: example - follower: example ---- diff --git a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.gitlab.md b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.gitlab.md index 705a43cf8..b2c279faf 100644 --- a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.gitlab.md +++ b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.gitlab.md @@ -5,7 +5,6 @@ rougail: leader: - leader: example - follower: example ``` @@ -17,7 +16,6 @@ rougail: condition: yes leader: - leader: example - follower: example ``` diff --git a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.html b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.html index 883543e86..909c2e0c7 100644 --- a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.html +++ b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.html @@ -2,11 +2,9 @@ 
    rougail:
   leader:
-    - leader: example
-      follower: example

    Example with all variables modifiable

    + - leader: example

    Example with all variables modifiable

    rougail:
   condition: yes
   leader:
-    - leader: example
-      follower: example
    \ No newline at end of file + - leader: example \ No newline at end of file diff --git a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md index 1faed1f1c..104d9793f 100644 --- a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md +++ b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md @@ -5,7 +5,6 @@ rougail: leader: - leader: example - follower: example ``` # Example with all variables modifiable @@ -15,5 +14,4 @@ rougail: condition: yes leader: - leader: example - follower: example ``` diff --git a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.sh b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.sh index 2cb1868af..c94b3765a 100644 --- a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.sh +++ b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.sh @@ -4,7 +4,6 @@ rougail:   leader:   - leader: example  - follower: example  Example with all variables modifiable @@ -13,5 +12,4 @@  condition: yes   leader:   - leader: example  - follower: example  diff --git a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.adoc b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.adoc index 8883887b3..4e5c0bbae 100644 --- a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.adoc +++ b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.adoc @@ -6,7 +6,6 @@ rougail: leader: - leader: a - follower: a - leader: b follower: b ---- diff --git a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.gitlab.md b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.gitlab.md index 2ccb04bf7..7ab393e36 100644 --- a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.gitlab.md +++ b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.gitlab.md @@ -5,7 +5,6 @@ rougail: leader: - leader: a - follower: a - leader: b follower: b ``` diff --git a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.html b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.html index f9ad88521..db30e7067 100644 --- a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.html +++ b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.html @@ -3,6 +3,5 @@ 
    rougail:
   leader:
     - leader: a
-      follower: a
     - leader: b
       follower: b
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.md b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.md index b3dd4b05b..d4fc90348 100644 --- a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.md +++ b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.md @@ -5,7 +5,6 @@ rougail: leader: - leader: a - follower: a - leader: b follower: b ``` diff --git a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.sh b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.sh index f54802a2c..27335af88 100644 --- a/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.sh +++ b/tests/results/test_namespace_examples/44_9calculated_default_leadership_leader.sh @@ -4,7 +4,6 @@ rougail:   leader:   - leader: a  - follower: a   - leader: b   follower: b  diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_test.adoc b/tests/results/test_namespace_examples/60_0family_dynamic_test.adoc index ded7eebc2..8b999cbde 100644 --- a/tests/results/test_namespace_examples/60_0family_dynamic_test.adoc +++ b/tests/results/test_namespace_examples/60_0family_dynamic_test.adoc @@ -4,9 +4,6 @@ ---- --- rougail: - var: - - val1 - - val2 dynval1: var: example dynval2: diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_test.gitlab.md b/tests/results/test_namespace_examples/60_0family_dynamic_test.gitlab.md index 4d227df3f..6f2e5b72c 100644 --- a/tests/results/test_namespace_examples/60_0family_dynamic_test.gitlab.md +++ b/tests/results/test_namespace_examples/60_0family_dynamic_test.gitlab.md @@ -3,9 +3,6 @@ ```yaml --- rougail: - var: - - val1 - - val2 dynval1: var: example dynval2: diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_test.html b/tests/results/test_namespace_examples/60_0family_dynamic_test.html index 78eaf4c09..6dc05d24a 100644 --- a/tests/results/test_namespace_examples/60_0family_dynamic_test.html +++ b/tests/results/test_namespace_examples/60_0family_dynamic_test.html @@ -1,9 +1,6 @@

    Example with mandatory variables not filled in

    rougail:
-  var:
-    - val1
-    - val2
   dynval1:
     var: example
   dynval2:
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_test.md b/tests/results/test_namespace_examples/60_0family_dynamic_test.md
index 830a65384..60bd77d9b 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_test.md
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_test.md
@@ -3,9 +3,6 @@
 ```yaml
 ---
 rougail:
-  var:
-    - val1
-    - val2
   dynval1:
     var: example
   dynval2:
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_test.sh b/tests/results/test_namespace_examples/60_0family_dynamic_test.sh
index 979b4993f..6ead9e284 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_test.sh
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_test.sh
@@ -2,9 +2,6 @@
 
 ---                                                                             
 rougail:                                                                        
-  var:                                                                          
-    - val1                                                                      
-    - val2                                                                      
   dynval1:                                                                      
     var: example                                                                
   dynval2:                                                                      
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.adoc b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.adoc
index ac3cfccff..9f28ea65b 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.adoc
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.adoc
@@ -1,12 +1,3 @@
-== Example with mandatory variables not filled in
-
-[,yaml]
-----
----
-rougail:
-  var:
-    - example
-----
 == Example with all variables modifiable
 
 [,yaml]
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.gitlab.md b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.gitlab.md
index 3923ded5f..6ddb244cf 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.gitlab.md
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.gitlab.md
@@ -1,13 +1,3 @@
-
    Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  var:
-    - example
-```
-
    
-
 
    Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.html b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.html
index 7d8400663..31a5e659d 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.html
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.html
@@ -1,8 +1,4 @@
-
    Example with mandatory variables not filled in
    
-
-
    rougail:
-  var:
-    - example
    Example with all variables modifiable
    
+
    Example with all variables modifiable
    
 
 
    rougail:
   var:
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.md b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.md
index f2098cded..73004439b 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.md
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.md
@@ -1,11 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  var:
-    - example
-```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.sh b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.sh
index 9d43b7a50..a461902ef 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.sh
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_empty.sh
@@ -1,10 +1,3 @@
-Example with mandatory variables not filled in
-
----                                                                             
-rougail:                                                                        
-  var:                                                                          
-    - example                                                                   
-
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.adoc b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.adoc
index ce2b04467..57903d7e6 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.adoc
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.adoc
@@ -1,13 +1,3 @@
-== Example with mandatory variables not filled in
-
-[,yaml]
-----
----
-rougail:
-  var:
-    - val1
-    - val2
-----
 == Example with all variables modifiable
 
 [,yaml]
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md
index 405c1dbfc..946a95569 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.gitlab.md
@@ -1,14 +1,3 @@
-
    Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  var:
-    - val1
-    - val2
-```
-
    
-
 
    Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.html b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.html
index 02791803a..3813a9133 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.html
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.html
@@ -1,9 +1,4 @@
-
    Example with mandatory variables not filled in
    
-
-
    rougail:
-  var:
-    - val1
-    - val2
    Example with all variables modifiable
    
+
    Example with all variables modifiable
    
 
 
    rougail:
   var:
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.md b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.md
index 08f907b75..d7d53377d 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.md
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.md
@@ -1,12 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  var:
-    - val1
-    - val2
-```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.sh b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.sh
index 4bce40a54..521b12789 100644
--- a/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.sh
+++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable_suffix_empty.sh
@@ -1,11 +1,3 @@
-Example with mandatory variables not filled in
-
----                                                                             
-rougail:                                                                        
-  var:                                                                          
-    - val1                                                                      
-    - val2                                                                      
-
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.adoc b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.adoc
index e800f270d..10ba5abc5 100644
--- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.adoc
+++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.adoc
@@ -22,6 +22,6 @@ rougail:
     var: example
   var1: example
   var2:
-    - null
-    - null
+    - example
+    - example
 ----
diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.gitlab.md b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.gitlab.md
index 5b89896b9..2ea4192c5 100644
--- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.gitlab.md
+++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.gitlab.md
@@ -22,8 +22,8 @@ rougail:
     var: example
   var1: example
   var2:
-    - null
-    - null
+    - example
+    - example
 ```
 
    
 
diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.html b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.html
index 082adc412..5b624c0d4 100644
--- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.html
+++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.html
@@ -14,5 +14,5 @@
     var: example
   var1: example
   var2:
-    - null
-    - null
    
\ No newline at end of file
+    - example
+    - example
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.md b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.md index f8c462919..f8d97d374 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.md +++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.md @@ -20,6 +20,6 @@ rougail: var: example var1: example var2: - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.sh b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.sh index 3295c0bbc..39d1573e4 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.sh +++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_description.sh @@ -18,6 +18,6 @@  var: example   var1: example   var2:  - - null  - - null  + - example  + - example  diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.adoc b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.adoc index 59bfe7e97..af47cc3ac 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.adoc +++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.adoc @@ -1,3 +1,11 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: + var2: example +---- == Example with all variables modifiable [,yaml] diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.gitlab.md b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.gitlab.md index 836ae6059..9b5f7450c 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.gitlab.md +++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.gitlab.md @@ -1,3 +1,12 @@ +
    Example with mandatory variables not filled in + +```yaml +--- +rougail: + var2: example +``` +
    +
    Example with all variables modifiable ```yaml diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.html b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.html index 4bad7dee5..43a8856e8 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.html +++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.html @@ -1,4 +1,7 @@ -

    Example with all variables modifiable

    +

    Example with mandatory variables not filled in

    + +
    rougail:
+  var2: example

    Example with all variables modifiable

    rougail:
   var1:
diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.md b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.md
index 0d65ad3f9..b5a09eb73 100644
--- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.md
+++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.md
@@ -1,3 +1,10 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+  var2: example
+```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.sh b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.sh
index 95f838525..542fe3290 100644
--- a/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.sh
+++ b/tests/results/test_namespace_examples/60_5family_dynamic_calc_suffix_disabled2.sh
@@ -1,3 +1,9 @@
+Example with mandatory variables not filled in
+
+---                                                                             
+rougail:                                                                        
+  var2: example                                                                 
+
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.adoc b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.adoc
index 46063ed82..25bef94cd 100644
--- a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.adoc
+++ b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.adoc
@@ -8,8 +8,4 @@ rougail:
     var: example
     family:
       var: example
-  dynval2:
-    var: example
-    family:
-      var: example
 ----
diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.gitlab.md b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.gitlab.md
index f30704ff3..92233e872 100644
--- a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.gitlab.md
+++ b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.gitlab.md
@@ -7,10 +7,6 @@ rougail:
     var: example
     family:
       var: example
-  dynval2:
-    var: example
-    family:
-      var: example
 ```
    diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.html b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.html index 207955ef4..bc40d277e 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.html +++ b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.html @@ -2,10 +2,6 @@ 
    rougail:
   dynval1:
-    var: example
-    family:
-      var: example
-  dynval2:
     var: example
     family:
       var: example
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.md b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.md index f416cca03..0dd8e758f 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.md +++ b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.md @@ -7,8 +7,4 @@ rougail: var: example family: var: example - dynval2: - var: example - family: - var: example ``` diff --git a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.sh b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.sh index f8a21d420..328c24440 100644 --- a/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.sh +++ b/tests/results/test_namespace_examples/60_5family_dynamic_hidden_suffix.sh @@ -6,8 +6,4 @@  var: example   family:   var: example  - dynval2:  - var: example  - family:  - var: example  diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.adoc b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.adoc index 8bedda982..c7ced930b 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.adoc +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.adoc @@ -35,6 +35,6 @@ rougail: dynval2: var: example var2: - - null - - null + - example + - example ---- diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.gitlab.md b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.gitlab.md index 795d1a29d..fd04a93e4 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.gitlab.md +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.gitlab.md @@ -35,8 +35,8 @@ rougail: dynval2: var: example var2: - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.html b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.html index 873dceebd..59f2b6f4a 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.html +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.html @@ -27,5 +27,5 @@ dynval2: var: example var2: - - null - - null \ No newline at end of file + - example + - example \ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.md b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.md index 97b9cbf2c..b7497ce2f 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.md +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.md @@ -33,6 +33,6 @@ rougail: dynval2: var: example var2: - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.sh b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.sh index 2f9083482..2ff787244 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.sh +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi.sh @@ -31,6 +31,6 @@  dynval2:   var: example   var2:  - - null  - - null  + - example  + - example  diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.adoc b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.adoc index 8bedda982..c7ced930b 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.adoc +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.adoc @@ -35,6 +35,6 @@ rougail: dynval2: var: example var2: - - null - - null + - example + - example ---- diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.gitlab.md b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.gitlab.md index 795d1a29d..fd04a93e4 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.gitlab.md +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.gitlab.md @@ -35,8 +35,8 @@ rougail: dynval2: var: example var2: - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.html b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.html index 873dceebd..59f2b6f4a 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.html +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.html @@ -27,5 +27,5 @@ dynval2: var: example var2: - - null - - null \ No newline at end of file + - example + - example \ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.md b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.md index 97b9cbf2c..b7497ce2f 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.md +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.md @@ -33,6 +33,6 @@ rougail: dynval2: var: example var2: - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.sh b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.sh index 2f9083482..2ff787244 100644 --- a/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.sh +++ b/tests/results/test_namespace_examples/60_6family_dynamic_suffix_auto_multi2.sh @@ -31,6 +31,6 @@  dynval2:   var: example   var2:  - - null  - - null  + - example  + - example  diff --git a/tests/results/test_namespace_examples/warnings_04_5validators_warnings b/tests/results/test_namespace_examples/warnings_04_5validators_warnings index 0637a088a..375f58427 100644 --- a/tests/results/test_namespace_examples/warnings_04_5validators_warnings +++ b/tests/results/test_namespace_examples/warnings_04_5validators_warnings @@ -1 +1 @@ -[] \ No newline at end of file +["attention, \"1000\" could be an invalid integer for \"An integer\", value is too high"] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_16_2family_redefine_calculation b/tests/results/test_namespace_examples/warnings_16_2family_redefine_calculation index d766e2d00..8c8b5fa6c 100644 --- a/tests/results/test_namespace_examples/warnings_16_2family_redefine_calculation +++ b/tests/results/test_namespace_examples/warnings_16_2family_redefine_calculation @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_16_3family_empty_at_ends b/tests/results/test_namespace_examples/warnings_16_3family_empty_at_ends index e7619cd3b..d48ef4869 100644 --- a/tests/results/test_namespace_examples/warnings_16_3family_empty_at_ends +++ b/tests/results/test_namespace_examples/warnings_16_3family_empty_at_ends @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_20_2family_looks_like_dynamic b/tests/results/test_namespace_examples/warnings_20_2family_looks_like_dynamic index 7ac2fbe7f..27fd375f3 100644 --- a/tests/results/test_namespace_examples/warnings_20_2family_looks_like_dynamic +++ b/tests/results/test_namespace_examples/warnings_20_2family_looks_like_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_20_2family_looks_like_variable b/tests/results/test_namespace_examples/warnings_20_2family_looks_like_variable index f688a53bb..c210375a8 100644 --- a/tests/results/test_namespace_examples/warnings_20_2family_looks_like_variable +++ b/tests/results/test_namespace_examples/warnings_20_2family_looks_like_variable @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test_namespace_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory index 3abb0f5e7..6d6e0f98d 100644 --- a/tests/results/test_namespace_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory +++ b/tests/results/test_namespace_examples/warnings_40_9leadership-calculation-outside-follower-no-mandatory @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_0family_dynamic_forbidden_char b/tests/results/test_namespace_examples/warnings_60_0family_dynamic_forbidden_char index d3aeda8b6..03f145898 100644 --- a/tests/results/test_namespace_examples/warnings_60_0family_dynamic_forbidden_char +++ b/tests/results/test_namespace_examples/warnings_60_0family_dynamic_forbidden_char @@ -1 +1 @@ -["\"default\" is a calculation for rougail.dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file +["\"default\" is a calculation for rougail.dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_disabled2 b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_disabled2 index 0637a088a..decb99275 100644 --- a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_disabled2 +++ b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_disabled2 @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden index 0637a088a..ca62c55c1 100644 --- a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden +++ b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_boolean b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_boolean index 0637a088a..aae5574da 100644 --- a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_boolean +++ b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_boolean @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_boolean/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_multi b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_multi index 0637a088a..fc2a53c8a 100644 --- a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_multi +++ b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_calc_suffix_hidden_multi @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_multi/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_unknown_suffix_empty b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_unknown_suffix_empty index e8a78f126..eeba5b344 100644 --- a/tests/results/test_namespace_examples/warnings_60_5family_dynamic_unknown_suffix_empty +++ b/tests/results/test_namespace_examples/warnings_60_5family_dynamic_unknown_suffix_empty @@ -1 +1 @@ -["\"disabled\" is a calculation for rougail.val1_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for rougail.{{ identifier }}_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi b/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi index b29a00ee6..5867be67f 100644 --- a/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi +++ b/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi2 b/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi2 index 77b1a877a..e329e6758 100644 --- a/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi2 +++ b/tests/results/test_namespace_examples/warnings_60_6family_dynamic_suffix_auto_multi2 @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_9extra_dynamic b/tests/results/test_namespace_examples/warnings_60_9extra_dynamic index 88aca57fe..282cd0554 100644 --- a/tests/results/test_namespace_examples/warnings_60_9extra_dynamic +++ b/tests/results/test_namespace_examples/warnings_60_9extra_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/warnings_60_9extra_dynamic_extra b/tests/results/test_namespace_examples/warnings_60_9extra_dynamic_extra index 649dabe67..b7b2cef9f 100644 --- a/tests/results/test_namespace_examples/warnings_60_9extra_dynamic_extra +++ b/tests/results/test_namespace_examples/warnings_60_9extra_dynamic_extra @@ -1 +1 @@ -["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_6choice.adoc b/tests/results/test_namespace_examples_comment/00_6choice.adoc index 6d0d422d1..d659dc0ec 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice.adoc +++ b/tests/results/test_namespace_examples_comment/00_6choice.adoc @@ -4,8 +4,8 @@ ---- --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable + var1: a # The first variable + var2: a # The second variable ---- == Example with all variables modifiable @@ -13,10 +13,10 @@ rougail: # Rougail ---- --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable - var3: a_choice # The third variable - var4: a_choice # The forth variable + var1: a # The first variable + var2: a # The second variable + var3: a # The third variable + var4: b # The forth variable var5: a # The fifth variable var6: 1 # The sixth variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_6choice.gitlab.md b/tests/results/test_namespace_examples_comment/00_6choice.gitlab.md index dd79e6bac..f986327d1 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_6choice.gitlab.md @@ -3,8 +3,8 @@ ```yaml --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable + var1: a # The first variable + var2: a # The second variable ``` @@ -13,10 +13,10 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable - var3: a_choice # The third variable - var4: a_choice # The forth variable + var1: a # The first variable + var2: a # The second variable + var3: a # The third variable + var4: b # The forth variable var5: a # The fifth variable var6: 1 # The sixth variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6choice.html b/tests/results/test_namespace_examples_comment/00_6choice.html index 865be45c0..7e27436fd 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice.html +++ b/tests/results/test_namespace_examples_comment/00_6choice.html @@ -1,13 +1,13 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  var1: a_choice              # The first variable
-  var2: a_choice              # The second variable

    Example with all variables modifiable

    + var1: a # The first variable + var2: a # The second variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  var1: a_choice              # The first variable
-  var2: a_choice              # The second variable
-  var3: a_choice              # The third variable
-  var4: a_choice              # The forth variable
+  var1: a                     # The first variable
+  var2: a                     # The second variable
+  var3: a                     # The third variable
+  var4: b                     # The forth variable
   var5: a                     # The fifth variable
   var6: 1                     # The sixth variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_6choice.md b/tests/results/test_namespace_examples_comment/00_6choice.md index 647a255fa..ba023ac9a 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice.md +++ b/tests/results/test_namespace_examples_comment/00_6choice.md @@ -3,18 +3,18 @@ ```yaml --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable + var1: a # The first variable + var2: a # The second variable ``` # Example with all variables modifiable ```yaml --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable - var3: a_choice # The third variable - var4: a_choice # The forth variable + var1: a # The first variable + var2: a # The second variable + var3: a # The third variable + var4: b # The forth variable var5: a # The fifth variable var6: 1 # The sixth variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6choice.sh b/tests/results/test_namespace_examples_comment/00_6choice.sh index 69d742137..2157e5949 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice.sh +++ b/tests/results/test_namespace_examples_comment/00_6choice.sh @@ -2,17 +2,17 @@ ---  rougail: # Rougail  - var1: a_choice # The first variable  - var2: a_choice # The second variable  + var1: a # The first variable  + var2: a # The second variable  Example with all variables modifiable ---  rougail: # Rougail  - var1: a_choice # The first variable  - var2: a_choice # The second variable  - var3: a_choice # The third variable  - var4: a_choice # The forth variable  + var1: a # The first variable  + var2: a # The second variable  + var3: a # The third variable  + var4: b # The forth variable   var5: a # The fifth variable   var6: 1 # The sixth variable  diff --git a/tests/results/test_namespace_examples_comment/00_6choice_link.adoc b/tests/results/test_namespace_examples_comment/00_6choice_link.adoc index 24e4ef192..11d544d02 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_link.adoc +++ b/tests/results/test_namespace_examples_comment/00_6choice_link.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - var1: a_choice # The first variable + var1: a # The first variable ---- == Example with all variables modifiable @@ -12,6 +12,6 @@ rougail: # Rougail ---- --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable + var1: a # The first variable + var2: a # The second variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_6choice_link.gitlab.md b/tests/results/test_namespace_examples_comment/00_6choice_link.gitlab.md index 00c4138f3..55f3a62dd 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_link.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_6choice_link.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - var1: a_choice # The first variable + var1: a # The first variable ``` @@ -12,8 +12,8 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable + var1: a # The first variable + var2: a # The second variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6choice_link.html b/tests/results/test_namespace_examples_comment/00_6choice_link.html index 06d93822b..277673df3 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_link.html +++ b/tests/results/test_namespace_examples_comment/00_6choice_link.html @@ -1,8 +1,8 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  var1: a_choice              # The first variable

    Example with all variables modifiable

    + var1: a # The first variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  var1: a_choice              # The first variable
-  var2: a_choice              # The second variable
    \ No newline at end of file + var1: a # The first variable + var2: a # The second variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_6choice_link.md b/tests/results/test_namespace_examples_comment/00_6choice_link.md index 7434d8004..39c818aff 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_link.md +++ b/tests/results/test_namespace_examples_comment/00_6choice_link.md @@ -3,13 +3,13 @@ ```yaml --- rougail: # Rougail - var1: a_choice # The first variable + var1: a # The first variable ``` # Example with all variables modifiable ```yaml --- rougail: # Rougail - var1: a_choice # The first variable - var2: a_choice # The second variable + var1: a # The first variable + var2: a # The second variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6choice_link.sh b/tests/results/test_namespace_examples_comment/00_6choice_link.sh index 0eb2e0a31..ab267ab27 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_link.sh +++ b/tests/results/test_namespace_examples_comment/00_6choice_link.sh @@ -2,12 +2,12 @@ ---  rougail: # Rougail  - var1: a_choice # The first variable  + var1: a # The first variable  Example with all variables modifiable ---  rougail: # Rougail  - var1: a_choice # The first variable  - var2: a_choice # The second variable  + var1: a # The first variable  + var2: a # The second variable  diff --git a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.adoc b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.adoc index 56d7815f4..1f4aa5042 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.adoc +++ b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.adoc @@ -9,6 +9,6 @@ rougail: # Rougail - b - c var2: a # A first variable - family: # family + family: var3: a # A third variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.gitlab.md b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.gitlab.md index f08b7adb1..a9314578d 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.gitlab.md @@ -8,7 +8,7 @@ rougail: # Rougail - b - c var2: a # A first variable - family: # family + family: var3: a # A third variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.html b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.html index d35f5af54..047b8df89 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.html +++ b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.html @@ -6,5 +6,5 @@ - b - c var2: a # A first variable - family: # family + family: var3: a # A third variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.md b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.md index a495d6a52..3efd9fc51 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.md +++ b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.md @@ -8,6 +8,6 @@ rougail: # Rougail - b - c var2: a # A first variable - family: # family + family: var3: a # A third variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.sh b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.sh index 278cd3415..71c327536 100644 --- a/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.sh +++ b/tests/results/test_namespace_examples_comment/00_6choice_variable_link2.sh @@ -7,6 +7,6 @@  - b   - c   var2: a # A first variable  - family: # family  + family:   var3: a # A third variable  diff --git a/tests/results/test_namespace_examples_comment/00_6custom.adoc b/tests/results/test_namespace_examples_comment/00_6custom.adoc index 6031dcd3f..e205a972e 100644 --- a/tests/results/test_namespace_examples_comment/00_6custom.adoc +++ b/tests/results/test_namespace_examples_comment/00_6custom.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - custom1: xxx # The first variable + custom1: example # The first variable ---- == Example with all variables modifiable @@ -12,6 +12,6 @@ rougail: # Rougail ---- --- rougail: # Rougail - custom1: xxx # The first variable + custom1: example # The first variable custom2: value # The seconf variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_6custom.gitlab.md b/tests/results/test_namespace_examples_comment/00_6custom.gitlab.md index d3b513fa1..d2172ed6b 100644 --- a/tests/results/test_namespace_examples_comment/00_6custom.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_6custom.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - custom1: xxx # The first variable + custom1: example # The first variable ``` @@ -12,7 +12,7 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - custom1: xxx # The first variable + custom1: example # The first variable custom2: value # The seconf variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6custom.html b/tests/results/test_namespace_examples_comment/00_6custom.html index 3cebb1aea..695b2764b 100644 --- a/tests/results/test_namespace_examples_comment/00_6custom.html +++ b/tests/results/test_namespace_examples_comment/00_6custom.html @@ -1,8 +1,8 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  custom1: xxx                # The first variable

    Example with all variables modifiable

    + custom1: example # The first variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  custom1: xxx                # The first variable
+  custom1: example            # The first variable
   custom2: value              # The seconf variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_6custom.md b/tests/results/test_namespace_examples_comment/00_6custom.md index 494b46c8a..b6e7a90aa 100644 --- a/tests/results/test_namespace_examples_comment/00_6custom.md +++ b/tests/results/test_namespace_examples_comment/00_6custom.md @@ -3,13 +3,13 @@ ```yaml --- rougail: # Rougail - custom1: xxx # The first variable + custom1: example # The first variable ``` # Example with all variables modifiable ```yaml --- rougail: # Rougail - custom1: xxx # The first variable + custom1: example # The first variable custom2: value # The seconf variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6custom.sh b/tests/results/test_namespace_examples_comment/00_6custom.sh index eb5f2aaf6..949bae814 100644 --- a/tests/results/test_namespace_examples_comment/00_6custom.sh +++ b/tests/results/test_namespace_examples_comment/00_6custom.sh @@ -2,12 +2,12 @@ ---  rougail: # Rougail  - custom1: xxx # The first variable  + custom1: example # The first variable  Example with all variables modifiable ---  rougail: # Rougail  - custom1: xxx # The first variable  + custom1: example # The first variable   custom2: value # The seconf variable  diff --git a/tests/results/test_namespace_examples_comment/00_6ip.adoc b/tests/results/test_namespace_examples_comment/00_6ip.adoc index b793a9686..da587765e 100644 --- a/tests/results/test_namespace_examples_comment/00_6ip.adoc +++ b/tests/results/test_namespace_examples_comment/00_6ip.adoc @@ -5,6 +5,6 @@ --- rougail: # Rougail var1: 1.1.1.1 # An IP - var2: 192.168.0.128/25 # An IP in CIDR format + var2: 192.168.0.129/25 # An IP in CIDR format var3: 1.1.1.1/24 # An IP in CIDR format with obsolete CIDR type ---- diff --git a/tests/results/test_namespace_examples_comment/00_6ip.gitlab.md b/tests/results/test_namespace_examples_comment/00_6ip.gitlab.md index cfe39afa1..5b92784a0 100644 --- a/tests/results/test_namespace_examples_comment/00_6ip.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_6ip.gitlab.md @@ -4,7 +4,7 @@ --- rougail: # Rougail var1: 1.1.1.1 # An IP - var2: 192.168.0.128/25 # An IP in CIDR format + var2: 192.168.0.129/25 # An IP in CIDR format var3: 1.1.1.1/24 # An IP in CIDR format with obsolete CIDR type ``` diff --git a/tests/results/test_namespace_examples_comment/00_6ip.html b/tests/results/test_namespace_examples_comment/00_6ip.html index 389829832..e81596934 100644 --- a/tests/results/test_namespace_examples_comment/00_6ip.html +++ b/tests/results/test_namespace_examples_comment/00_6ip.html @@ -2,5 +2,5 @@ 
    rougail:                      # Rougail
   var1: 1.1.1.1               # An IP
-  var2: 192.168.0.128/25      # An IP in CIDR format
+  var2: 192.168.0.129/25      # An IP in CIDR format
   var3: 1.1.1.1/24            # An IP in CIDR format with obsolete CIDR type
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_6ip.md b/tests/results/test_namespace_examples_comment/00_6ip.md index 08a734514..ab3d1ab75 100644 --- a/tests/results/test_namespace_examples_comment/00_6ip.md +++ b/tests/results/test_namespace_examples_comment/00_6ip.md @@ -4,6 +4,6 @@ --- rougail: # Rougail var1: 1.1.1.1 # An IP - var2: 192.168.0.128/25 # An IP in CIDR format + var2: 192.168.0.129/25 # An IP in CIDR format var3: 1.1.1.1/24 # An IP in CIDR format with obsolete CIDR type ``` diff --git a/tests/results/test_namespace_examples_comment/00_6ip.sh b/tests/results/test_namespace_examples_comment/00_6ip.sh index a2b4b9f7d..4527ccc2d 100644 --- a/tests/results/test_namespace_examples_comment/00_6ip.sh +++ b/tests/results/test_namespace_examples_comment/00_6ip.sh @@ -3,6 +3,6 @@ ---  rougail: # Rougail   var1: 1.1.1.1 # An IP  - var2: 192.168.0.128/25 # An IP in CIDR format  + var2: 192.168.0.129/25 # An IP in CIDR format   var3: 1.1.1.1/24 # An IP in CIDR format with obsolete CIDR type  diff --git a/tests/results/test_namespace_examples_comment/00_6secret_param.adoc b/tests/results/test_namespace_examples_comment/00_6secret_param.adoc index 199d8182f..ba51c87ad 100644 --- a/tests/results/test_namespace_examples_comment/00_6secret_param.adoc +++ b/tests/results/test_namespace_examples_comment/00_6secret_param.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - secret1: secrets # The first variable + secret1: ALongS4cr4t # The first variable ---- == Example with all variables modifiable @@ -12,7 +12,7 @@ rougail: # Rougail ---- --- rougail: # Rougail - secret1: secrets # The first variable + secret1: ALongS4cr4t # The first variable secret2: value # The second variable secret3: value # The third variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_6secret_param.gitlab.md b/tests/results/test_namespace_examples_comment/00_6secret_param.gitlab.md index a6fb6ca2c..f140ceaed 100644 --- a/tests/results/test_namespace_examples_comment/00_6secret_param.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_6secret_param.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - secret1: secrets # The first variable + secret1: ALongS4cr4t # The first variable ``` @@ -12,7 +12,7 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - secret1: secrets # The first variable + secret1: ALongS4cr4t # The first variable secret2: value # The second variable secret3: value # The third variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6secret_param.html b/tests/results/test_namespace_examples_comment/00_6secret_param.html index e8f2b1ebe..aeeb48f05 100644 --- a/tests/results/test_namespace_examples_comment/00_6secret_param.html +++ b/tests/results/test_namespace_examples_comment/00_6secret_param.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  secret1: secrets            # The first variable

    Example with all variables modifiable

    + secret1: ALongS4cr4t # The first variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  secret1: secrets            # The first variable
+  secret1: ALongS4cr4t        # The first variable
   secret2: value              # The second variable
   secret3: value              # The third variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_6secret_param.md b/tests/results/test_namespace_examples_comment/00_6secret_param.md index f616f5b46..6e20eb36d 100644 --- a/tests/results/test_namespace_examples_comment/00_6secret_param.md +++ b/tests/results/test_namespace_examples_comment/00_6secret_param.md @@ -3,14 +3,14 @@ ```yaml --- rougail: # Rougail - secret1: secrets # The first variable + secret1: ALongS4cr4t # The first variable ``` # Example with all variables modifiable ```yaml --- rougail: # Rougail - secret1: secrets # The first variable + secret1: ALongS4cr4t # The first variable secret2: value # The second variable secret3: value # The third variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_6secret_param.sh b/tests/results/test_namespace_examples_comment/00_6secret_param.sh index 0fca31166..14f986f65 100644 --- a/tests/results/test_namespace_examples_comment/00_6secret_param.sh +++ b/tests/results/test_namespace_examples_comment/00_6secret_param.sh @@ -2,13 +2,13 @@ ---  rougail: # Rougail  - secret1: secrets # The first variable  + secret1: ALongS4cr4t # The first variable  Example with all variables modifiable ---  rougail: # Rougail  - secret1: secrets # The first variable  + secret1: ALongS4cr4t # The first variable   secret2: value # The second variable   secret3: value # The third variable  diff --git a/tests/results/test_namespace_examples_comment/00_8calculation_information.adoc b/tests/results/test_namespace_examples_comment/00_8calculation_information.adoc index 927070e8d..a092aba3b 100644 --- a/tests/results/test_namespace_examples_comment/00_8calculation_information.adoc +++ b/tests/results/test_namespace_examples_comment/00_8calculation_information.adoc @@ -4,5 +4,5 @@ ---- --- rougail: # Rougail - variable: example # A variable + variable: value # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_8calculation_information.gitlab.md b/tests/results/test_namespace_examples_comment/00_8calculation_information.gitlab.md index c36fb1d38..5e40b891f 100644 --- a/tests/results/test_namespace_examples_comment/00_8calculation_information.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_8calculation_information.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - variable: example # A variable + variable: value # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_8calculation_information.html b/tests/results/test_namespace_examples_comment/00_8calculation_information.html index f5093ec1a..8da48f5ec 100644 --- a/tests/results/test_namespace_examples_comment/00_8calculation_information.html +++ b/tests/results/test_namespace_examples_comment/00_8calculation_information.html @@ -1,4 +1,4 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  variable: example           # A variable
    \ No newline at end of file + variable: value # A variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_8calculation_information.md b/tests/results/test_namespace_examples_comment/00_8calculation_information.md index 81ec3ddff..32f6180b1 100644 --- a/tests/results/test_namespace_examples_comment/00_8calculation_information.md +++ b/tests/results/test_namespace_examples_comment/00_8calculation_information.md @@ -3,5 +3,5 @@ ```yaml --- rougail: # Rougail - variable: example # A variable + variable: value # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_8calculation_information.sh b/tests/results/test_namespace_examples_comment/00_8calculation_information.sh index c183930fe..84eee5005 100644 --- a/tests/results/test_namespace_examples_comment/00_8calculation_information.sh +++ b/tests/results/test_namespace_examples_comment/00_8calculation_information.sh @@ -2,5 +2,5 @@ ---  rougail: # Rougail  - variable: example # A variable  + variable: value # A variable  diff --git a/tests/results/test_namespace_examples_comment/00_8test.adoc b/tests/results/test_namespace_examples_comment/00_8test.adoc index 719e37baa..ee32806b5 100644 --- a/tests/results/test_namespace_examples_comment/00_8test.adoc +++ b/tests/results/test_namespace_examples_comment/00_8test.adoc @@ -19,7 +19,7 @@ rougail: # Rougail var1: test # The first variable var2: test # The second variable var3: test1 # The third variable - var4: null # The forth variable + var4: example # The forth variable var5: false # The fifth variable var6: # The sixth variable - test1 diff --git a/tests/results/test_namespace_examples_comment/00_8test.gitlab.md b/tests/results/test_namespace_examples_comment/00_8test.gitlab.md index 02207b993..f50ae17f4 100644 --- a/tests/results/test_namespace_examples_comment/00_8test.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_8test.gitlab.md @@ -19,7 +19,7 @@ rougail: # Rougail var1: test # The first variable var2: test # The second variable var3: test1 # The third variable - var4: null # The forth variable + var4: example # The forth variable var5: false # The fifth variable var6: # The sixth variable - test1 diff --git a/tests/results/test_namespace_examples_comment/00_8test.html b/tests/results/test_namespace_examples_comment/00_8test.html index 6498ef20c..c03d450f3 100644 --- a/tests/results/test_namespace_examples_comment/00_8test.html +++ b/tests/results/test_namespace_examples_comment/00_8test.html @@ -11,7 +11,7 @@ var1: test # The first variable var2: test # The second variable var3: test1 # The third variable - var4: null # The forth variable + var4: example # The forth variable var5: false # The fifth variable var6: # The sixth variable - test1 diff --git a/tests/results/test_namespace_examples_comment/00_8test.md b/tests/results/test_namespace_examples_comment/00_8test.md index 1cd07378a..63b3f3735 100644 --- a/tests/results/test_namespace_examples_comment/00_8test.md +++ b/tests/results/test_namespace_examples_comment/00_8test.md @@ -17,7 +17,7 @@ rougail: # Rougail var1: test # The first variable var2: test # The second variable var3: test1 # The third variable - var4: null # The forth variable + var4: example # The forth variable var5: false # The fifth variable var6: # The sixth variable - test1 diff --git a/tests/results/test_namespace_examples_comment/00_8test.sh b/tests/results/test_namespace_examples_comment/00_8test.sh index 26ce17499..70d692e66 100644 --- a/tests/results/test_namespace_examples_comment/00_8test.sh +++ b/tests/results/test_namespace_examples_comment/00_8test.sh @@ -15,7 +15,7 @@  var1: test # The first variable   var2: test # The second variable   var3: test1 # The third variable  - var4: null # The forth variable  + var4: example # The forth variable   var5: false # The fifth variable   var6: # The sixth variable   - test1  diff --git a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.adoc b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.adoc index 9f5ef8d39..5e3e1935e 100644 --- a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.adoc +++ b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.adoc @@ -5,7 +5,8 @@ --- rougail: # Rougail variable1: # A first variable - - a_choice + - val1 + - val2 ---- == Example with all variables modifiable @@ -14,7 +15,9 @@ rougail: # Rougail --- rougail: # Rougail variable1: # A first variable - - a_choice + - val1 + - val2 variable2: # A second variable - - a_choice + - val1 + - val2 ---- diff --git a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.gitlab.md b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.gitlab.md index 1c4b9d15b..5eb2945a7 100644 --- a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.gitlab.md @@ -4,7 +4,8 @@ --- rougail: # Rougail variable1: # A first variable - - a_choice + - val1 + - val2 ``` @@ -14,9 +15,11 @@ rougail: # Rougail --- rougail: # Rougail variable1: # A first variable - - a_choice + - val1 + - val2 variable2: # A second variable - - a_choice + - val1 + - val2 ``` diff --git a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.html b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.html index a597799dc..ff1ce7cfc 100644 --- a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.html +++ b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.html @@ -2,10 +2,13 @@ 
    rougail:                      # Rougail
   variable1:                  # A first variable
-    - a_choice

    Example with all variables modifiable

    + - val1 + - val2

    Example with all variables modifiable

    rougail:                      # Rougail
   variable1:                  # A first variable
-    - a_choice
+    - val1
+    - val2
   variable2:                  # A second variable
-    - a_choice
    \ No newline at end of file + - val1 + - val2 \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.md b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.md index 789216f74..10a85fe1b 100644 --- a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.md +++ b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.md @@ -4,7 +4,8 @@ --- rougail: # Rougail variable1: # A first variable - - a_choice + - val1 + - val2 ``` # Example with all variables modifiable @@ -12,7 +13,9 @@ rougail: # Rougail --- rougail: # Rougail variable1: # A first variable - - a_choice + - val1 + - val2 variable2: # A second variable - - a_choice + - val1 + - val2 ``` diff --git a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.sh b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.sh index 8241f0dcc..bdc68b6fa 100644 --- a/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.sh +++ b/tests/results/test_namespace_examples_comment/00_9choice_variable_multi.sh @@ -3,14 +3,17 @@ ---  rougail: # Rougail   variable1: # A first variable  - - a_choice  + - val1  + - val2  Example with all variables modifiable ---  rougail: # Rougail   variable1: # A first variable  - - a_choice  + - val1  + - val2   variable2: # A second variable  - - a_choice  + - val1  + - val2  diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.adoc b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.adoc index 1ce76f726..af88db181 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.adoc +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.adoc @@ -4,5 +4,5 @@ ---- --- rougail: # Rougail - var: example # A variable + var: value # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.gitlab.md b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.gitlab.md index f451f2336..5c486620e 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - var: example # A variable + var: value # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.html b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.html index 3edcf77f2..50d1794c8 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.html +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.html @@ -1,4 +1,4 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  var: example                # A variable
    \ No newline at end of file + var: value # A variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.md b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.md index 4a8e62ce1..2a2e0d90d 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.md +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.md @@ -3,5 +3,5 @@ ```yaml --- rougail: # Rougail - var: example # A variable + var: value # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.sh b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.sh index 51c40daee..836e02f55 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information.sh +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information.sh @@ -2,5 +2,5 @@ ---  rougail: # Rougail  - var: example # A variable  + var: value # A variable  diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.adoc b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.adoc index f2be9ae13..abf801317 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.adoc +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.adoc @@ -13,5 +13,5 @@ rougail: # Rougail --- rougail: # Rougail var1: example # A first variable - var2: example # A second variable + var2: value # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.gitlab.md b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.gitlab.md index be9fe90f6..8b77db5bd 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.gitlab.md @@ -13,7 +13,7 @@ rougail: # Rougail --- rougail: # Rougail var1: example # A first variable - var2: example # A second variable + var2: value # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.html b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.html index 4671f759b..1a0d29edc 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.html +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.html @@ -5,4 +5,4 @@ 
    rougail:                      # Rougail
   var1: example               # A first variable
-  var2: example               # A second variable
    \ No newline at end of file + var2: value # A second variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.md b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.md index 9089b9dec..bb8e037e4 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.md +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.md @@ -11,5 +11,5 @@ rougail: # Rougail --- rougail: # Rougail var1: example # A first variable - var2: example # A second variable + var2: value # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.sh b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.sh index 854667e2d..5800ddb9f 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.sh +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation_information_other_variable.sh @@ -9,5 +9,5 @@ ---  rougail: # Rougail   var1: example # A first variable  - var2: example # A second variable  + var2: value # A second variable  diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.adoc b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.adoc index f2be9ae13..abf801317 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.adoc +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.adoc @@ -13,5 +13,5 @@ rougail: # Rougail --- rougail: # Rougail var1: example # A first variable - var2: example # A second variable + var2: value # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.gitlab.md b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.gitlab.md index be9fe90f6..8b77db5bd 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.gitlab.md @@ -13,7 +13,7 @@ rougail: # Rougail --- rougail: # Rougail var1: example # A first variable - var2: example # A second variable + var2: value # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.html b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.html index 4671f759b..1a0d29edc 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.html +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.html @@ -5,4 +5,4 @@ 
    rougail:                      # Rougail
   var1: example               # A first variable
-  var2: example               # A second variable
    \ No newline at end of file + var2: value # A second variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.md b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.md index 9089b9dec..bb8e037e4 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.md +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.md @@ -11,5 +11,5 @@ rougail: # Rougail --- rougail: # Rougail var1: example # A first variable - var2: example # A second variable + var2: value # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.sh b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.sh index 854667e2d..5800ddb9f 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.sh +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable.sh @@ -9,5 +9,5 @@ ---  rougail: # Rougail   var1: example # A first variable  - var2: example # A second variable  + var2: value # A second variable  diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.adoc b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.adoc index f2be9ae13..efdaff9ca 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.adoc +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.adoc @@ -5,6 +5,7 @@ --- rougail: # Rougail var1: example # A first variable + var2: example # A second variable ---- == Example with all variables modifiable diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.gitlab.md b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.gitlab.md index be9fe90f6..3eb6bcc89 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.gitlab.md @@ -4,6 +4,7 @@ --- rougail: # Rougail var1: example # A first variable + var2: example # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.html b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.html index 4671f759b..1f5a51905 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.html +++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.html @@ -1,7 +1,8 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  var1: example               # A first variable

    Example with all variables modifiable

    + var1: example # A first variable + var2: example # A second variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1: example               # A first variable
diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.md b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.md
index 9089b9dec..83656bbba 100644
--- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.md
+++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.md
@@ -4,6 +4,7 @@
 ---
 rougail:                      # Rougail
   var1: example               # A first variable
+  var2: example               # A second variable
 ```
 # Example with all variables modifiable
 
diff --git a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.sh b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.sh
index 854667e2d..3618ae5ee 100644
--- a/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.sh
+++ b/tests/results/test_namespace_examples_comment/00_9default_information_other_variable2.sh
@@ -3,6 +3,7 @@
 ---                                                                             
 rougail:                      # Rougail                                         
   var1: example               # A first variable                                
+  var2: example               # A second variable                               
 
 Example with all variables modifiable
 
diff --git a/tests/results/test_namespace_examples_comment/01_6custom_multi.adoc b/tests/results/test_namespace_examples_comment/01_6custom_multi.adoc
index 2c632b339..03998b44e 100644
--- a/tests/results/test_namespace_examples_comment/01_6custom_multi.adoc
+++ b/tests/results/test_namespace_examples_comment/01_6custom_multi.adoc
@@ -5,7 +5,7 @@
 ---
 rougail:                      # Rougail
   custom1:                    # A first custom variable
-    - xxx
+    - example
 ----
 == Example with all variables modifiable
 
@@ -14,7 +14,7 @@ rougail:                      # Rougail
 ---
 rougail:                      # Rougail
   custom1:                    # A first custom variable
-    - xxx
+    - example
   custom2:                    # A second custom variable
     - value
 ----
diff --git a/tests/results/test_namespace_examples_comment/01_6custom_multi.gitlab.md b/tests/results/test_namespace_examples_comment/01_6custom_multi.gitlab.md
index 430ea29e0..29eee6539 100644
--- a/tests/results/test_namespace_examples_comment/01_6custom_multi.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/01_6custom_multi.gitlab.md
@@ -4,7 +4,7 @@
 ---
 rougail:                      # Rougail
   custom1:                    # A first custom variable
-    - xxx
+    - example
 ```
 
 
@@ -14,7 +14,7 @@ rougail:                      # Rougail
 ---
 rougail:                      # Rougail
   custom1:                    # A first custom variable
-    - xxx
+    - example
   custom2:                    # A second custom variable
     - value
 ```
diff --git a/tests/results/test_namespace_examples_comment/01_6custom_multi.html b/tests/results/test_namespace_examples_comment/01_6custom_multi.html
index 351597ec6..03eae9d96 100644
--- a/tests/results/test_namespace_examples_comment/01_6custom_multi.html
+++ b/tests/results/test_namespace_examples_comment/01_6custom_multi.html
@@ -2,10 +2,10 @@
 
 
    rougail:                      # Rougail
   custom1:                    # A first custom variable
-    - xxx
    Example with all variables modifiable
    
+    - example

    Example with all variables modifiable

    rougail:                      # Rougail
   custom1:                    # A first custom variable
-    - xxx
+    - example
   custom2:                    # A second custom variable
     - value
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/01_6custom_multi.md b/tests/results/test_namespace_examples_comment/01_6custom_multi.md index 9ecaf68c6..17069d49b 100644 --- a/tests/results/test_namespace_examples_comment/01_6custom_multi.md +++ b/tests/results/test_namespace_examples_comment/01_6custom_multi.md @@ -4,7 +4,7 @@ --- rougail: # Rougail custom1: # A first custom variable - - xxx + - example ``` # Example with all variables modifiable @@ -12,7 +12,7 @@ rougail: # Rougail --- rougail: # Rougail custom1: # A first custom variable - - xxx + - example custom2: # A second custom variable - value ``` diff --git a/tests/results/test_namespace_examples_comment/01_6custom_multi.sh b/tests/results/test_namespace_examples_comment/01_6custom_multi.sh index ede08ed5a..b2dca0ef8 100644 --- a/tests/results/test_namespace_examples_comment/01_6custom_multi.sh +++ b/tests/results/test_namespace_examples_comment/01_6custom_multi.sh @@ -3,14 +3,14 @@ ---  rougail: # Rougail   custom1: # A first custom variable  - - xxx  + - example  Example with all variables modifiable ---  rougail: # Rougail   custom1: # A first custom variable  - - xxx  + - example   custom2: # A second custom variable   - value  diff --git a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.adoc b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.adoc index 7d30fbb7b..8c56d3cba 100644 --- a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.adoc +++ b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.adoc @@ -5,5 +5,5 @@ --- rougail: # Rougail variable: # A variable - - example + - value ---- diff --git a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.gitlab.md b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.gitlab.md index f5adda468..397c4ecaf 100644 --- a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.gitlab.md +++ b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.gitlab.md @@ -4,7 +4,7 @@ --- rougail: # Rougail variable: # A variable - - example + - value ``` diff --git a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.html b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.html index 86c42d32a..f8c55e172 100644 --- a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.html +++ b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.html @@ -2,4 +2,4 @@ 
    rougail:                      # Rougail
   variable:                   # A variable
-    - example
    \ No newline at end of file + - value \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.md b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.md index 38d6fd79a..c0460126d 100644 --- a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.md +++ b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.md @@ -4,5 +4,5 @@ --- rougail: # Rougail variable: # A variable - - example + - value ``` diff --git a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.sh b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.sh index 9055d6845..bc1888401 100644 --- a/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.sh +++ b/tests/results/test_namespace_examples_comment/01_8calculation_information_multi.sh @@ -3,5 +3,5 @@ ---  rougail: # Rougail   variable: # A variable  - - example  + - value  diff --git a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.adoc b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.adoc index a2bdb8076..c2ad75957 100644 --- a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.adoc +++ b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - variable2: a_choice # A second variable + variable2: a # A second variable ---- == Example with all variables modifiable @@ -16,5 +16,5 @@ rougail: # Rougail - a - b - c - variable2: a_choice # A second variable + variable2: a # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.gitlab.md b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.gitlab.md index 17a8a3624..9279cefa8 100644 --- a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.gitlab.md +++ b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - variable2: a_choice # A second variable + variable2: a # A second variable ``` @@ -16,7 +16,7 @@ rougail: # Rougail - a - b - c - variable2: a_choice # A second variable + variable2: a # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.html b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.html index fa95a74f0..abaea01f3 100644 --- a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.html +++ b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.html @@ -1,11 +1,11 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  variable2: a_choice         # A second variable

    Example with all variables modifiable

    + variable2: a # A second variable

    Example with all variables modifiable

    rougail:                      # Rougail
   variable1:                  # A first variable
     - a
     - b
     - c
-  variable2: a_choice         # A second variable
    \ No newline at end of file + variable2: a # A second variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.md b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.md index bc175ff12..ac1cfe17e 100644 --- a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.md +++ b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - variable2: a_choice # A second variable + variable2: a # A second variable ``` # Example with all variables modifiable @@ -14,5 +14,5 @@ rougail: # Rougail - a - b - c - variable2: a_choice # A second variable + variable2: a # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.sh b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.sh index 6de1739b9..fcc34a412 100644 --- a/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.sh +++ b/tests/results/test_namespace_examples_comment/01_9choice_variable_multi.sh @@ -2,7 +2,7 @@ ---  rougail: # Rougail  - variable2: a_choice # A second variable  + variable2: a # A second variable  Example with all variables modifiable @@ -12,5 +12,5 @@  - a   - b   - c  - variable2: a_choice # A second variable  + variable2: a # A second variable  diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.adoc b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.adoc index 7b8424ef4..984801fcc 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.adoc +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - var2: example # A second variable ----- == Example with all variables modifiable [,yaml] @@ -13,6 +5,5 @@ rougail: # Rougail --- rougail: # Rougail var1: value # A first variable - var2: example # A second variable var3: value # A third variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.gitlab.md b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.gitlab.md index 51e471798..58b73d812 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail var1: value # A first variable - var2: example # A second variable var3: value # A third variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.html b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.html index b51fc03e3..907251473 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.html +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.html @@ -1,9 +1,5 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:                      # Rougail
-  var2: example               # A second variable

    Example with all variables modifiable

    +

    Example with all variables modifiable

    rougail:                      # Rougail
   var1: value                 # A first variable
-  var2: example               # A second variable
   var3: value                 # A third variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.md b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.md index 4c702fcba..e3bea8fec 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.md +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.md @@ -1,16 +1,8 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var2: example # A second variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail var1: value # A first variable - var2: example # A second variable var3: value # A third variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.sh b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.sh index 27fea1656..a816c070b 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.sh +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden.sh @@ -1,14 +1,7 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - var2: example # A second variable  - Example with all variables modifiable ---  rougail: # Rougail   var1: value # A first variable  - var2: example # A second variable   var3: value # A third variable  diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.adoc b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.adoc index 9f5b009f0..984801fcc 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.adoc +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - var2: example # A second variable ----- == Example with all variables modifiable [,yaml] @@ -13,6 +5,5 @@ rougail: # Rougail --- rougail: # Rougail var1: value # A first variable - var2: example # A second variable - var3: example # A third variable + var3: value # A third variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.gitlab.md b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.gitlab.md index 8a76a6661..58b73d812 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.gitlab.md @@ -1,20 +1,10 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail var1: value # A first variable - var2: example # A second variable - var3: example # A third variable + var3: value # A third variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.html b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.html index 57b786958..907251473 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.html +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.html @@ -1,9 +1,5 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:                      # Rougail
-  var2: example               # A second variable

    Example with all variables modifiable

    +

    Example with all variables modifiable

    rougail:                      # Rougail
   var1: value                 # A first variable
-  var2: example               # A second variable
-  var3: example               # A third variable
    \ No newline at end of file + var3: value # A third variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.md b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.md index 8665f489f..e3bea8fec 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.md +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.md @@ -1,16 +1,8 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var2: example # A second variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail var1: value # A first variable - var2: example # A second variable - var3: example # A third variable + var3: value # A third variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.sh b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.sh index 1de1910a5..a816c070b 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.sh +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_2.sh @@ -1,14 +1,7 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - var2: example # A second variable  - Example with all variables modifiable ---  rougail: # Rougail   var1: value # A first variable  - var2: example # A second variable  - var3: example # A third variable  + var3: value # A third variable  diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.adoc b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.adoc index c20e28ead..16f0fd97d 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.adoc +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - var3: example # A third variable ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: # Rougail --- rougail: # Rougail var1: value # A first variable - var3: example # A third variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.gitlab.md b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.gitlab.md index f99ff6f39..09ec1dd7a 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var3: example # A third variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail var1: value # A first variable - var3: example # A third variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.html b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.html index 7c10767eb..e3bf48759 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.html +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:                      # Rougail
-  var3: example               # A third variable

    Example with all variables modifiable

    - -
    rougail:                      # Rougail
-  var1: value                 # A first variable
-  var3: example               # A third variable
    \ No newline at end of file + var1: value # A first variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.md b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.md index b22fa5eaa..5323d3254 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.md +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var3: example # A third variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail var1: value # A first variable - var3: example # A third variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.sh b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.sh index b3e920445..a7ff7423a 100644 --- a/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.sh +++ b/tests/results/test_namespace_examples_comment/04_1default_calculation_hidden_5.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - var3: example # A third variable  - Example with all variables modifiable ---  rougail: # Rougail   var1: value # A first variable  - var3: example # A third variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.adoc index 6d43781a6..f092c574c 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.adoc @@ -5,7 +5,6 @@ --- rougail: # Rougail variable1: example # A first variable - variable2: example # A seconde variable ---- == Example with all variables modifiable @@ -15,5 +14,4 @@ rougail: # Rougail rougail: # Rougail condition: no # A conditional variable variable1: example # A first variable - variable2: example # A seconde variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.gitlab.md index 2f9d6dc75..d2b719f6e 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.gitlab.md @@ -4,7 +4,6 @@ --- rougail: # Rougail variable1: example # A first variable - variable2: example # A seconde variable ``` @@ -15,7 +14,6 @@ rougail: # Rougail rougail: # Rougail condition: no # A conditional variable variable1: example # A first variable - variable2: example # A seconde variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.html index 916103307..24ab8d48c 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.html @@ -1,10 +1,8 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  variable1: example          # A first variable
-  variable2: example          # A seconde variable

    Example with all variables modifiable

    + variable1: example # A first variable

    Example with all variables modifiable

    rougail:                      # Rougail
   condition: no               # A conditional variable
-  variable1: example          # A first variable
-  variable2: example          # A seconde variable
    \ No newline at end of file + variable1: example # A first variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.md index a0ba099a5..2bc6cacfb 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.md @@ -4,7 +4,6 @@ --- rougail: # Rougail variable1: example # A first variable - variable2: example # A seconde variable ``` # Example with all variables modifiable @@ -13,5 +12,4 @@ rougail: # Rougail rougail: # Rougail condition: no # A conditional variable variable1: example # A first variable - variable2: example # A seconde variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.sh index 9a07ebeb2..c67324a6f 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_boolean.sh @@ -3,7 +3,6 @@ ---  rougail: # Rougail   variable1: example # A first variable  - variable2: example # A seconde variable  Example with all variables modifiable @@ -11,5 +10,4 @@ rougail: # Rougail   condition: no # A conditional variable   variable1: example # A first variable  - variable2: example # A seconde variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.adoc index 866a4ab27..9b3f26361 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.adoc @@ -5,6 +5,4 @@ --- rougail: # Rougail condition: no # A condition - var1: example # A first variable - var2: example # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.gitlab.md index 8ccccd5ff..d9a049a7c 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.gitlab.md @@ -4,8 +4,6 @@ --- rougail: # Rougail condition: no # A condition - var1: example # A first variable - var2: example # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.html index d9480303e..95973e2b7 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.html @@ -1,6 +1,4 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  condition: no               # A condition
-  var1: example               # A first variable
-  var2: example               # A second variable
    \ No newline at end of file + condition: no # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.md index 494bf32a1..9b2c3501c 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.md @@ -4,6 +4,4 @@ --- rougail: # Rougail condition: no # A condition - var1: example # A first variable - var2: example # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.sh index 194893bca..4c5863c99 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_optional.sh @@ -3,6 +3,4 @@ ---  rougail: # Rougail   condition: no # A condition  - var1: example # A first variable  - var2: example # A second variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.adoc index 3f8f4b17c..47d0364b2 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - variable: example # A variable ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: # Rougail --- rougail: # Rougail condition: true # A condition - variable: example # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.gitlab.md index cc6fb11e0..7624188c5 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable: example # A variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable: example # A variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.html index 5fa042ba6..499fc9af0 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:                      # Rougail
-  variable: example           # A variable

    Example with all variables modifiable

    - -
    rougail:                      # Rougail
-  condition: true             # A condition
-  variable: example           # A variable
    \ No newline at end of file + condition: true # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.md index 3ef709a5b..d26bd5b12 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable: example # A variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.sh index b3e26ba63..12e4e5734 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable10.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - variable: example # A variable  - Example with all variables modifiable ---  rougail: # Rougail   condition: true # A condition  - variable: example # A variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.adoc index 3f8f4b17c..47d0364b2 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - variable: example # A variable ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: # Rougail --- rougail: # Rougail condition: true # A condition - variable: example # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.gitlab.md index cc6fb11e0..7624188c5 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable: example # A variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable: example # A variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.html index 5fa042ba6..499fc9af0 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:                      # Rougail
-  variable: example           # A variable

    Example with all variables modifiable

    - -
    rougail:                      # Rougail
-  condition: true             # A condition
-  variable: example           # A variable
    \ No newline at end of file + condition: true # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.md index 3ef709a5b..d26bd5b12 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable: example # A variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.sh index b3e26ba63..12e4e5734 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable2.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - variable: example # A variable  - Example with all variables modifiable ---  rougail: # Rougail   condition: true # A condition  - variable: example # A variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.adoc index 576a069a2..0a0231d73 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - variable: example # A variable ----- == Example with all variables modifiable [,yaml] @@ -13,5 +5,4 @@ rougail: # Rougail --- rougail: # Rougail condition: yes # A condition - variable: example # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.gitlab.md index 6251c31af..656d59519 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.gitlab.md @@ -1,19 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable: example # A variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail condition: yes # A condition - variable: example # A variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.html index a485b64ee..efc40b9b2 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.html @@ -1,8 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:                      # Rougail
-  variable: example           # A variable

    Example with all variables modifiable

    - -
    rougail:                      # Rougail
-  condition: yes              # A condition
-  variable: example           # A variable
    \ No newline at end of file + condition: yes # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.md index d5b9280dc..c8af8c5b3 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.md @@ -1,15 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable: example # A variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail condition: yes # A condition - variable: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.sh index 0bb491c3e..1fd5a33bd 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable3.sh @@ -1,13 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - variable: example # A variable  - Example with all variables modifiable ---  rougail: # Rougail   condition: yes # A condition  - variable: example # A variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.adoc index fb8d106ab..47d0364b2 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.adoc @@ -1,12 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - variable1: example # A variable - variable2: example # A second variable ----- == Example with all variables modifiable [,yaml] @@ -14,6 +5,4 @@ rougail: # Rougail --- rougail: # Rougail condition: true # A condition - variable1: example # A variable - variable2: example # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md index 9725ba139..7624188c5 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.gitlab.md @@ -1,21 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable1: example # A variable - variable2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable1: example # A variable - variable2: example # A second variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.html index 636715d26..499fc9af0 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.html @@ -1,10 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:                      # Rougail
-  variable1: example          # A variable
-  variable2: example          # A second variable

    Example with all variables modifiable

    - -
    rougail:                      # Rougail
-  condition: true             # A condition
-  variable1: example          # A variable
-  variable2: example          # A second variable
    \ No newline at end of file + condition: true # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.md index 3e8aa9b08..d26bd5b12 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.md @@ -1,17 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable1: example # A variable - variable2: example # A second variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable1: example # A variable - variable2: example # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.sh index 0b4ae9337..12e4e5734 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive.sh @@ -1,15 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - variable1: example # A variable  - variable2: example # A second variable  - Example with all variables modifiable ---  rougail: # Rougail   condition: true # A condition  - variable1: example # A variable  - variable2: example # A second variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc index bdc3a8f5f..0a9dd7efc 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - variable2: example # A second variable ----- == Example with all variables modifiable [,yaml] @@ -14,5 +6,4 @@ rougail: # Rougail rougail: # Rougail condition: false # A condition variable1: disabled # A variable - variable2: example # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md index f6e9ad049..a362fac31 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.gitlab.md @@ -1,12 +1,3 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml @@ -14,7 +5,6 @@ rougail: # Rougail rougail: # Rougail condition: false # A condition variable1: disabled # A variable - variable2: example # A second variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.html index cccedc74d..8ddd0a677 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.html @@ -1,9 +1,5 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:                      # Rougail
-  variable2: example          # A second variable

    Example with all variables modifiable

    +

    Example with all variables modifiable

    rougail:                      # Rougail
   condition: false            # A condition
-  variable1: disabled         # A variable
-  variable2: example          # A second variable
    \ No newline at end of file + variable1: disabled # A variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.md index 0bb60e0a6..5f35ed6e2 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.md @@ -1,10 +1,3 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable2: example # A second variable -``` # Example with all variables modifiable ```yaml @@ -12,5 +5,4 @@ rougail: # Rougail rougail: # Rougail condition: false # A condition variable1: disabled # A variable - variable2: example # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.sh index 794192fb2..5f19e4398 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_3.sh @@ -1,14 +1,7 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - variable2: example # A second variable  - Example with all variables modifiable ---  rougail: # Rougail   condition: false # A condition   variable1: disabled # A variable  - variable2: example # A second variable  diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc index 69d70a5d2..47d0364b2 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.adoc @@ -1,11 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - variable2: example # A second variable ----- == Example with all variables modifiable [,yaml] @@ -13,6 +5,4 @@ rougail: # Rougail --- rougail: # Rougail condition: true # A condition - variable1: not_disabled # A variable - variable2: example # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md index 93e6d8374..7624188c5 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.gitlab.md @@ -1,20 +1,9 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable2: example # A second variable -``` -
    -
    Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable1: not_disabled # A variable - variable2: example # A second variable ```
    diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.html b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.html index 716b470e7..499fc9af0 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.html +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.html @@ -1,9 +1,4 @@ -

    Example with mandatory variables not filled in

    +

    Example with all variables modifiable

    rougail:                      # Rougail
-  variable2: example          # A second variable

    Example with all variables modifiable

    - -
    rougail:                      # Rougail
-  condition: true             # A condition
-  variable1: not_disabled     # A variable
-  variable2: example          # A second variable
    \ No newline at end of file + condition: true # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.md b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.md index 7ee06474a..d26bd5b12 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.md +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.md @@ -1,16 +1,7 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - variable2: example # A second variable -``` # Example with all variables modifiable ```yaml --- rougail: # Rougail condition: true # A condition - variable1: not_disabled # A variable - variable2: example # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.sh b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.sh index 6213df948..12e4e5734 100644 --- a/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.sh +++ b/tests/results/test_namespace_examples_comment/04_5disabled_calculation_variable_transitive_4.sh @@ -1,14 +1,6 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - variable2: example # A second variable  - Example with all variables modifiable ---  rougail: # Rougail   condition: true # A condition  - variable1: not_disabled # A variable  - variable2: example # A second variable  diff --git a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.adoc b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.adoc index da088216d..9b3f26361 100644 --- a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.adoc +++ b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.adoc @@ -5,6 +5,4 @@ --- rougail: # Rougail condition: no # A condition - var1: no # A first variable - var2: no # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.gitlab.md b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.gitlab.md index 6dbca1e23..d9a049a7c 100644 --- a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.gitlab.md @@ -4,8 +4,6 @@ --- rougail: # Rougail condition: no # A condition - var1: no # A first variable - var2: no # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.html b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.html index d7b0eb431..95973e2b7 100644 --- a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.html +++ b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.html @@ -1,6 +1,4 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  condition: no               # A condition
-  var1: no                    # A first variable
-  var2: no                    # A second variable
    \ No newline at end of file + condition: no # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.md b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.md index eff43a5d0..9b2c3501c 100644 --- a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.md +++ b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.md @@ -4,6 +4,4 @@ --- rougail: # Rougail condition: no # A condition - var1: no # A first variable - var2: no # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.sh b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.sh index dec08d594..4c5863c99 100644 --- a/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.sh +++ b/tests/results/test_namespace_examples_comment/04_5hidden_calculation2.sh @@ -3,6 +3,4 @@ ---  rougail: # Rougail   condition: no # A condition  - var1: no # A first variable  - var2: no # A second variable  diff --git a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.adoc b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.adoc index 3710fb095..e69de29bb 100644 --- a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.adoc +++ b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.adoc @@ -1,18 +0,0 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - family: # family - var1: example ----- -== Example with all variables modifiable - -[,yaml] ----- ---- -rougail: # Rougail - family: # family - var1: example ----- diff --git a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.gitlab.md b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.gitlab.md index 7f1b4d21e..e69de29bb 100644 --- a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.gitlab.md +++ b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.gitlab.md @@ -1,20 +0,0 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - family: # family - var1: example -``` -
    - -
    Example with all variables modifiable - -```yaml ---- -rougail: # Rougail - family: # family - var1: example -``` -
    - diff --git a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.html b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.html index d8ff86d14..e69de29bb 100644 --- a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.html +++ b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.html @@ -1,9 +0,0 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:                      # Rougail
-  family:                     # family
-    var1: example

    Example with all variables modifiable

    - -
    rougail:                      # Rougail
-  family:                     # family
-    var1: example
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.md b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.md index 1e9652576..e69de29bb 100644 --- a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.md +++ b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.md @@ -1,16 +0,0 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - family: # family - var1: example -``` -# Example with all variables modifiable - -```yaml ---- -rougail: # Rougail - family: # family - var1: example -``` diff --git a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.sh b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.sh index e26673ab2..e69de29bb 100644 --- a/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.sh +++ b/tests/results/test_namespace_examples_comment/16_2family_redefine_calculation.sh @@ -1,14 +0,0 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - family: # family  - var1: example  - -Example with all variables modifiable - ----  -rougail: # Rougail  - family: # family  - var1: example  - diff --git a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.adoc b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.adoc index 3710fb095..7fb82f5cf 100644 --- a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.adoc +++ b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - family: # family + family: var1: example ---- == Example with all variables modifiable @@ -13,6 +13,6 @@ rougail: # Rougail ---- --- rougail: # Rougail - family: # family + family: var1: example ---- diff --git a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.gitlab.md b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.gitlab.md index 7f1b4d21e..8876942ee 100644 --- a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.gitlab.md +++ b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - family: # family + family: var1: example ``` @@ -13,7 +13,7 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - family: # family + family: var1: example ``` diff --git a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.html b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.html index d8ff86d14..985f968da 100644 --- a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.html +++ b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example

    Example with all variables modifiable

    rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.md b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.md index 1e9652576..44e15adc4 100644 --- a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.md +++ b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - family: # family + family: var1: example ``` # Example with all variables modifiable @@ -11,6 +11,6 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - family: # family + family: var1: example ``` diff --git a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.sh b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.sh index e26673ab2..94e743a5a 100644 --- a/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.sh +++ b/tests/results/test_namespace_examples_comment/16_3family_empty_at_ends.sh @@ -2,13 +2,13 @@ ---  rougail: # Rougail  - family: # family  + family:   var1: example  Example with all variables modifiable ---  rougail: # Rougail  - family: # family  + family:   var1: example  diff --git a/tests/results/test_namespace_examples_comment/16_5redefine_choice.adoc b/tests/results/test_namespace_examples_comment/16_5redefine_choice.adoc index d3921914b..6b5bef121 100644 --- a/tests/results/test_namespace_examples_comment/16_5redefine_choice.adoc +++ b/tests/results/test_namespace_examples_comment/16_5redefine_choice.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - variable: a_choice # A variable + variable: a # A variable ---- == Example with all variables modifiable @@ -12,5 +12,5 @@ rougail: # Rougail ---- --- rougail: # Rougail - variable: a_choice # A variable + variable: a # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/16_5redefine_choice.gitlab.md b/tests/results/test_namespace_examples_comment/16_5redefine_choice.gitlab.md index 8d3a2afad..33a6cec23 100644 --- a/tests/results/test_namespace_examples_comment/16_5redefine_choice.gitlab.md +++ b/tests/results/test_namespace_examples_comment/16_5redefine_choice.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - variable: a_choice # A variable + variable: a # A variable ``` @@ -12,7 +12,7 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - variable: a_choice # A variable + variable: a # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/16_5redefine_choice.html b/tests/results/test_namespace_examples_comment/16_5redefine_choice.html index 3bac599af..514b67fd8 100644 --- a/tests/results/test_namespace_examples_comment/16_5redefine_choice.html +++ b/tests/results/test_namespace_examples_comment/16_5redefine_choice.html @@ -1,7 +1,7 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  variable: a_choice          # A variable

    Example with all variables modifiable

    + variable: a # A variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  variable: a_choice          # A variable
    \ No newline at end of file + variable: a # A variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/16_5redefine_choice.md b/tests/results/test_namespace_examples_comment/16_5redefine_choice.md index 2e4e6007a..bef3e9dae 100644 --- a/tests/results/test_namespace_examples_comment/16_5redefine_choice.md +++ b/tests/results/test_namespace_examples_comment/16_5redefine_choice.md @@ -3,12 +3,12 @@ ```yaml --- rougail: # Rougail - variable: a_choice # A variable + variable: a # A variable ``` # Example with all variables modifiable ```yaml --- rougail: # Rougail - variable: a_choice # A variable + variable: a # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/16_5redefine_choice.sh b/tests/results/test_namespace_examples_comment/16_5redefine_choice.sh index 9283dfbae..075363641 100644 --- a/tests/results/test_namespace_examples_comment/16_5redefine_choice.sh +++ b/tests/results/test_namespace_examples_comment/16_5redefine_choice.sh @@ -2,11 +2,11 @@ ---  rougail: # Rougail  - variable: a_choice # A variable  + variable: a # A variable  Example with all variables modifiable ---  rougail: # Rougail  - variable: a_choice # A variable  + variable: a # A variable  diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.adoc b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.adoc index e0c7049ca..579f9f485 100644 --- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.adoc +++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - my_family: # my_family + my_family: dynamic: - val1 - val2 diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.gitlab.md b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.gitlab.md index 9eeb5eb44..f29a15475 100644 --- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.gitlab.md +++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - my_family: # my_family + my_family: dynamic: - val1 - val2 diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.html b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.html index bab555651..9e4aa9214 100644 --- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.html +++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.html @@ -1,7 +1,7 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  my_family:                  # my_family
+  my_family:
     dynamic:
       - val1
       - val2
diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.md b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.md
index a72831ed0..f2afdff56 100644
--- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.md
+++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  my_family:                  # my_family
+  my_family:
     dynamic:
       - val1
       - val2
diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.sh b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.sh
index 01d292f74..ba135a84f 100644
--- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.sh
+++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_dynamic.sh
@@ -2,7 +2,7 @@
 
 ---                                                                             
 rougail:                      # Rougail                                         
-  my_family:                  # my_family                                       
+  my_family:                                                                    
     dynamic:                                                                    
       - val1                                                                    
       - val2                                                                    
diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.adoc b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.adoc
index 1cc2263ce..5bda38fa1 100644
--- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.adoc
+++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.adoc
@@ -4,6 +4,6 @@
 ----
 ---
 rougail:                      # Rougail
-  my_family:                  # my_family
+  my_family:
     default: true
 ----
diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.gitlab.md b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.gitlab.md
index 68d444469..f0fe3374e 100644
--- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  my_family:                  # my_family
+  my_family:
     default: true
 ```
 
diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.html b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.html
index 526737d31..b1b9c6941 100644
--- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.html
+++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.html
@@ -1,5 +1,5 @@
 
    Example with all variables modifiable
    
 
 
    rougail:                      # Rougail
-  my_family:                  # my_family
+  my_family:
     default: true
    
\ No newline at end of file
diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.md b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.md
index aaf2afed5..7781510e8 100644
--- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.md
+++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.md
@@ -3,6 +3,6 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  my_family:                  # my_family
+  my_family:
     default: true
 ```
diff --git a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.sh b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.sh
index 87f7e0cb5..09197276f 100644
--- a/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.sh
+++ b/tests/results/test_namespace_examples_comment/20_2family_looks_like_variable.sh
@@ -2,6 +2,6 @@
 
 ---                                                                             
 rougail:                      # Rougail                                         
-  my_family:                  # my_family                                       
+  my_family:                                                                    
     default: true                                                               
 
diff --git a/tests/results/test_namespace_examples_comment/20_9default_information_parent.adoc b/tests/results/test_namespace_examples_comment/20_9default_information_parent.adoc
index 75426c521..615569d79 100644
--- a/tests/results/test_namespace_examples_comment/20_9default_information_parent.adoc
+++ b/tests/results/test_namespace_examples_comment/20_9default_information_parent.adoc
@@ -4,7 +4,7 @@
 ----
 ---
 rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example             # A first variable
 ----
 == Example with all variables modifiable
@@ -13,7 +13,7 @@ rougail:                      # Rougail
 ----
 ---
 rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example             # A first variable
-    var2: example             # A second variable
+    var2: value               # A second variable
 ----
diff --git a/tests/results/test_namespace_examples_comment/20_9default_information_parent.gitlab.md b/tests/results/test_namespace_examples_comment/20_9default_information_parent.gitlab.md
index e0d87fb92..a1c0229b4 100644
--- a/tests/results/test_namespace_examples_comment/20_9default_information_parent.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/20_9default_information_parent.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example             # A first variable
 ```
 
@@ -13,9 +13,9 @@ rougail:                      # Rougail
 ```yaml
 ---
 rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example             # A first variable
-    var2: example             # A second variable
+    var2: value               # A second variable
 ```
 
 
diff --git a/tests/results/test_namespace_examples_comment/20_9default_information_parent.html b/tests/results/test_namespace_examples_comment/20_9default_information_parent.html
index 55c9c746a..24c5ae492 100644
--- a/tests/results/test_namespace_examples_comment/20_9default_information_parent.html
+++ b/tests/results/test_namespace_examples_comment/20_9default_information_parent.html
@@ -1,10 +1,10 @@
 
    Example with mandatory variables not filled in
    
 
 
    rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example             # A first variable
    Example with all variables modifiable
    
 
 
    rougail:                      # Rougail
-  family:                     # family
+  family:
     var1: example             # A first variable
-    var2: example             # A second variable
    
\ No newline at end of file
+    var2: value               # A second variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/20_9default_information_parent.md b/tests/results/test_namespace_examples_comment/20_9default_information_parent.md index 74d83913d..7bc0d07a5 100644 --- a/tests/results/test_namespace_examples_comment/20_9default_information_parent.md +++ b/tests/results/test_namespace_examples_comment/20_9default_information_parent.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - family: # family + family: var1: example # A first variable ``` # Example with all variables modifiable @@ -11,7 +11,7 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - family: # family + family: var1: example # A first variable - var2: example # A second variable + var2: value # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/20_9default_information_parent.sh b/tests/results/test_namespace_examples_comment/20_9default_information_parent.sh index 59245b6c7..279ce3a8e 100644 --- a/tests/results/test_namespace_examples_comment/20_9default_information_parent.sh +++ b/tests/results/test_namespace_examples_comment/20_9default_information_parent.sh @@ -2,14 +2,14 @@ ---  rougail: # Rougail  - family: # family  + family:   var1: example # A first variable  Example with all variables modifiable ---  rougail: # Rougail  - family: # family  + family:   var1: example # A first variable  - var2: example # A second variable  + var2: value # A second variable  diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.adoc b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.adoc index d927bad9b..7b23e15d5 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.adoc +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.adoc @@ -5,6 +5,4 @@ --- rougail: # Rougail condition: false # A conditional variable - family: # A family - variable: example # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.gitlab.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.gitlab.md index 49bc2a64d..ad0c7c507 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.gitlab.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.gitlab.md @@ -4,8 +4,6 @@ --- rougail: # Rougail condition: false # A conditional variable - family: # A family - variable: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.html b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.html index 404c5c8f0..002dcde41 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.html +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.html @@ -1,6 +1,4 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  condition: false            # A conditional variable
-  family:                     # A family
-    variable: example         # A variable
    \ No newline at end of file + condition: false # A conditional variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.md index 64ecbc9fb..f270bb63b 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.md @@ -4,6 +4,4 @@ --- rougail: # Rougail condition: false # A conditional variable - family: # A family - variable: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.sh b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.sh index 3a42eddba..0d88a7187 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.sh +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_boolean.sh @@ -3,6 +3,4 @@ ---  rougail: # Rougail   condition: false # A conditional variable  - family: # A family  - variable: example # A variable  diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.adoc b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.adoc index 6c4fed69e..56d54afc5 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.adoc +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.adoc @@ -5,7 +5,7 @@ --- rougail: # Rougail family: # Possibly hidden family - subfamily: # subfamily + subfamily: var1: example # A variable ---- == Example with all variables modifiable @@ -16,6 +16,6 @@ rougail: # Rougail rougail: # Rougail condition: no # The variable use has condition family: # Possibly hidden family - subfamily: # subfamily + subfamily: var1: example # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md index 0c39df495..40362c6ab 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.gitlab.md @@ -4,7 +4,7 @@ --- rougail: # Rougail family: # Possibly hidden family - subfamily: # subfamily + subfamily: var1: example # A variable ``` @@ -16,7 +16,7 @@ rougail: # Rougail rougail: # Rougail condition: no # The variable use has condition family: # Possibly hidden family - subfamily: # subfamily + subfamily: var1: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.html b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.html index 92afc0ae2..afc1d303e 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.html +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.html @@ -2,11 +2,11 @@ 
    rougail:                      # Rougail
   family:                     # Possibly hidden family
-    subfamily:                # subfamily
+    subfamily:
       var1: example           # A variable

    Example with all variables modifiable

    rougail:                      # Rougail
   condition: no               # The variable use has condition
   family:                     # Possibly hidden family
-    subfamily:                # subfamily
+    subfamily:
       var1: example           # A variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.md index 0c24b0742..fbcf6aae9 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.md @@ -4,7 +4,7 @@ --- rougail: # Rougail family: # Possibly hidden family - subfamily: # subfamily + subfamily: var1: example # A variable ``` # Example with all variables modifiable @@ -14,6 +14,6 @@ rougail: # Rougail rougail: # Rougail condition: no # The variable use has condition family: # Possibly hidden family - subfamily: # subfamily + subfamily: var1: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.sh b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.sh index e098a47ed..776eb42bb 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.sh +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_sub_family.sh @@ -3,7 +3,7 @@ ---  rougail: # Rougail   family: # Possibly hidden family  - subfamily: # subfamily  + subfamily:   var1: example # A variable  Example with all variables modifiable @@ -12,6 +12,6 @@ rougail: # Rougail   condition: no # The variable use has condition   family: # Possibly hidden family  - subfamily: # subfamily  + subfamily:   var1: example # A variable  diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc index 4c8601f80..e49375fbe 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.adoc @@ -5,7 +5,4 @@ --- rougail: # Rougail condition: true # The variable use has condition - family: # Possibly hidden family - subfamily: # A subfamily - var1: example # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md index 7e42c73b8..9a67a4cda 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.gitlab.md @@ -4,9 +4,6 @@ --- rougail: # Rougail condition: true # The variable use has condition - family: # Possibly hidden family - subfamily: # A subfamily - var1: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.html b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.html index b96805d11..73e6924aa 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.html +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.html @@ -1,7 +1,4 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  condition: true             # The variable use has condition
-  family:                     # Possibly hidden family
-    subfamily:                # A subfamily
-      var1: example           # A variable
    \ No newline at end of file + condition: true # The variable use has condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.md index 74b8c89a7..3b1aeeecb 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.md @@ -4,7 +4,4 @@ --- rougail: # Rougail condition: true # The variable use has condition - family: # Possibly hidden family - subfamily: # A subfamily - var1: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.sh b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.sh index 3a62a3f95..fc0752096 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.sh +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_variable_sub_family.sh @@ -3,7 +3,4 @@ ---  rougail: # Rougail   condition: true # The variable use has condition  - family: # Possibly hidden family  - subfamily: # A subfamily  - var1: example # A variable  diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.adoc b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.adoc index 3437a92e1..d73087ed3 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.adoc +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.adoc @@ -6,6 +6,4 @@ rougail: # Rougail condition1: false # A first conditional variable condition2: false # A second conditional variable - family: # A family - variable: example # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.gitlab.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.gitlab.md index 949d1df2b..93e43d704 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.gitlab.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.gitlab.md @@ -5,8 +5,6 @@ rougail: # Rougail condition1: false # A first conditional variable condition2: false # A second conditional variable - family: # A family - variable: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.html b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.html index 41c75b2d6..0224d27c1 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.html +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.html @@ -2,6 +2,4 @@ 
    rougail:                      # Rougail
   condition1: false           # A first conditional variable
-  condition2: false           # A second conditional variable
-  family:                     # A family
-    variable: example         # A variable
    \ No newline at end of file + condition2: false # A second conditional variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.md b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.md index 2aba4c5ef..1d658110b 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.md +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.md @@ -5,6 +5,4 @@ rougail: # Rougail condition1: false # A first conditional variable condition2: false # A second conditional variable - family: # A family - variable: example # A variable ``` diff --git a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.sh b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.sh index cc189d0c5..773f897a6 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.sh +++ b/tests/results/test_namespace_examples_comment/24_0family_hidden_condition_with_variable.sh @@ -4,6 +4,4 @@ rougail: # Rougail   condition1: false # A first conditional variable   condition2: false # A second conditional variable  - family: # A family  - variable: example # A variable  diff --git a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.adoc b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.adoc index e802d9384..295fc3c87 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.adoc +++ b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.adoc @@ -1,3 +1,11 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: # Rougail + var: example # A variable +---- == Example with all variables modifiable [,yaml] diff --git a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.gitlab.md b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.gitlab.md index 885f5c744..7aa77af95 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.gitlab.md +++ b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.gitlab.md @@ -1,3 +1,12 @@ +
    Example with mandatory variables not filled in + +```yaml +--- +rougail: # Rougail + var: example # A variable +``` +
    +
    Example with all variables modifiable ```yaml diff --git a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.html b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.html index 8c8b40fa6..b343aae3c 100644 --- a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.html +++ b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.html @@ -1,4 +1,7 @@ -

    Example with all variables modifiable

    +

    Example with mandatory variables not filled in

    + +
    rougail:                      # Rougail
+  var: example                # A variable

    Example with all variables modifiable

    rougail:                      # Rougail
   condition: true             # A condition
diff --git a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.md b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.md
index d1e07d963..9a894048f 100644
--- a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.md
+++ b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.md
@@ -1,3 +1,10 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:                      # Rougail
+  var: example                # A variable
+```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.sh b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.sh
index 1c464a5b0..e147eceef 100644
--- a/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.sh
+++ b/tests/results/test_namespace_examples_comment/24_0family_mandatory_condition_variable.sh
@@ -1,3 +1,9 @@
+Example with mandatory variables not filled in
+
+---                                                                             
+rougail:                      # Rougail                                         
+  var: example                # A variable                                      
+
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.adoc b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.adoc
index 3412d2951..fa0f3965b 100644
--- a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.adoc
+++ b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.adoc
@@ -4,7 +4,7 @@
 ----
 ---
 rougail:                      # Rougail
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
@@ -16,9 +16,9 @@ rougail:                      # Rougail
 ----
 ---
 rougail:                      # Rougail
-  general:                    # general
+  general:
     mode_conteneur_actif: non # No change
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.gitlab.md b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.gitlab.md
index 408d07429..2e6e3e20f 100644
--- a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.gitlab.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
@@ -16,9 +16,9 @@ rougail:                      # Rougail
 ```yaml
 ---
 rougail:                      # Rougail
-  general:                    # general
+  general:
     mode_conteneur_actif: non # No change
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.html b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.html
index 64e774d41..2ad273cfe 100644
--- a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.html
+++ b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.html
@@ -1,16 +1,16 @@
 
    Example with mandatory variables not filled in
    
 
 
    rougail:                      # Rougail
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
         follower2: example    # Follower2
    Example with all variables modifiable
    
 
 
    rougail:                      # Rougail
-  general:                    # general
+  general:
     mode_conteneur_actif: non # No change
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.md b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.md
index c129e6550..cf989c2ec 100644
--- a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.md
+++ b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.md
@@ -3,7 +3,7 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
@@ -14,9 +14,9 @@ rougail:                      # Rougail
 ```yaml
 ---
 rougail:                      # Rougail
-  general:                    # general
+  general:
     mode_conteneur_actif: non # No change
-  general1:                   # general1
+  general1:
     leader:                   # Leader
       - leader: example       # Leader
         follower1: example    # Follower1
diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.sh b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.sh
index 6b123ac71..159aba1d1 100644
--- a/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.sh
+++ b/tests/results/test_namespace_examples_comment/40_0leadership_leader_not_multi.sh
@@ -2,7 +2,7 @@
 
 ---                                                                             
 rougail:                      # Rougail                                         
-  general1:                   # general1                                        
+  general1:                                                                     
     leader:                   # Leader                                          
       - leader: example       # Leader                                          
         follower1: example    # Follower1                                       
@@ -12,9 +12,9 @@
 
 ---                                                                             
 rougail:                      # Rougail                                         
-  general:                    # general                                         
+  general:                                                                      
     mode_conteneur_actif: non # No change                                       
-  general1:                   # general1                                        
+  general1:                                                                     
     leader:                   # Leader                                          
       - leader: example       # Leader                                          
         follower1: example    # Follower1                                       
diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.adoc b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.adoc
index 53f76dc66..a4138e0d6 100644
--- a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.adoc
+++ b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.adoc
@@ -8,5 +8,5 @@ rougail:                      # Rougail
     - leader: val1            # A leader
       follower: example       # A follower
     - leader: val2            # A leader
-      follower: example       # A follower
+      follower: example1      # A follower
 ----
diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.gitlab.md b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.gitlab.md
index fafc4f976..f19e573d7 100644
--- a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.gitlab.md
@@ -7,7 +7,7 @@ rougail:                      # Rougail
     - leader: val1            # A leader
       follower: example       # A follower
     - leader: val2            # A leader
-      follower: example       # A follower
+      follower: example1      # A follower
 ```
    diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.html b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.html index ac8495d29..3c3c20380 100644 --- a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.html +++ b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.html @@ -5,4 +5,4 @@ - leader: val1 # A leader follower: example # A follower - leader: val2 # A leader - follower: example # A follower \ No newline at end of file + follower: example1 # A follower \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.md b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.md index 2b849d040..f9585a025 100644 --- a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.md +++ b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.md @@ -7,5 +7,5 @@ rougail: # Rougail - leader: val1 # A leader follower: example # A follower - leader: val2 # A leader - follower: example # A follower + follower: example1 # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.sh b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.sh index abf713f84..73dca4dec 100644 --- a/tests/results/test_namespace_examples_comment/40_0leadership_reduce.sh +++ b/tests/results/test_namespace_examples_comment/40_0leadership_reduce.sh @@ -6,5 +6,5 @@  - leader: val1 # A leader   follower: example # A follower   - leader: val2 # A leader  - follower: example # A follower  + follower: example1 # A follower  diff --git a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.adoc b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.adoc index 932e38a1c..e91da1bdd 100644 --- a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.adoc +++ b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.adoc @@ -9,6 +9,6 @@ rougail: # Rougail follower1: example # A first follower follower2: example # A second follower - leader: val2 # A leader - follower1: example # A first follower - follower2: example # A second follower + follower1: example1 # A first follower + follower2: example1 # A second follower ---- diff --git a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.gitlab.md b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.gitlab.md index 015be639d..b793d7c94 100644 --- a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.gitlab.md +++ b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.gitlab.md @@ -8,8 +8,8 @@ rougail: # Rougail follower1: example # A first follower follower2: example # A second follower - leader: val2 # A leader - follower1: example # A first follower - follower2: example # A second follower + follower1: example1 # A first follower + follower2: example1 # A second follower ``` diff --git a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.html b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.html index cb3d2d306..eff03bf27 100644 --- a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.html +++ b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.html @@ -6,5 +6,5 @@ follower1: example # A first follower follower2: example # A second follower - leader: val2 # A leader - follower1: example # A first follower - follower2: example # A second follower \ No newline at end of file + follower1: example1 # A first follower + follower2: example1 # A second follower \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.md b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.md index d4291f546..c101a92cf 100644 --- a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.md +++ b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.md @@ -8,6 +8,6 @@ rougail: # Rougail follower1: example # A first follower follower2: example # A second follower - leader: val2 # A leader - follower1: example # A first follower - follower2: example # A second follower + follower1: example1 # A first follower + follower2: example1 # A second follower ``` diff --git a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.sh b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.sh index d36dad66e..99eb6e158 100644 --- a/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.sh +++ b/tests/results/test_namespace_examples_comment/40_2leadership_leader_calculation.sh @@ -7,6 +7,6 @@  follower1: example # A first follower   follower2: example # A second follower   - leader: val2 # A leader  - follower1: example # A first follower  - follower2: example # A second follower  + follower1: example1 # A first follower  + follower2: example1 # A second follower  diff --git a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.adoc b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.adoc index c60b873db..a7c2fbc02 100644 --- a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.adoc +++ b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.adoc @@ -1,3 +1,11 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: # Rougail + var2: true # A second variable +---- == Example with all variables modifiable [,yaml] @@ -5,5 +13,5 @@ --- rougail: # Rougail var1: yes # A first variable - var2: xxx # A second variable + var2: true # A second variable ---- diff --git a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.gitlab.md b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.gitlab.md index db839d77e..cede91ec3 100644 --- a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.gitlab.md +++ b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.gitlab.md @@ -1,10 +1,19 @@ +
    Example with mandatory variables not filled in + +```yaml +--- +rougail: # Rougail + var2: true # A second variable +``` +
    +
    Example with all variables modifiable ```yaml --- rougail: # Rougail var1: yes # A first variable - var2: xxx # A second variable + var2: true # A second variable ```
    diff --git a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.html b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.html index af0da7171..0c76af42b 100644 --- a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.html +++ b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.html @@ -1,5 +1,8 @@ -

    Example with all variables modifiable

    +

    Example with mandatory variables not filled in

    + +
    rougail:                      # Rougail
+  var2: true                  # A second variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1: yes                   # A first variable
-  var2: xxx                   # A second variable
    \ No newline at end of file + var2: true # A second variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.md b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.md index 1a6ca788a..719ecd466 100644 --- a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.md +++ b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.md @@ -1,8 +1,15 @@ +# Example with mandatory variables not filled in + +```yaml +--- +rougail: # Rougail + var2: true # A second variable +``` # Example with all variables modifiable ```yaml --- rougail: # Rougail var1: yes # A first variable - var2: xxx # A second variable + var2: true # A second variable ``` diff --git a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.sh b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.sh index 5640358fe..1bc015522 100644 --- a/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.sh +++ b/tests/results/test_namespace_examples_comment/40_8calculation_boolean_return_none.sh @@ -1,7 +1,13 @@ +Example with mandatory variables not filled in + +---  +rougail: # Rougail  + var2: true # A second variable  + Example with all variables modifiable ---  rougail: # Rougail   var1: yes # A first variable  - var2: xxx # A second variable  + var2: true # A second variable  diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc index 99f12d108..8384f4934 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.adoc @@ -4,12 +4,12 @@ ---- --- rougail: # Rougail - leader: # leader + leader: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ---- diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md index fba9514d7..de69fa935 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.gitlab.md @@ -3,14 +3,14 @@ ```yaml --- rougail: # Rougail - leader: # leader + leader: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ``` diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html index 6d78aceaa..5702add61 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.html @@ -1,11 +1,11 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  leader:                     # leader
+  leader:
     - leader: a
       follower: example
     - leader: b
-      follower: example
+      follower: example1
   variable:
-    - null
-    - null
    \ No newline at end of file + - example + - example1 \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md index 0957d433e..79a345527 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.md @@ -3,12 +3,12 @@ ```yaml --- rougail: # Rougail - leader: # leader + leader: - leader: a follower: example - leader: b - follower: example + follower: example1 variable: - - null - - null + - example + - example1 ``` diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh index af7e952dc..bd05ab8fe 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-outside-follower-no-mandatory.sh @@ -2,12 +2,12 @@ ---  rougail: # Rougail  - leader: # leader  + leader:   - leader: a   follower: example   - leader: b  - follower: example  + follower: example1   variable:  - - null  - - null  + - example  + - example1  diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc index 090339090..568ea0b4a 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.adoc @@ -8,10 +8,10 @@ rougail: # Rougail - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - - leader: null # A leader + - leader: example # A leader follower: val # A follower - - leader: null # A leader + - leader: example1 # A leader follower: val # A follower ---- diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md index 80114a0d3..542d6f369 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.gitlab.md @@ -7,11 +7,11 @@ rougail: # Rougail - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - - leader: null # A leader + - leader: example # A leader follower: val # A follower - - leader: null # A leader + - leader: example1 # A leader follower: val # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.html b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.html index 92b341de9..f1820df90 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.html +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.html @@ -5,9 +5,9 @@ - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - - leader: null # A leader + - leader: example # A leader follower: val # A follower - - leader: null # A leader + - leader: example1 # A leader follower: val # A follower \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.md b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.md index 4721f8e22..1def2e7e2 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.md +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.md @@ -7,10 +7,10 @@ rougail: # Rougail - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - - leader: null # A leader + - leader: example # A leader follower: val # A follower - - leader: null # A leader + - leader: example1 # A leader follower: val # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.sh b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.sh index d3cf23a57..6befdb8d5 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.sh +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower.sh @@ -6,10 +6,10 @@  - leader: value1 # A leader   follower: example # A follower   - leader: value2 # A leader  - follower: example # A follower  + follower: example1 # A follower   leadership_2: # A second leadership  - - leader: null # A leader  + - leader: example # A leader   follower: val # A follower  - - leader: null # A leader  + - leader: example1 # A leader   follower: val # A follower  diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc index 2b2266b1c..7f64ff901 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.adoc @@ -8,7 +8,7 @@ rougail: # Rougail - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - leader: value1 # A leader follower: # A follower diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md index ee56b0217..2eefa710f 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.gitlab.md @@ -7,7 +7,7 @@ rougail: # Rougail - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - leader: value1 # A leader follower: # A follower diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html index efb4d9db0..694515a84 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.html @@ -5,7 +5,7 @@ - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - leader: value1 # A leader follower: # A follower diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md index bd011abb3..f62b98c4e 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.md @@ -7,7 +7,7 @@ rougail: # Rougail - leader: value1 # A leader follower: example # A follower - leader: value2 # A leader - follower: example # A follower + follower: example1 # A follower leadership_2: # A second leadership - leader: value1 # A leader follower: # A follower diff --git a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh index 74edc1a88..9eb5cd5b0 100644 --- a/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh +++ b/tests/results/test_namespace_examples_comment/40_9leadership-calculation-variable_leader_follower_not_same.sh @@ -6,7 +6,7 @@  - leader: value1 # A leader   follower: example # A follower   - leader: value2 # A leader  - follower: example # A follower  + follower: example1 # A follower   leadership_2: # A second leadership   - leader: value1 # A leader   follower: # A follower  diff --git a/tests/results/test_namespace_examples_comment/41_0choice_leader.adoc b/tests/results/test_namespace_examples_comment/41_0choice_leader.adoc index 15e320344..ada9f3055 100644 --- a/tests/results/test_namespace_examples_comment/41_0choice_leader.adoc +++ b/tests/results/test_namespace_examples_comment/41_0choice_leader.adoc @@ -6,5 +6,5 @@ rougail: # Rougail leader: # The leadership - leader: example # The leader - follower1: a_choice # A follower + follower1: a # A follower ---- diff --git a/tests/results/test_namespace_examples_comment/41_0choice_leader.gitlab.md b/tests/results/test_namespace_examples_comment/41_0choice_leader.gitlab.md index c12137ad1..e7f607319 100644 --- a/tests/results/test_namespace_examples_comment/41_0choice_leader.gitlab.md +++ b/tests/results/test_namespace_examples_comment/41_0choice_leader.gitlab.md @@ -5,7 +5,7 @@ rougail: # Rougail leader: # The leadership - leader: example # The leader - follower1: a_choice # A follower + follower1: a # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/41_0choice_leader.html b/tests/results/test_namespace_examples_comment/41_0choice_leader.html index 93fb0bc15..977f81a6a 100644 --- a/tests/results/test_namespace_examples_comment/41_0choice_leader.html +++ b/tests/results/test_namespace_examples_comment/41_0choice_leader.html @@ -3,4 +3,4 @@ 
    rougail:                      # Rougail
   leader:                     # The leadership
     - leader: example         # The leader
-      follower1: a_choice     # A follower
    \ No newline at end of file + follower1: a # A follower \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/41_0choice_leader.md b/tests/results/test_namespace_examples_comment/41_0choice_leader.md index 23a4f0e7e..582aba539 100644 --- a/tests/results/test_namespace_examples_comment/41_0choice_leader.md +++ b/tests/results/test_namespace_examples_comment/41_0choice_leader.md @@ -5,5 +5,5 @@ rougail: # Rougail leader: # The leadership - leader: example # The leader - follower1: a_choice # A follower + follower1: a # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/41_0choice_leader.sh b/tests/results/test_namespace_examples_comment/41_0choice_leader.sh index c5bed6c97..2c74bfe80 100644 --- a/tests/results/test_namespace_examples_comment/41_0choice_leader.sh +++ b/tests/results/test_namespace_examples_comment/41_0choice_leader.sh @@ -4,5 +4,5 @@ rougail: # Rougail   leader: # The leadership   - leader: example # The leader  - follower1: a_choice # A follower  + follower1: a # A follower  diff --git a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.adoc b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.adoc index 218970147..72834ae6f 100644 --- a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.adoc +++ b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.adoc @@ -6,7 +6,6 @@ rougail: # Rougail leadership: # A leadership - leader: a # Aleader - follower: value # A follower - leader: b # Aleader follower: value # A follower ---- diff --git a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md index cc1c69424..0dab6cf42 100644 --- a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md +++ b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.gitlab.md @@ -5,7 +5,6 @@ rougail: # Rougail leadership: # A leadership - leader: a # Aleader - follower: value # A follower - leader: b # Aleader follower: value # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.html b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.html index 8aaf2663c..92cb725be 100644 --- a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.html +++ b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.html @@ -3,6 +3,5 @@ 
    rougail:                      # Rougail
   leadership:                 # A leadership
     - leader: a               # Aleader
-      follower: value         # A follower
     - leader: b               # Aleader
       follower: value         # A follower
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.md b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.md index bd32773cb..3f48dc0ed 100644 --- a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.md +++ b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.md @@ -5,7 +5,6 @@ rougail: # Rougail leadership: # A leadership - leader: a # Aleader - follower: value # A follower - leader: b # Aleader follower: value # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.sh b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.sh index 4b5800811..040da9f81 100644 --- a/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.sh +++ b/tests/results/test_namespace_examples_comment/44_4disabled_calcultion_follower_index.sh @@ -4,7 +4,6 @@ rougail: # Rougail   leadership: # A leadership   - leader: a # Aleader  - follower: value # A follower   - leader: b # Aleader   follower: value # A follower  diff --git a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.adoc b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.adoc index e2016bef6..9b3f26361 100644 --- a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.adoc +++ b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.adoc @@ -5,7 +5,4 @@ --- rougail: # Rougail condition: no # A condition - leader: # A leadership - - leader: example # A leader - follower: example # A follower ---- diff --git a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md index 2d6874bf1..d9a049a7c 100644 --- a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md +++ b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.gitlab.md @@ -4,9 +4,6 @@ --- rougail: # Rougail condition: no # A condition - leader: # A leadership - - leader: example # A leader - follower: example # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.html b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.html index 337548d3e..95973e2b7 100644 --- a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.html +++ b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.html @@ -1,7 +1,4 @@

    Example with all variables modifiable

    rougail:                      # Rougail
-  condition: no               # A condition
-  leader:                     # A leadership
-    - leader: example         # A leader
-      follower: example       # A follower
    \ No newline at end of file + condition: no # A condition \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.md b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.md index 225e58b83..9b2c3501c 100644 --- a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.md +++ b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.md @@ -4,7 +4,4 @@ --- rougail: # Rougail condition: no # A condition - leader: # A leadership - - leader: example # A leader - follower: example # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.sh b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.sh index 73265cfea..4c5863c99 100644 --- a/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.sh +++ b/tests/results/test_namespace_examples_comment/44_5leadership_leader_hidden_calculation.sh @@ -3,7 +3,4 @@ ---  rougail: # Rougail   condition: no # A condition  - leader: # A leadership  - - leader: example # A leader  - follower: example # A follower  diff --git a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.adoc b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.adoc index e037dbe70..167d37281 100644 --- a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.adoc +++ b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.adoc @@ -6,7 +6,6 @@ rougail: # Rougail leader: # A leadership - leader: example # A leader - follower: example # A follower ---- == Example with all variables modifiable @@ -17,5 +16,4 @@ rougail: # Rougail condition: yes # A condition leader: # A leadership - leader: example # A leader - follower: example # A follower ---- diff --git a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md index 3ab8a1f3b..826977051 100644 --- a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md +++ b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.gitlab.md @@ -5,7 +5,6 @@ rougail: # Rougail leader: # A leadership - leader: example # A leader - follower: example # A follower ``` @@ -17,7 +16,6 @@ rougail: # Rougail condition: yes # A condition leader: # A leadership - leader: example # A leader - follower: example # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.html b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.html index 5e5d2d262..d55c0ae65 100644 --- a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.html +++ b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.html @@ -2,11 +2,9 @@ 
    rougail:                      # Rougail
   leader:                     # A leadership
-    - leader: example         # A leader
-      follower: example       # A follower

    Example with all variables modifiable

    + - leader: example # A leader

    Example with all variables modifiable

    rougail:                      # Rougail
   condition: yes              # A condition
   leader:                     # A leadership
-    - leader: example         # A leader
-      follower: example       # A follower
    \ No newline at end of file + - leader: example # A leader \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.md b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.md index dd493ed4b..5ae0ebbfb 100644 --- a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.md +++ b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.md @@ -5,7 +5,6 @@ rougail: # Rougail leader: # A leadership - leader: example # A leader - follower: example # A follower ``` # Example with all variables modifiable @@ -15,5 +14,4 @@ rougail: # Rougail condition: yes # A condition leader: # A leadership - leader: example # A leader - follower: example # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.sh b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.sh index fbb3603b3..da0fad25b 100644 --- a/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.sh +++ b/tests/results/test_namespace_examples_comment/44_6leadership_follower_disabled_calculation.sh @@ -4,7 +4,6 @@ rougail: # Rougail   leader: # A leadership   - leader: example # A leader  - follower: example # A follower  Example with all variables modifiable @@ -13,5 +12,4 @@  condition: yes # A condition   leader: # A leadership   - leader: example # A leader  - follower: example # A follower  diff --git a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.adoc b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.adoc index 001abd752..ebb3ca3ea 100644 --- a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.adoc +++ b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.adoc @@ -6,7 +6,6 @@ rougail: # Rougail leader: # Leader - leader: a # A leader - follower: a # A follower - leader: b # A leader follower: b # A follower ---- diff --git a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.gitlab.md b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.gitlab.md index 876a89bf9..54a7c47ab 100644 --- a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.gitlab.md +++ b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.gitlab.md @@ -5,7 +5,6 @@ rougail: # Rougail leader: # Leader - leader: a # A leader - follower: a # A follower - leader: b # A leader follower: b # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.html b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.html index aba5d5844..5102086e4 100644 --- a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.html +++ b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.html @@ -3,6 +3,5 @@ 
    rougail:                      # Rougail
   leader:                     # Leader
     - leader: a               # A leader
-      follower: a             # A follower
     - leader: b               # A leader
       follower: b             # A follower
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.md b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.md index 43f685774..afdce10bc 100644 --- a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.md +++ b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.md @@ -5,7 +5,6 @@ rougail: # Rougail leader: # Leader - leader: a # A leader - follower: a # A follower - leader: b # A leader follower: b # A follower ``` diff --git a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.sh b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.sh index 632e84939..19c766063 100644 --- a/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.sh +++ b/tests/results/test_namespace_examples_comment/44_9calculated_default_leadership_leader.sh @@ -4,7 +4,6 @@ rougail: # Rougail   leader: # Leader   - leader: a # A leader  - follower: a # A follower   - leader: b # A leader   follower: b # A follower  diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.adoc index 62b22586a..b63c46d32 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.adoc +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.adoc @@ -7,8 +7,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.gitlab.md index 5588b9ee0..d1fb4efbe 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.gitlab.md @@ -6,9 +6,9 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.html index 131160a8b..6676a4251 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.html +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.html @@ -4,7 +4,7 @@ var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.md index a7a770c2c..a06fc871e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.md @@ -6,8 +6,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.sh index 01c11d2fe..e7cf8a05e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.sh +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0.sh @@ -5,8 +5,8 @@  var: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   vardyn: example # Dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   vardyn: example # Dynamic variable  diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.adoc index 62b22586a..b63c46d32 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.adoc +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.adoc @@ -7,8 +7,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.gitlab.md index 5588b9ee0..d1fb4efbe 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.gitlab.md @@ -6,9 +6,9 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.html index 131160a8b..6676a4251 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.html +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.html @@ -4,7 +4,7 @@ var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.md index a7a770c2c..a06fc871e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.md @@ -6,8 +6,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # Dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # Dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.sh index 01c11d2fe..e7cf8a05e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.sh +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_empty.sh @@ -5,8 +5,8 @@  var: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   vardyn: example # Dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   vardyn: example # Dynamic variable  diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.adoc index 4898aac2a..8a32bbec2 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.adoc +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.adoc @@ -4,9 +4,9 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ---- == Example with all variables modifiable @@ -18,8 +18,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.gitlab.md index 729bac764..c624f4f5e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.gitlab.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` @@ -18,9 +18,9 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.html index 527eaee62..ccd5c384f 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.html +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.html @@ -1,16 +1,16 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     vardyn: example           # A dyn variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     vardyn: example           # A dyn variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var:                        # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     vardyn: example           # A dyn variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     vardyn: example           # A dyn variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.md index 12374ae05..72673e56e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` # Example with all variables modifiable @@ -16,8 +16,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.sh index 83dd020a9..7e7f41065 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.sh +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   vardyn: example # A dyn variable  - dynval2: # dyn{{ identifier }}  + dynval2:   vardyn: example # A dyn variable  Example with all variables modifiable @@ -14,8 +14,8 @@  var: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   vardyn: example # A dyn variable  - dynval2: # dyn{{ identifier }}  + dynval2:   vardyn: example # A dyn variable  diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.adoc index 4898aac2a..8a32bbec2 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.adoc +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.adoc @@ -4,9 +4,9 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ---- == Example with all variables modifiable @@ -18,8 +18,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.gitlab.md index 729bac764..c624f4f5e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.gitlab.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` @@ -18,9 +18,9 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.html index 527eaee62..ccd5c384f 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.html +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.html @@ -1,16 +1,16 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     vardyn: example           # A dyn variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     vardyn: example           # A dyn variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var:                        # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     vardyn: example           # A dyn variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     vardyn: example           # A dyn variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.md index 12374ae05..72673e56e 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` # Example with all variables modifiable @@ -16,8 +16,8 @@ rougail: # Rougail var: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: vardyn: example # A dyn variable - dynval2: # dyn{{ identifier }} + dynval2: vardyn: example # A dyn variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.sh index 83dd020a9..7e7f41065 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.sh +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_1_0_type_empty.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   vardyn: example # A dyn variable  - dynval2: # dyn{{ identifier }}  + dynval2:   vardyn: example # A dyn variable  Example with all variables modifiable @@ -14,8 +14,8 @@  var: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   vardyn: example # A dyn variable  - dynval2: # dyn{{ identifier }}  + dynval2:   vardyn: example # A dyn variable  diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.adoc index ce3efa08b..c8cd526f1 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.adoc +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.adoc @@ -4,9 +4,6 @@ ---- --- rougail: # Rougail - var: # A suffix variable - - val1 - - val2 dynval1: # A dynamic family var: example # A dynamic variable dynval2: # A dynamic family diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.gitlab.md index f9bdcf7f7..473168b94 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.gitlab.md @@ -3,9 +3,6 @@ ```yaml --- rougail: # Rougail - var: # A suffix variable - - val1 - - val2 dynval1: # A dynamic family var: example # A dynamic variable dynval2: # A dynamic family diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.html index e28b2b1d1..99dec38bf 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.html +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.html @@ -1,9 +1,6 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  var:                        # A suffix variable
-    - val1
-    - val2
   dynval1:                    # A dynamic family
     var: example              # A dynamic variable
   dynval2:                    # A dynamic family
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.md
index 063391ba6..f6e2a152f 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.md
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.md
@@ -3,9 +3,6 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  var:                        # A suffix variable
-    - val1
-    - val2
   dynval1:                    # A dynamic family
     var: example              # A dynamic variable
   dynval2:                    # A dynamic family
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.sh
index b65be535a..3264f2244 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.sh
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_test.sh
@@ -2,9 +2,6 @@
 
 ---                                                                             
 rougail:                      # Rougail                                         
-  var:                        # A suffix variable                               
-    - val1                                                                      
-    - val2                                                                      
   dynval1:                    # A dynamic family                                
     var: example              # A dynamic variable                              
   dynval2:                    # A dynamic family                                
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.adoc
index 08f569370..cfd309141 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.adoc
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.adoc
@@ -1,12 +1,3 @@
-== Example with mandatory variables not filled in
-
-[,yaml]
-----
----
-rougail:                      # Rougail
-  var:                        # A suffix variable
-    - example
-----
 == Example with all variables modifiable
 
 [,yaml]
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.gitlab.md
index e6123f625..1661568f7 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.gitlab.md
@@ -1,13 +1,3 @@
-
    Example with mandatory variables not filled in
-
-```yaml
----
-rougail:                      # Rougail
-  var:                        # A suffix variable
-    - example
-```
-
    
-
 
    Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.html
index f18606ae2..f76c7397c 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.html
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.html
@@ -1,8 +1,4 @@
-
    Example with mandatory variables not filled in
    
-
-
    rougail:                      # Rougail
-  var:                        # A suffix variable
-    - example
    Example with all variables modifiable
    
+
    Example with all variables modifiable
    
 
 
    rougail:                      # Rougail
   var:                        # A suffix variable
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.md
index cf9a174ee..2825fd0f8 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.md
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.md
@@ -1,11 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:                      # Rougail
-  var:                        # A suffix variable
-    - example
-```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.sh
index 1eea4d09f..692fccec1 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.sh
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_empty.sh
@@ -1,10 +1,3 @@
-Example with mandatory variables not filled in
-
----                                                                             
-rougail:                      # Rougail                                         
-  var:                        # A suffix variable                               
-    - example                                                                   
-
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.adoc
index c8b168ffb..2d4df5649 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.adoc
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.adoc
@@ -8,7 +8,7 @@ rougail:                      # Rougail
     - val1
     - val2
   dynval1:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
+    var: a value              # A dynamic variable with suffix val1
   dynval2:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
+    var: a value              # A dynamic variable with suffix val2
 ----
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md
index 0484f5d4d..f0582120f 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.gitlab.md
@@ -7,9 +7,9 @@ rougail:                      # Rougail
     - val1
     - val2
   dynval1:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
+    var: a value              # A dynamic variable with suffix val1
   dynval2:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
+    var: a value              # A dynamic variable with suffix val2
 ```
 
    
 
diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.html
index 02bf3dfb2..b65b58648 100644
--- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.html
+++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.html
@@ -5,6 +5,6 @@
     - val1
     - val2
   dynval1:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
+    var: a value              # A dynamic variable with suffix val1
   dynval2:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
    \ No newline at end of file + var: a value # A dynamic variable with suffix val2 \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.md index ef33c10ac..9fbd1e814 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.md @@ -7,7 +7,7 @@ rougail: # Rougail - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.sh index 613e88c37..e4375d6bc 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.sh +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix.sh @@ -6,7 +6,7 @@  - val1   - val2   dynval1: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val1   dynval2: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val2  diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc index 8de6f8f09..2d4df5649 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.adoc @@ -1,13 +1,3 @@ -== Example with mandatory variables not filled in - -[,yaml] ----- ---- -rougail: # Rougail - var: # A suffix variable - - val1 - - val2 ----- == Example with all variables modifiable [,yaml] @@ -18,7 +8,7 @@ rougail: # Rougail - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ---- diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md index b641739af..f0582120f 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.gitlab.md @@ -1,14 +1,3 @@ -
    Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var: # A suffix variable - - val1 - - val2 -``` -
    -
    Example with all variables modifiable ```yaml @@ -18,9 +7,9 @@ rougail: # Rougail - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ```
    diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.html index ff489cb00..b65b58648 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.html +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.html @@ -1,15 +1,10 @@ -

    Example with mandatory variables not filled in

    - -
    rougail:                      # Rougail
-  var:                        # A suffix variable
-    - val1
-    - val2

    Example with all variables modifiable

    +

    Example with all variables modifiable

    rougail:                      # Rougail
   var:                        # A suffix variable
     - val1
     - val2
   dynval1:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
+    var: a value              # A dynamic variable with suffix val1
   dynval2:                    # A dynamic family
-    var: a value              # A dynamic variable with suffix {{ identifier }}
    \ No newline at end of file + var: a value # A dynamic variable with suffix val2 \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.md index 26eafee6a..9fbd1e814 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.md +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.md @@ -1,12 +1,3 @@ -# Example with mandatory variables not filled in - -```yaml ---- -rougail: # Rougail - var: # A suffix variable - - val1 - - val2 -``` # Example with all variables modifiable ```yaml @@ -16,7 +7,7 @@ rougail: # Rougail - val1 - val2 dynval1: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val1 dynval2: # A dynamic family - var: a value # A dynamic variable with suffix {{ identifier }} + var: a value # A dynamic variable with suffix val2 ``` diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.sh index bba7e2a95..e4375d6bc 100644 --- a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.sh +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable_suffix_empty.sh @@ -1,11 +1,3 @@ -Example with mandatory variables not filled in - ----  -rougail: # Rougail  - var: # A suffix variable  - - val1  - - val2  - Example with all variables modifiable ---  @@ -14,7 +6,7 @@  - val1   - val2   dynval1: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val1   dynval2: # A dynamic family  - var: a value # A dynamic variable with suffix {{ identifier }}  + var: a value # A dynamic variable with suffix val2  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.adoc index 4c3acc238..e70a07d75 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.adoc @@ -4,10 +4,10 @@ ---- --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} - dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} + dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 + dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable ---- == Example with all variables modifiable @@ -16,12 +16,12 @@ rougail: # Rougail ---- --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} - dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} + dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 + dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable var2: # A new variable - - null - - null + - example + - example ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.gitlab.md index a68ed8d3e..51a334e25 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.gitlab.md @@ -3,10 +3,10 @@ ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} - dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} + dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 + dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable ``` @@ -16,14 +16,14 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} - dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} + dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 + dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable var2: # A new variable - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.html index 8a572bcda..7f952b14d 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.html @@ -1,18 +1,18 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # A dynamic famify for {{ identifier }}
-    var: example              # A dynamic variable for {{ identifier }}
-  dynval2:                    # A dynamic famify for {{ identifier }}
-    var: example              # A dynamic variable for {{ identifier }}
+  dynval1:                    # A dynamic famify for val1
+    var: example              # A dynamic variable for val1
+  dynval2:                    # A dynamic famify for val2
+    var: example              # A dynamic variable for val2
   var1: example               # A new variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  dynval1:                    # A dynamic famify for {{ identifier }}
-    var: example              # A dynamic variable for {{ identifier }}
-  dynval2:                    # A dynamic famify for {{ identifier }}
-    var: example              # A dynamic variable for {{ identifier }}
+  dynval1:                    # A dynamic famify for val1
+    var: example              # A dynamic variable for val1
+  dynval2:                    # A dynamic famify for val2
+    var: example              # A dynamic variable for val2
   var1: example               # A new variable
   var2:                       # A new variable
-    - null
-    - null
    \ No newline at end of file + - example + - example \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.md index 711295ccc..5bab273bd 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.md @@ -3,10 +3,10 @@ ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} - dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} + dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 + dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable ``` # Example with all variables modifiable @@ -14,12 +14,12 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} - dynval2: # A dynamic famify for {{ identifier }} - var: example # A dynamic variable for {{ identifier }} + dynval1: # A dynamic famify for val1 + var: example # A dynamic variable for val1 + dynval2: # A dynamic famify for val2 + var: example # A dynamic variable for val2 var1: example # A new variable var2: # A new variable - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.sh index 81aa85d4f..311084e4b 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_description.sh @@ -2,22 +2,22 @@ ---  rougail: # Rougail  - dynval1: # A dynamic famify for {{ identifier }}  - var: example # A dynamic variable for {{ identifier }}  - dynval2: # A dynamic famify for {{ identifier }}  - var: example # A dynamic variable for {{ identifier }}  + dynval1: # A dynamic famify for val1  + var: example # A dynamic variable for val1  + dynval2: # A dynamic famify for val2  + var: example # A dynamic variable for val2   var1: example # A new variable  Example with all variables modifiable ---  rougail: # Rougail  - dynval1: # A dynamic famify for {{ identifier }}  - var: example # A dynamic variable for {{ identifier }}  - dynval2: # A dynamic famify for {{ identifier }}  - var: example # A dynamic variable for {{ identifier }}  + dynval1: # A dynamic famify for val1  + var: example # A dynamic variable for val1  + dynval2: # A dynamic famify for val2  + var: example # A dynamic variable for val2   var1: example # A new variable   var2: # A new variable  - - null  - - null  + - example  + - example  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.adoc index 281b004e0..c6784b8d2 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.adoc @@ -8,9 +8,9 @@ rougail: # Rougail - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: val1 # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: val2 # A dynamic variable var3: val1 # A variable calculated ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md index d8896ab64..6fd3b32f8 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.gitlab.md @@ -7,9 +7,9 @@ rougail: # Rougail - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: val1 # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: val2 # A dynamic variable var3: val1 # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.html index eb59a8123..4cfeaf0ab 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.html @@ -5,8 +5,8 @@ - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: val1 # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: val2 # A dynamic variable var3: val1 # A variable calculated \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.md index 5baf3bc10..560676bec 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.md @@ -7,9 +7,9 @@ rougail: # Rougail - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: val1 # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: val2 # A dynamic variable var3: val1 # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.sh index 58752e49d..271398466 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier.sh @@ -6,9 +6,9 @@  - val1   - val2   var2: val1 # A suffix variable2  - dynval1: # dyn{{ identifier }}  + dynval1:   var: val1 # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: val2 # A dynamic variable   var3: val1 # A variable calculated  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc index 02777c668..de390dc68 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.adoc @@ -8,10 +8,10 @@ rougail: # Rougail - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: # A dynamic variable - val1 - dynval2: # dyn{{ identifier }} + dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md index 9206b9f49..f46127e65 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.gitlab.md @@ -7,10 +7,10 @@ rougail: # Rougail - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: # A dynamic variable - val1 - dynval2: # dyn{{ identifier }} + dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.html index 229d1fc61..db6e4bb10 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.html @@ -5,10 +5,10 @@ - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: # A dynamic variable - val1 - dynval2: # dyn{{ identifier }} + dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.md index 0088ee987..b32c84dd2 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.md @@ -7,10 +7,10 @@ rougail: # Rougail - val1 - val2 var2: val1 # A suffix variable2 - dynval1: # dyn{{ identifier }} + dynval1: var: # A dynamic variable - val1 - dynval2: # dyn{{ identifier }} + dynval2: var: # A dynamic variable - val2 var3: # A variable calculated diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.sh index cccae3756..41147e5c0 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_identifier_multi.sh @@ -6,10 +6,10 @@  - val1   - val2   var2: val1 # A suffix variable2  - dynval1: # dyn{{ identifier }}  + dynval1:   var: # A dynamic variable   - val1  - dynval2: # dyn{{ identifier }}  + dynval2:   var: # A dynamic variable   - val2   var3: # A variable calculated  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.adoc index 2b4575327..e344d231b 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.adoc @@ -4,9 +4,9 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -18,9 +18,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.gitlab.md index 7ec7432c8..741a05be1 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.gitlab.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` @@ -18,9 +18,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.html index dc0eed2de..bf2687186 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.html @@ -1,17 +1,17 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
   var2: example               # A variable calculated
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.md index ced09523c..88c8b8a9a 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -16,9 +16,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.sh index 6c2fc65b9..1744d3884 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable @@ -14,9 +14,9 @@  var1: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable   var2: example # A variable calculated  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc index ec1421ed6..7a63502ec 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -13,6 +13,6 @@ rougail: # Rougail ---- --- rougail: # Rougail - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md index 810cba6b0..730a79ccf 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` @@ -13,7 +13,7 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.html index 0845ac68b..2c373294f 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.md index a35b553c6..9a775f3aa 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -11,6 +11,6 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh index 8fccaf70d..6b7f92e88 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled.sh @@ -2,13 +2,13 @@ ---  rougail: # Rougail  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable ---  rougail: # Rougail  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.adoc index edae58d9c..257869cce 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.adoc @@ -1,3 +1,11 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: # Rougail + var2: example # A variable calculated +---- == Example with all variables modifiable [,yaml] diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.gitlab.md index 531e56349..48edd8507 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.gitlab.md @@ -1,3 +1,12 @@ +
    Example with mandatory variables not filled in + +```yaml +--- +rougail: # Rougail + var2: example # A variable calculated +``` +
    +
    Example with all variables modifiable ```yaml diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.html index 8685abe01..1608afb00 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.html @@ -1,4 +1,7 @@ -

    Example with all variables modifiable

    +

    Example with mandatory variables not filled in

    + +
    rougail:                      # Rougail
+  var2: example               # A variable calculated

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.md
index c1a0dda7f..88a8fc730 100644
--- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.md
+++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.md
@@ -1,3 +1,10 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:                      # Rougail
+  var2: example               # A variable calculated
+```
 # Example with all variables modifiable
 
 ```yaml
diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.sh
index c270d03ce..261352006 100644
--- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.sh
+++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_disabled2.sh
@@ -1,3 +1,9 @@
+Example with mandatory variables not filled in
+
+---                                                                             
+rougail:                      # Rougail                                         
+  var2: example               # A variable calculated                           
+
 Example with all variables modifiable
 
 ---                                                                             
diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.adoc
index 2b4575327..e344d231b 100644
--- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.adoc
+++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.adoc
@@ -4,9 +4,9 @@
 ----
 ---
 rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
 ----
 == Example with all variables modifiable
@@ -18,9 +18,9 @@ rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
   var2: example               # A variable calculated
 ----
diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.gitlab.md
index 7ec7432c8..741a05be1 100644
--- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.gitlab.md
+++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.gitlab.md
@@ -3,9 +3,9 @@
 ```yaml
 ---
 rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
 ```
    @@ -18,9 +18,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.html index dc0eed2de..bf2687186 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.html @@ -1,17 +1,17 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
   var2: example               # A variable calculated
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.md index ced09523c..88c8b8a9a 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -16,9 +16,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.sh index 6c2fc65b9..1744d3884 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable @@ -14,9 +14,9 @@  var1: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable   var2: example # A variable calculated  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.adoc index 03847445d..c759c0f4c 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.adoc @@ -4,7 +4,7 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -15,7 +15,7 @@ rougail: # Rougail rougail: # Rougail var1: # A suffix variable - val1 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable var2: example # A variable calculated ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.gitlab.md index 14d51e79c..95799bbbf 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable ``` @@ -15,7 +15,7 @@ rougail: # Rougail rougail: # Rougail var1: # A suffix variable - val1 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.html index ced2cc937..2ecbda431 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.html @@ -1,12 +1,12 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
   var2: example               # A variable calculated
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.md index a1539f54f..4000b4c4f 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -13,7 +13,7 @@ rougail: # Rougail rougail: # Rougail var1: # A suffix variable - val1 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.sh index a457e8b38..cbbbd557b 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_2.sh @@ -2,7 +2,7 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  Example with all variables modifiable @@ -11,7 +11,7 @@ rougail: # Rougail   var1: # A suffix variable   - val1  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable   var2: example # A variable calculated  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.adoc index f6cd48563..6d6f96663 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.adoc @@ -4,9 +4,9 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -19,8 +19,8 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.gitlab.md index 5e8326133..cb8b03e3f 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.gitlab.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` @@ -19,9 +19,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.html index 5d2ed6213..1bfec4dfe 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.html @@ -1,9 +1,9 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
@@ -11,7 +11,7 @@
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.md index e3ed88bf2..32825260b 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -17,8 +17,8 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.sh index 9d1ad8265..3429f3770 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_suffix_empty_3.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable @@ -15,8 +15,8 @@  var1: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.adoc index 2b4575327..e344d231b 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.adoc @@ -4,9 +4,9 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -18,9 +18,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.gitlab.md index 7ec7432c8..741a05be1 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.gitlab.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` @@ -18,9 +18,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.html index dc0eed2de..bf2687186 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.html @@ -1,17 +1,17 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
   var2: example               # A variable calculated
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.md index ced09523c..88c8b8a9a 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -16,9 +16,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.sh index 6c2fc65b9..1744d3884 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable @@ -14,9 +14,9 @@  var1: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable   var2: example # A variable calculated  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc index 7c992292b..321461e1c 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.adoc @@ -4,10 +4,10 @@ ---- --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable var2: example # A new variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ---- @@ -17,10 +17,10 @@ rougail: # Rougail ---- --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable var2: example # A new variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md index e69cca880..2cff3916f 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.gitlab.md @@ -3,10 +3,10 @@ ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable var2: example # A new variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` @@ -17,10 +17,10 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable var2: example # A new variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.html index e08dd6869..811dbc5bb 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.html @@ -1,17 +1,17 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # A dynamic famify for {{ identifier }}
+  dynval1:                    # A dynamic famify for val1
     var1: example             # A dynamic variable
     var2: example             # A new variable
-  dynval2:                    # A dynamic famify for {{ identifier }}
+  dynval2:                    # A dynamic famify for val2
     var1: example             # A dynamic variable
     var2: example             # A new variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  dynval1:                    # A dynamic famify for {{ identifier }}
+  dynval1:                    # A dynamic famify for val1
     var1: example             # A dynamic variable
     var2: example             # A new variable
-  dynval2:                    # A dynamic famify for {{ identifier }}
+  dynval2:                    # A dynamic famify for val2
     var1: example             # A dynamic variable
     var2: example             # A new variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.md index d368c07f5..49b0a7e06 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.md @@ -3,10 +3,10 @@ ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable var2: example # A new variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` @@ -15,10 +15,10 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable var2: example # A new variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.sh index bb781c364..0d86b2c5a 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled.sh @@ -2,10 +2,10 @@ ---  rougail: # Rougail  - dynval1: # A dynamic famify for {{ identifier }}  + dynval1: # A dynamic famify for val1   var1: example # A dynamic variable   var2: example # A new variable  - dynval2: # A dynamic famify for {{ identifier }}  + dynval2: # A dynamic famify for val2   var1: example # A dynamic variable   var2: example # A new variable  @@ -13,10 +13,10 @@ ---  rougail: # Rougail  - dynval1: # A dynamic famify for {{ identifier }}  + dynval1: # A dynamic famify for val1   var1: example # A dynamic variable   var2: example # A new variable  - dynval2: # A dynamic famify for {{ identifier }}  + dynval2: # A dynamic famify for val2   var1: example # A dynamic variable   var2: example # A new variable  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc index 0d0567bb4..c96a594a0 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.adoc @@ -4,9 +4,9 @@ ---- --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ---- @@ -16,9 +16,9 @@ rougail: # Rougail ---- --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md index 115dbc5fb..d5b9c0506 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.gitlab.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` @@ -16,9 +16,9 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html index c664b9698..c05e55cf0 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.html @@ -1,15 +1,15 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # A dynamic famify for {{ identifier }}
+  dynval1:                    # A dynamic famify for val1
     var1: example             # A dynamic variable
-  dynval2:                    # A dynamic famify for {{ identifier }}
+  dynval2:                    # A dynamic famify for val2
     var1: example             # A dynamic variable
   var2: example               # A new variable

    Example with all variables modifiable

    rougail:                      # Rougail
-  dynval1:                    # A dynamic famify for {{ identifier }}
+  dynval1:                    # A dynamic famify for val1
     var1: example             # A dynamic variable
-  dynval2:                    # A dynamic famify for {{ identifier }}
+  dynval2:                    # A dynamic famify for val2
     var1: example             # A dynamic variable
   var2: example               # A new variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md index b15b06763..284c8e4c7 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` @@ -14,9 +14,9 @@ rougail: # Rougail ```yaml --- rougail: # Rougail - dynval1: # A dynamic famify for {{ identifier }} + dynval1: # A dynamic famify for val1 var1: example # A dynamic variable - dynval2: # A dynamic famify for {{ identifier }} + dynval2: # A dynamic famify for val2 var1: example # A dynamic variable var2: example # A new variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh index 2ed6a3e15..08af06b8d 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_disabled_outside.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # A dynamic famify for {{ identifier }}  + dynval1: # A dynamic famify for val1   var1: example # A dynamic variable  - dynval2: # A dynamic famify for {{ identifier }}  + dynval2: # A dynamic famify for val2   var1: example # A dynamic variable   var2: example # A new variable  @@ -12,9 +12,9 @@ ---  rougail: # Rougail  - dynval1: # A dynamic famify for {{ identifier }}  + dynval1: # A dynamic famify for val1   var1: example # A dynamic variable  - dynval2: # A dynamic famify for {{ identifier }}  + dynval2: # A dynamic famify for val2   var1: example # A dynamic variable   var2: example # A new variable  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.adoc index 2b4575327..e344d231b 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.adoc @@ -4,9 +4,9 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -18,9 +18,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md index 7ec7432c8..741a05be1 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.gitlab.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` @@ -18,9 +18,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.html index dc0eed2de..bf2687186 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.html @@ -1,17 +1,17 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
+  dynval1:
     var: example              # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
+  dynval2:
     var: example              # A dynamic variable
   var2: example               # A variable calculated
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.md index ced09523c..88c8b8a9a 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.md @@ -3,9 +3,9 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -16,9 +16,9 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: example # A variable calculated ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.sh index 6c2fc65b9..1744d3884 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_calc_variable_empty.sh @@ -2,9 +2,9 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable @@ -14,9 +14,9 @@  var1: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable   var2: example # A variable calculated  diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.adoc b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.adoc index b1ad43614..7360feaaf 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.adoc +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.adoc @@ -8,8 +8,4 @@ rougail: # Rougail var: example # A variable family: # A family var: example # A new variable - dynval2: # A dynamic family - var: example # A variable - family: # A family - var: example # A new variable ---- diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md index 36607ac4f..346f517c2 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.gitlab.md @@ -7,10 +7,6 @@ rougail: # Rougail var: example # A variable family: # A family var: example # A new variable - dynval2: # A dynamic family - var: example # A variable - family: # A family - var: example # A new variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.html b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.html index 4138610bf..624f28d30 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.html +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.html @@ -2,10 +2,6 @@ 
    rougail:                      # Rougail
   dynval1:                    # A dynamic family
-    var: example              # A variable
-    family:                   # A family
-      var: example            # A new variable
-  dynval2:                    # A dynamic family
     var: example              # A variable
     family:                   # A family
       var: example            # A new variable
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.md b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.md index 17a26fad3..dde9be95b 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.md +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.md @@ -7,8 +7,4 @@ rougail: # Rougail var: example # A variable family: # A family var: example # A new variable - dynval2: # A dynamic family - var: example # A variable - family: # A family - var: example # A new variable ``` diff --git a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.sh b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.sh index 9dff9cc08..0c10bc826 100644 --- a/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.sh +++ b/tests/results/test_namespace_examples_comment/60_5family_dynamic_hidden_suffix.sh @@ -6,8 +6,4 @@  var: example # A variable   family: # A family   var: example # A new variable  - dynval2: # A dynamic family  - var: example # A variable  - family: # A family  - var: example # A new variable  diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.adoc b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.adoc index 79cdf7125..28740e6cb 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.adoc +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.adoc @@ -4,15 +4,15 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -24,17 +24,17 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: # A variable calculated - - null - - null + - example + - example ---- diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.gitlab.md b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.gitlab.md index 24ddce497..4b4a6372a 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.gitlab.md @@ -3,15 +3,15 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` @@ -24,19 +24,19 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: # A variable calculated - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.html b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.html index f5ea8670e..9b9ed3117 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.html +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.html @@ -1,31 +1,31 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval1:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval2:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval1:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval2:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable
   var2:                       # A variable calculated
-    - null
-    - null
    \ No newline at end of file + - example + - example \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.md b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.md index c4121b813..a9f8cce47 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.md +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.md @@ -3,15 +3,15 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -22,17 +22,17 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: # A variable calculated - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.sh b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.sh index 4fe878d52..f7520e43d 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.sh +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi.sh @@ -2,15 +2,15 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval1:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval2:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable @@ -20,17 +20,17 @@  var1: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval1:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval2:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable   var2: # A variable calculated  - - null  - - null  + - example  + - example  diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.adoc b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.adoc index 79cdf7125..28740e6cb 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.adoc +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.adoc @@ -4,15 +4,15 @@ ---- --- rougail: # Rougail - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ---- == Example with all variables modifiable @@ -24,17 +24,17 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: # A variable calculated - - null - - null + - example + - example ---- diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.gitlab.md b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.gitlab.md index 24ddce497..4b4a6372a 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.gitlab.md @@ -3,15 +3,15 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` @@ -24,19 +24,19 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: # A variable calculated - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.html b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.html index f5ea8670e..9b9ed3117 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.html +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.html @@ -1,31 +1,31 @@

    Example with mandatory variables not filled in

    rougail:                      # Rougail
-  dynval1:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval1:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval2:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable

    Example with all variables modifiable

    rougail:                      # Rougail
   var1:                       # A suffix variable
     - val1
     - val2
-  dynval1:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval1:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable
-  dynval2:                    # dyn{{ identifier }}
-    dynval1:                  # dyn{{ identifier }}
+  dynval2:
+    dynval1:
       var: example            # A dynamic variable
-    dynval2:                  # dyn{{ identifier }}
+    dynval2:
       var: example            # A dynamic variable
   var2:                       # A variable calculated
-    - null
-    - null
    \ No newline at end of file + - example + - example \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.md b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.md index c4121b813..a9f8cce47 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.md +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.md @@ -3,15 +3,15 @@ ```yaml --- rougail: # Rougail - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable ``` # Example with all variables modifiable @@ -22,17 +22,17 @@ rougail: # Rougail var1: # A suffix variable - val1 - val2 - dynval1: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval1: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} - dynval1: # dyn{{ identifier }} + dynval2: + dynval1: var: example # A dynamic variable - dynval2: # dyn{{ identifier }} + dynval2: var: example # A dynamic variable var2: # A variable calculated - - null - - null + - example + - example ``` diff --git a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.sh b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.sh index 4fe878d52..f7520e43d 100644 --- a/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.sh +++ b/tests/results/test_namespace_examples_comment/60_6family_dynamic_suffix_auto_multi2.sh @@ -2,15 +2,15 @@ ---  rougail: # Rougail  - dynval1: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval1:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval2:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  Example with all variables modifiable @@ -20,17 +20,17 @@  var1: # A suffix variable   - val1   - val2  - dynval1: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval1:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  - dynval1: # dyn{{ identifier }}  + dynval2:  + dynval1:   var: example # A dynamic variable  - dynval2: # dyn{{ identifier }}  + dynval2:   var: example # A dynamic variable   var2: # A variable calculated  - - null  - - null  + - example  + - example  diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.adoc b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.adoc index 35eaaf06a..54f5f9251 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.adoc +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.adoc @@ -4,7 +4,7 @@ ---- --- extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ---- == Example with all variables modifiable @@ -16,6 +16,6 @@ rougail: # Rougail var: # A variable - a extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ---- diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.gitlab.md b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.gitlab.md index e4034cd45..9bbb42fdf 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` @@ -16,7 +16,7 @@ rougail: # Rougail var: # A variable - a extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.html b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.html index e47e7264d..722a59161 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.html +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.html @@ -1,12 +1,12 @@

    Example with mandatory variables not filled in

    extra:                        # Extra
-  dyn_a:                      # dyn_{{ identifier }}
+  dyn_a:
     var: example

    Example with all variables modifiable

    rougail:                      # Rougail
   var:                        # A variable
     - a
 extra:                        # Extra
-  dyn_a:                      # dyn_{{ identifier }}
+  dyn_a:
     var: example
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.md b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.md index aef3fffdd..cda3f4884 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.md +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.md @@ -3,7 +3,7 @@ ```yaml --- extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` # Example with all variables modifiable @@ -14,6 +14,6 @@ rougail: # Rougail var: # A variable - a extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.sh b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.sh index af20c3e57..0a1dbb096 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic.sh +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic.sh @@ -2,7 +2,7 @@ ---  extra: # Extra  - dyn_a: # dyn_{{ identifier }}  + dyn_a:   var: example  Example with all variables modifiable @@ -12,6 +12,6 @@  var: # A variable   - a  extra: # Extra  - dyn_a: # dyn_{{ identifier }}  + dyn_a:   var: example  diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.adoc b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.adoc index 3ad0c1488..d36585f18 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.adoc +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.adoc @@ -4,7 +4,7 @@ ---- --- extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ---- == Example with all variables modifiable @@ -19,6 +19,6 @@ rougail: # Rougail extra: # Extra var: # A variable - a - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ---- diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.gitlab.md b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.gitlab.md index 7d72fe20e..75273bd7c 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.gitlab.md +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` @@ -19,7 +19,7 @@ rougail: # Rougail extra: # Extra var: # A variable - a - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.html b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.html index dcd956b74..b635765e9 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.html +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.html @@ -1,7 +1,7 @@

    Example with mandatory variables not filled in

    extra:                        # Extra
-  dyn_a:                      # dyn_{{ identifier }}
+  dyn_a:
     var: example

    Example with all variables modifiable

    rougail:                      # Rougail
@@ -11,5 +11,5 @@
 extra:                        # Extra
   var:                        # A variable
     - a
-  dyn_a:                      # dyn_{{ identifier }}
+  dyn_a:
     var: example
    \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.md b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.md index 44bb69dfa..929c156fd 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.md +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.md @@ -3,7 +3,7 @@ ```yaml --- extra: # Extra - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` # Example with all variables modifiable @@ -17,6 +17,6 @@ rougail: # Rougail extra: # Extra var: # A variable - a - dyn_a: # dyn_{{ identifier }} + dyn_a: var: example ``` diff --git a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.sh b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.sh index b4d5f4eb1..819eed3a9 100644 --- a/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.sh +++ b/tests/results/test_namespace_examples_comment/60_9extra_dynamic_extra.sh @@ -2,7 +2,7 @@ ---  extra: # Extra  - dyn_a: # dyn_{{ identifier }}  + dyn_a:   var: example  Example with all variables modifiable @@ -15,6 +15,6 @@ extra: # Extra   var: # A variable   - a  - dyn_a: # dyn_{{ identifier }}  + dyn_a:   var: example  diff --git a/tests/results/test_namespace_examples_comment/warnings_04_5validators_warnings b/tests/results/test_namespace_examples_comment/warnings_04_5validators_warnings index 0637a088a..375f58427 100644 --- a/tests/results/test_namespace_examples_comment/warnings_04_5validators_warnings +++ b/tests/results/test_namespace_examples_comment/warnings_04_5validators_warnings @@ -1 +1 @@ -[] \ No newline at end of file +["attention, \"1000\" could be an invalid integer for \"An integer\", value is too high"] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_16_2family_redefine_calculation b/tests/results/test_namespace_examples_comment/warnings_16_2family_redefine_calculation index d766e2d00..8c8b5fa6c 100644 --- a/tests/results/test_namespace_examples_comment/warnings_16_2family_redefine_calculation +++ b/tests/results/test_namespace_examples_comment/warnings_16_2family_redefine_calculation @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_16_3family_empty_at_ends b/tests/results/test_namespace_examples_comment/warnings_16_3family_empty_at_ends index e7619cd3b..d48ef4869 100644 --- a/tests/results/test_namespace_examples_comment/warnings_16_3family_empty_at_ends +++ b/tests/results/test_namespace_examples_comment/warnings_16_3family_empty_at_ends @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_dynamic b/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_dynamic index 7ac2fbe7f..27fd375f3 100644 --- a/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_dynamic +++ b/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_variable b/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_variable index f688a53bb..c210375a8 100644 --- a/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_variable +++ b/tests/results/test_namespace_examples_comment/warnings_20_2family_looks_like_variable @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test_namespace_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory index 3abb0f5e7..6d6e0f98d 100644 --- a/tests/results/test_namespace_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory +++ b/tests/results/test_namespace_examples_comment/warnings_40_9leadership-calculation-outside-follower-no-mandatory @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_forbidden_char b/tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_forbidden_char index d3aeda8b6..03f145898 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_forbidden_char +++ b/tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_forbidden_char @@ -1 +1 @@ -["\"default\" is a calculation for rougail.dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file +["\"default\" is a calculation for rougail.dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_disabled2 b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_disabled2 index 0637a088a..decb99275 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_disabled2 +++ b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_disabled2 @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden index 0637a088a..ca62c55c1 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden +++ b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_boolean b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_boolean index 0637a088a..aae5574da 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_boolean +++ b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_boolean @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_boolean/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_multi b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_multi index 0637a088a..fc2a53c8a 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_multi +++ b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_calc_suffix_hidden_multi @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_multi/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_unknown_suffix_empty b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_unknown_suffix_empty index e8a78f126..eeba5b344 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_unknown_suffix_empty +++ b/tests/results/test_namespace_examples_comment/warnings_60_5family_dynamic_unknown_suffix_empty @@ -1 +1 @@ -["\"disabled\" is a calculation for rougail.val1_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for rougail.{{ identifier }}_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi b/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi index b29a00ee6..5867be67f 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi +++ b/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi2 b/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi2 index 77b1a877a..e329e6758 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi2 +++ b/tests/results/test_namespace_examples_comment/warnings_60_6family_dynamic_suffix_auto_multi2 @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic b/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic index 88aca57fe..282cd0554 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic +++ b/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic_extra b/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic_extra index 649dabe67..b7b2cef9f 100644 --- a/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic_extra +++ b/tests/results/test_namespace_examples_comment/warnings_60_9extra_dynamic_extra @@ -1 +1 @@ -["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/00_0version_underscore.json b/tests/results/test_namespace_without_family/00_0version_underscore.json index d7ad5f812..62c3d0eb4 100644 --- a/tests/results/test_namespace_without_family/00_0version_underscore.json +++ b/tests/results/test_namespace_without_family/00_0version_underscore.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "version": { - "type": "variable", - "variable_type": "string", "path": "rougail.version", - "names": [ - "version" - ], + "name": "version", "description": "A variable.", "properties": [ { @@ -31,10 +25,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_1empty_variable.json b/tests/results/test_namespace_without_family/00_1empty_variable.json index c00fb8867..3bd256332 100644 --- a/tests/results/test_namespace_without_family/00_1empty_variable.json +++ b/tests/results/test_namespace_without_family/00_1empty_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "empty": { - "type": "variable", - "variable_type": "string", "path": "rougail.empty", - "names": [ - "empty" - ], + "name": "empty", "properties": [ { "type": "property", @@ -30,10 +24,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_2default_calculated.json b/tests/results/test_namespace_without_family/00_2default_calculated.json index 0bd0ba0eb..3b71d27d1 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value of var1" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -69,13 +51,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var1" + } + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.json b/tests/results/test_namespace_without_family/00_2default_calculated_multi.json index 10b51bc9a..f98e8f094 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes", - "maybe" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -45,35 +31,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "no", "yes", "maybe" ] - ], - "mandatory_without_value": false - }, - "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of \"{0}\"", - "variables": [ - { - "path": "rougail.var1", - "description": "a first variable" - } - ] - } }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -90,15 +62,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no", - "yes", - "maybe" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "rougail.var1", + "description": "a first variable" + } + ] + } + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_params_permissive.json b/tests/results/test_namespace_without_family/00_2default_calculated_params_permissive.json index 6b676237e..9ec17ce44 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_params_permissive.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated_params_permissive.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "a_value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_variable.json b/tests/results/test_namespace_without_family/00_2default_calculated_variable.json index 451dce52f..362367e24 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_variable.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -44,15 +31,36 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" ] - ], - "mandatory_without_value": true + }, + "multiple": true }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -70,33 +78,7 @@ "name": "Validator", "values": "type domainname" }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_variable_description.json b/tests/results/test_namespace_without_family/00_2default_calculated_variable_description.json index 0fe5cf065..779cef9db 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_variable_description.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated_variable_description.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -31,24 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "value of a variable!" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -59,10 +41,14 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "value of a variable!" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_variable_description_multi_line.json b/tests/results/test_namespace_without_family/00_2default_calculated_variable_description_multi_line.json index ef2971ab1..1a7d126f5 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_variable_description_multi_line.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated_variable_description_multi_line.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -31,24 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "value\nof\na\nvariable!" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -59,18 +41,18 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "value\nof\na\nvariable!" + } + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A new variable.", "properties": [ { @@ -81,10 +63,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_variable_transitive.json b/tests/results/test_namespace_without_family/00_2default_calculated_variable_transitive.json index a4c750158..7aa330936 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_variable_transitive.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated_variable_transitive.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -44,15 +31,36 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" ] - ], - "mandatory_without_value": true + }, + "multiple": true }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -73,33 +81,7 @@ "the domain name can be an IP" ] }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_4load_subfolder.json b/tests/results/test_namespace_without_family/00_4load_subfolder.json index 1ccddf5e7..e5175eaa4 100644 --- a/tests/results/test_namespace_without_family/00_4load_subfolder.json +++ b/tests/results/test_namespace_without_family/00_4load_subfolder.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -31,18 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -53,10 +41,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_5load_notype.json b/tests/results/test_namespace_without_family/00_5load_notype.json index 69333da38..b1ec36bcd 100644 --- a/tests/results/test_namespace_without_family/00_5load_notype.json +++ b/tests/results/test_namespace_without_family/00_5load_notype.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "without_type": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "rougail.without_type", - "names": [ - "without_type" - ], + "name": "without_type", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_6boolean.json b/tests/results/test_namespace_without_family/00_6boolean.json index 8ddcdc5ac..d37ea69a7 100644 --- a/tests/results/test_namespace_without_family/00_6boolean.json +++ b/tests/results/test_namespace_without_family/00_6boolean.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -61,22 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -87,22 +65,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var4": { "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -113,22 +85,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -139,22 +105,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -165,10 +125,12 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test_namespace_without_family/00_6boolean_no_mandatory.json b/tests/results/test_namespace_without_family/00_6boolean_no_mandatory.json index 9156ad6a5..922a70a48 100644 --- a/tests/results/test_namespace_without_family/00_6boolean_no_mandatory.json +++ b/tests/results/test_namespace_without_family/00_6boolean_no_mandatory.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,23 +13,17 @@ }, "children": { "variable": { + "path": "rougail.variable", + "name": "variable", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", - "path": "rougail.variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "variable_type": "boolean" } } } diff --git a/tests/results/test_namespace_without_family/00_6choice.json b/tests/results/test_namespace_without_family/00_6choice.json index c35c7c36a..9f8386a40 100644 --- a/tests/results/test_namespace_without_family/00_6choice.json +++ b/tests/results/test_namespace_without_family/00_6choice.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -39,12 +25,6 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true - }, - "var2": { "type": "variable", "variable_type": "choice", "choices": { @@ -54,11 +34,11 @@ "b", "c" ] - }, + } + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -69,12 +49,23 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + } }, "var3": { + "path": "rougail.var3", + "name": "var3", + "description": "The third variable.", + "properties": [], + "mode": "standard", "type": "variable", "variable_type": "choice", "choices": { @@ -85,20 +76,14 @@ "c", null ] - }, - "path": "rougail.var3", - "names": [ - "var3" - ], - "description": "The third variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } }, "var4": { + "path": "rougail.var4", + "name": "var4", + "description": "The forth variable.", + "properties": [], + "mode": "standard", "type": "variable", "variable_type": "choice", "choices": { @@ -108,20 +93,21 @@ "b", "c" ] - }, - "path": "rougail.var4", - "names": [ - "var4" - ], - "description": "The forth variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } }, "var5": { + "path": "rougail.var5", + "name": "var5", + "description": "The fifth variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -135,12 +121,12 @@ "b", "c" ] - }, - "path": "rougail.var5", - "names": [ - "var5" - ], - "description": "The fifth variable.", + } + }, + "var6": { + "path": "rougail.var6", + "name": "var6", + "description": "The sixth variable.", "properties": [ { "type": "property", @@ -150,12 +136,6 @@ } ], "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -169,25 +149,7 @@ 2, 3 ] - }, - "path": "rougail.var6", - "names": [ - "var6" - ], - "description": "The sixth variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6choice_calculation.json b/tests/results/test_namespace_without_family/00_6choice_calculation.json index b56159059..8880d4b73 100644 --- a/tests/results/test_namespace_without_family/00_6choice_calculation.json +++ b/tests/results/test_namespace_without_family/00_6choice_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "var": { + "path": "rougail.var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -26,25 +36,7 @@ "values": { "description": "choices is 0 to 9" } - }, - "path": "rougail.var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6choice_link.json b/tests/results/test_namespace_without_family/00_6choice_link.json index d4e2a66ee..ae3761115 100644 --- a/tests/results/test_namespace_without_family/00_6choice_link.json +++ b/tests/results/test_namespace_without_family/00_6choice_link.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -39,12 +25,30 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "The second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -65,25 +69,7 @@ "b", "c" ] - }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "The second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6choice_variable.json b/tests/results/test_namespace_without_family/00_6choice_variable.json index 8b90e050c..0e73717bd 100644 --- a/tests/results/test_namespace_without_family/00_6choice_variable.json +++ b/tests/results/test_namespace_without_family/00_6choice_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -45,17 +31,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -72,25 +72,7 @@ }, "description": "A second variable" } - }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6choice_variable_link.json b/tests/results/test_namespace_without_family/00_6choice_variable_link.json index a1eee6635..3857046bf 100644 --- a/tests/results/test_namespace_without_family/00_6choice_variable_link.json +++ b/tests/results/test_namespace_without_family/00_6choice_variable_link.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -45,17 +31,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -72,12 +72,12 @@ }, "description": "A second variable" } - }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A first variable.", + } + }, + "var3": { + "path": "rougail.var3", + "name": "var3", + "description": "A third variable.", "properties": [ { "type": "property", @@ -87,12 +87,6 @@ } ], "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -116,25 +110,7 @@ }, "description": "A second variable" } - }, - "path": "rougail.var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6choice_variable_link2.json b/tests/results/test_namespace_without_family/00_6choice_variable_link2.json index bcae39453..3c807385f 100644 --- a/tests/results/test_namespace_without_family/00_6choice_variable_link2.json +++ b/tests/results/test_namespace_without_family/00_6choice_variable_link2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -45,17 +31,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -72,39 +72,31 @@ }, "description": "A second variable" } - }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "standard" }, "children": { "var3": { + "path": "rougail.family.var3", + "name": "var3", + "description": "A third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -128,25 +120,7 @@ }, "description": "A second variable" } - }, - "path": "rougail.family.var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6custom.json b/tests/results/test_namespace_without_family/00_6custom.json index 46d8faa4f..c50b31cac 100644 --- a/tests/results/test_namespace_without_family/00_6custom.json +++ b/tests/results/test_namespace_without_family/00_6custom.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "custom1": { - "type": "variable", - "variable_type": "custom", "path": "rougail.custom1", - "names": [ - "custom1" - ], + "name": "custom1", "description": "The first variable.", "properties": [ { @@ -31,22 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "xxx" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "custom" }, "custom2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "custom", "path": "rougail.custom2", - "names": [ - "custom2" - ], + "name": "custom2", "description": "The seconf variable.", "properties": [ { @@ -57,10 +41,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "custom" } } } diff --git a/tests/results/test_namespace_without_family/00_6domainname.json b/tests/results/test_namespace_without_family/00_6domainname.json index 6da2ae434..68ea3c09e 100644 --- a/tests/results/test_namespace_without_family/00_6domainname.json +++ b/tests/results/test_namespace_without_family/00_6domainname.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "my.domain.name" - }, - "variable_type": "domainname", - "validators": { - "name": "Validator", - "values": "type domainname" - }, "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A domain name variable.", "properties": [ { @@ -39,10 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "my.domain.name" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "my.domain.name" + }, + "variable_type": "domainname", + "validators": { + "name": "Validator", + "values": "type domainname" + } } } } diff --git a/tests/results/test_namespace_without_family/00_6domainname_params.json b/tests/results/test_namespace_without_family/00_6domainname_params.json index c717b2509..62c326724 100644 --- a/tests/results/test_namespace_without_family/00_6domainname_params.json +++ b/tests/results/test_namespace_without_family/00_6domainname_params.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "variable": { + "path": "rougail.variable", + "name": "variable", + "description": "A domain name variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -27,25 +37,7 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "rougail.variable", - "names": [ - "variable" - ], - "description": "A domain name variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "my.domain.name" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6float.json b/tests/results/test_namespace_without_family/00_6float.json index 3674d4f7b..4edb0a062 100644 --- a/tests/results/test_namespace_without_family/00_6float.json +++ b/tests/results/test_namespace_without_family/00_6float.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0.0 - }, - "variable_type": "float", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -61,22 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -87,22 +65,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10.1 + "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var4": { "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -113,22 +85,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10.1 }, - "variable_type": "float", + "variable_type": "float" + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -139,22 +105,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10.1 }, - "variable_type": "float", + "variable_type": "float" + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -165,10 +125,12 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10.1 + }, + "variable_type": "float" } } } diff --git a/tests/results/test_namespace_without_family/00_6integer.json b/tests/results/test_namespace_without_family/00_6integer.json index edcd2ba16..1f0e09c9e 100644 --- a/tests/results/test_namespace_without_family/00_6integer.json +++ b/tests/results/test_namespace_without_family/00_6integer.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0 - }, - "variable_type": "integer", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -61,22 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -87,22 +65,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10 + "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var4": { "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "This forth variable.", "properties": [ { @@ -113,22 +85,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -139,22 +105,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -165,10 +125,12 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10 + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_namespace_without_family/00_6ip.adoc b/tests/results/test_namespace_without_family/00_6ip.adoc index e529faf7e..d5c2e248e 100644 --- a/tests/results/test_namespace_without_family/00_6ip.adoc +++ b/tests/results/test_namespace_without_family/00_6ip.adoc @@ -13,7 +13,7 @@ * reserved IP are allowed **Default**: 1.1.1.1/24 + -**Example**: 192.168.0.128/25 +**Example**: 192.168.0.129/25 | **rougail.var3** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[CIDR]` `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type. + **Validator**: IP must be in CIDR format + diff --git a/tests/results/test_namespace_without_family/00_6ip.changelog.adoc b/tests/results/test_namespace_without_family/00_6ip.changelog.adoc index 0e6e94b37..e9dddc601 100644 --- a/tests/results/test_namespace_without_family/00_6ip.changelog.adoc +++ b/tests/results/test_namespace_without_family/00_6ip.changelog.adoc @@ -15,7 +15,7 @@ * reserved IP are allowed **Default**: 1.1.1.1/24 + -**Example**: 192.168.0.128/25 +**Example**: 192.168.0.129/25 | **rougail.var3** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[CIDR]` `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type. + **Validator**: IP must be in CIDR format + diff --git a/tests/results/test_namespace_without_family/00_6ip.changelog.gitlab.md b/tests/results/test_namespace_without_family/00_6ip.changelog.gitlab.md index 3be11f448..5ccf83d87 100644 --- a/tests/results/test_namespace_without_family/00_6ip.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/00_6ip.changelog.gitlab.md @@ -3,7 +3,7 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **rougail.var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_namespace_without_family/00_6ip.changelog.html b/tests/results/test_namespace_without_family/00_6ip.changelog.html index 895f6f30e..f753c91dc 100644 --- a/tests/results/test_namespace_without_family/00_6ip.changelog.html +++ b/tests/results/test_namespace_without_family/00_6ip.changelog.html @@ -7,7 +7,7 @@ rougail.var1
    IP standard mandatory An IP.
    Validator: reserved IP are allowed
    Default: 1.1.1.1 rougail.var2
    IP standard mandatory An IP in CIDR format.
    Validators:
    • IP must be in CIDR format
      • -
    • reserved IP are allowed

    Default: 1.1.1.1/24
    Example: 192.168.0.128/25 +
  • reserved IP are allowed

    • Default: 1.1.1.1/24
    Example: 192.168.0.129/25 rougail.var3
    CIDR standard mandatoryAn IP in CIDR format with obsolete CIDR type.
    Validator: IP must be in CIDR format
    Default: 1.1.1.1/24 diff --git a/tests/results/test_namespace_without_family/00_6ip.changelog.md b/tests/results/test_namespace_without_family/00_6ip.changelog.md index 7d1b8212d..77b4c862e 100644 --- a/tests/results/test_namespace_without_family/00_6ip.changelog.md +++ b/tests/results/test_namespace_without_family/00_6ip.changelog.md @@ -3,6 +3,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **rougail.var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_namespace_without_family/00_6ip.changelog.sh b/tests/results/test_namespace_without_family/00_6ip.changelog.sh index 570817e5f..40719d439 100644 --- a/tests/results/test_namespace_without_family/00_6ip.changelog.sh +++ b/tests/results/test_namespace_without_family/00_6ip.changelog.sh @@ -12,7 +12,7 @@ │ │ • IP must be in CIDR format │ │ │ • reserved IP are allowed │ │ │ Default: 1.1.1.1/24 │ -│ │ Example: 192.168.0.128/25 │ +│ │ Example: 192.168.0.129/25 │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var3 │ An IP in CIDR format with obsolete │ │  CIDR   standard   mandatory  │ CIDR type. │ diff --git a/tests/results/test_namespace_without_family/00_6ip.gitlab.md b/tests/results/test_namespace_without_family/00_6ip.gitlab.md index 98a88b450..ab8ffec01 100644 --- a/tests/results/test_namespace_without_family/00_6ip.gitlab.md +++ b/tests/results/test_namespace_without_family/00_6ip.gitlab.md @@ -1,6 +1,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **rougail.var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_namespace_without_family/00_6ip.html b/tests/results/test_namespace_without_family/00_6ip.html index 3cdf05cb1..99f3365f1 100644 --- a/tests/results/test_namespace_without_family/00_6ip.html +++ b/tests/results/test_namespace_without_family/00_6ip.html @@ -5,7 +5,7 @@ rougail.var1
    IP standard mandatory An IP.
    Validator: reserved IP are allowed
    Default: 1.1.1.1 rougail.var2
    IP standard mandatory An IP in CIDR format.
    Validators:
    • IP must be in CIDR format
      • -
    • reserved IP are allowed

    Default: 1.1.1.1/24
    Example: 192.168.0.128/25 +
  • reserved IP are allowed

    • Default: 1.1.1.1/24
    Example: 192.168.0.129/25 rougail.var3
    CIDR standard mandatoryAn IP in CIDR format with obsolete CIDR type.
    Validator: IP must be in CIDR format
    Default: 1.1.1.1/24 diff --git a/tests/results/test_namespace_without_family/00_6ip.json b/tests/results/test_namespace_without_family/00_6ip.json index a69af22a3..5cbc8b4b2 100644 --- a/tests/results/test_namespace_without_family/00_6ip.json +++ b/tests/results/test_namespace_without_family/00_6ip.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.1" - }, - "variable_type": "IP", - "validators": { - "name": "Validator", - "values": "reserved IP are allowed" - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "An IP.", "properties": [ { @@ -39,12 +25,30 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.1" + }, + "variable_type": "IP", + "validators": { + "name": "Validator", + "values": "reserved IP are allowed" + } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "An IP in CIDR format.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -58,44 +62,14 @@ "reserved IP are allowed" ] }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "An IP in CIDR format.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", - "values": "192.168.0.128/25" - }, - "gen_examples": [ - "192.168.0.128/25" - ], - "mandatory_without_value": false + "values": "192.168.0.129/25" + } }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.1/24" - }, - "variable_type": "CIDR", - "validators": { - "name": "Validator", - "values": "IP must be in CIDR format" - }, "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "An IP in CIDR format with obsolete CIDR type.", "properties": [ { @@ -106,10 +80,16 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.1/24" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.1/24" + }, + "variable_type": "CIDR", + "validators": { + "name": "Validator", + "values": "IP must be in CIDR format" + } } } } diff --git a/tests/results/test_namespace_without_family/00_6ip.md b/tests/results/test_namespace_without_family/00_6ip.md index 98a88b450..ab8ffec01 100644 --- a/tests/results/test_namespace_without_family/00_6ip.md +++ b/tests/results/test_namespace_without_family/00_6ip.md @@ -1,6 +1,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **rougail.var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **rougail.var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_namespace_without_family/00_6ip.sh b/tests/results/test_namespace_without_family/00_6ip.sh index 01137eeaa..ea3881c27 100644 --- a/tests/results/test_namespace_without_family/00_6ip.sh +++ b/tests/results/test_namespace_without_family/00_6ip.sh @@ -10,7 +10,7 @@ │ │ • IP must be in CIDR format │ │ │ • reserved IP are allowed │ │ │ Default: 1.1.1.1/24 │ -│ │ Example: 192.168.0.128/25 │ +│ │ Example: 192.168.0.129/25 │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var3 │ An IP in CIDR format with obsolete │ │  CIDR   standard   mandatory  │ CIDR type. │ diff --git a/tests/results/test_namespace_without_family/00_6network.json b/tests/results/test_namespace_without_family/00_6network.json index 473d8b658..77f467613 100644 --- a/tests/results/test_namespace_without_family/00_6network.json +++ b/tests/results/test_namespace_without_family/00_6network.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.0" - }, - "variable_type": "network", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "An network.", "properties": [ { @@ -35,26 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "1.1.1.0/24" - }, - "variable_type": "network", - "validators": { - "name": "Validator", - "values": "network must be in CIDR format" + "values": "1.1.1.0" }, + "variable_type": "network" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "An network in CIDR format.", "properties": [ { @@ -65,26 +45,20 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0/24" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": "1.1.1.0/24" }, - "variable_type": "network CIDR", + "variable_type": "network", "validators": { "name": "Validator", "values": "network must be in CIDR format" - }, + } + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "An network in CIDR format with obsolete CIDR type.", "properties": [ { @@ -95,10 +69,16 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0/24" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.0/24" + }, + "variable_type": "network CIDR", + "validators": { + "name": "Validator", + "values": "network must be in CIDR format" + } } } } diff --git a/tests/results/test_namespace_without_family/00_6number.json b/tests/results/test_namespace_without_family/00_6number.json index edcd2ba16..1f0e09c9e 100644 --- a/tests/results/test_namespace_without_family/00_6number.json +++ b/tests/results/test_namespace_without_family/00_6number.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0 - }, - "variable_type": "integer", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -61,22 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -87,22 +65,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10 + "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var4": { "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "This forth variable.", "properties": [ { @@ -113,22 +85,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -139,22 +105,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -165,10 +125,12 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10 + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_namespace_without_family/00_6port.json b/tests/results/test_namespace_without_family/00_6port.json index cf2a3e4fe..72e6464aa 100644 --- a/tests/results/test_namespace_without_family/00_6port.json +++ b/tests/results/test_namespace_without_family/00_6port.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,20 +13,8 @@ }, "children": { "variable1": { - "type": "variable", - "variable_type": "port", - "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" - ] - }, "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A port variable.", "properties": [ { @@ -39,17 +25,7 @@ } ], "mode": "basic", - "gen_examples": [ - "111" - ], - "mandatory_without_value": true - }, - "variable2": { "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, "variable_type": "port", "validators": { "name": "Validators", @@ -58,11 +34,11 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, + } + }, + "variable2": { "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A port variable with default value.", "properties": [ { @@ -73,12 +49,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "variable3": { "type": "variable", "default": { "name": "Default", @@ -92,11 +62,11 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, + } + }, + "variable3": { "path": "rougail.variable3", - "names": [ - "variable3" - ], + "name": "variable3", "description": "A port variable with integer default value.", "properties": [ { @@ -107,10 +77,20 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "8080" + }, + "variable_type": "port", + "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" + ] + } } } } diff --git a/tests/results/test_namespace_without_family/00_6regexp.json b/tests/results/test_namespace_without_family/00_6regexp.json index b19a531a0..8085a9611 100644 --- a/tests/results/test_namespace_without_family/00_6regexp.json +++ b/tests/results/test_namespace_without_family/00_6regexp.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "#a1a1a1" - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A first variable.", "properties": [ { @@ -39,17 +25,23 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "examples": { "name": "Examples", "values": [ "#b1b1b1", "#b2b2b2" ] - }, - "gen_examples": [ - "#b1b1b1" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6regexp_link.json b/tests/results/test_namespace_without_family/00_6regexp_link.json index 1c1da58e2..afdf46bd4 100644 --- a/tests/results/test_namespace_without_family/00_6regexp_link.json +++ b/tests/results/test_namespace_without_family/00_6regexp_link.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "#a1a1a1" - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -39,19 +25,37 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "examples": { "name": "Examples", "values": [ "#b1b1b1", "#b2b2b2" ] - }, - "gen_examples": [ - "#b1b1b1" - ], - "mandatory_without_value": false + } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -69,31 +73,13 @@ "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Examples", "values": [ "#b2b1b1", "#b3b2b2" ] - }, - "gen_examples": [ - "#b2b1b1" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6secret.json b/tests/results/test_namespace_without_family/00_6secret.json index b6a628dc3..73a977a8b 100644 --- a/tests/results/test_namespace_without_family/00_6secret.json +++ b/tests/results/test_namespace_without_family/00_6secret.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "secret1": { - "type": "variable", - "variable_type": "secret", "path": "rougail.secret1", - "names": [ - "secret1" - ], + "name": "secret1", "description": "The first variable.", "properties": [ { @@ -31,22 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "secrets" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "secret" }, "secret2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "secret", "path": "rougail.secret2", - "names": [ - "secret2" - ], + "name": "secret2", "description": "The second variable.", "properties": [ { @@ -57,10 +41,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "secret" } } } diff --git a/tests/results/test_namespace_without_family/00_6secret_param.adoc b/tests/results/test_namespace_without_family/00_6secret_param.adoc index 8fd50069d..74e21a1fd 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.adoc +++ b/tests/results/test_namespace_without_family/00_6secret_param.adoc @@ -3,7 +3,8 @@ | Variable | Description | **rougail.secret1** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `basic` `mandatory` | The first variable. + -**Validator**: minimum length for the secret is 10 characters +**Validator**: minimum length for the secret is 10 characters + +**Example**: ALongS4cr4t | **rougail.secret2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `standard` `mandatory` | The second variable. + **Validators**: diff --git a/tests/results/test_namespace_without_family/00_6secret_param.changelog.adoc b/tests/results/test_namespace_without_family/00_6secret_param.changelog.adoc index 2853f4c70..cc4d5f01d 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.changelog.adoc +++ b/tests/results/test_namespace_without_family/00_6secret_param.changelog.adoc @@ -5,7 +5,8 @@ | Variable | Description | **rougail.secret1** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `basic` `mandatory` | The first variable. + -**Validator**: minimum length for the secret is 10 characters +**Validator**: minimum length for the secret is 10 characters + +**Example**: ALongS4cr4t | **rougail.secret2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `standard` `mandatory` | The second variable. + **Validators**: diff --git a/tests/results/test_namespace_without_family/00_6secret_param.changelog.gitlab.md b/tests/results/test_namespace_without_family/00_6secret_param.changelog.gitlab.md index 46ab93646..cd880bcb0 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/00_6secret_param.changelog.gitlab.md @@ -2,7 +2,7 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **rougail.secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **rougail.secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_namespace_without_family/00_6secret_param.changelog.html b/tests/results/test_namespace_without_family/00_6secret_param.changelog.html index 5d41c290b..bf1d4a5dc 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.changelog.html +++ b/tests/results/test_namespace_without_family/00_6secret_param.changelog.html @@ -2,14 +2,14 @@ - + - + +
  • 'forbidden characters: "$" and "^"'

    • Default: value +
  • 'forbidden characters: "$"'

    • Default: value
    Variable Description
    Variable Description
    rougail.secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    rougail.secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    Example: ALongS4cr4t
    rougail.secret2
    secret standard mandatory    		The second variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$" and "^"'

    Default: value
    rougail.secret3
    secret standard mandatory    		The third variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$"'

    Default: value
    diff --git a/tests/results/test_namespace_without_family/00_6secret_param.changelog.md b/tests/results/test_namespace_without_family/00_6secret_param.changelog.md index f14502d3a..2c097b48f 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.changelog.md +++ b/tests/results/test_namespace_without_family/00_6secret_param.changelog.md @@ -2,7 +2,7 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **rougail.secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **rougail.secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_namespace_without_family/00_6secret_param.changelog.sh b/tests/results/test_namespace_without_family/00_6secret_param.changelog.sh index 58090ac0e..458dff3f5 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.changelog.sh +++ b/tests/results/test_namespace_without_family/00_6secret_param.changelog.sh @@ -6,6 +6,7 @@ │ rougail.secret1 │ The first variable. │ │  secret   basic   mandatory  │ Validator: minimum length for the │ │ │ secret is 10 characters │ +│ │ Example: ALongS4cr4t │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.secret2 │ The second variable. │ │  secret   standard   mandatory  │ Validators: │ diff --git a/tests/results/test_namespace_without_family/00_6secret_param.gitlab.md b/tests/results/test_namespace_without_family/00_6secret_param.gitlab.md index 9dfa782c3..c724c4b87 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.gitlab.md +++ b/tests/results/test_namespace_without_family/00_6secret_param.gitlab.md @@ -1,6 +1,6 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **rougail.secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **rougail.secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_namespace_without_family/00_6secret_param.html b/tests/results/test_namespace_without_family/00_6secret_param.html index 3845fe442..3ba3fc411 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.html +++ b/tests/results/test_namespace_without_family/00_6secret_param.html @@ -1,13 +1,13 @@ - + - + +
  • 'forbidden characters: "$" and "^"'

    • Default: value +
  • 'forbidden characters: "$"'

    • Default: value
    Variable Description
    Variable Description
    rougail.secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    rougail.secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    Example: ALongS4cr4t
    rougail.secret2
    secret standard mandatory    		The second variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$" and "^"'

    Default: value
    rougail.secret3
    secret standard mandatory    		The third variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$"'

    Default: value
    diff --git a/tests/results/test_namespace_without_family/00_6secret_param.json b/tests/results/test_namespace_without_family/00_6secret_param.json index 0af8035b8..2b0d78c98 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.json +++ b/tests/results/test_namespace_without_family/00_6secret_param.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "secret1": { - "type": "variable", - "variable_type": "secret", - "validators": { - "name": "Validator", - "values": "minimum length for the secret is 10 characters" - }, "path": "rougail.secret1", - "names": [ - "secret1" - ], + "name": "secret1", "description": "The first variable.", "properties": [ { @@ -35,12 +25,30 @@ } ], "mode": "basic", - "gen_examples": [ - "secrets" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "secret", + "validators": { + "name": "Validator", + "values": "minimum length for the secret is 10 characters" + }, + "examples": { + "name": "Example", + "values": "ALongS4cr4t" + } }, "secret2": { + "path": "rougail.secret2", + "name": "secret2", + "description": "The second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -53,12 +61,12 @@ "maximum length for the secret is 10 characters", "forbidden characters: \"$\" and \"^\"" ] - }, - "path": "rougail.secret2", - "names": [ - "secret2" - ], - "description": "The second variable.", + } + }, + "secret3": { + "path": "rougail.secret3", + "name": "secret3", + "description": "The third variable.", "properties": [ { "type": "property", @@ -68,12 +76,6 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "secret3": { "type": "variable", "default": { "name": "Default", @@ -86,25 +88,7 @@ "maximum length for the secret is 10 characters", "forbidden characters: \"$\"" ] - }, - "path": "rougail.secret3", - "names": [ - "secret3" - ], - "description": "The third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_6secret_param.md b/tests/results/test_namespace_without_family/00_6secret_param.md index 9dfa782c3..c724c4b87 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.md +++ b/tests/results/test_namespace_without_family/00_6secret_param.md @@ -1,6 +1,6 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **rougail.secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **rougail.secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **rougail.secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_namespace_without_family/00_6secret_param.sh b/tests/results/test_namespace_without_family/00_6secret_param.sh index 01d06985c..33ea32c57 100644 --- a/tests/results/test_namespace_without_family/00_6secret_param.sh +++ b/tests/results/test_namespace_without_family/00_6secret_param.sh @@ -4,6 +4,7 @@ │ rougail.secret1 │ The first variable. │ │  secret   basic   mandatory  │ Validator: minimum length for the │ │ │ secret is 10 characters │ +│ │ Example: ALongS4cr4t │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.secret2 │ The second variable. │ │  secret   standard   mandatory  │ Validators: │ diff --git a/tests/results/test_namespace_without_family/00_6string.json b/tests/results/test_namespace_without_family/00_6string.json index 24f758d19..c3cf531d8 100644 --- a/tests/results/test_namespace_without_family/00_6string.json +++ b/tests/results/test_namespace_without_family/00_6string.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -31,18 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -53,18 +41,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -75,22 +57,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var4": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -101,22 +73,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -127,22 +93,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -153,22 +113,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", - "values": "8080" + "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var7": { "path": "rougail.var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -179,22 +133,16 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", - "values": "true" + "values": "8080" }, - "variable_type": "string", + "variable_type": "string" + }, + "var8": { "path": "rougail.var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The height variable.", "properties": [ { @@ -205,10 +153,12 @@ } ], "mode": "standard", - "gen_examples": [ - "true" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "true" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_7choice_quote.json b/tests/results/test_namespace_without_family/00_7choice_quote.json index 7c3269f2f..532b48ff8 100644 --- a/tests/results/test_namespace_without_family/00_7choice_quote.json +++ b/tests/results/test_namespace_without_family/00_7choice_quote.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "var": { + "path": "rougail.var", + "name": "var", + "description": "A choice.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -28,25 +38,7 @@ "quote\"", "quote\"'" ] - }, - "path": "rougail.var", - "names": [ - "var" - ], - "description": "A choice.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "quote'" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_7help.json b/tests/results/test_namespace_without_family/00_7help.json index 88d85d90f..2de586c97 100644 --- a/tests/results/test_namespace_without_family/00_7help.json +++ b/tests/results/test_namespace_without_family/00_7help.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "help": [ "Multi line\n\nHelp\n\nWith useful information." @@ -34,18 +28,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "help": [ "Multi line\nHelp\nWith useful information." @@ -59,10 +47,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_7help_quote.json b/tests/results/test_namespace_without_family/00_7help_quote.json index 9dded2bed..37b075e4f 100644 --- a/tests/results/test_namespace_without_family/00_7help_quote.json +++ b/tests/results/test_namespace_without_family/00_7help_quote.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "help": [ "Message with '." @@ -34,18 +28,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "help": [ "Message with \"." @@ -59,10 +47,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_7help_sup.json b/tests/results/test_namespace_without_family/00_7help_sup.json index ec9fd047f..c8c0260a4 100644 --- a/tests/results/test_namespace_without_family/00_7help_sup.json +++ b/tests/results/test_namespace_without_family/00_7help_sup.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first .", "help": [ "Multi line\n\n\n\nWith useful information." @@ -34,18 +28,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second .", "help": [ "Multi line\n\nWith useful information." @@ -59,10 +47,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_7value_doublequote.json b/tests/results/test_namespace_without_family/00_7value_doublequote.json index adf63671a..9c9a9e905 100644 --- a/tests/results/test_namespace_without_family/00_7value_doublequote.json +++ b/tests/results/test_namespace_without_family/00_7value_doublequote.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote\"" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "quote\"" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote\"" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_7value_doublequote2.json b/tests/results/test_namespace_without_family/00_7value_doublequote2.json index 60cf64ce4..2db2ef36a 100644 --- a/tests/results/test_namespace_without_family/00_7value_doublequote2.json +++ b/tests/results/test_namespace_without_family/00_7value_doublequote2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote'\"" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "quote'\"" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote'\"" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_7value_doublequote3.json b/tests/results/test_namespace_without_family/00_7value_doublequote3.json index ce8929630..02f9e1ad6 100644 --- a/tests/results/test_namespace_without_family/00_7value_doublequote3.json +++ b/tests/results/test_namespace_without_family/00_7value_doublequote3.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote\\\"\\'" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "quote\\\"\\'" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote\\\"\\'" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_7value_quote.json b/tests/results/test_namespace_without_family/00_7value_quote.json index 8ba3f5733..7b09502d1 100644 --- a/tests/results/test_namespace_without_family/00_7value_quote.json +++ b/tests/results/test_namespace_without_family/00_7value_quote.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote'" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "quote'" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote'" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_8calculation_information.json b/tests/results/test_namespace_without_family/00_8calculation_information.json index de0b2fb3a..665547703 100644 --- a/tests/results/test_namespace_without_family/00_8calculation_information.json +++ b/tests/results/test_namespace_without_family/00_8calculation_information.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "get information test_information" - } - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -37,10 +25,14 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "get information test_information" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_8calculation_namespace.json b/tests/results/test_namespace_without_family/00_8calculation_namespace.json index d1b778054..d241e12d8 100644 --- a/tests/results/test_namespace_without_family/00_8calculation_namespace.json +++ b/tests/results/test_namespace_without_family/00_8calculation_namespace.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,23 +13,17 @@ }, "children": { "variable": { + "path": "rougail.variable", + "name": "variable", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", "values": "the value of the namespace" }, - "variable_type": "string", - "path": "rougail.variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "Rougail" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_8calculation_param_namespace.json b/tests/results/test_namespace_without_family/00_8calculation_param_namespace.json index a123807ce..431b80f16 100644 --- a/tests/results/test_namespace_without_family/00_8calculation_param_namespace.json +++ b/tests/results/test_namespace_without_family/00_8calculation_param_namespace.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,23 +13,17 @@ }, "children": { "variable": { + "path": "rougail.variable", + "name": "variable", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", "values": "depends on a calculation" }, - "variable_type": "string", - "path": "rougail.variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "Rougail" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_8test.json b/tests/results/test_namespace_without_family/00_8test.json index fd7ca3621..b5b172ab5 100644 --- a/tests/results/test_namespace_without_family/00_8test.json +++ b/tests/results/test_namespace_without_family/00_8test.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -31,26 +25,16 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Example", "values": "test" - }, - "gen_examples": [ - "test" - ], - "mandatory_without_value": true + } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -61,22 +45,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string", "examples": { "name": "Example", "values": "test" - }, - "gen_examples": [ - "test" - ], - "mandatory_without_value": false + } }, "var3": { - "type": "variable", - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -87,28 +69,24 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Examples", "values": [ "test1", "test2" ] - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": true + } }, "var4": { - "type": "variable", - "variable_type": "string", "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [], "mode": "standard", + "type": "variable", + "variable_type": "string", "examples": { "name": "Examples", "values": [ @@ -116,23 +94,11 @@ "test1", "test2" ] - }, - "gen_examples": [ - null - ], - "mandatory_without_value": false + } }, "var5": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -143,22 +109,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean", "examples": { "name": "Example", "values": false - }, - "gen_examples": [ - false - ], - "mandatory_without_value": false + } }, "var6": { - "type": "variable", - "variable_type": "string", "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -175,6 +139,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -182,14 +148,7 @@ "test1", "test2" ] - }, - "gen_examples": [ - [ - "test1", - "test2" - ] - ], - "mandatory_without_value": true + } } } } diff --git a/tests/results/test_namespace_without_family/00_9choice_variable_multi.json b/tests/results/test_namespace_without_family/00_9choice_variable_multi.json index d12373ce6..631250e1d 100644 --- a/tests/results/test_namespace_without_family/00_9choice_variable_multi.json +++ b/tests/results/test_namespace_without_family/00_9choice_variable_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "variable1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "val1", - "val2" - ] - }, "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -44,15 +31,6 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "a_choice" - ] - ], - "mandatory_without_value": true - }, - "variable2": { "type": "variable", "variable_type": "choice", "choices": { @@ -62,10 +40,11 @@ "val2" ] }, + "multiple": true + }, + "variable2": { "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -76,13 +55,16 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a_choice" + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "val1", + "val2" ] - ], - "mandatory_without_value": false + }, + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_9choice_variables.json b/tests/results/test_namespace_without_family/00_9choice_variables.json index 82aa174f7..dc120fe54 100644 --- a/tests/results/test_namespace_without_family/00_9choice_variables.json +++ b/tests/results/test_namespace_without_family/00_9choice_variables.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "source_variable_1": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "rougail.source_variable_1", - "names": [ - "source_variable_1" - ], + "name": "source_variable_1", "description": "The first source variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "source_variable_2": { "type": "variable", "default": { "name": "Default", - "values": "val2" + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "source_variable_2": { "path": "rougail.source_variable_2", - "names": [ - "source_variable_2" - ], + "name": "source_variable_2", "description": "The second source variable.", "properties": [ { @@ -61,12 +45,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val2" + }, + "variable_type": "string" }, "my_variable": { + "path": "rougail.my_variable", + "name": "my_variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -93,25 +91,7 @@ "description": "The second source variable" } ] - }, - "path": "rougail.my_variable", - "names": [ - "my_variable" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation.json b/tests/results/test_namespace_without_family/00_9default_calculation.json index ef8ed90c6..e9b9f08fd 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "concat all parameters" - } - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -37,10 +25,14 @@ } ], "mode": "standard", - "gen_examples": [ - "string_1_True_" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "concat all parameters" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_information.json b/tests/results/test_namespace_without_family/00_9default_calculation_information.json index f0e9b8e30..32411e326 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_information.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_information.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns the information" - } - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -37,10 +25,14 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns the information" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_information_other_variable.json b/tests/results/test_namespace_without_family/00_9default_calculation_information_other_variable.json index 50ce0fc21..3f320c5a1 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_information_other_variable.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_information_other_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -31,22 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -57,10 +41,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional.json b/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional.json index 5a8de09fb..acd4e1533 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "rougail.my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -34,31 +24,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "rougail.my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "rougail.my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -74,13 +49,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "rougail.my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional2.json b/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional2.json index 5a8de09fb..acd4e1533 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional2.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "rougail.my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -34,31 +24,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "rougail.my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "rougail.my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -74,13 +49,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "rougail.my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional_default.json b/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional_default.json index 54c19f185..acd4e1533 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional_default.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_multi_optional_default.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "rougail.my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -34,31 +24,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "rougail.my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "rougail.my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -74,14 +49,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "value" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "rougail.my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_optional.json b/tests/results/test_namespace_without_family/00_9default_calculation_optional.json index b1462964f..265dd8f1d 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_optional.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_optional.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "my_calculated_variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -36,13 +30,9 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_optional_exists.json b/tests/results/test_namespace_without_family/00_9default_calculation_optional_exists.json index 49cb305ff..918a9d6b6 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_optional_exists.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_optional_exists.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -43,16 +30,35 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "my_calculated_variable": { + "path": "rougail.my_calculated_variable", + "name": "my_calculated_variable", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -66,33 +72,7 @@ } }, "variable_type": "string", - "path": "rougail.my_calculated_variable", - "names": [ - "my_calculated_variable" - ], - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/00_9default_calculation_param_optional.json b/tests/results/test_namespace_without_family/00_9default_calculation_param_optional.json index 061e14f48..a95f9bb35 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation_param_optional.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation_param_optional.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,11 @@ }, "children": { "var1": { + "path": "rougail.var1", + "name": "var1", + "description": "A first variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -22,30 +25,11 @@ "description": "returns a value" } }, - "variable_type": "string", - "path": "rougail.var1", - "names": [ - "var1" - ], - "description": "A first variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -56,10 +40,12 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9default_information_other_variable.json b/tests/results/test_namespace_without_family/00_9default_information_other_variable.json index de38e96e9..652f12d3f 100644 --- a/tests/results/test_namespace_without_family/00_9default_information_other_variable.json +++ b/tests/results/test_namespace_without_family/00_9default_information_other_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -31,22 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"rougail.var1\"" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -57,10 +41,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"rougail.var1\"" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9default_information_other_variable2.json b/tests/results/test_namespace_without_family/00_9default_information_other_variable2.json index de38e96e9..652f12d3f 100644 --- a/tests/results/test_namespace_without_family/00_9default_information_other_variable2.json +++ b/tests/results/test_namespace_without_family/00_9default_information_other_variable2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -31,22 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"rougail.var1\"" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -57,10 +41,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"rougail.var1\"" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9default_integer.json b/tests/results/test_namespace_without_family/00_9default_integer.json index 35105f7ad..ee6c871a4 100644 --- a/tests/results/test_namespace_without_family/00_9default_integer.json +++ b/tests/results/test_namespace_without_family/00_9default_integer.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "var": { + "path": "rougail.var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -26,25 +36,7 @@ "values": { "description": "choice for 0 to 9" } - }, - "path": "rougail.var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_9default_number.json b/tests/results/test_namespace_without_family/00_9default_number.json index 35105f7ad..ee6c871a4 100644 --- a/tests/results/test_namespace_without_family/00_9default_number.json +++ b/tests/results/test_namespace_without_family/00_9default_number.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "var": { + "path": "rougail.var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -26,25 +36,7 @@ "values": { "description": "choice for 0 to 9" } - }, - "path": "rougail.var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/00_9extra.json b/tests/results/test_namespace_without_family/00_9extra.json index 9115e805e..79510ad35 100644 --- a/tests/results/test_namespace_without_family/00_9extra.json +++ b/tests/results/test_namespace_without_family/00_9extra.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "rougail" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "rougail" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "rougail" + }, + "variable_type": "string" } } }, @@ -46,9 +38,7 @@ "type": "namespace", "informations": { "path": "extra", - "names": [ - "extra" - ], + "name": "extra", "description": "Extra", "properties": [], "mode": "standard", @@ -58,18 +48,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "return no" - } - }, - "variable_type": "string", "path": "extra.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -80,10 +60,14 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "return no" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9extra_calculation.json b/tests/results/test_namespace_without_family/00_9extra_calculation.json index 53672bed8..c85093a37 100644 --- a/tests/results/test_namespace_without_family/00_9extra_calculation.json +++ b/tests/results/test_namespace_without_family/00_9extra_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" } } }, @@ -46,9 +38,7 @@ "type": "namespace", "informations": { "path": "extra", - "names": [ - "extra" - ], + "name": "extra", "description": "Extra", "properties": [], "mode": "standard", @@ -58,6 +48,18 @@ }, "children": { "variable1": { + "path": "extra.variable1", + "name": "variable1", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -70,39 +72,11 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "extra.variable1", - "names": [ - "variable1" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "variable_type": "string" }, "variable2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy the value of rougail.variable" - } - }, - "variable_type": "string", "path": "extra.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -113,12 +87,6 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "variable3": { "type": "variable", "default": { "name": "Default", @@ -126,11 +94,11 @@ "description": "copy the value of rougail.variable" } }, - "variable_type": "string", + "variable_type": "string" + }, + "variable3": { "path": "extra.variable3", - "names": [ - "variable3" - ], + "name": "variable3", "description": "A third variable.", "properties": [ { @@ -141,10 +109,14 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy the value of rougail.variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/00_9extra_ouside.json b/tests/results/test_namespace_without_family/00_9extra_ouside.json index 603d52fb3..c0301d59d 100644 --- a/tests/results/test_namespace_without_family/00_9extra_ouside.json +++ b/tests/results/test_namespace_without_family/00_9extra_ouside.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "variable": { + "path": "rougail.variable", + "name": "variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -27,25 +37,7 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "rougail.variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "value in extra" - ], - "mandatory_without_value": false + "variable_type": "string" } } }, @@ -53,9 +45,7 @@ "type": "namespace", "informations": { "path": "extra", - "names": [ - "extra" - ], + "name": "extra", "description": "Extra", "properties": [], "mode": "standard", @@ -65,16 +55,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "value in extra" - }, - "variable_type": "string", "path": "extra.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -85,10 +67,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value in extra" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value in extra" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/01_6boolean_multi.json b/tests/results/test_namespace_without_family/01_6boolean_multi.json index 996189070..def98e456 100644 --- a/tests/results/test_namespace_without_family/01_6boolean_multi.json +++ b/tests/results/test_namespace_without_family/01_6boolean_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - true - ] - }, - "variable_type": "boolean", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -43,15 +31,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -60,10 +39,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -80,15 +60,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -97,10 +68,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -117,27 +89,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - false + true ] }, "variable_type": "boolean", + "multiple": true + }, + "var4": { "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -154,15 +118,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -171,10 +126,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -191,15 +147,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -208,10 +155,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -228,27 +176,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - true + false ] }, "variable_type": "boolean", + "multiple": true + }, + "var7": { "path": "rougail.var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -265,15 +205,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -282,10 +213,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var8": { "path": "rougail.var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -302,13 +234,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ true ] - ], - "mandatory_without_value": false + }, + "variable_type": "boolean", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_6custom_multi.json b/tests/results/test_namespace_without_family/01_6custom_multi.json index f258d7427..adfeac206 100644 --- a/tests/results/test_namespace_without_family/01_6custom_multi.json +++ b/tests/results/test_namespace_without_family/01_6custom_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "custom1": { - "type": "variable", - "variable_type": "custom", "path": "rougail.custom1", - "names": [ - "custom1" - ], + "name": "custom1", "description": "A first custom variable.", "properties": [ { @@ -37,27 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "xxx" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "custom", + "multiple": true }, "custom2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "custom", "path": "rougail.custom2", - "names": [ - "custom2" - ], + "name": "custom2", "description": "A second custom variable.", "properties": [ { @@ -74,13 +54,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "custom", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_6float_multi.json b/tests/results/test_namespace_without_family/01_6float_multi.json index 006ccbd2c..97a3f345e 100644 --- a/tests/results/test_namespace_without_family/01_6float_multi.json +++ b/tests/results/test_namespace_without_family/01_6float_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0.0 - ] - }, - "variable_type": "float", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -43,15 +31,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -60,10 +39,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -80,15 +60,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -97,10 +68,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -117,27 +89,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - 10.1 + 0.0 ] }, "variable_type": "float", + "multiple": true + }, + "var4": { "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -154,15 +118,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -171,10 +126,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -191,15 +147,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -208,10 +155,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -228,27 +176,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - 0.0 + 10.1 ] }, "variable_type": "float", + "multiple": true + }, + "var7": { "path": "rougail.var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -265,15 +205,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -282,10 +213,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var8": { "path": "rougail.var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -302,13 +234,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ 0.0 ] - ], - "mandatory_without_value": false + }, + "variable_type": "float", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_6integer_multi.json b/tests/results/test_namespace_without_family/01_6integer_multi.json index 365f8e4e6..b12fb02cc 100644 --- a/tests/results/test_namespace_without_family/01_6integer_multi.json +++ b/tests/results/test_namespace_without_family/01_6integer_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0 - ] - }, - "variable_type": "integer", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -43,15 +31,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -60,10 +39,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -80,15 +60,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -97,10 +68,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -117,27 +89,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - 10 + 0 ] }, "variable_type": "integer", + "multiple": true + }, + "var4": { "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -154,15 +118,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -171,10 +126,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -191,15 +147,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -208,10 +155,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -228,27 +176,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - 0 + 10 ] }, "variable_type": "integer", + "multiple": true + }, + "var7": { "path": "rougail.var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -265,15 +205,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -282,10 +213,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var8": { "path": "rougail.var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -302,13 +234,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ 0 ] - ], - "mandatory_without_value": false + }, + "variable_type": "integer", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_6integer_multi_mandatory.json b/tests/results/test_namespace_without_family/01_6integer_multi_mandatory.json index d96186d61..704474a7c 100644 --- a/tests/results/test_namespace_without_family/01_6integer_multi_mandatory.json +++ b/tests/results/test_namespace_without_family/01_6integer_multi_mandatory.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "integer", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "The first variable.", "properties": [ { @@ -37,13 +31,9 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - 42 - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "integer", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_6string_empty.json b/tests/results/test_namespace_without_family/01_6string_empty.json index c772cbc1f..21cf68902 100644 --- a/tests/results/test_namespace_without_family/01_6string_empty.json +++ b/tests/results/test_namespace_without_family/01_6string_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value", - null - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The second variable.", "properties": [ { @@ -44,14 +31,16 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value", null ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_6string_multi.json b/tests/results/test_namespace_without_family/01_6string_multi.json index 9a04ed5e3..5a4ce4580 100644 --- a/tests/results/test_namespace_without_family/01_6string_multi.json +++ b/tests/results/test_namespace_without_family/01_6string_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "var2": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -68,21 +54,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "var3": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -99,27 +77,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "var4": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -136,15 +100,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -153,10 +108,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var5": { "path": "rougail.var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -173,15 +129,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -190,10 +137,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var6": { "path": "rougail.var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -210,15 +158,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", @@ -227,10 +166,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var7": { "path": "rougail.var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -247,15 +187,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -264,10 +195,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var8": { "path": "rougail.var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -284,13 +216,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_6string_multi_length.json b/tests/results/test_namespace_without_family/01_6string_multi_length.json index 84907b675..5aaf45de4 100644 --- a/tests/results/test_namespace_without_family/01_6string_multi_length.json +++ b/tests/results/test_namespace_without_family/01_6string_multi_length.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,26 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2", - "val3" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "needs exactly 3 values" - } - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The variable.", "properties": [ { @@ -51,17 +31,43 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2", "val3" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "needs exactly 3 values" + } + }, + "multiple": true }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "The variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -82,34 +88,7 @@ } ] }, - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "The variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val4", - "val5" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_7value_multi_doublequote.json b/tests/results/test_namespace_without_family/01_7value_multi_doublequote.json index e7012a38d..7c739eabe 100644 --- a/tests/results/test_namespace_without_family/01_7value_multi_doublequote.json +++ b/tests/results/test_namespace_without_family/01_7value_multi_doublequote.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote\"" - ] - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -43,13 +31,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote\"" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_7value_multi_doublequote2.json b/tests/results/test_namespace_without_family/01_7value_multi_doublequote2.json index fab3ba5a7..8f9646b0f 100644 --- a/tests/results/test_namespace_without_family/01_7value_multi_doublequote2.json +++ b/tests/results/test_namespace_without_family/01_7value_multi_doublequote2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote'\"" - ] - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -43,13 +31,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote'\"" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_7value_multi_quote.json b/tests/results/test_namespace_without_family/01_7value_multi_quote.json index 35c0f9765..1e5d40bf0 100644 --- a/tests/results/test_namespace_without_family/01_7value_multi_quote.json +++ b/tests/results/test_namespace_without_family/01_7value_multi_quote.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote'" - ] - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -43,13 +31,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote'" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_8calculation_information_multi.json b/tests/results/test_namespace_without_family/01_8calculation_information_multi.json index 3cdffc876..959803cb9 100644 --- a/tests/results/test_namespace_without_family/01_8calculation_information_multi.json +++ b/tests/results/test_namespace_without_family/01_8calculation_information_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "get information test_information" - } - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -43,13 +31,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "get information test_information" + } + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/01_9choice_variable_multi.json b/tests/results/test_namespace_without_family/01_9choice_variable_multi.json index 69b049634..d618d4aff 100644 --- a/tests/results/test_namespace_without_family/01_9choice_variable_multi.json +++ b/tests/results/test_namespace_without_family/01_9choice_variable_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,20 +13,8 @@ }, "children": { "variable1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -45,17 +31,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "variable2": { + "path": "rougail.variable2", + "name": "variable2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", "type": "variable", "variable_type": "choice", "choices": { @@ -68,25 +68,7 @@ }, "description": "A first variable" } - }, - "path": "rougail.variable2", - "names": [ - "variable2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + } } } } diff --git a/tests/results/test_namespace_without_family/01_9choice_variable_optional.json b/tests/results/test_namespace_without_family/01_9choice_variable_optional.json index b279cdfee..90fb0dac4 100644 --- a/tests/results/test_namespace_without_family/01_9choice_variable_optional.json +++ b/tests/results/test_namespace_without_family/01_9choice_variable_optional.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "variable": { + "path": "rougail.variable", + "name": "variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -28,25 +38,7 @@ "b", "c" ] - }, - "path": "rougail.variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "c" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/02_0tags.json b/tests/results/test_namespace_without_family/02_0tags.json index 1f70f8d42..deba63f5a 100644 --- a/tests/results/test_namespace_without_family/02_0tags.json +++ b/tests/results/test_namespace_without_family/02_0tags.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -31,22 +25,16 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "tags": { "name": "Tag", "values": "one_tag" - }, - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + } }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -57,17 +45,15 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "tags": { "name": "Tags", "values": [ "one_tag", "second_tag" ] - }, - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + } } } } diff --git a/tests/results/test_namespace_without_family/04_0type_param.json b/tests/results/test_namespace_without_family/04_0type_param.json index b58ce959b..37fa5819f 100644 --- a/tests/results/test_namespace_without_family/04_0type_param.json +++ b/tests/results/test_namespace_without_family/04_0type_param.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "int": { + "path": "rougail.int", + "name": "int", + "description": "A limited number.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -27,25 +37,7 @@ "the minimum value is 0", "the maximum value is 100" ] - }, - "path": "rougail.int", - "names": [ - "int" - ], - "description": "A limited number.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/04_0type_param_integer.json b/tests/results/test_namespace_without_family/04_0type_param_integer.json index d5ef12271..651fe9a89 100644 --- a/tests/results/test_namespace_without_family/04_0type_param_integer.json +++ b/tests/results/test_namespace_without_family/04_0type_param_integer.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "int": { + "path": "rougail.int", + "name": "int", + "description": "A limited integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -27,25 +37,7 @@ "the minimum value is 0", "the maximum value is 100" ] - }, - "path": "rougail.int", - "names": [ - "int" - ], - "description": "A limited integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/04_1auto_save.json b/tests/results/test_namespace_without_family/04_1auto_save.json index 14dcd701a..76d059f41 100644 --- a/tests/results/test_namespace_without_family/04_1auto_save.json +++ b/tests/results/test_namespace_without_family/04_1auto_save.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "An auto save variable.", "properties": [ { @@ -41,10 +31,12 @@ } ], "mode": "basic", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1auto_save_and_calculated.json b/tests/results/test_namespace_without_family/04_1auto_save_and_calculated.json index 976886b5f..245ac3ed2 100644 --- a/tests/results/test_namespace_without_family/04_1auto_save_and_calculated.json +++ b/tests/results/test_namespace_without_family/04_1auto_save_and_calculated.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,29 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.var1", - "type": "variable" - }, - "description": "A first variable" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -74,10 +51,19 @@ } ], "mode": "basic", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.var1", + "type": "variable" + }, + "description": "A first variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1auto_save_and_calculated_hidden.json b/tests/results/test_namespace_without_family/04_1auto_save_and_calculated_hidden.json index 6441cb3c8..e9d5124a8 100644 --- a/tests/results/test_namespace_without_family/04_1auto_save_and_calculated_hidden.json +++ b/tests/results/test_namespace_without_family/04_1auto_save_and_calculated_hidden.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value is always yes" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -78,10 +60,14 @@ } ], "mode": "basic", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value is always yes" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1default_calculation_hidden.json b/tests/results/test_namespace_without_family/04_1default_calculation_hidden.json index bb7ebb35c..c14601b76 100644 --- a/tests/results/test_namespace_without_family/04_1default_calculation_hidden.json +++ b/tests/results/test_namespace_without_family/04_1default_calculation_hidden.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -70,22 +58,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -96,10 +74,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_2.json b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_2.json index f6cc5d6df..c14601b76 100644 --- a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_2.json +++ b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -70,22 +58,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -96,10 +74,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_3.json b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_3.json index 477de914e..0adc970ed 100644 --- a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_3.json +++ b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_3.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_4.json b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_4.json index 12944120c..7d95b3db7 100644 --- a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_4.json +++ b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_4.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -31,22 +25,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -57,10 +41,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_5.json b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_5.json index 2cc35cdbb..17ed6711a 100644 --- a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_5.json +++ b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_5.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -64,10 +52,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_6.json b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_6.json index 2cc35cdbb..17ed6711a 100644 --- a/tests/results/test_namespace_without_family/04_1default_calculation_hidden_6.json +++ b/tests/results/test_namespace_without_family/04_1default_calculation_hidden_6.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -64,10 +52,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation.json b/tests/results/test_namespace_without_family/04_5disabled_calculation.json index 307d9b914..d45924421 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A conditional variable.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -66,18 +54,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -97,10 +79,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_boolean.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_boolean.json index 52eca57b4..c7dfcf598 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_boolean.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_boolean.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A conditional variable.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -66,18 +54,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A seconde variable.", "properties": [ { @@ -97,10 +79,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_default.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_default.json index 91937c438..9ee93f78e 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_default.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_default.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var1": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value of condition" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var1": { "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -72,12 +54,6 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -85,11 +61,11 @@ "description": "the value of condition" } }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -109,10 +85,14 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of condition" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_multi.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_multi.json index 9dd400768..7b1997eaf 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_multi.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A conditional variable.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -72,21 +60,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "variable2": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "variable2": { "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -112,13 +92,9 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_optional.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_optional.json index d4acc88e7..623dbdafd 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_optional.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_optional.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -60,18 +48,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -85,10 +67,8 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_optional_default.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_optional_default.json index db5e327d6..a1b750670 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_optional_default.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_optional_default.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,33 +25,25 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A second variable.", "properties": [ { @@ -79,18 +61,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var4": { - "type": "variable", - "variable_type": "string", "path": "rougail.var4", - "names": [ - "var4" - ], + "name": "var4", "description": "A forth variable.", "properties": [ { @@ -108,10 +84,8 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable.json index ec86923ff..a3e69c1cc 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -70,10 +58,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable10.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable10.json index 41418494a..c9d2883f4 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable10.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable10.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -70,10 +58,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable2.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable2.json index 41418494a..c9d2883f4 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable2.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -70,10 +58,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable3.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable3.json index 00ff3c121..aa434af50 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable3.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable3.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -70,10 +58,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable4.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable4.json index c81fc8b13..8ab82e05e 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable4.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable4.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -70,10 +58,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable5.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable5.json index 50b0266f0..474b778b5 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable5.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable5.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -31,10 +25,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable6.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable6.json index 50b0266f0..474b778b5 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable6.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable6.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -31,10 +25,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable7.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable7.json index ec86923ff..a3e69c1cc 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable7.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable7.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -70,10 +58,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable9.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable9.json index 50b0266f0..474b778b5 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable9.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable9.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -31,10 +25,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_multi.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_multi.json index 91ccf05d9..c49665da1 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_multi.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -76,13 +64,9 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive.json index 8ae6b8f96..917e0dd75 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -70,18 +58,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -105,10 +87,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_3.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_3.json index 2d23bf1c5..a0d5f0af0 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_3.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_3.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "variable1": { "type": "variable", "default": { "name": "Default", - "values": "disabled" + "values": false }, - "variable_type": "string", + "variable_type": "boolean" + }, + "variable1": { "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -74,18 +58,16 @@ } ], "mode": "standard", - "gen_examples": [ - "disabled" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "disabled" + }, + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -109,10 +91,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_4.json b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_4.json index 82862e88d..e786c43d4 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_4.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation_variable_transitive_4.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "variable1": { "type": "variable", "default": { "name": "Default", - "values": "not_disabled" + "values": true }, - "variable_type": "string", + "variable_type": "boolean" + }, + "variable1": { "path": "rougail.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -74,18 +58,16 @@ } ], "mode": "standard", - "gen_examples": [ - "not_disabled" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "not_disabled" + }, + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -109,10 +91,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5hidden_calculation.json b/tests/results/test_namespace_without_family/04_5hidden_calculation.json index 958304289..23627ffc0 100644 --- a/tests/results/test_namespace_without_family/04_5hidden_calculation.json +++ b/tests/results/test_namespace_without_family/04_5hidden_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The condition.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var1": { "type": "variable", "default": { "name": "Default", "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var1": { "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -70,22 +54,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -105,10 +83,12 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5hidden_calculation2.json b/tests/results/test_namespace_without_family/04_5hidden_calculation2.json index 0e517d9d8..de3f41556 100644 --- a/tests/results/test_namespace_without_family/04_5hidden_calculation2.json +++ b/tests/results/test_namespace_without_family/04_5hidden_calculation2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var1": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value of condition" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var1": { "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -72,12 +54,6 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -85,11 +61,11 @@ "description": "the value of condition" } }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -109,10 +85,14 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of condition" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5hidden_calculation_default_calculation.json b/tests/results/test_namespace_without_family/04_5hidden_calculation_default_calculation.json index 436cf2f11..6712841a7 100644 --- a/tests/results/test_namespace_without_family/04_5hidden_calculation_default_calculation.json +++ b/tests/results/test_namespace_without_family/04_5hidden_calculation_default_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var1": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "returns the condition value" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var1": { "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -72,12 +54,6 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -85,11 +61,11 @@ "description": "returns the condition value" } }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -109,10 +85,14 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns the condition value" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5validators.json b/tests/results/test_namespace_without_family/04_5validators.json index 4205930ed..fc45b7907 100644 --- a/tests/results/test_namespace_without_family/04_5validators.json +++ b/tests/results/test_namespace_without_family/04_5validators.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,18 +13,8 @@ }, "children": { "int": { - "type": "variable", - "variable_type": "integer", - "validators": { - "name": "Validator", - "values": { - "description": "the max value is 100" - } - }, "path": "rougail.int", - "names": [ - "int" - ], + "name": "int", "description": "An integer.", "properties": [ { @@ -37,10 +25,14 @@ } ], "mode": "basic", - "gen_examples": [ - 42 - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "integer", + "validators": { + "name": "Validator", + "values": { + "description": "the max value is 100" + } + } } } } diff --git a/tests/results/test_namespace_without_family/04_5validators_differ.json b/tests/results/test_namespace_without_family/04_5validators_differ.json index 76cafa964..5e6188142 100644 --- a/tests/results/test_namespace_without_family/04_5validators_differ.json +++ b/tests/results/test_namespace_without_family/04_5validators_differ.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "var1": { + "path": "rougail.var1", + "name": "var1", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -27,40 +37,14 @@ "description": "var1 must be different than var2" } }, - "path": "rougail.var1", - "names": [ - "var1" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", "values": "another_value" - }, - "gen_examples": [ - "another_value" - ], - "mandatory_without_value": false + } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -71,10 +55,12 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/04_5validators_multi.json b/tests/results/test_namespace_without_family/04_5validators_multi.json index 348b32010..e34a007f4 100644 --- a/tests/results/test_namespace_without_family/04_5validators_multi.json +++ b/tests/results/test_namespace_without_family/04_5validators_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,25 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "check length is less than 10" - } - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -50,14 +31,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "no", "yes" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "check length is less than 10" + } + }, + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/04_5validators_multi2.json b/tests/results/test_namespace_without_family/04_5validators_multi2.json index d221316e1..6444bc57d 100644 --- a/tests/results/test_namespace_without_family/04_5validators_multi2.json +++ b/tests/results/test_namespace_without_family/04_5validators_multi2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,25 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "check length is less than 3" - } - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -50,6 +31,21 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "no", + "yes" + ] + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "check length is less than 3" + } + }, "multiple": true, "examples": { "name": "Examples", @@ -57,14 +53,7 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/04_5validators_multi3.json b/tests/results/test_namespace_without_family/04_5validators_multi3.json index 541dc4a96..1d27bb2bd 100644 --- a/tests/results/test_namespace_without_family/04_5validators_multi3.json +++ b/tests/results/test_namespace_without_family/04_5validators_multi3.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,26 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0, - 1, - 2 - ] - }, - "variable_type": "integer", - "validators": { - "name": "Validator", - "values": { - "description": "value must be equal to index" - } - }, "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -51,17 +31,27 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + 0, + 1, + 2 + ] + }, + "variable_type": "integer", + "validators": { + "name": "Validator", + "values": { + "description": "value must be equal to index" + } + }, "multiple": true, "examples": { "name": "Example", "values": 0 - }, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/04_5validators_warnings.json b/tests/results/test_namespace_without_family/04_5validators_warnings.json index ba1835bac..583a54691 100644 --- a/tests/results/test_namespace_without_family/04_5validators_warnings.json +++ b/tests/results/test_namespace_without_family/04_5validators_warnings.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "int": { + "path": "rougail.int", + "name": "int", + "description": "An integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -26,25 +36,7 @@ "values": { "description": "the max value is 100" } - }, - "path": "rougail.int", - "names": [ - "int" - ], - "description": "An integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1000 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/04_5validators_warnings_all.json b/tests/results/test_namespace_without_family/04_5validators_warnings_all.json index 9a65c78cb..179b2343f 100644 --- a/tests/results/test_namespace_without_family/04_5validators_warnings_all.json +++ b/tests/results/test_namespace_without_family/04_5validators_warnings_all.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "int": { + "path": "rougail.int", + "name": "int", + "description": "An integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -27,25 +37,7 @@ "the minimum value is 10", "the maximum value is 100" ] - }, - "path": "rougail.int", - "names": [ - "int" - ], - "description": "An integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1000 - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/05_0multi_not_uniq.json b/tests/results/test_namespace_without_family/05_0multi_not_uniq.json index 794eb3d77..bce63cf5e 100644 --- a/tests/results/test_namespace_without_family/05_0multi_not_uniq.json +++ b/tests/results/test_namespace_without_family/05_0multi_not_uniq.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -37,13 +25,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/05_0multi_uniq.json b/tests/results/test_namespace_without_family/05_0multi_uniq.json index bd5fd8a72..cfc3b47bd 100644 --- a/tests/results/test_namespace_without_family/05_0multi_uniq.json +++ b/tests/results/test_namespace_without_family/05_0multi_uniq.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -43,13 +31,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/12_1auto_save_expert.json b/tests/results/test_namespace_without_family/12_1auto_save_expert.json index c6832d013..5002a068a 100644 --- a/tests/results/test_namespace_without_family/12_1auto_save_expert.json +++ b/tests/results/test_namespace_without_family/12_1auto_save_expert.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "advanced", @@ -15,16 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -41,10 +31,12 @@ } ], "mode": "advanced", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_0redefine_description.json b/tests/results/test_namespace_without_family/16_0redefine_description.json index 547eab734..70e47ad7f 100644 --- a/tests/results/test_namespace_without_family/16_0redefine_description.json +++ b/tests/results/test_namespace_without_family/16_0redefine_description.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "Redefined.", "properties": [ { @@ -31,10 +25,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_2family_redefine_calculation.json b/tests/results/test_namespace_without_family/16_2family_redefine_calculation.json index c75e73d18..c84725572 100644 --- a/tests/results/test_namespace_without_family/16_2family_redefine_calculation.json +++ b/tests/results/test_namespace_without_family/16_2family_redefine_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [ { @@ -35,12 +31,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.var1", - "names": [ - "var1" - ], + "name": "var1", "properties": [ { "type": "property", @@ -50,10 +42,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_3family_empty_at_ends.json b/tests/results/test_namespace_without_family/16_3family_empty_at_ends.json index 141e39ad0..6410e7577 100644 --- a/tests/results/test_namespace_without_family/16_3family_empty_at_ends.json +++ b/tests/results/test_namespace_without_family/16_3family_empty_at_ends.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,21 +16,15 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.var1", - "names": [ - "var1" - ], + "name": "var1", "properties": [ { "type": "property", @@ -42,10 +34,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5exists_nonexists.json b/tests/results/test_namespace_without_family/16_5exists_nonexists.json index 954e44f88..b5c04ce09 100644 --- a/tests/results/test_namespace_without_family/16_5exists_nonexists.json +++ b/tests/results/test_namespace_without_family/16_5exists_nonexists.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "yes" + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A new variable.", "properties": [ { @@ -61,10 +45,12 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_calculation.json b/tests/results/test_namespace_without_family/16_5redefine_calculation.json index bd799eae2..9e5532320 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_calculation.json +++ b/tests/results/test_namespace_without_family/16_5redefine_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns yes" - } - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -37,10 +25,14 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns yes" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_choice.json b/tests/results/test_namespace_without_family/16_5redefine_choice.json index 7d15a65e3..cde00964e 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_choice.json +++ b/tests/results/test_namespace_without_family/16_5redefine_choice.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b" - ] - }, "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -38,10 +25,15 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b" + ] + } } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_default.json b/tests/results/test_namespace_without_family/16_5redefine_default.json index 2602f0daf..63417f6b3 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_default.json +++ b/tests/results/test_namespace_without_family/16_5redefine_default.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -35,10 +25,12 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_default_calculation.json b/tests/results/test_namespace_without_family/16_5redefine_default_calculation.json index 50b0266f0..474b778b5 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_default_calculation.json +++ b/tests/results/test_namespace_without_family/16_5redefine_default_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -31,10 +25,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_family.json b/tests/results/test_namespace_without_family/16_5redefine_family.json index d8a8f8ab5..cf9495833 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_family.json +++ b/tests/results/test_namespace_without_family/16_5redefine_family.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,21 +16,15 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "New description", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -43,10 +35,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_help.json b/tests/results/test_namespace_without_family/16_5redefine_help.json index 3fe38cd47..c175f7920 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_help.json +++ b/tests/results/test_namespace_without_family/16_5redefine_help.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "help": [ "Redefine help family ok." @@ -30,12 +26,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "Redefine help.", "help": [ "Redefine help ok." @@ -49,10 +41,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_multi.json b/tests/results/test_namespace_without_family/16_5redefine_multi.json index bd5fd8a72..cfc3b47bd 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_multi.json +++ b/tests/results/test_namespace_without_family/16_5redefine_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -43,13 +31,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/16_5redefine_remove_disable_calculation.json b/tests/results/test_namespace_without_family/16_5redefine_remove_disable_calculation.json index 5cbcf07e1..2e8935edc 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_remove_disable_calculation.json +++ b/tests/results/test_namespace_without_family/16_5redefine_remove_disable_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -57,10 +45,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_5test_redefine.json b/tests/results/test_namespace_without_family/16_5test_redefine.json index 2852a5c9f..43c72d1db 100644 --- a/tests/results/test_namespace_without_family/16_5test_redefine.json +++ b/tests/results/test_namespace_without_family/16_5test_redefine.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,26 +25,20 @@ } ], "mode": "standard", - "examples": { - "name": "Example", - "values": "test1" - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "non" + "values": "no" }, "variable_type": "string", + "examples": { + "name": "Example", + "values": "test1" + } + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -65,22 +49,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string", "examples": { "name": "Example", "values": "test1" - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": false + } }, "var3": { - "type": "variable", - "variable_type": "string", "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -91,10 +73,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16_6choice_redefine.json b/tests/results/test_namespace_without_family/16_6choice_redefine.json index 49989e73b..ab6f65eda 100644 --- a/tests/results/test_namespace_without_family/16_6choice_redefine.json +++ b/tests/results/test_namespace_without_family/16_6choice_redefine.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,18 @@ }, "children": { "var": { + "path": "rougail.var", + "name": "var", + "description": "A choice.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -27,25 +37,7 @@ "a", "c" ] - }, - "path": "rougail.var", - "names": [ - "var" - ], - "description": "A choice.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "c" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/16_6exists_redefine_family.json b/tests/results/test_namespace_without_family/16_6exists_redefine_family.json index 4a855e690..9d76adc29 100644 --- a/tests/results/test_namespace_without_family/16_6exists_redefine_family.json +++ b/tests/results/test_namespace_without_family/16_6exists_redefine_family.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,21 +16,15 @@ "type": "family", "informations": { "path": "rougail.family1", - "names": [ - "family1" - ], + "name": "family1", "description": "New description", "properties": [], "mode": "basic" }, "children": { "variable1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family1.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -43,10 +35,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -54,21 +44,15 @@ "type": "family", "informations": { "path": "rougail.family2", - "names": [ - "family2" - ], + "name": "family2", "description": "A second family", "properties": [], "mode": "basic" }, "children": { "variable2": { - "type": "variable", - "variable_type": "string", "path": "rougail.family2.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -79,10 +63,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/16exists_exists.json b/tests/results/test_namespace_without_family/16exists_exists.json index ca95cb1a5..639f57003 100644 --- a/tests/results/test_namespace_without_family/16exists_exists.json +++ b/tests/results/test_namespace_without_family/16exists_exists.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "Description.", "properties": [ { @@ -31,10 +25,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/20_0family_append.json b/tests/results/test_namespace_without_family/20_0family_append.json index 98013fc5e..1c0ed59e9 100644 --- a/tests/results/test_namespace_without_family/20_0family_append.json +++ b/tests/results/test_namespace_without_family/20_0family_append.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,21 +16,15 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -43,18 +35,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -65,10 +51,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/20_0multi_family.json b/tests/results/test_namespace_without_family/20_0multi_family.json index cfa57bda3..c943a9e90 100644 --- a/tests/results/test_namespace_without_family/20_0multi_family.json +++ b/tests/results/test_namespace_without_family/20_0multi_family.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "standard" @@ -30,28 +26,20 @@ "type": "family", "informations": { "path": "rougail.family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "standard" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/20_0multi_family_basic.json b/tests/results/test_namespace_without_family/20_0multi_family_basic.json index 81dd4989c..99c9b30dc 100644 --- a/tests/results/test_namespace_without_family/20_0multi_family_basic.json +++ b/tests/results/test_namespace_without_family/20_0multi_family_basic.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" @@ -30,21 +26,15 @@ "type": "family", "informations": { "path": "rougail.family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,10 +45,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/20_0multi_family_expert.json b/tests/results/test_namespace_without_family/20_0multi_family_expert.json index f59b44641..ce730049a 100644 --- a/tests/results/test_namespace_without_family/20_0multi_family_expert.json +++ b/tests/results/test_namespace_without_family/20_0multi_family_expert.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "advanced", @@ -18,9 +16,7 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "advanced" @@ -30,28 +26,20 @@ "type": "family", "informations": { "path": "rougail.family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "advanced" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [], "mode": "advanced", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/20_0multi_family_order.json b/tests/results/test_namespace_without_family/20_0multi_family_order.json index e0cee2f60..e5696af2d 100644 --- a/tests/results/test_namespace_without_family/20_0multi_family_order.json +++ b/tests/results/test_namespace_without_family/20_0multi_family_order.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -31,30 +25,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "variable1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -65,30 +51,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "subfamily": { "type": "family", "informations": { "path": "rougail.family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -99,20 +77,14 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -123,10 +95,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/20_0validators_differ_redefine.json b/tests/results/test_namespace_without_family/20_0validators_differ_redefine.json index 01f56277c..c8907b33e 100644 --- a/tests/results/test_namespace_without_family/20_0validators_differ_redefine.json +++ b/tests/results/test_namespace_without_family/20_0validators_differ_redefine.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -61,12 +45,26 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var3": { + "path": "rougail.var3", + "name": "var3", + "description": "A third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -79,28 +77,10 @@ "description": "var3 must be different than var2" } }, - "path": "rougail.var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", "values": "yes" - }, - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_namespace_without_family/20_2family_looks_like_dynamic.json b/tests/results/test_namespace_without_family/20_2family_looks_like_dynamic.json index 5d173ac17..8bf0ba81b 100644 --- a/tests/results/test_namespace_without_family/20_2family_looks_like_dynamic.json +++ b/tests/results/test_namespace_without_family/20_2family_looks_like_dynamic.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,28 +16,15 @@ "type": "family", "informations": { "path": "rougail.my_family", - "names": [ - "my_family" - ], + "name": "my_family", "description": "my_family", "properties": [], "mode": "standard" }, "children": { "dynamic": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.my_family.dynamic", - "names": [ - "dynamic" - ], + "name": "dynamic", "properties": [ { "type": "property", @@ -55,26 +40,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var": { "type": "variable", "default": { "name": "Default", - "values": true + "values": [ + "val1", + "val2" + ] }, - "variable_type": "boolean", + "variable_type": "string", + "multiple": true + }, + "var": { "path": "rougail.my_family.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -85,10 +64,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test_namespace_without_family/20_2family_looks_like_variable.json b/tests/results/test_namespace_without_family/20_2family_looks_like_variable.json index 665697830..1ea58d3b4 100644 --- a/tests/results/test_namespace_without_family/20_2family_looks_like_variable.json +++ b/tests/results/test_namespace_without_family/20_2family_looks_like_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,25 +16,15 @@ "type": "family", "informations": { "path": "rougail.my_family", - "names": [ - "my_family" - ], + "name": "my_family", "description": "my_family", "properties": [], "mode": "standard" }, "children": { "default": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.my_family.default", - "names": [ - "default" - ], + "name": "default", "properties": [ { "type": "property", @@ -46,10 +34,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test_namespace_without_family/20_7help_family.json b/tests/results/test_namespace_without_family/20_7help_family.json index 54014c6ea..9769591f9 100644 --- a/tests/results/test_namespace_without_family/20_7help_family.json +++ b/tests/results/test_namespace_without_family/20_7help_family.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "family", "informations": { "path": "rougail.family1", - "names": [ - "family1" - ], + "name": "family1", "description": "The first family", "help": [ "Multi line\n\nHelp\n\nWith useful information." @@ -30,12 +26,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.family1.var", - "names": [ - "var" - ], + "name": "var", "properties": [ { "type": "property", @@ -45,10 +37,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -56,9 +46,7 @@ "type": "family", "informations": { "path": "rougail.family2", - "names": [ - "family2" - ], + "name": "family2", "description": "The second family", "help": [ "Multi line\nHelp\nWith useful information." @@ -68,12 +56,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.family2.var", - "names": [ - "var" - ], + "name": "var", "properties": [ { "type": "property", @@ -83,10 +67,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/20_9default_information_parent.json b/tests/results/test_namespace_without_family/20_9default_information_parent.json index 67ecd5dba..3a99a29f0 100644 --- a/tests/results/test_namespace_without_family/20_9default_information_parent.json +++ b/tests/results/test_namespace_without_family/20_9default_information_parent.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,21 +16,15 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -43,22 +35,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"rougail.family\"" - }, - "variable_type": "string", "path": "rougail.family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -69,10 +51,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"rougail.family\"" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_hidden_condition.json b/tests/results/test_namespace_without_family/24_0family_hidden_condition.json index 13616a766..4d3d83b04 100644 --- a/tests/results/test_namespace_without_family/24_0family_hidden_condition.json +++ b/tests/results/test_namespace_without_family/24_0family_hidden_condition.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -63,12 +53,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -79,10 +65,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_hidden_condition_boolean.json b/tests/results/test_namespace_without_family/24_0family_hidden_condition_boolean.json index 7e300338e..7f8c082a1 100644 --- a/tests/results/test_namespace_without_family/24_0family_hidden_condition_boolean.json +++ b/tests/results/test_namespace_without_family/24_0family_hidden_condition_boolean.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A conditional variable.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [ { @@ -63,19 +53,13 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_hidden_condition_sub_family.json b/tests/results/test_namespace_without_family/24_0family_hidden_condition_sub_family.json index 8434e086f..e802a9340 100644 --- a/tests/results/test_namespace_without_family/24_0family_hidden_condition_sub_family.json +++ b/tests/results/test_namespace_without_family/24_0family_hidden_condition_sub_family.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -66,21 +56,15 @@ "type": "family", "informations": { "path": "rougail.family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "subfamily", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.subfamily.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -91,10 +75,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_hidden_condition_variable_sub_family.json b/tests/results/test_namespace_without_family/24_0family_hidden_condition_variable_sub_family.json index e631633d5..ac827c09a 100644 --- a/tests/results/test_namespace_without_family/24_0family_hidden_condition_variable_sub_family.json +++ b/tests/results/test_namespace_without_family/24_0family_hidden_condition_variable_sub_family.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -70,28 +60,20 @@ "type": "family", "informations": { "path": "rougail.family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A subfamily", "properties": [], "mode": "standard" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.subfamily.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_hidden_condition_with_variable.json b/tests/results/test_namespace_without_family/24_0family_hidden_condition_with_variable.json index 4955b1d3b..b52941617 100644 --- a/tests/results/test_namespace_without_family/24_0family_hidden_condition_with_variable.json +++ b/tests/results/test_namespace_without_family/24_0family_hidden_condition_with_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition1": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.condition1", - "names": [ - "condition1" - ], + "name": "condition1", "description": "A first conditional variable.", "properties": [ { @@ -35,22 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "condition2": { "type": "variable", "default": { "name": "Default", "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "condition2": { "path": "rougail.condition2", - "names": [ - "condition2" - ], + "name": "condition2", "description": "A second conditional variable.", "properties": [ { @@ -61,18 +45,18 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [ { @@ -89,12 +73,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -108,10 +88,8 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_hidden_param_condition_sub_family.json b/tests/results/test_namespace_without_family/24_0family_hidden_param_condition_sub_family.json index d7a048c07..2edce40fd 100644 --- a/tests/results/test_namespace_without_family/24_0family_hidden_param_condition_sub_family.json +++ b/tests/results/test_namespace_without_family/24_0family_hidden_param_condition_sub_family.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -66,21 +56,15 @@ "type": "family", "informations": { "path": "rougail.family.sub_family", - "names": [ - "sub_family" - ], + "name": "sub_family", "description": "A subfamily", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.family.sub_family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -91,10 +75,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_mandatory_condition.json b/tests/results/test_namespace_without_family/24_0family_mandatory_condition.json index 885458ec7..85f0048cb 100644 --- a/tests/results/test_namespace_without_family/24_0family_mandatory_condition.json +++ b/tests/results/test_namespace_without_family/24_0family_mandatory_condition.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -60,10 +48,8 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_0family_mandatory_condition_variable.json b/tests/results/test_namespace_without_family/24_0family_mandatory_condition_variable.json index b2c89fcb2..1ae22f741 100644 --- a/tests/results/test_namespace_without_family/24_0family_mandatory_condition_variable.json +++ b/tests/results/test_namespace_without_family/24_0family_mandatory_condition_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -64,10 +52,8 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/24_7validators_variable_optional.json b/tests/results/test_namespace_without_family/24_7validators_variable_optional.json index e0ecc7a09..419c40042 100644 --- a/tests/results/test_namespace_without_family/24_7validators_variable_optional.json +++ b/tests/results/test_namespace_without_family/24_7validators_variable_optional.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,15 +16,25 @@ "type": "family", "informations": { "path": "rougail.general", - "names": [ - "general" - ], + "name": "general", "description": "A family", "properties": [], "mode": "basic" }, "children": { "int": { + "path": "rougail.general.int", + "name": "int", + "description": "A first integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", "type": "variable", "variable_type": "integer", "validators": { @@ -40,40 +48,14 @@ } ] }, - "path": "rougail.general.int", - "names": [ - "int" - ], - "description": "A first integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", "examples": { "name": "Example", "values": 5 - }, - "gen_examples": [ - 5 - ], - "mandatory_without_value": true + } }, "int2": { - "type": "variable", - "default": { - "name": "Default", - "values": 1 - }, - "variable_type": "integer", "path": "rougail.general.int2", - "names": [ - "int2" - ], + "name": "int2", "description": "A second integer.", "properties": [ { @@ -84,10 +66,12 @@ } ], "mode": "standard", - "gen_examples": [ - 1 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 1 + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership.json b/tests/results/test_namespace_without_family/40_0leadership.json index 96eae850b..9eb491f58 100644 --- a/tests/results/test_namespace_without_family/40_0leadership.json +++ b/tests/results/test_namespace_without_family/40_0leadership.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -52,21 +44,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -77,20 +61,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -101,12 +77,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_diff_name.json b/tests/results/test_namespace_without_family/40_0leadership_diff_name.json index 0d994707f..1caf9618f 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_diff_name.json +++ b/tests/results/test_namespace_without_family/40_0leadership_diff_name.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -52,21 +44,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -77,20 +61,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "rougail.leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -101,12 +77,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json index 72e2ecfb3..cc018f7d1 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -52,25 +44,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -81,26 +61,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "returns follower1 value" - } + "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A second follower.", "properties": [ { @@ -111,12 +81,14 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns follower1 value" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json index e424e2a34..853d5c461 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,18 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "leader" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -58,27 +44,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "leader" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", "values": [ - "value" + "leader" ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower1.", "properties": [ { @@ -95,30 +73,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", "values": [ - "value1", - "value2" + "value" ] }, "variable_type": "string", + "multiple": true + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A follower2.", "properties": [ { @@ -135,16 +102,16 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value1", - "value2" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value1", + "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json index 6ae155768..7c9105d39 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,18 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "leader" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -58,27 +44,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "leader" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", "values": [ - "value" + "leader" ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The follower1.", "properties": [ { @@ -95,34 +73,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.leader.follower1", - "type": "variable" - }, - "description": "The follower1" - } + "values": [ + "value" + ] }, "variable_type": "string", + "multiple": true + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The follower2.", "properties": [ { @@ -139,15 +102,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.leader.follower1", + "type": "variable" + }, + "description": "The follower1" + } + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json index 544355536..adc1dfcae 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -46,25 +38,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower with default value.", "properties": [ { @@ -75,12 +55,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json b/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json index 30bc3edba..fc11df1bc 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json +++ b/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,16 +44,30 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { + "path": "rougail.leadership.follower", + "name": "follower", + "description": "A follower.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -81,28 +80,7 @@ "description": "A leader" } }, - "variable_type": "string", - "path": "rougail.leadership.follower", - "names": [ - "follower" - ], - "description": "A follower.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json b/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json index f1b21db2e..cf92c2b55 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json +++ b/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,25 +16,15 @@ "type": "family", "informations": { "path": "rougail.general", - "names": [ - "general" - ], + "name": "general", "description": "general", "properties": [], "mode": "standard" }, "children": { "mode_conteneur_actif": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "rougail.general.mode_conteneur_actif", - "names": [ - "mode_conteneur_actif" - ], + "name": "mode_conteneur_actif", "description": "No change.", "properties": [ { @@ -47,10 +35,12 @@ } ], "mode": "standard", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } }, @@ -58,9 +48,7 @@ "type": "family", "informations": { "path": "rougail.general1", - "names": [ - "general1" - ], + "name": "general1", "description": "general1", "properties": [], "mode": "basic" @@ -70,9 +58,7 @@ "type": "leadership", "informations": { "path": "rougail.general1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leader", "properties": [], "mode": "basic", @@ -82,12 +68,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.general1.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leader.", "properties": [ { @@ -104,21 +86,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.general1.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "Follower1.", "properties": [ { @@ -129,20 +103,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "rougail.general1.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "Follower2.", "properties": [ { @@ -153,12 +119,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_0leadership_reduce.json b/tests/results/test_namespace_without_family/40_0leadership_reduce.json index bee7d8a24..6478a1f88 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_reduce.json +++ b/tests/results/test_namespace_without_family/40_0leadership_reduce.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,20 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value_1", - "value_2", - "value_3" - ] - }, - "variable_type": "string", "path": "rougail.leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -60,6 +44,16 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value_1", + "value_2", + "value_3" + ] + }, + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -67,22 +61,11 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "follower": { - "type": "variable", - "variable_type": "string", "path": "rougail.leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -93,13 +76,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_1leadership_append_follower.json b/tests/results/test_namespace_without_family/40_1leadership_append_follower.json index 9c6cfad76..87d8d43a5 100644 --- a/tests/results/test_namespace_without_family/40_1leadership_append_follower.json +++ b/tests/results/test_namespace_without_family/40_1leadership_append_follower.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -52,21 +44,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The follower1.", "properties": [ { @@ -77,20 +61,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The follower2.", "properties": [ { @@ -101,20 +77,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower3": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower3", - "names": [ - "follower3" - ], + "name": "follower3", "description": "The follower3.", "properties": [ { @@ -125,12 +93,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json b/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json index ef9676831..3900f6e94 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json +++ b/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,20 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -60,27 +44,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the index" - }, - "variable_type": "integer", "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -91,14 +69,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - 0, - 1, - 2 - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the index" + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json b/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json index ef9676831..3900f6e94 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json +++ b/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,20 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -60,27 +44,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the index" - }, - "variable_type": "integer", "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -91,14 +69,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - 0, - 1, - 2 - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the index" + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json b/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json index dc474eece..9e444e11c 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json +++ b/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leadership", "properties": [], "mode": "standard", @@ -30,20 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -60,29 +44,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns index" - } - }, - "variable_type": "integer", "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -93,14 +69,14 @@ } ], "mode": "standard", - "gen_examples": [ - [ - 0, - 1, - 2 - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns index" + } + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json b/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json index 76810c349..dd856e0f2 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json +++ b/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,18 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns val1 and val2" - } - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -58,22 +44,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns val1 and val2" + } + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A first follower.", "properties": [ { @@ -84,21 +67,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A second follower.", "properties": [ { @@ -109,13 +83,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json b/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json index 86043202f..e9ed06b95 100644 --- a/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json +++ b/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -52,21 +44,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The first follower.", "properties": [ { @@ -83,29 +67,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - [ - "example" - ] - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "rougail.leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The second follower.", "properties": [ { @@ -122,15 +90,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json index 1b445751f..080c7e3bb 100644 --- a/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -46,21 +38,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The first follower.", "properties": [ { @@ -77,29 +61,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - [ - "example" - ] - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "rougail.leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The second follower.", "properties": [ { @@ -116,15 +84,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_8calculation_boolean.json b/tests/results/test_namespace_without_family/40_8calculation_boolean.json index c5a8b541d..064ba4755 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_boolean.json +++ b/tests/results/test_namespace_without_family/40_8calculation_boolean.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "bool": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.bool", - "names": [ - "bool" - ], + "name": "bool", "description": "A boolean variable.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "multi1": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "a calculation" - } + "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "multi1": { "path": "rougail.multi1", - "names": [ - "multi1" - ], + "name": "multi1", "description": "A first multi variable.", "properties": [ { @@ -69,15 +51,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "multi2": { "type": "variable", "default": { "name": "Default", @@ -86,10 +59,11 @@ } }, "variable_type": "boolean", + "multiple": true + }, + "multi2": { "path": "rougail.multi2", - "names": [ - "multi2" - ], + "name": "multi2", "description": "A second multi variable.", "properties": [ { @@ -106,14 +80,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true, - false - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "a calculation" + } + }, + "variable_type": "boolean", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_8calculation_boolean_return_none.json b/tests/results/test_namespace_without_family/40_8calculation_boolean_return_none.json index dd21a3622..ca3989b19 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_boolean_return_none.json +++ b/tests/results/test_namespace_without_family/40_8calculation_boolean_return_none.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "return false if the value of var1 is \"no\"" - } + "values": "yes" }, - "variable_type": "boolean", + "variable_type": "string" + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -63,10 +45,14 @@ } ], "mode": "standard", - "gen_examples": [ - "xxx" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "return false if the value of var1 is \"no\"" + } + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test_namespace_without_family/40_8calculation_integer.json b/tests/results/test_namespace_without_family/40_8calculation_integer.json index 47961b460..6a4b990fb 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_integer.json +++ b/tests/results/test_namespace_without_family/40_8calculation_integer.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "bool": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "rougail.bool", - "names": [ - "bool" - ], + "name": "bool", "description": "A boolean variable.", "properties": [ { @@ -35,24 +25,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "int1": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "if bool returns 1 otherwise return 2" - } + "values": false }, - "variable_type": "integer", + "variable_type": "boolean" + }, + "int1": { "path": "rougail.int1", - "names": [ - "int1" - ], + "name": "int1", "description": "First integer variable.", "properties": [ { @@ -63,24 +45,18 @@ } ], "mode": "standard", - "gen_examples": [ - 2 - ], - "mandatory_without_value": false - }, - "int2": { "type": "variable", "default": { "name": "Default", "values": { - "description": "if bool returns 3 otherwise return 4" + "description": "if bool returns 1 otherwise return 2" } }, - "variable_type": "integer", + "variable_type": "integer" + }, + "int2": { "path": "rougail.int2", - "names": [ - "int2" - ], + "name": "int2", "description": "Second integer variable.", "properties": [ { @@ -91,10 +67,14 @@ } ], "mode": "standard", - "gen_examples": [ - 3 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "if bool returns 3 otherwise return 4" + } + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_namespace_without_family/40_8calculation_multi_variable.json b/tests/results/test_namespace_without_family/40_8calculation_multi_variable.json index f57fbe409..de0f39798 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_multi_variable.json +++ b/tests/results/test_namespace_without_family/40_8calculation_multi_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,24 @@ }, "children": { "var": { + "path": "rougail.var", + "name": "var", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -38,46 +54,11 @@ ] }, "variable_type": "string", - "path": "rougail.var", - "names": [ - "var" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no", - "yes" - ] - ], - "mandatory_without_value": false + "multiple": true }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -88,22 +69,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", - "values": "yes" + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var3": { "path": "rougail.var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -114,10 +89,12 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent.json b/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent.json index 5b754a2d1..c7fee67b0 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent.json +++ b/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,16 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -35,24 +25,36 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "fam1": { "type": "family", "informations": { "path": "rougail.fam1", - "names": [ - "fam1" - ], + "name": "fam1", "description": "A family", "properties": [], "mode": "standard" }, "children": { "var": { + "path": "rougail.fam1.var", + "name": "var", + "description": "A calculated variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -65,25 +67,7 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "rougail.fam1.var", - "names": [ - "var" - ], - "description": "A calculated variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent2.json b/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent2.json index 74a6fdb04..4faf429ff 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent2.json +++ b/tests/results/test_namespace_without_family/40_8calculation_multi_variable_parent2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,25 +16,15 @@ "type": "family", "informations": { "path": "rougail.fam1", - "names": [ - "fam1" - ], + "name": "fam1", "description": "First family", "properties": [], "mode": "standard" }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.fam1.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -47,10 +35,12 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } }, @@ -58,15 +48,25 @@ "type": "family", "informations": { "path": "rougail.fam2", - "names": [ - "fam2" - ], + "name": "fam2", "description": "Second family", "properties": [], "mode": "standard" }, "children": { "var": { + "path": "rougail.fam2.var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -79,25 +79,7 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "rougail.fam2.var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json index 2b3d73a35..b8b67a280 100644 --- a/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,35 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "default": { "name": "Default", "values": [ - { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.leadership.leader", - "type": "variable" - }, - "description": "A leader" - } + "value1", + "value2" ] }, "variable_type": "string", + "multiple": true + }, + "follower": { "path": "rougail.leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -104,18 +74,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value1" - ], - [ - "value2" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.leadership.leader", + "type": "variable" + }, + "description": "A leader" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json index 3ff7d9c7e..4ce06f39c 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,26 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -89,25 +68,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -118,27 +88,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -149,13 +110,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json index 3ff7d9c7e..4ce06f39c 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,26 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -89,25 +68,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -118,27 +88,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -149,13 +110,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json index 194538446..51fb02a2b 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "leader", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "properties": [ { "type": "property", @@ -58,35 +43,39 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower", - "names": [ - "follower" - ], + "name": "follower", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } }, "variable": { + "path": "rougail.variable", + "name": "variable", + "properties": [ + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -100,27 +89,7 @@ } }, "variable_type": "string", - "path": "rougail.variable", - "names": [ - "variable" - ], - "properties": [ - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json index 872fd8323..c342283c8 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,26 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -89,25 +68,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -118,17 +88,28 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { + "path": "rougail.calculate", + "name": "calculate", + "description": "A calculated variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -142,28 +123,7 @@ } }, "variable_type": "string", - "path": "rougail.calculate", - "names": [ - "calculate" - ], - "description": "A calculated variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json index 30acf8d19..41ca119ed 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,26 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -89,25 +68,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -118,27 +88,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -149,10 +110,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json index 0f5e7f3e6..41ca119ed 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,26 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -89,25 +68,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -118,27 +88,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -149,10 +110,12 @@ } ], "mode": "standard", - "gen_examples": [ - "value2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json index c49c2c2d5..8e9f57e29 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,26 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -89,25 +68,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -118,34 +88,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.leader.leader", - "type": "variable" - }, - "description": "A leader" - } - }, - "variable_type": "string", "path": "rougail.calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -162,14 +116,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.leader.leader", + "type": "variable" + }, + "description": "A leader" + } + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json index dcd54db13..ac764b79b 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -44,22 +31,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "leader": { "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -69,23 +56,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.calculate", - "type": "variable" - }, - "description": "A calculated variable" - } - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -102,26 +74,24 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.calculate", + "type": "variable" + }, + "description": "A calculated variable" + } }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -132,25 +102,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -161,13 +122,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json index ecde50e5b..d7f097081 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership_1", - "names": [ - "leadership_1" - ], + "name": "leadership_1", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leadership_1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,22 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "rougail.leadership_1.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -85,13 +68,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -99,9 +77,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership_2", - "names": [ - "leadership_2" - ], + "name": "leadership_2", "description": "A second leadership", "properties": [], "mode": "standard", @@ -111,6 +87,24 @@ }, "children": { "leader": { + "path": "rougail.leadership_2.leader", + "name": "leader", + "description": "A leader.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -124,46 +118,11 @@ } }, "variable_type": "string", - "path": "rougail.leadership_2.leader", - "names": [ - "leader" - ], - "description": "A leader.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true }, "follower": { - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "path": "rougail.leadership_2.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -174,13 +133,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val", - "val" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json index 0854a1a16..217d6b8b5 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership_1", - "names": [ - "leadership_1" - ], + "name": "leadership_1", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leadership_1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,22 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "rougail.leadership_1.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -85,13 +68,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -99,9 +77,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership_2", - "names": [ - "leadership_2" - ], + "name": "leadership_2", "description": "A second leadership", "properties": [], "mode": "standard", @@ -111,19 +87,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "rougail.leadership_2.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -140,16 +105,36 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { + "path": "rougail.leadership_2.follower", + "name": "follower", + "description": "A follower.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -163,40 +148,7 @@ } }, "variable_type": "string", - "path": "rougail.leadership_2.follower", - "names": [ - "follower" - ], - "description": "A follower.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value1", - "value2" - ], - [ - "value1", - "value2" - ] - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/41_0choice_leader.json b/tests/results/test_namespace_without_family/41_0choice_leader.json index 374bd36ce..65c3e8237 100644 --- a/tests/results/test_namespace_without_family/41_0choice_leader.json +++ b/tests/results/test_namespace_without_family/41_0choice_leader.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -46,29 +38,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -79,12 +55,16 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "a_choice" + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" ] - ], - "mandatory_without_value": true + } } } } diff --git a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json index 50f6c8ad8..efaefbc3a 100644 --- a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json +++ b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "leader": { "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -56,18 +46,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Aleader.", "properties": [ { @@ -84,21 +64,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -118,12 +96,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json index b46b9be49..e2d94dac3 100644 --- a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json +++ b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b" - ] - }, - "variable_type": "string", "path": "rougail.leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Aleader.", "properties": [ { @@ -59,26 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a", - "b" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "default": { "name": "Default", - "values": "value" + "values": [ + "a", + "b" + ] }, "variable_type": "string", + "multiple": true + }, + "follower": { "path": "rougail.leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -96,13 +75,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value", - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/44_4leadership_mandatory.json b/tests/results/test_namespace_without_family/44_4leadership_mandatory.json index 1afa1d588..609b277ce 100644 --- a/tests/results/test_namespace_without_family/44_4leadership_mandatory.json +++ b/tests/results/test_namespace_without_family/44_4leadership_mandatory.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -52,30 +44,18 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json b/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json index 0c0970c2f..333350f84 100644 --- a/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json +++ b/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -46,21 +38,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "rougail.leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -71,12 +55,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json b/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json index 0219ec174..31aa486a0 100644 --- a/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "leader": { "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [ { @@ -66,12 +56,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -82,21 +68,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "rougail.leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -107,12 +85,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json b/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json index 6efe8c79e..750f4c7c9 100644 --- a/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "rougail.condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -35,18 +25,18 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "leader": { "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -56,12 +46,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -78,21 +64,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "rougail.leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -112,12 +90,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json index f0834e9fc..9b3b67d1e 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leader", "properties": [], "mode": "standard", @@ -30,19 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b" - ] - }, - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -59,33 +44,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a", - "b" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.leader.leader", - "type": "variable" - }, - "description": "A leader" - } + "values": [ + "a", + "b" + ] }, "variable_type": "string", + "multiple": true + }, + "follower": { "path": "rougail.leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -111,13 +83,19 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "a", - "b" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.leader.leader", + "type": "variable" + }, + "description": "A leader" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic.json b/tests/results/test_namespace_without_family/60_0family_dynamic.json index 9e145e924..4bd6ec1a2 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,29 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,11 +86,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0.json b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0.json index d88ecc091..194af17ca 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,17 +70,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], + "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", + "description": "Dynamic variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -100,17 +87,8 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.vardyn", - "description": "Dynamic variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_empty.json index c3fa68d86..bac6f9bff 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,17 +64,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], + "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", + "description": "Dynamic variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -94,17 +81,8 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.vardyn", - "description": "Dynamic variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type.json b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type.json index a8ed96a8e..93be1afa2 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,29 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dyn variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,11 +86,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type_empty.json index 9235d910b..7e44bf34a 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_1_0_type_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,29 +64,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dyn variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -107,11 +80,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_1_1.json b/tests/results/test_namespace_without_family/60_0family_dynamic_1_1.json index dd7002017..e84d5ac08 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_1_1.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_1_1.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,29 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,11 +86,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_1_1_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_1_1_empty.json index 6a5890f6f..fdb76f23d 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_1_1_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_1_1_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,29 +64,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -107,11 +80,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_empty.json index 9a13312c4..ca0a82b86 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,29 +25,26 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynexample" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "example" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -63,25 +54,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "example" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -91,10 +70,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example" + "identifiers": [ + [ + "example" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_forbidden_char.json b/tests/results/test_namespace_without_family/60_0family_dynamic_forbidden_char.json index 6241c288b..deb35dc89 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_forbidden_char.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_forbidden_char.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val.1", - "val.2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val.1", "val.2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval_1", - "dynval_2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val.1" @@ -68,10 +58,9 @@ "val.2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,17 +70,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" + "path": "rougail.dyn{{ identifier }}.var1", + "name": "var1", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val.1" @@ -100,14 +94,17 @@ "val.2" ] ], - "path": "rougail.dyn{{ identifier }}.var1", - "description": "A dynamic variable.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { + "path": "rougail.dyn{{ identifier }}.var2", + "name": "var2", + "description": "A dynamic variable.", "properties": [ { "type": "property", @@ -117,17 +114,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val.1", - "val.2" - ], - "mandatory_without_value": false - }, - "var2": { - "names": [ - "var2", - "var2" - ], "identifiers": [ [ "val.1" @@ -136,28 +122,12 @@ "val.2" ] ], - "path": "rougail.dyn{{ identifier }}.var2", - "description": "A dynamic variable.", "type": "variable", "default": { "name": "Default", "values": "depends on a calculation" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val.1", - "val.2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.json index abdd39f83..8d42d83a0 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "integer", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "integer", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ 1, 2 ] - }, - "gen_examples": [ - [ - 1, - 2 - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn1", - "dyn2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ 1 @@ -62,10 +52,9 @@ 2 ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,33 +64,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - 1 - ], - [ - 2 - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -111,15 +80,36 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + 1 + ], + [ + 2 + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -136,25 +126,7 @@ ] } }, - "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.json b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.json index 5f64d17e8..7180c7e33 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 1, - 2 - ] - }, - "variable_type": "integer", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ 1, 2 ] - ], - "mandatory_without_value": false + }, + "variable_type": "integer", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn1", - "dyn2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ 1 @@ -68,10 +58,9 @@ 2 ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,33 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - 1 - ], - [ - 2 - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,15 +86,36 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + 1 + ], + [ + 2 + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -142,25 +132,7 @@ ] } }, - "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_no_description.json b/tests/results/test_namespace_without_family/60_0family_dynamic_no_description.json index 724ebe330..90f307aa7 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_no_description.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_no_description.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,28 +70,12 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -112,11 +85,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_no_description_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_no_description_empty.json index bad6dbd29..4b97ec9f8 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_no_description_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_no_description_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,28 +64,12 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -106,11 +79,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_source_hidden.json b/tests/results/test_namespace_without_family/60_0family_dynamic_source_hidden.json index 616436b7d..b83de73bb 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_source_hidden.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_source_hidden.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -17,10 +15,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -29,10 +28,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "submessage": "(from an undocumented variable)", @@ -41,29 +39,13 @@ "val2" ] } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -73,11 +55,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_static.json b/tests/results/test_namespace_without_family/60_0family_dynamic_static.json index a8c55cb42..2413ef6b8 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_static.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_static.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -17,10 +15,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -29,36 +28,19 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside a dynamic family.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -68,11 +50,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_test.json b/tests/results/test_namespace_without_family/60_0family_dynamic_test.json index 1bcffce7d..18ff20bf4 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_test.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_test.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -37,6 +31,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -44,22 +40,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": true + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,29 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,11 +86,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_upper_char.json b/tests/results/test_namespace_without_family/60_0family_dynamic_upper_char.json index 86ed161a0..a4431ec91 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_upper_char.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_upper_char.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "Val1", - "VAL2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "Val1", "VAL2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "Val1" @@ -68,10 +58,9 @@ "VAL2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,29 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "Val1" - ], - [ - "VAL2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,11 +86,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "Val1" + ], + [ + "VAL2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_empty.json index fd15f9a68..e0bad4c8d 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -37,29 +31,26 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynexample" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "example" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -69,29 +60,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "example" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -101,10 +76,17 @@ } ], "mode": "standard", - "gen_examples": [ - "val" + "identifiers": [ + [ + "example" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_optional.json b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_optional.json index cda1b3661..e89874908 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_optional.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_optional.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -17,10 +15,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyna", - "dynb" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "a" @@ -29,40 +28,19 @@ "b" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "a", "b" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "a" - ], - [ - "b" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -72,11 +50,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "a" + ], + [ + "b" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix.json b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix.json index 2dad33543..f47bbc05b 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,33 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable with suffix {{ identifier }}.", - "type": "variable", - "default": { - "name": "Default", - "values": "a value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,11 +86,20 @@ } ], "mode": "standard", - "gen_examples": [ - "a value", - "a value" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix_empty.json b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix_empty.json index 7b53af715..bb3530a2f 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix_empty.json +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable_suffix_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -37,6 +31,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -44,22 +40,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": true + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,33 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable with suffix {{ identifier }}.", - "type": "variable", - "default": { - "name": "Default", - "values": "a value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,11 +86,20 @@ } ], "mode": "standard", - "gen_examples": [ - "a value", - "a value" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_0family_mode.json b/tests/results/test_namespace_without_family/60_0family_mode.json index 37d440ae4..c2f4fdaed 100644 --- a/tests/results/test_namespace_without_family/60_0family_mode.json +++ b/tests/results/test_namespace_without_family/60_0family_mode.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,25 +16,15 @@ "type": "family", "informations": { "path": "rougail.family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "rougail.family.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -47,10 +35,12 @@ } ], "mode": "basic", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_1family_dynamic_jinja.json b/tests/results/test_namespace_without_family/60_1family_dynamic_jinja.json index 728f50068..9d84b5fc7 100644 --- a/tests/results/test_namespace_without_family/60_1family_dynamic_jinja.json +++ b/tests/results/test_namespace_without_family/60_1family_dynamic_jinja.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn1", - "dyn2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "1" @@ -68,41 +58,20 @@ "2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "description": "index of suffix value" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "1" - ], - [ - "2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -112,11 +81,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "1" + ], + [ + "2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.json index 093c44a98..f589c14f8 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,19 +70,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "rougail.dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -101,30 +88,13 @@ [ "val2" ] - ], - "path": "rougail.dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "basic" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.family.var", + "name": "var", "description": "With a variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -134,17 +104,34 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -161,25 +148,7 @@ ] } }, - "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json index 252fa198c..b1b72c240 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,19 +70,17 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "rougail.dyn{{ identifier }}.family", + "name": "family", + "description": "A family inside dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -101,34 +88,13 @@ [ "val2" ] - ], - "path": "rougail.dyn{{ identifier }}.family", - "description": "A family inside dynamic family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.family.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -138,29 +104,28 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of var" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A varible outside dynamic family.", "properties": [ { @@ -171,10 +136,14 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json index 79e3170d6..37afb644d 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,19 +64,17 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "rougail.dyn{{ identifier }}.family", + "name": "family", + "description": "A family inside dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -95,34 +82,13 @@ [ "val2" ] - ], - "path": "rougail.dyn{{ identifier }}.family", - "description": "A family inside dynamic family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.family.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -132,17 +98,31 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A varible outside dynamic family.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -150,18 +130,7 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A varible outside dynamic family.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json index ee9f3b99a..e6edec72c 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,19 +64,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "rougail.dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -95,30 +82,13 @@ [ "val2" ] - ], - "path": "rougail.dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "basic" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.family.var", + "name": "var", "description": "With a variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -128,17 +98,27 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A second variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -146,18 +126,7 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc.json b/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc.json index 48ebcda9a..c74701eb0 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffx variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,33 +70,13 @@ }, "description": "A suffx variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,27 +86,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "newvar": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of var" - } - }, - "variable_type": "string", "path": "rougail.newvar", - "names": [ - "newvar" - ], + "name": "newvar", "description": "A second variable.", "properties": [ { @@ -148,10 +116,14 @@ } ], "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc_empty.json b/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc_empty.json index eb162c7a3..2669899af 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc_empty.json +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_outside_calc_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffx variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,33 +64,13 @@ }, "description": "A suffx variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -111,15 +80,29 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "newvar": { + "path": "rougail.newvar", + "name": "newvar", + "description": "A second variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -127,18 +110,7 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "rougail.newvar", - "names": [ - "newvar" - ], - "description": "A second variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc2.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc2.json index 5679d5dd8..ca8abd24f 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc2.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -70,27 +55,14 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", "description": "A dynamic family", "properties": [ { @@ -104,6 +76,17 @@ } ], "mode": "standard", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -113,33 +96,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -149,11 +112,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc2_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc2_empty.json index b9c1f6f07..b5cc14906 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc2_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc2_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,11 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -64,27 +49,14 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", "description": "A dynamic family", "properties": [ { @@ -98,6 +70,17 @@ } ], "mode": "standard", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -107,33 +90,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -143,11 +106,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_description.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_description.json index 9644eb867..b8b898556 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_description.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_description.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -17,10 +15,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -29,36 +28,19 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable for {{ identifier }}.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -68,21 +50,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A new variable.", "properties": [ { @@ -109,12 +92,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A new variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -142,28 +135,7 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A new variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier.json index 4d5905896..cc222830c 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "val1" + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A suffix variable2.", "properties": [ { @@ -74,18 +55,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val1" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -94,10 +78,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -107,33 +90,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -143,15 +106,36 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var3": { + "path": "rougail.var3", + "name": "var3", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -178,25 +162,7 @@ } ] }, - "variable_type": "string", - "path": "rougail.var3", - "names": [ - "var3" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier_multi.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier_multi.json index ed7753ed6..590ad7042 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier_multi.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_identifier_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "val1" + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A suffix variable2.", "properties": [ { @@ -74,18 +55,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val1" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -94,10 +78,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -107,35 +90,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": [ - "the value of the identifier" - ] - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -151,8 +112,7 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ "val1" ], @@ -160,11 +120,37 @@ "val2" ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": [ + "the value of the identifier" + ] + }, + "variable_type": "string", + "multiple": true } } }, "var3": { + "path": "rougail.var3", + "name": "var3", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -192,33 +178,7 @@ ] }, "variable_type": "string", - "path": "rougail.var3", - "names": [ - "var3" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix.json index 827fc0e6e..9792fa34e 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,29 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,35 +86,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -152,10 +112,21 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2.json index 511da2780..43ecd093a 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,33 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "Suffix has value.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,11 +86,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2_empty.json index f413604cc..580345fa0 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix2_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,33 +64,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "Suffix has value.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -111,11 +80,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled.json index e2d1bf981..f1a7f92f0 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -17,10 +15,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -29,32 +28,19 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -71,11 +57,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.adoc b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.adoc index dc3419cd3..98b70e3b4 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.adoc +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.adoc @@ -9,6 +9,6 @@ * val2 | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable calculated. + -**Default**: depends on an undocumented variable +**Default**: the value of an undocumented variable |==== diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.adoc b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.adoc index 80e599d87..a5bb0c068 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.adoc +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.adoc @@ -11,6 +11,6 @@ * val2 | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable calculated. + -**Default**: depends on an undocumented variable +**Default**: the value of an undocumented variable |==== diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.gitlab.md b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.gitlab.md index dfff1e627..8e02fa2f3 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.gitlab.md @@ -1,9 +1,9 @@
    New variables -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: depends on an undocumented variable | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: the value of an undocumented variable |
    diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.html b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.html index 792935234..8e13fd07c 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.html +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.html @@ -2,12 +2,12 @@ - + - +
  • val2
    • +
    Variable Description
    Variable Description
    rougail.var1
    string multiple standard unique    		A suffix variable.
    Examples:
    • val1
      • -
    • val2
    rougail.var2
    string standard mandatory     		A variable calculated.
    Default: depends on an undocumented variable
    rougail.var2
    string standard mandatory     		A variable calculated.
    Default: the value of an undocumented variable
    diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.md b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.md index 967d8238f..f6c3796b1 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.md +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.md @@ -1,7 +1,7 @@ # New variables -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: depends on an undocumented variable | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: the value of an undocumented variable | diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.sh b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.sh index e8a882a67..772382070 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.sh +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.changelog.sh @@ -9,7 +9,7 @@ │ │ • val2 │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A variable calculated. │ -│  string   standard   mandatory  │ Default: depends on an undocumented │ -│ │ variable │ +│  string   standard   mandatory  │ Default: the value of an │ +│ │ undocumented variable │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.gitlab.md b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.gitlab.md index 8d5457b88..4d87dfe02 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.gitlab.md +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.gitlab.md @@ -1,5 +1,5 @@ -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: depends on an undocumented variable | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: the value of an undocumented variable | diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.html b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.html index fbd19116c..e55fa548e 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.html +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.html @@ -1,11 +1,11 @@ - + - +
  • val2
    • +
    Variable Description
    Variable Description
    rougail.var1
    string multiple standard unique    		A suffix variable.
    Examples:
    • val1
      • -
    • val2
    rougail.var2
    string standard mandatory     		A variable calculated.
    Default: depends on an undocumented variable
    rougail.var2
    string standard mandatory     		A variable calculated.
    Default: the value of an undocumented variable
    diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.json index 0189e09a0..ff207b2f7 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,36 +34,11 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "depends on an undocumented variable", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -78,10 +49,21 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of an undocumented variable", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.md b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.md index 8d5457b88..4d87dfe02 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.md +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.md @@ -1,5 +1,5 @@ -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: depends on an undocumented variable | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `unique` | A suffix variable.
    **Examples**:
    • val1
    • val2 | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable calculated.
    **Default**: the value of an undocumented variable | diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.sh b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.sh index 1cfe064a0..383e0b79a 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.sh +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_disabled2.sh @@ -7,6 +7,6 @@ │ │ • val2 │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A variable calculated. │ -│  string   standard   mandatory  │ Default: depends on an undocumented │ -│ │ variable │ +│  string   standard   mandatory  │ Default: the value of an │ +│ │ undocumented variable │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty.json index f7a049114..ed6066bfd 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,29 +64,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -107,35 +80,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -146,10 +106,21 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_2.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_2.json index 7ea1444cf..29e75991f 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_2.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -31,33 +25,30 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Example", "values": "val1" - }, - "gen_examples": [ - [ - "val1" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -67,25 +58,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "val1" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -95,34 +74,19 @@ } ], "mode": "basic", - "gen_examples": [ - "example" + "identifiers": [ + [ + "val1" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -133,10 +97,21 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_3.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_3.json index 1a2f3a487..55f44f852 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_3.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_empty_3.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,26 +13,8 @@ }, "children": { "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -45,18 +25,25 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" }, "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -67,6 +54,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -74,22 +63,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -98,10 +81,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -111,29 +93,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -143,11 +109,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden.json index b1adf406b..7b05a4fee 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -38,36 +25,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "message": "a value (from an undocumented variable)", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -78,10 +49,21 @@ } ], "mode": "standard", - "gen_examples": [ - "a value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "a value (from an undocumented variable)", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_boolean.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_boolean.json index 9d8575e6f..cc3eb99f9 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_boolean.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_boolean.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -38,36 +25,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "message": "true (from an undocumented variable)", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } + "values": [ + "val1", + "val2" + ] }, - "variable_type": "boolean", + "variable_type": "string", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -78,10 +49,21 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "true (from an undocumented variable)", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_multi.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_multi.json index 1c5feaf42..c3452ba09 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_multi.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_hidden_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -38,32 +25,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "submessage": "(from an undocumented variable)", - "values": [ - "a value", - "a second value" - ] - } + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -80,14 +55,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a value", - "a second value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "submessage": "(from an undocumented variable)", + "values": [ + "a value", + "a second value" + ] + } + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param.json index 840be0749..316b49250 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,35 +70,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "from suffix" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -119,11 +86,22 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "from suffix" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param_empty.json index e7c6d718a..38a72040b 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_suffix_param_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,35 +64,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "from suffix" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -113,11 +80,22 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "from suffix" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable.json index 827fc0e6e..9792fa34e 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,29 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,35 +86,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -152,10 +112,21 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled.json index 714ee3a83..fc0dc9b05 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -17,10 +15,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -29,36 +28,19 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var1", + "name": "var1", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -68,17 +50,6 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": true - }, - "var2": { - "names": [ - "var2", - "var2" - ], "identifiers": [ [ "val1" @@ -87,10 +58,13 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.var2", - "description": "A new variable.", "type": "variable", - "variable_type": "string", + "variable_type": "string" + }, + "var2": { + "path": "rougail.dyn{{ identifier }}.var2", + "name": "var2", + "description": "A new variable.", "properties": [ { "type": "property", @@ -128,11 +102,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled_outside.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled_outside.json index ff42a2ce5..07a048d86 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled_outside.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_disabled_outside.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -17,10 +15,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -29,36 +28,19 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var1", + "name": "var1", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -68,21 +50,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A new variable.", "properties": [ { @@ -109,10 +92,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_empty.json index f7a049114..ed6066bfd 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_calc_variable_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,29 +64,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -107,35 +80,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "rougail.dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -146,10 +106,21 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "rougail.dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_hidden_suffix.json b/tests/results/test_namespace_without_family/60_5family_dynamic_hidden_suffix.json index b72db9adc..ca07872e7 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_hidden_suffix.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_hidden_suffix.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -17,19 +15,8 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", "description": "A dynamic family", "properties": [ { @@ -43,20 +30,29 @@ } ], "mode": "standard", - "identifier": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "val1", + "val2" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.dyn{{ identifier }}.var", + "name": "var", + "description": "A variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -65,25 +61,17 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.var", - "description": "A variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" }, "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "rougail.dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -91,18 +79,15 @@ [ "val2" ] - ], - "path": "rougail.dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.dyn{{ identifier }}.family.var", + "name": "var", + "description": "A new variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -111,17 +96,8 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.family.var", - "description": "A new variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_unknown_suffix_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_unknown_suffix_empty.json index 39c75a73c..3f95a908e 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_unknown_suffix_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_unknown_suffix_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -40,26 +36,16 @@ "val3", "val4" ] - }, - "gen_examples": [ - [ - "val1", - "val2", - "val3", - "val4" - ] - ], - "mandatory_without_value": false + } }, "{{ identifier }}_dyn": { "type": "dynamic", "informations": { - "names": [ - "val1_dyn", - "val2_dyn", - "val3_dyn", - "val4_dyn" - ], + "path": "rougail.{{ identifier }}_dyn", + "name": "{{ identifier }}_dyn", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -74,10 +60,9 @@ "val4" ] ], - "path": "rougail.{{ identifier }}_dyn", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -87,19 +72,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1", - "var1", - "var1" + "path": "rougail.{{ identifier }}_dyn.var1", + "name": "var1", + "description": "A variable 1.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -114,38 +102,26 @@ "val4" ] ], - "path": "rougail.{{ identifier }}_dyn.var1", - "description": "A variable 1.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2", - "val3", - "val4" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var2": { - "names": [ - "var2", - "var2", - "var2", - "var2" + "path": "rougail.{{ identifier }}_dyn.var2", + "name": "var2", + "description": "A variable 2.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -160,8 +136,6 @@ "val4" ] ], - "path": "rougail.{{ identifier }}_dyn.var2", - "description": "A variable 2.", "type": "variable", "default": { "name": "Default", @@ -208,31 +182,21 @@ } ] }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2", - "val3", - "val4" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var3": { - "names": [ - "var3", - "var3", - "var3", - "var3" + "path": "rougail.{{ identifier }}_dyn.var3", + "name": "var3", + "description": "A variable 3.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -247,8 +211,6 @@ "val4" ] ], - "path": "rougail.{{ identifier }}_dyn.var3", - "description": "A variable 3.", "type": "variable", "default": { "name": "Default", @@ -295,63 +257,12 @@ } ] }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2", - "val3", - "val4" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var4": { - "names": [ - "var4", - "var4", - "var4", - "var4" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ], - [ - "val3" - ], - [ - "val4" - ] - ], "path": "rougail.{{ identifier }}_dyn.var4", + "name": "var4", "description": "A variable 4.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.{{ identifier }}_dyn.var1", - "identifiers": [ - "val4" - ], - "type": "variable" - }, - "description": "A variable 1" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -368,13 +279,35 @@ } ], "mode": "standard", - "gen_examples": [ - "val4", - "val4", - "val4", - "val4" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ], + [ + "val3" + ], + [ + "val4" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.{{ identifier }}_dyn.var1", + "identifiers": [ + "val4" + ] + }, + "description": "A variable 1" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside.json index 9a246bc00..22278dd0b 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,17 +70,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a dynamic family.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -100,25 +87,34 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.var", - "description": "A variable inside a dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -146,34 +142,7 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2.json index b177b6514..de019795f 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,24 @@ }, "children": { "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -42,49 +58,11 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true }, "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -101,22 +79,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -125,10 +106,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -138,17 +118,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a dynamic family.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -157,21 +135,12 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.var", - "description": "A variable inside a dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2_empty.json index 99bb0861e..5afbd94c2 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside2_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,6 +13,24 @@ }, "children": { "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -42,42 +58,11 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true }, "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -88,6 +73,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -95,22 +82,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -119,10 +100,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -132,17 +112,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a dynamic family.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -151,21 +129,12 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.var", - "description": "A variable inside a dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_1_0.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_1_0.json index 9a246bc00..22278dd0b 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_1_0.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_1_0.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,17 +70,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a dynamic family.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -100,25 +87,34 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.var", - "description": "A variable inside a dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -146,34 +142,7 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_empty.json index c518dc652..e2b4845bf 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,17 +64,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a dynamic family.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -94,25 +81,34 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.var", - "description": "A variable inside a dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -140,34 +136,7 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja.json index 7a79f2c8d..825649f27 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,17 +70,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a dynamic family.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -100,35 +87,18 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.var", - "description": "A variable inside a dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -145,14 +115,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja_empty.json index 4aded0e48..647b18568 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_jinja_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,17 +64,15 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a dynamic family.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -94,35 +81,18 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.var", - "description": "A variable inside a dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -139,14 +109,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_sub_suffix_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_sub_suffix_empty.json index e62214d19..ab39333b5 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_sub_suffix_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_sub_suffix_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "my_dyn_family_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "my_dyn_family_val1", - "my_dyn_family_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}", + "name": "my_dyn_family_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,21 +64,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "subdyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "subdyn_val1", - "subdyn_val2", - "subdyn_val1", - "subdyn_val2" - ], + "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}", + "name": "subdyn_{{ identifier }}", + "description": "A sub dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1", @@ -108,10 +93,9 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}", - "description": "A sub dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -121,19 +105,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var", - "var", - "var" + "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}.var", + "name": "var", + "description": "A variable inside a sub dynamic family.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1", @@ -152,36 +139,30 @@ "val2" ] ], - "path": "rougail.my_dyn_family_{{ identifier }}.subdyn_{{ identifier }}.var", - "description": "A variable inside a sub dynamic family.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2", - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -211,28 +192,7 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix.json index eddb991da..f3bfe27e0 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_val1", - "dyn_val2" - ], + "path": "rougail.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,33 +70,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn_{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,35 +86,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "rougail.dyn_{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A variable inside dynamic family" - } - }, - "variable_type": "string", "path": "rougail.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -156,10 +116,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "rougail.dyn_{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A variable inside dynamic family" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix_empty.json b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix_empty.json index 87e96c108..434b7ed5f 100644 --- a/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix_empty.json +++ b/tests/results/test_namespace_without_family/60_5family_dynamic_variable_outside_suffix_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "Asuffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_val1", - "dyn_val2" - ], + "path": "rougail.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,33 +64,13 @@ }, "description": "Asuffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn_{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -111,15 +80,29 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -129,24 +112,12 @@ "path": "rougail.dyn_{{ identifier }}.var", "identifiers": [ "val1" - ], - "type": "variable" + ] }, "description": "A variable inside dynamic family" } }, - "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_inside.json b/tests/results/test_namespace_without_family/60_6family_dynamic_inside.json index c1ff39c88..8a66521e3 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_inside.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_inside.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "{{ identifier }}_dyn": { "type": "dynamic", "informations": { - "names": [ - "val1_dyn", - "val2_dyn" - ], + "path": "rougail.{{ identifier }}_dyn", + "name": "{{ identifier }}_dyn", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,17 +70,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" + "path": "rougail.{{ identifier }}_dyn.var1", + "name": "var1", + "description": "Value is suffix.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -100,34 +94,26 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var1", - "description": "Value is suffix.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var2": { - "names": [ - "var2", - "var2" + "path": "rougail.{{ identifier }}_dyn.var2", + "name": "var2", + "description": "Value is first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -136,8 +122,6 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var2", - "description": "Value is first variable.", "type": "variable", "default": { "name": "Default", @@ -164,27 +148,21 @@ } ] }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var3": { - "names": [ - "var3", - "var3" + "path": "rougail.{{ identifier }}_dyn.var3", + "name": "var3", + "description": "Value is relative first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -193,8 +171,6 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var3", - "description": "Value is relative first variable.", "type": "variable", "default": { "name": "Default", @@ -221,7 +197,12 @@ } ] }, - "variable_type": "string", + "variable_type": "string" + }, + "var4": { + "path": "rougail.{{ identifier }}_dyn.var4", + "name": "var4", + "description": "Value is first variable of val1.", "properties": [ { "type": "property", @@ -231,17 +212,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false - }, - "var4": { - "names": [ - "var4", - "var4" - ], "identifiers": [ [ "val1" @@ -250,8 +220,6 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var4", - "description": "Value is first variable of val1.", "type": "variable", "default": { "name": "Default", @@ -261,27 +229,12 @@ "path": "rougail.{{ identifier }}_dyn.var1", "identifiers": [ "val1" - ], - "type": "variable" + ] }, "description": "Value is suffix" } }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_inside_empty.json b/tests/results/test_namespace_without_family/60_6family_dynamic_inside_empty.json index c27d0d803..ac7fc9766 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_inside_empty.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_inside_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "{{ identifier }}_dyn": { "type": "dynamic", "informations": { - "names": [ - "val1_dyn", - "val2_dyn" - ], + "path": "rougail.{{ identifier }}_dyn", + "name": "{{ identifier }}_dyn", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,17 +64,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" + "path": "rougail.{{ identifier }}_dyn.var1", + "name": "var1", + "description": "Value is suffix.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -94,34 +88,26 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var1", - "description": "Value is suffix.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var2": { - "names": [ - "var2", - "var2" + "path": "rougail.{{ identifier }}_dyn.var2", + "name": "var2", + "description": "Value is first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -130,8 +116,6 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var2", - "description": "Value is first variable.", "type": "variable", "default": { "name": "Default", @@ -158,27 +142,21 @@ } ] }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var3": { - "names": [ - "var3", - "var3" + "path": "rougail.{{ identifier }}_dyn.var3", + "name": "var3", + "description": "Value is relative first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1" @@ -187,8 +165,6 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var3", - "description": "Value is relative first variable.", "type": "variable", "default": { "name": "Default", @@ -215,7 +191,12 @@ } ] }, - "variable_type": "string", + "variable_type": "string" + }, + "var4": { + "path": "rougail.{{ identifier }}_dyn.var4", + "name": "var4", + "description": "Value is first variable of val1.", "properties": [ { "type": "property", @@ -225,17 +206,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false - }, - "var4": { - "names": [ - "var4", - "var4" - ], "identifiers": [ [ "val1" @@ -244,8 +214,6 @@ "val2" ] ], - "path": "rougail.{{ identifier }}_dyn.var4", - "description": "Value is first variable of val1.", "type": "variable", "default": { "name": "Default", @@ -255,27 +223,12 @@ "path": "rougail.{{ identifier }}_dyn.var1", "identifiers": [ "val1" - ], - "type": "variable" + ] }, "description": "Value is suffix" } }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1", - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json index 444449f74..1e68de79d 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,19 +70,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "leadership": { "type": "leadership", "informations": { - "names": [ - "leadership", - "leadership" - ], + "path": "rougail.dyn{{ identifier }}.leadership", + "name": "leadership", + "description": "A leadership", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -102,32 +89,15 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.leadership", - "description": "A leadership", - "properties": [], - "mode": "basic", "help": [ "This family contains lists of variable blocks" ] }, "children": { "leader": { - "names": [ - "leader", - "leader" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.leadership.leader", + "name": "leader", "description": "A leader.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -143,22 +113,24 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "example" + "val1" ], [ - "example" + "val2" ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "names": [ - "follower1", - "follower1" - ], + "path": "rougail.dyn{{ identifier }}.leadership.follower1", + "name": "follower1", + "description": "A follower1.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -167,27 +139,15 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.leadership.follower1", - "description": "A follower1.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" }, "follower2": { - "names": [ - "follower2", - "follower2" - ], + "path": "rougail.dyn{{ identifier }}.leadership.follower2", + "name": "follower2", + "description": "A follower2.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -196,21 +156,8 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.leadership.follower2", - "description": "A follower2.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json index adf77f984..a1d4dc498 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,19 +64,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "leadership": { "type": "leadership", "informations": { - "names": [ - "leadership", - "leadership" - ], + "path": "rougail.dyn{{ identifier }}.leadership", + "name": "leadership", + "description": "A leadership", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -96,32 +83,15 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.leadership", - "description": "A leadership", - "properties": [], - "mode": "basic", "help": [ "This family contains lists of variable blocks" ] }, "children": { "leader": { - "names": [ - "leader", - "leader" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.leadership.leader", + "name": "leader", "description": "A leader.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -137,22 +107,24 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "example" + "val1" ], [ - "example" + "val2" ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "names": [ - "follower1", - "follower1" - ], + "path": "rougail.dyn{{ identifier }}.leadership.follower1", + "name": "follower1", + "description": "A follower1.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -161,27 +133,15 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.leadership.follower1", - "description": "A follower1.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" }, "follower2": { - "names": [ - "follower2", - "follower2" - ], + "path": "rougail.dyn{{ identifier }}.leadership.follower2", + "name": "follower2", + "description": "A follower2.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -190,21 +150,8 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.leadership.follower2", - "description": "A follower2.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic.json b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic.json index abf8ddb83..22c80e069 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,35 +70,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "add 't' to each var value" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -125,28 +92,32 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "tval1", - "tval2" + "val1" ], [ - "tval1", - "tval2" + "val2" ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "add 't' to each var value" + } + }, + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_tval1", - "dyn_tval2", - "dyn_tval1", - "dyn_tval2" - ], + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A Second dynamic variable", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1", @@ -165,10 +136,9 @@ "tval2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", - "description": "A Second dynamic variable", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -190,19 +160,22 @@ }, "description": "A dynamic variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var", - "var", - "var" + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", + "name": "var", + "description": "A variable dynamic.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1", @@ -221,64 +194,17 @@ "tval2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", - "description": "A variable dynamic.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "tval1", - "tval2", - "tval1", - "tval2" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var_identifier": { - "names": [ - "var_identifier", - "var_identifier", - "var_identifier", - "var_identifier" - ], - "identifiers": [ - [ - "val1", - "tval1" - ], - [ - "val1", - "tval2" - ], - [ - "val2", - "tval1" - ], - [ - "val2", - "tval2" - ] - ], "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier", + "name": "var_identifier", "description": "Identifier from first family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -288,21 +214,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val1", - "val2", - "val2" - ], - "mandatory_without_value": false - }, - "var_identifiers": { - "names": [ - "var_identifiers", - "var_identifiers", - "var_identifiers", - "var_identifiers" - ], "identifiers": [ [ "val1", @@ -321,8 +232,44 @@ "tval2" ] ], + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" + }, + "var_identifiers": { "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers", + "name": "var_identifiers", "description": "Merge identifiers.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "identifiers": [ + [ + "val1", + "tval1" + ], + [ + "val1", + "tval2" + ], + [ + "val2", + "tval1" + ], + [ + "val2", + "tval2" + ] + ], "type": "variable", "default": { "name": "Default", @@ -330,23 +277,7 @@ "description": "join identifier 1 and identifier 2" } }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1-tval1", - "val1-tval2", - "val2-tval1", - "val2-tval2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0.json b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0.json index abf8ddb83..22c80e069 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,35 +70,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "add 't' to each var value" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -125,28 +92,32 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "tval1", - "tval2" + "val1" ], [ - "tval1", - "tval2" + "val2" ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "add 't' to each var value" + } + }, + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_tval1", - "dyn_tval2", - "dyn_tval1", - "dyn_tval2" - ], + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A Second dynamic variable", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1", @@ -165,10 +136,9 @@ "tval2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", - "description": "A Second dynamic variable", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -190,19 +160,22 @@ }, "description": "A dynamic variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var", - "var", - "var" + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", + "name": "var", + "description": "A variable dynamic.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1", @@ -221,64 +194,17 @@ "tval2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", - "description": "A variable dynamic.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "tval1", - "tval2", - "tval1", - "tval2" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var_identifier": { - "names": [ - "var_identifier", - "var_identifier", - "var_identifier", - "var_identifier" - ], - "identifiers": [ - [ - "val1", - "tval1" - ], - [ - "val1", - "tval2" - ], - [ - "val2", - "tval1" - ], - [ - "val2", - "tval2" - ] - ], "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier", + "name": "var_identifier", "description": "Identifier from first family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -288,21 +214,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val1", - "val2", - "val2" - ], - "mandatory_without_value": false - }, - "var_identifiers": { - "names": [ - "var_identifiers", - "var_identifiers", - "var_identifiers", - "var_identifiers" - ], "identifiers": [ [ "val1", @@ -321,8 +232,44 @@ "tval2" ] ], + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" + }, + "var_identifiers": { "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers", + "name": "var_identifiers", "description": "Merge identifiers.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "identifiers": [ + [ + "val1", + "tval1" + ], + [ + "val1", + "tval2" + ], + [ + "val2", + "tval1" + ], + [ + "val2", + "tval2" + ] + ], "type": "variable", "default": { "name": "Default", @@ -330,23 +277,7 @@ "description": "join identifier 1 and identifier 2" } }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1-tval1", - "val1-tval2", - "val2-tval1", - "val2-tval2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0_2.json b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0_2.json index 593f5b24f..c0f3d4480 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0_2.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_1_0_2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "val1", - "val2" - ], + "path": "rougail.{{ identifier }}", + "name": "{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,21 +70,17 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "val1", - "val2", - "val1", - "val2" - ], + "path": "rougail.{{ identifier }}.{{ identifier }}", + "name": "{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1", @@ -114,10 +99,9 @@ "val2" ] ], - "path": "rougail.{{ identifier }}.{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -127,19 +111,22 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var", - "var", - "var" + "path": "rougail.{{ identifier }}.{{ identifier }}.var", + "name": "var", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "basic", "identifiers": [ [ "val1", @@ -158,26 +145,8 @@ "val2" ] ], - "path": "rougail.{{ identifier }}.{{ identifier }}.var", - "description": "A dynamic variable.", "type": "variable", - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "gen_examples": [ - "example", - "example", - "example", - "example" - ], - "mandatory_without_value": true + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty.json b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty.json index 6dbec8790..fb69b5abe 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -31,6 +25,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -38,22 +34,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,35 +64,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "add 't' to each var value" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -119,28 +86,32 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "tval1", - "tval2" + "val1" ], [ - "tval1", - "tval2" + "val2" ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "add 't' to each var value" + } + }, + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_tval1", - "dyn_tval2", - "dyn_tval1", - "dyn_tval2" - ], + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A Second dynamic variable", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1", @@ -159,10 +130,9 @@ "tval2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", - "description": "A Second dynamic variable", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -184,19 +154,22 @@ }, "description": "A dynamic variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var", - "var", - "var" + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", + "name": "var", + "description": "A variable dynamic.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1", @@ -215,64 +188,17 @@ "tval2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", - "description": "A variable dynamic.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "tval1", - "tval2", - "tval1", - "tval2" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var_identifier": { - "names": [ - "var_identifier", - "var_identifier", - "var_identifier", - "var_identifier" - ], - "identifiers": [ - [ - "val1", - "tval1" - ], - [ - "val1", - "tval2" - ], - [ - "val2", - "tval1" - ], - [ - "val2", - "tval2" - ] - ], "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier", + "name": "var_identifier", "description": "Identifier from first family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -282,21 +208,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val1", - "val2", - "val2" - ], - "mandatory_without_value": false - }, - "var_identifiers": { - "names": [ - "var_identifiers", - "var_identifiers", - "var_identifiers", - "var_identifiers" - ], "identifiers": [ [ "val1", @@ -315,8 +226,44 @@ "tval2" ] ], + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" + }, + "var_identifiers": { "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers", + "name": "var_identifiers", "description": "Merge identifiers.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "identifiers": [ + [ + "val1", + "tval1" + ], + [ + "val1", + "tval2" + ], + [ + "val2", + "tval1" + ], + [ + "val2", + "tval2" + ] + ], "type": "variable", "default": { "name": "Default", @@ -324,23 +271,7 @@ "description": "join identifier 1 and identifier 2" } }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1-tval1", - "val1-tval2", - "val2-tval1", - "val2-tval2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty2.json b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty2.json index 0b2415dc2..691b00bbf 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty2.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_sub_dynamic_empty2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -38,22 +25,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -62,10 +52,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -75,29 +64,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -107,24 +80,26 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "example" + "val1" ], [ - "example" + "val2" ] ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_example", - "dyn_example" - ], + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A Second dynamic variable", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1", @@ -135,10 +110,9 @@ "example" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}", - "description": "A Second dynamic variable", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -160,17 +134,22 @@ }, "description": "A dynamic variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" + "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", + "name": "var", + "description": "A variable dynamic.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val1", @@ -181,52 +160,17 @@ "example" ] ], - "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var", - "description": "A variable dynamic.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var_identifier": { - "names": [ - "var_identifier", - "var_identifier" - ], - "identifiers": [ - [ - "val1", - "example" - ], - [ - "val2", - "example" - ] - ], "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier", + "name": "var_identifier", "description": "Identifier from first family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -236,17 +180,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" - ], - "mandatory_without_value": false - }, - "var_identifiers": { - "names": [ - "var_identifiers", - "var_identifiers" - ], "identifiers": [ [ "val1", @@ -257,8 +190,36 @@ "example" ] ], + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" + }, + "var_identifiers": { "path": "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers", + "name": "var_identifiers", "description": "Merge identifiers.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "identifiers": [ + [ + "val1", + "example" + ], + [ + "val2", + "example" + ] + ], "type": "variable", "default": { "name": "Default", @@ -266,21 +227,7 @@ "description": "join identifier 1 and identifier 2" } }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1-example", - "val2-example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi.json b/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi.json index 7815102ee..cc14f03a8 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,21 +70,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2", - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1", @@ -114,10 +99,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -127,19 +111,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var", - "var", - "var" + "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var", + "name": "var", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "basic", "identifiers": [ [ "val1", @@ -158,32 +145,26 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var", - "description": "A dynamic variable.", "type": "variable", - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "gen_examples": [ - "example", - "example", - "example", - "example" - ], - "mandatory_without_value": true + "variable_type": "string" } } } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -213,28 +194,7 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi2.json b/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi2.json index f7cfee1ca..c61a8f1e3 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi2.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_suffix_auto_multi2.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "rougail.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -44,22 +31,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -68,10 +58,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -81,21 +70,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2", - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1", @@ -114,10 +99,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -127,19 +111,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var", - "var", - "var" + "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var", + "name": "var", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "basic", "identifiers": [ [ "val1", @@ -158,32 +145,26 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}.dyn{{ identifier }}.var", - "description": "A dynamic variable.", "type": "variable", - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "gen_examples": [ - "example", - "example", - "example", - "example" - ], - "mandatory_without_value": true + "variable_type": "string" } } } } }, "var2": { + "path": "rougail.var2", + "name": "var2", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -213,28 +194,7 @@ ] }, "variable_type": "string", - "path": "rougail.var2", - "names": [ - "var2" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_namespace_without_family/60_9extra_dynamic.json b/tests/results/test_namespace_without_family/60_9extra_dynamic.json index f6bf85ba0..e107b2869 100644 --- a/tests/results/test_namespace_without_family/60_9extra_dynamic.json +++ b/tests/results/test_namespace_without_family/60_9extra_dynamic.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -15,18 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a" - ] - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -43,13 +31,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } }, @@ -57,9 +47,7 @@ "type": "namespace", "informations": { "path": "extra", - "names": [ - "extra" - ], + "name": "extra", "description": "Extra", "properties": [], "mode": "basic", @@ -71,18 +59,19 @@ "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_a" - ], + "path": "extra.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "dyn_{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "a" ] ], - "path": "extra.dyn_{{ identifier }}", - "description": "dyn_{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -92,24 +81,12 @@ }, "description": "A variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "a" - ] - ], "path": "extra.dyn_{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -119,10 +96,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example" + "identifiers": [ + [ + "a" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_9extra_dynamic_extra.json b/tests/results/test_namespace_without_family/60_9extra_dynamic_extra.json index de3391a1b..0c08391e1 100644 --- a/tests/results/test_namespace_without_family/60_9extra_dynamic_extra.json +++ b/tests/results/test_namespace_without_family/60_9extra_dynamic_extra.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "standard", @@ -18,27 +16,15 @@ "type": "family", "informations": { "path": "rougail.general", - "names": [ - "general" - ], + "name": "general", "description": "Général", "properties": [], "mode": "standard" }, "children": { "varname": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a" - ] - }, - "variable_type": "string", "path": "rougail.general.varname", - "names": [ - "varname" - ], + "name": "varname", "description": "No change.", "properties": [ { @@ -55,13 +41,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } @@ -71,9 +59,7 @@ "type": "namespace", "informations": { "path": "extra", - "names": [ - "extra" - ], + "name": "extra", "description": "Extra", "properties": [], "mode": "basic", @@ -83,18 +69,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a" - ] - }, - "variable_type": "string", "path": "extra.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -111,29 +87,32 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_a" - ], + "path": "extra.dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "dyn_{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "a" ] ], - "path": "extra.dyn_{{ identifier }}", - "description": "dyn_{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -143,24 +122,12 @@ }, "description": "A variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "a" - ] - ], "path": "extra.dyn_{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -170,10 +137,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example" + "identifiers": [ + [ + "a" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/60_9family_dynamic_calc_both.json b/tests/results/test_namespace_without_family/60_9family_dynamic_calc_both.json index 28eb2c9c5..bdfbe4696 100644 --- a/tests/results/test_namespace_without_family/60_9family_dynamic_calc_both.json +++ b/tests/results/test_namespace_without_family/60_9family_dynamic_calc_both.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -15,16 +13,8 @@ }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "val2" - }, - "variable_type": "string", "path": "rougail.var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -35,18 +25,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val2" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -55,10 +48,9 @@ "val2" ] ], - "path": "rougail.dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", { @@ -69,29 +61,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "rougail.dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -101,11 +77,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/68_0family_leadership_mode.json b/tests/results/test_namespace_without_family/68_0family_leadership_mode.json index 793fd1d3b..10accd09c 100644 --- a/tests/results/test_namespace_without_family/68_0family_leadership_mode.json +++ b/tests/results/test_namespace_without_family/68_0family_leadership_mode.json @@ -3,9 +3,7 @@ "type": "namespace", "informations": { "path": "rougail", - "names": [ - "rougail" - ], + "name": "rougail", "description": "Rougail", "properties": [], "mode": "basic", @@ -18,9 +16,7 @@ "type": "leadership", "informations": { "path": "rougail.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -30,12 +26,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -46,38 +38,22 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "rougail.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower1.", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "rougail.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A follower2.", "properties": [ { @@ -88,12 +64,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_namespace_without_family/warnings_16_2family_redefine_calculation b/tests/results/test_namespace_without_family/warnings_16_2family_redefine_calculation index d766e2d00..8c8b5fa6c 100644 --- a/tests/results/test_namespace_without_family/warnings_16_2family_redefine_calculation +++ b/tests/results/test_namespace_without_family/warnings_16_2family_redefine_calculation @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for rougail.family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_16_3family_empty_at_ends b/tests/results/test_namespace_without_family/warnings_16_3family_empty_at_ends index e7619cd3b..d48ef4869 100644 --- a/tests/results/test_namespace_without_family/warnings_16_3family_empty_at_ends +++ b/tests/results/test_namespace_without_family/warnings_16_3family_empty_at_ends @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"rougail.family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_dynamic b/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_dynamic index 7ac2fbe7f..27fd375f3 100644 --- a/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_dynamic +++ b/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_variable b/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_variable index f688a53bb..c210375a8 100644 --- a/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_variable +++ b/tests/results/test_namespace_without_family/warnings_20_2family_looks_like_variable @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test_namespace_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory index 3abb0f5e7..6d6e0f98d 100644 --- a/tests/results/test_namespace_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory +++ b/tests/results/test_namespace_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_0family_dynamic_forbidden_char b/tests/results/test_namespace_without_family/warnings_60_0family_dynamic_forbidden_char index d3aeda8b6..03f145898 100644 --- a/tests/results/test_namespace_without_family/warnings_60_0family_dynamic_forbidden_char +++ b/tests/results/test_namespace_without_family/warnings_60_0family_dynamic_forbidden_char @@ -1 +1 @@ -["\"default\" is a calculation for rougail.dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file +["\"default\" is a calculation for rougail.dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_disabled2 b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_disabled2 index 0637a088a..decb99275 100644 --- a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_disabled2 +++ b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_disabled2 @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden index 0637a088a..ca62c55c1 100644 --- a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden +++ b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_boolean b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_boolean index 0637a088a..aae5574da 100644 --- a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_boolean +++ b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_boolean @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_boolean/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_multi b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_multi index 0637a088a..fc2a53c8a 100644 --- a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_multi +++ b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_calc_suffix_hidden_multi @@ -1 +1 @@ -[] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_5family_dynamic_calc_suffix_hidden_multi/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_unknown_suffix_empty b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_unknown_suffix_empty index e8a78f126..eeba5b344 100644 --- a/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_unknown_suffix_empty +++ b/tests/results/test_namespace_without_family/warnings_60_5family_dynamic_unknown_suffix_empty @@ -1 +1 @@ -["\"disabled\" is a calculation for rougail.val1_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for rougail.{{ identifier }}_dyn.var4 but has no description in \"../../rougail-tests/structures/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi b/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi index b29a00ee6..5867be67f 100644 --- a/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi +++ b/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi2 b/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi2 index 77b1a877a..e329e6758 100644 --- a/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi2 +++ b/tests/results/test_namespace_without_family/warnings_60_6family_dynamic_suffix_auto_multi2 @@ -1 +1 @@ -["No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"rougail.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\"", "No attribute \"description\" for \"rougail.dyn{{ identifier }}.dyn{{ identifier }}\" in \"../../rougail-tests/structures/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic b/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic index 88aca57fe..282cd0554 100644 --- a/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic +++ b/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic/extra/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic_extra b/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic_extra index 649dabe67..b7b2cef9f 100644 --- a/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic_extra +++ b/tests/results/test_namespace_without_family/warnings_60_9extra_dynamic_extra @@ -1 +1 @@ -["No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"extra.dyn_{{ identifier }}\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\"", "No attribute \"description\" for \"extra.dyn_{{ identifier }}.var\" in \"../../rougail-tests/structures/60_9extra_dynamic_extra/extra/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_without_family/00_0version_underscore.json b/tests/results/test_without_family/00_0version_underscore.json index a55b11525..f44cdb8f6 100644 --- a/tests/results/test_without_family/00_0version_underscore.json +++ b/tests/results/test_without_family/00_0version_underscore.json @@ -1,11 +1,7 @@ { "version": { - "type": "variable", - "variable_type": "string", "path": "version", - "names": [ - "version" - ], + "name": "version", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_1empty_variable.json b/tests/results/test_without_family/00_1empty_variable.json index ad3c8f23d..d592c39c3 100644 --- a/tests/results/test_without_family/00_1empty_variable.json +++ b/tests/results/test_without_family/00_1empty_variable.json @@ -1,11 +1,7 @@ { "empty": { - "type": "variable", - "variable_type": "string", "path": "empty", - "names": [ - "empty" - ], + "name": "empty", "properties": [ { "type": "property", @@ -15,9 +11,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_2default_calculated.json b/tests/results/test_without_family/00_2default_calculated.json index 1bbd0e3e8..86c7b9f36 100644 --- a/tests/results/test_without_family/00_2default_calculated.json +++ b/tests/results/test_without_family/00_2default_calculated.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,24 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value of var1" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -54,12 +38,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var1" + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_2default_calculated_multi.json b/tests/results/test_without_family/00_2default_calculated_multi.json index 013f7a00a..1d66b97ec 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.json +++ b/tests/results/test_without_family/00_2default_calculated_multi.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes", - "maybe" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -30,35 +18,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "no", "yes", "maybe" ] - ], - "mandatory_without_value": false - }, - "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of \"{0}\"", - "variables": [ - { - "path": "var1", - "description": "a first variable" - } - ] - } }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -75,14 +49,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no", - "yes", - "maybe" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "var1", + "description": "a first variable" + } + ] + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_2default_calculated_params_permissive.json b/tests/results/test_without_family/00_2default_calculated_params_permissive.json index 13a242260..f392e16fe 100644 --- a/tests/results/test_without_family/00_2default_calculated_params_permissive.json +++ b/tests/results/test_without_family/00_2default_calculated_params_permissive.json @@ -1,15 +1,7 @@ { "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "a_value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_2default_calculated_variable.json b/tests/results/test_without_family/00_2default_calculated_variable.json index 9d5cfeff9..d7fa72456 100644 --- a/tests/results/test_without_family/00_2default_calculated_variable.json +++ b/tests/results/test_without_family/00_2default_calculated_variable.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -29,15 +18,36 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" ] - ], - "mandatory_without_value": true + }, + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -55,32 +65,6 @@ "name": "Validator", "values": "type domainname" }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_2default_calculated_variable_description.json b/tests/results/test_without_family/00_2default_calculated_variable_description.json index 95c8afdfd..188918ca7 100644 --- a/tests/results/test_without_family/00_2default_calculated_variable_description.json +++ b/tests/results/test_without_family/00_2default_calculated_variable_description.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,24 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "value of a variable!" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -44,9 +28,13 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "value of a variable!" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_2default_calculated_variable_description_multi_line.json b/tests/results/test_without_family/00_2default_calculated_variable_description_multi_line.json index 8cd3729dc..9286d7dae 100644 --- a/tests/results/test_without_family/00_2default_calculated_variable_description_multi_line.json +++ b/tests/results/test_without_family/00_2default_calculated_variable_description_multi_line.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,24 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "value\nof\na\nvariable!" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -44,18 +28,18 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "value\nof\na\nvariable!" + } + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A new variable.", "properties": [ { @@ -66,9 +50,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_2default_calculated_variable_transitive.json b/tests/results/test_without_family/00_2default_calculated_variable_transitive.json index 7b15f900c..11e5dda9f 100644 --- a/tests/results/test_without_family/00_2default_calculated_variable_transitive.json +++ b/tests/results/test_without_family/00_2default_calculated_variable_transitive.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -29,15 +18,36 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example.net" + "type": "variable", + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be an IP" ] - ], - "mandatory_without_value": true + }, + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -58,32 +68,6 @@ "the domain name can be an IP" ] }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example.net" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_4load_subfolder.json b/tests/results/test_without_family/00_4load_subfolder.json index b22d24502..a1da77af6 100644 --- a/tests/results/test_without_family/00_4load_subfolder.json +++ b/tests/results/test_without_family/00_4load_subfolder.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -16,18 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -38,9 +28,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_5load_notype.json b/tests/results/test_without_family/00_5load_notype.json index 3a379e5cd..ad6667eb0 100644 --- a/tests/results/test_without_family/00_5load_notype.json +++ b/tests/results/test_without_family/00_5load_notype.json @@ -1,15 +1,7 @@ { "without_type": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "without_type", - "names": [ - "without_type" - ], + "name": "without_type", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6boolean.json b/tests/results/test_without_family/00_6boolean.json index 80df69245..a8603fe8b 100644 --- a/tests/results/test_without_family/00_6boolean.json +++ b/tests/results/test_without_family/00_6boolean.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": false + "values": true }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6boolean_no_mandatory.json b/tests/results/test_without_family/00_6boolean_no_mandatory.json index 629315cf1..c30395b40 100644 --- a/tests/results/test_without_family/00_6boolean_no_mandatory.json +++ b/tests/results/test_without_family/00_6boolean_no_mandatory.json @@ -1,21 +1,15 @@ { "variable": { + "path": "variable", + "name": "variable", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", "values": true }, - "variable_type": "boolean", - "path": "variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "variable_type": "boolean" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6choice.json b/tests/results/test_without_family/00_6choice.json index 565de5475..eee67096b 100644 --- a/tests/results/test_without_family/00_6choice.json +++ b/tests/results/test_without_family/00_6choice.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -24,12 +12,6 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true - }, - "var2": { "type": "variable", "variable_type": "choice", "choices": { @@ -39,11 +21,11 @@ "b", "c" ] - }, + } + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -54,12 +36,23 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + } }, "var3": { + "path": "var3", + "name": "var3", + "description": "The third variable.", + "properties": [], + "mode": "standard", "type": "variable", "variable_type": "choice", "choices": { @@ -70,20 +63,14 @@ "c", null ] - }, - "path": "var3", - "names": [ - "var3" - ], - "description": "The third variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } }, "var4": { + "path": "var4", + "name": "var4", + "description": "The forth variable.", + "properties": [], + "mode": "standard", "type": "variable", "variable_type": "choice", "choices": { @@ -93,20 +80,21 @@ "b", "c" ] - }, - "path": "var4", - "names": [ - "var4" - ], - "description": "The forth variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } }, "var5": { + "path": "var5", + "name": "var5", + "description": "The fifth variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -120,12 +108,12 @@ "b", "c" ] - }, - "path": "var5", - "names": [ - "var5" - ], - "description": "The fifth variable.", + } + }, + "var6": { + "path": "var6", + "name": "var6", + "description": "The sixth variable.", "properties": [ { "type": "property", @@ -135,12 +123,6 @@ } ], "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -154,24 +136,6 @@ 2, 3 ] - }, - "path": "var6", - "names": [ - "var6" - ], - "description": "The sixth variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6choice_calculation.json b/tests/results/test_without_family/00_6choice_calculation.json index fa5ae7779..4867da6f8 100644 --- a/tests/results/test_without_family/00_6choice_calculation.json +++ b/tests/results/test_without_family/00_6choice_calculation.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "choices is 0 to 9" } - }, - "path": "var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6choice_link.json b/tests/results/test_without_family/00_6choice_link.json index fb16ae262..8cceebe1e 100644 --- a/tests/results/test_without_family/00_6choice_link.json +++ b/tests/results/test_without_family/00_6choice_link.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -24,12 +12,30 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" + ] + } }, "var2": { + "path": "var2", + "name": "var2", + "description": "The second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -50,24 +56,6 @@ "b", "c" ] - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "The second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6choice_variable.json b/tests/results/test_without_family/00_6choice_variable.json index 1892c6788..5c78fdfdf 100644 --- a/tests/results/test_without_family/00_6choice_variable.json +++ b/tests/results/test_without_family/00_6choice_variable.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -57,24 +59,6 @@ }, "description": "A second variable" } - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6choice_variable_link.json b/tests/results/test_without_family/00_6choice_variable_link.json index 8c471e2e9..5cf89cf6c 100644 --- a/tests/results/test_without_family/00_6choice_variable_link.json +++ b/tests/results/test_without_family/00_6choice_variable_link.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -57,12 +59,12 @@ }, "description": "A second variable" } - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A first variable.", + } + }, + "var3": { + "path": "var3", + "name": "var3", + "description": "A third variable.", "properties": [ { "type": "property", @@ -72,12 +74,6 @@ } ], "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -101,24 +97,6 @@ }, "description": "A second variable" } - }, - "path": "var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6choice_variable_link2.json b/tests/results/test_without_family/00_6choice_variable_link2.json index 064f92b2b..0b892f6d0 100644 --- a/tests/results/test_without_family/00_6choice_variable_link2.json +++ b/tests/results/test_without_family/00_6choice_variable_link2.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -57,39 +59,31 @@ }, "description": "A second variable" } - }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "standard" }, "children": { "var3": { + "path": "family.var3", + "name": "var3", + "description": "A third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -113,25 +107,7 @@ }, "description": "A second variable" } - }, - "path": "family.var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "a" - ], - "mandatory_without_value": false + } } } } diff --git a/tests/results/test_without_family/00_6custom.json b/tests/results/test_without_family/00_6custom.json index c7e278007..635c16d85 100644 --- a/tests/results/test_without_family/00_6custom.json +++ b/tests/results/test_without_family/00_6custom.json @@ -1,11 +1,7 @@ { "custom1": { - "type": "variable", - "variable_type": "custom", "path": "custom1", - "names": [ - "custom1" - ], + "name": "custom1", "description": "The first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "xxx" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "custom" }, "custom2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "custom", "path": "custom2", - "names": [ - "custom2" - ], + "name": "custom2", "description": "The seconf variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "custom" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6domainname.json b/tests/results/test_without_family/00_6domainname.json index 302c0b890..1c044cff3 100644 --- a/tests/results/test_without_family/00_6domainname.json +++ b/tests/results/test_without_family/00_6domainname.json @@ -1,19 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "my.domain.name" - }, - "variable_type": "domainname", - "validators": { - "name": "Validator", - "values": "type domainname" - }, "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A domain name variable.", "properties": [ { @@ -24,9 +12,15 @@ } ], "mode": "standard", - "gen_examples": [ - "my.domain.name" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "my.domain.name" + }, + "variable_type": "domainname", + "validators": { + "name": "Validator", + "values": "type domainname" + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6domainname_params.json b/tests/results/test_without_family/00_6domainname_params.json index bc965714d..d4c9db648 100644 --- a/tests/results/test_without_family/00_6domainname_params.json +++ b/tests/results/test_without_family/00_6domainname_params.json @@ -1,5 +1,17 @@ { "variable": { + "path": "variable", + "name": "variable", + "description": "A domain name variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "type domainname", "the domain name can be an IP" ] - }, - "path": "variable", - "names": [ - "variable" - ], - "description": "A domain name variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "my.domain.name" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6float.json b/tests/results/test_without_family/00_6float.json index 64bee977d..9031038cb 100644 --- a/tests/results/test_without_family/00_6float.json +++ b/tests/results/test_without_family/00_6float.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0.0 - }, - "variable_type": "float", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0.0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10.1 + "values": 0.0 }, - "variable_type": "float", + "variable_type": "float" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10.1 }, - "variable_type": "float", + "variable_type": "float" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10.1 }, - "variable_type": "float", + "variable_type": "float" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - 10.1 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10.1 + }, + "variable_type": "float" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6integer.json b/tests/results/test_without_family/00_6integer.json index e17f2bd49..64293bac2 100644 --- a/tests/results/test_without_family/00_6integer.json +++ b/tests/results/test_without_family/00_6integer.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0 - }, - "variable_type": "integer", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10 + "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "This forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10 + }, + "variable_type": "integer" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6ip.adoc b/tests/results/test_without_family/00_6ip.adoc index 656055c1b..97349db9d 100644 --- a/tests/results/test_without_family/00_6ip.adoc +++ b/tests/results/test_without_family/00_6ip.adoc @@ -13,7 +13,7 @@ * reserved IP are allowed **Default**: 1.1.1.1/24 + -**Example**: 192.168.0.128/25 +**Example**: 192.168.0.129/25 | **var3** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[CIDR]` `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type. + **Validator**: IP must be in CIDR format + diff --git a/tests/results/test_without_family/00_6ip.changelog.adoc b/tests/results/test_without_family/00_6ip.changelog.adoc index 3f7cbb71b..1a22161e4 100644 --- a/tests/results/test_without_family/00_6ip.changelog.adoc +++ b/tests/results/test_without_family/00_6ip.changelog.adoc @@ -15,7 +15,7 @@ * reserved IP are allowed **Default**: 1.1.1.1/24 + -**Example**: 192.168.0.128/25 +**Example**: 192.168.0.129/25 | **var3** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[CIDR]` `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type. + **Validator**: IP must be in CIDR format + diff --git a/tests/results/test_without_family/00_6ip.changelog.gitlab.md b/tests/results/test_without_family/00_6ip.changelog.gitlab.md index 884187203..9c7f528ac 100644 --- a/tests/results/test_without_family/00_6ip.changelog.gitlab.md +++ b/tests/results/test_without_family/00_6ip.changelog.gitlab.md @@ -3,7 +3,7 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_without_family/00_6ip.changelog.html b/tests/results/test_without_family/00_6ip.changelog.html index 13aafe75a..482abffea 100644 --- a/tests/results/test_without_family/00_6ip.changelog.html +++ b/tests/results/test_without_family/00_6ip.changelog.html @@ -7,7 +7,7 @@ var1
    IP standard mandatory An IP.
    Validator: reserved IP are allowed
    Default: 1.1.1.1 var2
    IP standard mandatory An IP in CIDR format.
    Validators:
    • IP must be in CIDR format
      • -
    • reserved IP are allowed

    Default: 1.1.1.1/24
    Example: 192.168.0.128/25 +
  • reserved IP are allowed

    • Default: 1.1.1.1/24
    Example: 192.168.0.129/25 var3
    CIDR standard mandatoryAn IP in CIDR format with obsolete CIDR type.
    Validator: IP must be in CIDR format
    Default: 1.1.1.1/24 diff --git a/tests/results/test_without_family/00_6ip.changelog.md b/tests/results/test_without_family/00_6ip.changelog.md index 1d83620d4..bf8087c49 100644 --- a/tests/results/test_without_family/00_6ip.changelog.md +++ b/tests/results/test_without_family/00_6ip.changelog.md @@ -3,6 +3,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_without_family/00_6ip.changelog.sh b/tests/results/test_without_family/00_6ip.changelog.sh index 7c5206381..6deb5b2cf 100644 --- a/tests/results/test_without_family/00_6ip.changelog.sh +++ b/tests/results/test_without_family/00_6ip.changelog.sh @@ -12,7 +12,7 @@ │ │ • IP must be in CIDR format │ │ │ • reserved IP are allowed │ │ │ Default: 1.1.1.1/24 │ -│ │ Example: 192.168.0.128/25 │ +│ │ Example: 192.168.0.129/25 │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var3 │ An IP in CIDR format with obsolete │ │  CIDR   standard   mandatory  │ CIDR type. │ diff --git a/tests/results/test_without_family/00_6ip.gitlab.md b/tests/results/test_without_family/00_6ip.gitlab.md index 99a1ded55..987c09a28 100644 --- a/tests/results/test_without_family/00_6ip.gitlab.md +++ b/tests/results/test_without_family/00_6ip.gitlab.md @@ -1,6 +1,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_without_family/00_6ip.html b/tests/results/test_without_family/00_6ip.html index 86a690e85..531dea2b1 100644 --- a/tests/results/test_without_family/00_6ip.html +++ b/tests/results/test_without_family/00_6ip.html @@ -5,7 +5,7 @@ var1
    IP standard mandatory An IP.
    Validator: reserved IP are allowed
    Default: 1.1.1.1 var2
    IP standard mandatory An IP in CIDR format.
    Validators:
    • IP must be in CIDR format
      • -
    • reserved IP are allowed

    Default: 1.1.1.1/24
    Example: 192.168.0.128/25 +
  • reserved IP are allowed

    • Default: 1.1.1.1/24
    Example: 192.168.0.129/25 var3
    CIDR standard mandatoryAn IP in CIDR format with obsolete CIDR type.
    Validator: IP must be in CIDR format
    Default: 1.1.1.1/24 diff --git a/tests/results/test_without_family/00_6ip.json b/tests/results/test_without_family/00_6ip.json index bb2d70e2b..570b31f8d 100644 --- a/tests/results/test_without_family/00_6ip.json +++ b/tests/results/test_without_family/00_6ip.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.1" - }, - "variable_type": "IP", - "validators": { - "name": "Validator", - "values": "reserved IP are allowed" - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "An IP.", "properties": [ { @@ -24,12 +12,30 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.1" + }, + "variable_type": "IP", + "validators": { + "name": "Validator", + "values": "reserved IP are allowed" + } }, "var2": { + "path": "var2", + "name": "var2", + "description": "An IP in CIDR format.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -43,44 +49,14 @@ "reserved IP are allowed" ] }, - "path": "var2", - "names": [ - "var2" - ], - "description": "An IP in CIDR format.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", - "values": "192.168.0.128/25" - }, - "gen_examples": [ - "192.168.0.128/25" - ], - "mandatory_without_value": false + "values": "192.168.0.129/25" + } }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.1/24" - }, - "variable_type": "CIDR", - "validators": { - "name": "Validator", - "values": "IP must be in CIDR format" - }, "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "An IP in CIDR format with obsolete CIDR type.", "properties": [ { @@ -91,9 +67,15 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.1/24" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.1/24" + }, + "variable_type": "CIDR", + "validators": { + "name": "Validator", + "values": "IP must be in CIDR format" + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6ip.md b/tests/results/test_without_family/00_6ip.md index 99a1ded55..987c09a28 100644 --- a/tests/results/test_without_family/00_6ip.md +++ b/tests/results/test_without_family/00_6ip.md @@ -1,6 +1,6 @@ | Variable | Description | |---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP.
    **Validator**: reserved IP are allowed
    **Default**: 1.1.1.1 | -| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.128/25 | +| **var2**
    [`IP`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format.
    **Validators**:
    • IP must be in CIDR format
    • reserved IP are allowed
    **Default**: 1.1.1.1/24
    **Example**: 192.168.0.129/25 | | **var3**
    [`CIDR`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | An IP in CIDR format with obsolete CIDR type.
    **Validator**: IP must be in CIDR format
    **Default**: 1.1.1.1/24 | diff --git a/tests/results/test_without_family/00_6ip.sh b/tests/results/test_without_family/00_6ip.sh index 31c3f33f3..477bc2420 100644 --- a/tests/results/test_without_family/00_6ip.sh +++ b/tests/results/test_without_family/00_6ip.sh @@ -10,7 +10,7 @@ │ │ • IP must be in CIDR format │ │ │ • reserved IP are allowed │ │ │ Default: 1.1.1.1/24 │ -│ │ Example: 192.168.0.128/25 │ +│ │ Example: 192.168.0.129/25 │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var3 │ An IP in CIDR format with obsolete │ │  CIDR   standard   mandatory  │ CIDR type. │ diff --git a/tests/results/test_without_family/00_6network.json b/tests/results/test_without_family/00_6network.json index 838b00fbe..bfcc96f17 100644 --- a/tests/results/test_without_family/00_6network.json +++ b/tests/results/test_without_family/00_6network.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "1.1.1.0" - }, - "variable_type": "network", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "An network.", "properties": [ { @@ -20,26 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "1.1.1.0/24" - }, - "variable_type": "network", - "validators": { - "name": "Validator", - "values": "network must be in CIDR format" + "values": "1.1.1.0" }, + "variable_type": "network" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "An network in CIDR format.", "properties": [ { @@ -50,26 +32,20 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0/24" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": "1.1.1.0/24" }, - "variable_type": "network CIDR", + "variable_type": "network", "validators": { "name": "Validator", "values": "network must be in CIDR format" - }, + } + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "An network in CIDR format with obsolete CIDR type.", "properties": [ { @@ -80,9 +56,15 @@ } ], "mode": "standard", - "gen_examples": [ - "1.1.1.0/24" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "1.1.1.0/24" + }, + "variable_type": "network CIDR", + "validators": { + "name": "Validator", + "values": "network must be in CIDR format" + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6number.json b/tests/results/test_without_family/00_6number.json index e17f2bd49..64293bac2 100644 --- a/tests/results/test_without_family/00_6number.json +++ b/tests/results/test_without_family/00_6number.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": 0 - }, - "variable_type": "integer", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,22 +52,16 @@ } ], "mode": "standard", - "gen_examples": [ - 0 - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", - "values": 10 + "values": 0 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "This forth variable.", "properties": [ { @@ -98,22 +72,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -124,22 +92,16 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": 10 }, - "variable_type": "integer", + "variable_type": "integer" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -150,9 +112,11 @@ } ], "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 10 + }, + "variable_type": "integer" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6port.json b/tests/results/test_without_family/00_6port.json index c6536fd69..aa91692ca 100644 --- a/tests/results/test_without_family/00_6port.json +++ b/tests/results/test_without_family/00_6port.json @@ -1,19 +1,7 @@ { "variable1": { - "type": "variable", - "variable_type": "port", - "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" - ] - }, "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A port variable.", "properties": [ { @@ -24,17 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "111" - ], - "mandatory_without_value": true - }, - "variable2": { "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, "variable_type": "port", "validators": { "name": "Validators", @@ -43,11 +21,11 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, + } + }, + "variable2": { "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A port variable with default value.", "properties": [ { @@ -58,12 +36,6 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "variable3": { "type": "variable", "default": { "name": "Default", @@ -77,11 +49,11 @@ "registred ports (1024 to 49151) are allowed", "private ports (greater than 49152) are allowed" ] - }, + } + }, + "variable3": { "path": "variable3", - "names": [ - "variable3" - ], + "name": "variable3", "description": "A port variable with integer default value.", "properties": [ { @@ -92,9 +64,19 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "8080" + }, + "variable_type": "port", + "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" + ] + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6regexp.json b/tests/results/test_without_family/00_6regexp.json index e156b37a4..da14904a2 100644 --- a/tests/results/test_without_family/00_6regexp.json +++ b/tests/results/test_without_family/00_6regexp.json @@ -1,19 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "#a1a1a1" - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A first variable.", "properties": [ { @@ -24,16 +12,22 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "examples": { "name": "Examples", "values": [ "#b1b1b1", "#b2b2b2" ] - }, - "gen_examples": [ - "#b1b1b1" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6regexp_link.json b/tests/results/test_without_family/00_6regexp_link.json index b3e76aaa8..0f226a465 100644 --- a/tests/results/test_without_family/00_6regexp_link.json +++ b/tests/results/test_without_family/00_6regexp_link.json @@ -1,19 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "#a1a1a1" - }, - "variable_type": "regexp", - "validators": { - "name": "Validator", - "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -24,19 +12,37 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "#a1a1a1" + }, + "variable_type": "regexp", + "validators": { + "name": "Validator", + "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" + }, "examples": { "name": "Examples", "values": [ "#b1b1b1", "#b2b2b2" ] - }, - "gen_examples": [ - "#b1b1b1" - ], - "mandatory_without_value": false + } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -54,30 +60,12 @@ "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" }, - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Examples", "values": [ "#b2b1b1", "#b3b2b2" ] - }, - "gen_examples": [ - "#b2b1b1" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6secret.json b/tests/results/test_without_family/00_6secret.json index 37111d131..69cb6c23b 100644 --- a/tests/results/test_without_family/00_6secret.json +++ b/tests/results/test_without_family/00_6secret.json @@ -1,11 +1,7 @@ { "secret1": { - "type": "variable", - "variable_type": "secret", "path": "secret1", - "names": [ - "secret1" - ], + "name": "secret1", "description": "The first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "secrets" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "secret" }, "secret2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "secret", "path": "secret2", - "names": [ - "secret2" - ], + "name": "secret2", "description": "The second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "secret" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6secret_param.adoc b/tests/results/test_without_family/00_6secret_param.adoc index 1cea0a5d9..6ab1b5b9e 100644 --- a/tests/results/test_without_family/00_6secret_param.adoc +++ b/tests/results/test_without_family/00_6secret_param.adoc @@ -3,7 +3,8 @@ | Variable | Description | **secret1** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `basic` `mandatory` | The first variable. + -**Validator**: minimum length for the secret is 10 characters +**Validator**: minimum length for the secret is 10 characters + +**Example**: ALongS4cr4t | **secret2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `standard` `mandatory` | The second variable. + **Validators**: diff --git a/tests/results/test_without_family/00_6secret_param.changelog.adoc b/tests/results/test_without_family/00_6secret_param.changelog.adoc index 590336617..4eb35565b 100644 --- a/tests/results/test_without_family/00_6secret_param.changelog.adoc +++ b/tests/results/test_without_family/00_6secret_param.changelog.adoc @@ -5,7 +5,8 @@ | Variable | Description | **secret1** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `basic` `mandatory` | The first variable. + -**Validator**: minimum length for the secret is 10 characters +**Validator**: minimum length for the secret is 10 characters + +**Example**: ALongS4cr4t | **secret2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[secret]` `standard` `mandatory` | The second variable. + **Validators**: diff --git a/tests/results/test_without_family/00_6secret_param.changelog.gitlab.md b/tests/results/test_without_family/00_6secret_param.changelog.gitlab.md index 352a9920e..fc9f0ee23 100644 --- a/tests/results/test_without_family/00_6secret_param.changelog.gitlab.md +++ b/tests/results/test_without_family/00_6secret_param.changelog.gitlab.md @@ -2,7 +2,7 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_without_family/00_6secret_param.changelog.html b/tests/results/test_without_family/00_6secret_param.changelog.html index 71f87b6ac..58e711fc4 100644 --- a/tests/results/test_without_family/00_6secret_param.changelog.html +++ b/tests/results/test_without_family/00_6secret_param.changelog.html @@ -2,14 +2,14 @@ - + - + +
  • 'forbidden characters: "$" and "^"'

    • Default: value +
  • 'forbidden characters: "$"'

    • Default: value
    Variable Description
    Variable Description
    secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    Example: ALongS4cr4t
    secret2
    secret standard mandatory    		The second variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$" and "^"'

    Default: value
    secret3
    secret standard mandatory    		The third variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$"'

    Default: value
    diff --git a/tests/results/test_without_family/00_6secret_param.changelog.md b/tests/results/test_without_family/00_6secret_param.changelog.md index d81a7d1af..d620c942b 100644 --- a/tests/results/test_without_family/00_6secret_param.changelog.md +++ b/tests/results/test_without_family/00_6secret_param.changelog.md @@ -2,7 +2,7 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_without_family/00_6secret_param.changelog.sh b/tests/results/test_without_family/00_6secret_param.changelog.sh index 61babd0e0..735256626 100644 --- a/tests/results/test_without_family/00_6secret_param.changelog.sh +++ b/tests/results/test_without_family/00_6secret_param.changelog.sh @@ -6,6 +6,7 @@ │ secret1 │ The first variable. │ │  secret   basic   mandatory  │ Validator: minimum length for the │ │ │ secret is 10 characters │ +│ │ Example: ALongS4cr4t │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ secret2 │ The second variable. │ │  secret   standard   mandatory  │ Validators: │ diff --git a/tests/results/test_without_family/00_6secret_param.gitlab.md b/tests/results/test_without_family/00_6secret_param.gitlab.md index a2571bb43..769c3635c 100644 --- a/tests/results/test_without_family/00_6secret_param.gitlab.md +++ b/tests/results/test_without_family/00_6secret_param.gitlab.md @@ -1,6 +1,6 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_without_family/00_6secret_param.html b/tests/results/test_without_family/00_6secret_param.html index c03550757..c96f269c8 100644 --- a/tests/results/test_without_family/00_6secret_param.html +++ b/tests/results/test_without_family/00_6secret_param.html @@ -1,13 +1,13 @@ - + - + +
  • 'forbidden characters: "$" and "^"'

    • Default: value +
  • 'forbidden characters: "$"'

    • Default: value
    Variable Description
    Variable Description
    secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    secret1
    secret basic mandatory     		The first variable.
    Validator: minimum length for the secret is 10 characters
    Example: ALongS4cr4t
    secret2
    secret standard mandatory    		The second variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$" and "^"'

    Default: value
    secret3
    secret standard mandatory    		The third variable.
    Validators:
    • maximum length for the secret is 10 characters
      • -
    • 'forbidden characters: "$"'

    Default: value
    diff --git a/tests/results/test_without_family/00_6secret_param.json b/tests/results/test_without_family/00_6secret_param.json index 3bd26f19b..9e7500a8b 100644 --- a/tests/results/test_without_family/00_6secret_param.json +++ b/tests/results/test_without_family/00_6secret_param.json @@ -1,15 +1,7 @@ { "secret1": { - "type": "variable", - "variable_type": "secret", - "validators": { - "name": "Validator", - "values": "minimum length for the secret is 10 characters" - }, "path": "secret1", - "names": [ - "secret1" - ], + "name": "secret1", "description": "The first variable.", "properties": [ { @@ -20,12 +12,30 @@ } ], "mode": "basic", - "gen_examples": [ - "secrets" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "secret", + "validators": { + "name": "Validator", + "values": "minimum length for the secret is 10 characters" + }, + "examples": { + "name": "Example", + "values": "ALongS4cr4t" + } }, "secret2": { + "path": "secret2", + "name": "secret2", + "description": "The second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -38,12 +48,12 @@ "maximum length for the secret is 10 characters", "forbidden characters: \"$\" and \"^\"" ] - }, - "path": "secret2", - "names": [ - "secret2" - ], - "description": "The second variable.", + } + }, + "secret3": { + "path": "secret3", + "name": "secret3", + "description": "The third variable.", "properties": [ { "type": "property", @@ -53,12 +63,6 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "secret3": { "type": "variable", "default": { "name": "Default", @@ -71,24 +75,6 @@ "maximum length for the secret is 10 characters", "forbidden characters: \"$\"" ] - }, - "path": "secret3", - "names": [ - "secret3" - ], - "description": "The third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_6secret_param.md b/tests/results/test_without_family/00_6secret_param.md index a2571bb43..769c3635c 100644 --- a/tests/results/test_without_family/00_6secret_param.md +++ b/tests/results/test_without_family/00_6secret_param.md @@ -1,6 +1,6 @@ | Variable | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters | +| **secret1**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | The first variable.
    **Validator**: minimum length for the secret is 10 characters
    **Example**: ALongS4cr4t | | **secret2**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The second variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$" and "^"
    **Default**: value | | **secret3**
    [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | The third variable.
    **Validators**:
    • maximum length for the secret is 10 characters
    • forbidden characters: "$"
    **Default**: value | diff --git a/tests/results/test_without_family/00_6secret_param.sh b/tests/results/test_without_family/00_6secret_param.sh index df2e441e8..a38520869 100644 --- a/tests/results/test_without_family/00_6secret_param.sh +++ b/tests/results/test_without_family/00_6secret_param.sh @@ -4,6 +4,7 @@ │ secret1 │ The first variable. │ │  secret   basic   mandatory  │ Validator: minimum length for the │ │ │ secret is 10 characters │ +│ │ Example: ALongS4cr4t │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ secret2 │ The second variable. │ │  secret   standard   mandatory  │ Validators: │ diff --git a/tests/results/test_without_family/00_6string.json b/tests/results/test_without_family/00_6string.json index 444169622..c2e0d8fb1 100644 --- a/tests/results/test_without_family/00_6string.json +++ b/tests/results/test_without_family/00_6string.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -16,18 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -38,18 +28,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -60,22 +44,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var4": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -86,22 +60,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -112,22 +80,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -138,22 +100,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", - "values": "8080" + "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -164,22 +120,16 @@ } ], "mode": "standard", - "gen_examples": [ - "8080" - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", - "values": "true" + "values": "8080" }, - "variable_type": "string", + "variable_type": "string" + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The height variable.", "properties": [ { @@ -190,9 +140,11 @@ } ], "mode": "standard", - "gen_examples": [ - "true" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "true" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7choice_quote.json b/tests/results/test_without_family/00_7choice_quote.json index 839140e61..74f472129 100644 --- a/tests/results/test_without_family/00_7choice_quote.json +++ b/tests/results/test_without_family/00_7choice_quote.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A choice.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -13,24 +25,6 @@ "quote\"", "quote\"'" ] - }, - "path": "var", - "names": [ - "var" - ], - "description": "A choice.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "quote'" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7help.json b/tests/results/test_without_family/00_7help.json index 43ba40aff..0a573fe7c 100644 --- a/tests/results/test_without_family/00_7help.json +++ b/tests/results/test_without_family/00_7help.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "help": [ "Multi line\n\nHelp\n\nWith useful information." @@ -19,18 +15,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "help": [ "Multi line\nHelp\nWith useful information." @@ -44,9 +34,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7help_quote.json b/tests/results/test_without_family/00_7help_quote.json index ab6053e19..5a3bde9ac 100644 --- a/tests/results/test_without_family/00_7help_quote.json +++ b/tests/results/test_without_family/00_7help_quote.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "help": [ "Message with '." @@ -19,18 +15,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "help": [ "Message with \"." @@ -44,9 +34,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7help_sup.json b/tests/results/test_without_family/00_7help_sup.json index 033ab9bd3..34b1adba5 100644 --- a/tests/results/test_without_family/00_7help_sup.json +++ b/tests/results/test_without_family/00_7help_sup.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first .", "help": [ "Multi line\n\n\n\nWith useful information." @@ -19,18 +15,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second .", "help": [ "Multi line\n\nWith useful information." @@ -44,9 +34,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7value_doublequote.json b/tests/results/test_without_family/00_7value_doublequote.json index bd84d644e..032a89b93 100644 --- a/tests/results/test_without_family/00_7value_doublequote.json +++ b/tests/results/test_without_family/00_7value_doublequote.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote\"" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote\"" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7value_doublequote2.json b/tests/results/test_without_family/00_7value_doublequote2.json index f6a51faf9..163cd8225 100644 --- a/tests/results/test_without_family/00_7value_doublequote2.json +++ b/tests/results/test_without_family/00_7value_doublequote2.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote'\"" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote'\"" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote'\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7value_doublequote3.json b/tests/results/test_without_family/00_7value_doublequote3.json index e1a6538ee..772a83db6 100644 --- a/tests/results/test_without_family/00_7value_doublequote3.json +++ b/tests/results/test_without_family/00_7value_doublequote3.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote\\\"\\'" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote\\\"\\'" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote\\\"\\'" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_7value_quote.json b/tests/results/test_without_family/00_7value_quote.json index e2641ba2c..84e76dad0 100644 --- a/tests/results/test_without_family/00_7value_quote.json +++ b/tests/results/test_without_family/00_7value_quote.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "quote'" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "quote'" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "quote'" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_8calculation_information.json b/tests/results/test_without_family/00_8calculation_information.json index 8b4564862..52cc6a009 100644 --- a/tests/results/test_without_family/00_8calculation_information.json +++ b/tests/results/test_without_family/00_8calculation_information.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "get information test_information" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "get information test_information" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_8test.json b/tests/results/test_without_family/00_8test.json index 40c559c81..d6eae5fbe 100644 --- a/tests/results/test_without_family/00_8test.json +++ b/tests/results/test_without_family/00_8test.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -16,26 +12,16 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Example", "values": "test" - }, - "gen_examples": [ - "test" - ], - "mandatory_without_value": true + } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -46,22 +32,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string", "examples": { "name": "Example", "values": "test" - }, - "gen_examples": [ - "test" - ], - "mandatory_without_value": false + } }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -72,28 +56,24 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Examples", "values": [ "test1", "test2" ] - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": true + } }, "var4": { - "type": "variable", - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [], "mode": "standard", + "type": "variable", + "variable_type": "string", "examples": { "name": "Examples", "values": [ @@ -101,23 +81,11 @@ "test1", "test2" ] - }, - "gen_examples": [ - null - ], - "mandatory_without_value": false + } }, "var5": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -128,22 +96,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean", "examples": { "name": "Example", "values": false - }, - "gen_examples": [ - false - ], - "mandatory_without_value": false + } }, "var6": { - "type": "variable", - "variable_type": "string", "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -160,6 +126,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -167,13 +135,6 @@ "test1", "test2" ] - }, - "gen_examples": [ - [ - "test1", - "test2" - ] - ], - "mandatory_without_value": true + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9choice_variable_multi.json b/tests/results/test_without_family/00_9choice_variable_multi.json index c166c09ed..73438b127 100644 --- a/tests/results/test_without_family/00_9choice_variable_multi.json +++ b/tests/results/test_without_family/00_9choice_variable_multi.json @@ -1,18 +1,7 @@ { "variable1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "val1", - "val2" - ] - }, "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -29,15 +18,6 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "a_choice" - ] - ], - "mandatory_without_value": true - }, - "variable2": { "type": "variable", "variable_type": "choice", "choices": { @@ -47,10 +27,11 @@ "val2" ] }, + "multiple": true + }, + "variable2": { "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -61,12 +42,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a_choice" + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "val1", + "val2" ] - ], - "mandatory_without_value": false + }, + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9choice_variables.json b/tests/results/test_without_family/00_9choice_variables.json index d961bec6d..b324b8ff0 100644 --- a/tests/results/test_without_family/00_9choice_variables.json +++ b/tests/results/test_without_family/00_9choice_variables.json @@ -1,15 +1,7 @@ { "source_variable_1": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "source_variable_1", - "names": [ - "source_variable_1" - ], + "name": "source_variable_1", "description": "The first source variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "source_variable_2": { "type": "variable", "default": { "name": "Default", - "values": "val2" + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "source_variable_2": { "path": "source_variable_2", - "names": [ - "source_variable_2" - ], + "name": "source_variable_2", "description": "The second source variable.", "properties": [ { @@ -46,12 +32,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val2" + }, + "variable_type": "string" }, "my_variable": { + "path": "my_variable", + "name": "my_variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -78,24 +78,6 @@ "description": "The second source variable" } ] - }, - "path": "my_variable", - "names": [ - "my_variable" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation.json b/tests/results/test_without_family/00_9default_calculation.json index 33fa4bee8..7f740435e 100644 --- a/tests/results/test_without_family/00_9default_calculation.json +++ b/tests/results/test_without_family/00_9default_calculation.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "concat all parameters" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "string_1_True_" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "concat all parameters" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_information.json b/tests/results/test_without_family/00_9default_calculation_information.json index 748d028dd..8379f3edb 100644 --- a/tests/results/test_without_family/00_9default_calculation_information.json +++ b/tests/results/test_without_family/00_9default_calculation_information.json @@ -1,17 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns the information" - } - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns the information" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_information_other_variable.json b/tests/results/test_without_family/00_9default_calculation_information_other_variable.json index e2a492dc8..77e9f1ca8 100644 --- a/tests/results/test_without_family/00_9default_calculation_information_other_variable.json +++ b/tests/results/test_without_family/00_9default_calculation_information_other_variable.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_multi_optional.json b/tests/results/test_without_family/00_9default_calculation_multi_optional.json index 181de22d6..2e3638b08 100644 --- a/tests/results/test_without_family/00_9default_calculation_multi_optional.json +++ b/tests/results/test_without_family/00_9default_calculation_multi_optional.json @@ -1,15 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -19,31 +11,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -59,12 +36,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_multi_optional2.json b/tests/results/test_without_family/00_9default_calculation_multi_optional2.json index 181de22d6..2e3638b08 100644 --- a/tests/results/test_without_family/00_9default_calculation_multi_optional2.json +++ b/tests/results/test_without_family/00_9default_calculation_multi_optional2.json @@ -1,15 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -19,31 +11,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -59,12 +36,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_multi_optional_default.json b/tests/results/test_without_family/00_9default_calculation_multi_optional_default.json index 8bcea7345..2e3638b08 100644 --- a/tests/results/test_without_family/00_9default_calculation_multi_optional_default.json +++ b/tests/results/test_without_family/00_9default_calculation_multi_optional_default.json @@ -1,15 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "val1" - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -19,31 +11,16 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false - }, - "my_calculated_variable": { "type": "variable", "default": { "name": "Default", - "values": [ - { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "my_variable", - "type": "variable" - }, - "description": "My_variable" - } - ] + "values": "val1" }, - "variable_type": "string", + "variable_type": "string" + }, + "my_calculated_variable": { "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -59,13 +36,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "value" + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "my_variable", + "type": "variable" + }, + "description": "My_variable" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_optional.json b/tests/results/test_without_family/00_9default_calculation_optional.json index 4c00044e1..72ca1373f 100644 --- a/tests/results/test_without_family/00_9default_calculation_optional.json +++ b/tests/results/test_without_family/00_9default_calculation_optional.json @@ -1,11 +1,7 @@ { "my_calculated_variable": { - "type": "variable", - "variable_type": "string", "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], + "name": "my_calculated_variable", "properties": [ { "type": "property", @@ -21,12 +17,8 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_optional_exists.json b/tests/results/test_without_family/00_9default_calculation_optional_exists.json index e05694279..77dd7dea9 100644 --- a/tests/results/test_without_family/00_9default_calculation_optional_exists.json +++ b/tests/results/test_without_family/00_9default_calculation_optional_exists.json @@ -1,18 +1,7 @@ { "my_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "my_variable", - "names": [ - "my_variable" - ], + "name": "my_variable", "properties": [ { "type": "property", @@ -28,16 +17,35 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "my_calculated_variable": { + "path": "my_calculated_variable", + "name": "my_calculated_variable", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -51,32 +59,6 @@ } }, "variable_type": "string", - "path": "my_calculated_variable", - "names": [ - "my_calculated_variable" - ], - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_calculation_param_optional.json b/tests/results/test_without_family/00_9default_calculation_param_optional.json index 24732372a..bf11dbfc4 100644 --- a/tests/results/test_without_family/00_9default_calculation_param_optional.json +++ b/tests/results/test_without_family/00_9default_calculation_param_optional.json @@ -1,5 +1,10 @@ { "var1": { + "path": "var1", + "name": "var1", + "description": "A first variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -7,30 +12,11 @@ "description": "returns a value" } }, - "variable_type": "string", - "path": "var1", - "names": [ - "var1" - ], - "description": "A first variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -41,9 +27,11 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_information_other_variable.json b/tests/results/test_without_family/00_9default_information_other_variable.json index d596ee5a8..42c1358f6 100644 --- a/tests/results/test_without_family/00_9default_information_other_variable.json +++ b/tests/results/test_without_family/00_9default_information_other_variable.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"var1\"" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"var1\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_information_other_variable2.json b/tests/results/test_without_family/00_9default_information_other_variable2.json index d596ee5a8..42c1358f6 100644 --- a/tests/results/test_without_family/00_9default_information_other_variable2.json +++ b/tests/results/test_without_family/00_9default_information_other_variable2.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"var1\"" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"var1\"" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_integer.json b/tests/results/test_without_family/00_9default_integer.json index 4f3d9ac18..73e0a04a2 100644 --- a/tests/results/test_without_family/00_9default_integer.json +++ b/tests/results/test_without_family/00_9default_integer.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "choice for 0 to 9" } - }, - "path": "var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/00_9default_number.json b/tests/results/test_without_family/00_9default_number.json index 4f3d9ac18..73e0a04a2 100644 --- a/tests/results/test_without_family/00_9default_number.json +++ b/tests/results/test_without_family/00_9default_number.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "choice for 0 to 9" } - }, - "path": "var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 9 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6boolean_multi.json b/tests/results/test_without_family/01_6boolean_multi.json index f525b5f23..a69a4b448 100644 --- a/tests/results/test_without_family/01_6boolean_multi.json +++ b/tests/results/test_without_family/01_6boolean_multi.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - true - ] - }, - "variable_type": "boolean", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,15 +18,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -45,10 +26,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -65,15 +47,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -82,10 +55,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -102,27 +76,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - false + true ] }, "variable_type": "boolean", + "multiple": true + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -139,15 +105,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -156,10 +113,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -176,15 +134,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -193,10 +142,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -213,27 +163,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - true + false ] }, "variable_type": "boolean", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -250,15 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -267,10 +200,11 @@ ] }, "variable_type": "boolean", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -287,12 +221,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ true ] - ], - "mandatory_without_value": false + }, + "variable_type": "boolean", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6custom_multi.json b/tests/results/test_without_family/01_6custom_multi.json index e95ef462f..d785e4923 100644 --- a/tests/results/test_without_family/01_6custom_multi.json +++ b/tests/results/test_without_family/01_6custom_multi.json @@ -1,11 +1,7 @@ { "custom1": { - "type": "variable", - "variable_type": "custom", "path": "custom1", - "names": [ - "custom1" - ], + "name": "custom1", "description": "A first custom variable.", "properties": [ { @@ -22,27 +18,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "xxx" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "custom", + "multiple": true }, "custom2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "custom", "path": "custom2", - "names": [ - "custom2" - ], + "name": "custom2", "description": "A second custom variable.", "properties": [ { @@ -59,12 +41,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "custom", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6float_multi.json b/tests/results/test_without_family/01_6float_multi.json index 979d78e1c..4ae5efa9b 100644 --- a/tests/results/test_without_family/01_6float_multi.json +++ b/tests/results/test_without_family/01_6float_multi.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0.0 - ] - }, - "variable_type": "float", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,15 +18,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -45,10 +26,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -65,15 +47,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -82,10 +55,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -102,27 +76,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - 10.1 + 0.0 ] }, "variable_type": "float", + "multiple": true + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -139,15 +105,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -156,10 +113,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -176,15 +134,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -193,10 +142,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -213,27 +163,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10.1 - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - 0.0 + 10.1 ] }, "variable_type": "float", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -250,15 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0.0 - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -267,10 +200,11 @@ ] }, "variable_type": "float", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -287,12 +221,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ 0.0 ] - ], - "mandatory_without_value": false + }, + "variable_type": "float", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6integer_multi.json b/tests/results/test_without_family/01_6integer_multi.json index 767dcee8f..c48e7bf46 100644 --- a/tests/results/test_without_family/01_6integer_multi.json +++ b/tests/results/test_without_family/01_6integer_multi.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0 - ] - }, - "variable_type": "integer", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,15 +18,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", @@ -45,10 +26,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -65,15 +47,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", @@ -82,10 +55,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -102,27 +76,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var4": { "type": "variable", "default": { "name": "Default", "values": [ - 10 + 0 ] }, "variable_type": "integer", + "multiple": true + }, + "var4": { "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -139,15 +105,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -156,10 +113,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -176,15 +134,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -193,10 +142,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -213,27 +163,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 10 - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", "values": [ - 0 + 10 ] }, "variable_type": "integer", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -250,15 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -267,10 +200,11 @@ ] }, "variable_type": "integer", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -287,12 +221,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ 0 ] - ], - "mandatory_without_value": false + }, + "variable_type": "integer", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6integer_multi_mandatory.json b/tests/results/test_without_family/01_6integer_multi_mandatory.json index e5aee1c5a..3858d26bb 100644 --- a/tests/results/test_without_family/01_6integer_multi_mandatory.json +++ b/tests/results/test_without_family/01_6integer_multi_mandatory.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "integer", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "The first variable.", "properties": [ { @@ -22,12 +18,8 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - 42 - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "integer", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6string_empty.json b/tests/results/test_without_family/01_6string_empty.json index b5fb497d6..0f899e7be 100644 --- a/tests/results/test_without_family/01_6string_empty.json +++ b/tests/results/test_without_family/01_6string_empty.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value", - null - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The second variable.", "properties": [ { @@ -29,13 +18,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value", null ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6string_multi.json b/tests/results/test_without_family/01_6string_multi.json index 1ffb8cc01..5990b68e1 100644 --- a/tests/results/test_without_family/01_6string_multi.json +++ b/tests/results/test_without_family/01_6string_multi.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -22,21 +18,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "var2": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -53,21 +41,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "var3": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "The third variable.", "properties": [ { @@ -84,27 +64,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "var4": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "The forth variable.", "properties": [ { @@ -121,15 +87,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var5": { "type": "variable", "default": { "name": "Default", @@ -138,10 +95,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var5": { "path": "var5", - "names": [ - "var5" - ], + "name": "var5", "description": "The fifth variable.", "properties": [ { @@ -158,15 +116,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var6": { "type": "variable", "default": { "name": "Default", @@ -175,10 +124,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var6": { "path": "var6", - "names": [ - "var6" - ], + "name": "var6", "description": "The sixth variable.", "properties": [ { @@ -195,15 +145,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var7": { "type": "variable", "default": { "name": "Default", @@ -212,10 +153,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var7": { "path": "var7", - "names": [ - "var7" - ], + "name": "var7", "description": "The seventh variable.", "properties": [ { @@ -232,15 +174,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "var8": { "type": "variable", "default": { "name": "Default", @@ -249,10 +182,11 @@ ] }, "variable_type": "string", + "multiple": true + }, + "var8": { "path": "var8", - "names": [ - "var8" - ], + "name": "var8", "description": "The eighth variable.", "properties": [ { @@ -269,12 +203,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_6string_multi_length.json b/tests/results/test_without_family/01_6string_multi_length.json index d1e123338..4cbdfa669 100644 --- a/tests/results/test_without_family/01_6string_multi_length.json +++ b/tests/results/test_without_family/01_6string_multi_length.json @@ -1,25 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2", - "val3" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "needs exactly 3 values" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The variable.", "properties": [ { @@ -36,17 +18,43 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2", "val3" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "needs exactly 3 values" + } + }, + "multiple": true }, "var2": { + "path": "var2", + "name": "var2", + "description": "The variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -67,33 +75,6 @@ } ] }, - "path": "var2", - "names": [ - "var2" - ], - "description": "The variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val4", - "val5" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_7value_multi_doublequote.json b/tests/results/test_without_family/01_7value_multi_doublequote.json index bbc1e9374..bc05a5814 100644 --- a/tests/results/test_without_family/01_7value_multi_doublequote.json +++ b/tests/results/test_without_family/01_7value_multi_doublequote.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote\"" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote\"" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_7value_multi_doublequote2.json b/tests/results/test_without_family/01_7value_multi_doublequote2.json index 3107ffa95..4025a2537 100644 --- a/tests/results/test_without_family/01_7value_multi_doublequote2.json +++ b/tests/results/test_without_family/01_7value_multi_doublequote2.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote'\"" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote'\"" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_7value_multi_quote.json b/tests/results/test_without_family/01_7value_multi_quote.json index a415bb340..edf7fa3da 100644 --- a/tests/results/test_without_family/01_7value_multi_quote.json +++ b/tests/results/test_without_family/01_7value_multi_quote.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "quote'" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "quote'" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_8calculation_information_multi.json b/tests/results/test_without_family/01_8calculation_information_multi.json index 98f22fc6a..aca212f9c 100644 --- a/tests/results/test_without_family/01_8calculation_information_multi.json +++ b/tests/results/test_without_family/01_8calculation_information_multi.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "get information test_information" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "get information test_information" + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_9choice_variable_multi.json b/tests/results/test_without_family/01_9choice_variable_multi.json index 5e8b02318..e72dc5eb5 100644 --- a/tests/results/test_without_family/01_9choice_variable_multi.json +++ b/tests/results/test_without_family/01_9choice_variable_multi.json @@ -1,19 +1,7 @@ { "variable1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -30,17 +18,31 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "variable2": { + "path": "variable2", + "name": "variable2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", "type": "variable", "variable_type": "choice", "choices": { @@ -53,24 +55,6 @@ }, "description": "A first variable" } - }, - "path": "variable2", - "names": [ - "variable2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/01_9choice_variable_optional.json b/tests/results/test_without_family/01_9choice_variable_optional.json index 54c857238..03126714f 100644 --- a/tests/results/test_without_family/01_9choice_variable_optional.json +++ b/tests/results/test_without_family/01_9choice_variable_optional.json @@ -1,5 +1,17 @@ { "variable": { + "path": "variable", + "name": "variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -13,24 +25,6 @@ "b", "c" ] - }, - "path": "variable", - "names": [ - "variable" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "c" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/02_0tags.json b/tests/results/test_without_family/02_0tags.json index 65f33dee2..224a84d72 100644 --- a/tests/results/test_without_family/02_0tags.json +++ b/tests/results/test_without_family/02_0tags.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -16,22 +12,16 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "tags": { "name": "Tag", "values": "one_tag" - }, - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + } }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -42,16 +32,14 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "tags": { "name": "Tags", "values": [ "one_tag", "second_tag" ] - }, - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_0type_param.json b/tests/results/test_without_family/04_0type_param.json index a1b44b6be..edc6f7d83 100644 --- a/tests/results/test_without_family/04_0type_param.json +++ b/tests/results/test_without_family/04_0type_param.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "A limited number.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "the minimum value is 0", "the maximum value is 100" ] - }, - "path": "int", - "names": [ - "int" - ], - "description": "A limited number.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_0type_param_integer.json b/tests/results/test_without_family/04_0type_param_integer.json index 38433d7ce..8435a3958 100644 --- a/tests/results/test_without_family/04_0type_param_integer.json +++ b/tests/results/test_without_family/04_0type_param_integer.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "A limited integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "the minimum value is 0", "the maximum value is 100" ] - }, - "path": "int", - "names": [ - "int" - ], - "description": "A limited integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 10 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1auto_save.json b/tests/results/test_without_family/04_1auto_save.json index 74d0d5ee6..4eb151f4e 100644 --- a/tests/results/test_without_family/04_1auto_save.json +++ b/tests/results/test_without_family/04_1auto_save.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "An auto save variable.", "properties": [ { @@ -26,9 +18,11 @@ } ], "mode": "basic", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1auto_save_and_calculated.json b/tests/results/test_without_family/04_1auto_save_and_calculated.json index 839988099..eeb7b9550 100644 --- a/tests/results/test_without_family/04_1auto_save_and_calculated.json +++ b/tests/results/test_without_family/04_1auto_save_and_calculated.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,29 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "var1", - "type": "variable" - }, - "description": "A first variable" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -59,9 +38,18 @@ } ], "mode": "basic", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "var1", + "type": "variable" + }, + "description": "A first variable" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1auto_save_and_calculated_hidden.json b/tests/results/test_without_family/04_1auto_save_and_calculated_hidden.json index 79e748a52..31c64e04d 100644 --- a/tests/results/test_without_family/04_1auto_save_and_calculated_hidden.json +++ b/tests/results/test_without_family/04_1auto_save_and_calculated_hidden.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,24 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "the value is always yes" - } + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -63,9 +47,13 @@ } ], "mode": "basic", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value is always yes" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1default_calculation_hidden.json b/tests/results/test_without_family/04_1default_calculation_hidden.json index 689c96aef..a8ad15f79 100644 --- a/tests/results/test_without_family/04_1default_calculation_hidden.json +++ b/tests/results/test_without_family/04_1default_calculation_hidden.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -55,22 +45,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -81,9 +61,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1default_calculation_hidden_2.json b/tests/results/test_without_family/04_1default_calculation_hidden_2.json index 1e2dda4e0..a8ad15f79 100644 --- a/tests/results/test_without_family/04_1default_calculation_hidden_2.json +++ b/tests/results/test_without_family/04_1default_calculation_hidden_2.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -55,22 +45,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -81,9 +61,11 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1default_calculation_hidden_3.json b/tests/results/test_without_family/04_1default_calculation_hidden_3.json index d80296a03..9ea1b3e54 100644 --- a/tests/results/test_without_family/04_1default_calculation_hidden_3.json +++ b/tests/results/test_without_family/04_1default_calculation_hidden_3.json @@ -1,15 +1,7 @@ { "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1default_calculation_hidden_4.json b/tests/results/test_without_family/04_1default_calculation_hidden_4.json index 2bfb72c59..3d005b962 100644 --- a/tests/results/test_without_family/04_1default_calculation_hidden_4.json +++ b/tests/results/test_without_family/04_1default_calculation_hidden_4.json @@ -1,11 +1,7 @@ { "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -16,22 +12,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -42,9 +28,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1default_calculation_hidden_5.json b/tests/results/test_without_family/04_1default_calculation_hidden_5.json index 059403285..ac191e6e2 100644 --- a/tests/results/test_without_family/04_1default_calculation_hidden_5.json +++ b/tests/results/test_without_family/04_1default_calculation_hidden_5.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -49,9 +39,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_1default_calculation_hidden_6.json b/tests/results/test_without_family/04_1default_calculation_hidden_6.json index 059403285..ac191e6e2 100644 --- a/tests/results/test_without_family/04_1default_calculation_hidden_6.json +++ b/tests/results/test_without_family/04_1default_calculation_hidden_6.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "value" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -49,9 +39,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_boolean.json b/tests/results/test_without_family/04_5disabled_calculation_boolean.json index a84626714..9db58d1f2 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_boolean.json +++ b/tests/results/test_without_family/04_5disabled_calculation_boolean.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A conditional variable.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -51,18 +41,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A seconde variable.", "properties": [ { @@ -82,9 +66,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_optional.json b/tests/results/test_without_family/04_5disabled_calculation_optional.json index 5de8baa9b..5e03809c6 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_optional.json +++ b/tests/results/test_without_family/04_5disabled_calculation_optional.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -45,18 +35,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -70,9 +54,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_optional_default.json b/tests/results/test_without_family/04_5disabled_calculation_optional_default.json index 0f97a606e..d8ff57db3 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_optional_default.json +++ b/tests/results/test_without_family/04_5disabled_calculation_optional_default.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,33 +12,25 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A second variable.", "properties": [ { @@ -64,18 +48,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "var4": { - "type": "variable", - "variable_type": "string", "path": "var4", - "names": [ - "var4" - ], + "name": "var4", "description": "A forth variable.", "properties": [ { @@ -93,9 +71,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable.json b/tests/results/test_without_family/04_5disabled_calculation_variable.json index 0ed57c787..953a2b8a0 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable10.json b/tests/results/test_without_family/04_5disabled_calculation_variable10.json index 0d8f4a70b..ae6237d4c 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable10.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable10.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable2.json b/tests/results/test_without_family/04_5disabled_calculation_variable2.json index 0d8f4a70b..ae6237d4c 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable2.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable2.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable3.json b/tests/results/test_without_family/04_5disabled_calculation_variable3.json index cae16009f..eea98baa9 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable3.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable3.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable4.json b/tests/results/test_without_family/04_5disabled_calculation_variable4.json index 5c4a1e5b7..48ab236a3 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable4.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable4.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable5.json b/tests/results/test_without_family/04_5disabled_calculation_variable5.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable5.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable5.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable6.json b/tests/results/test_without_family/04_5disabled_calculation_variable6.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable6.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable6.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable7.json b/tests/results/test_without_family/04_5disabled_calculation_variable7.json index 0ed57c787..953a2b8a0 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable7.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable7.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -55,9 +45,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable9.json b/tests/results/test_without_family/04_5disabled_calculation_variable9.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable9.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable9.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable_multi.json b/tests/results/test_without_family/04_5disabled_calculation_variable_multi.json index 197851f38..fa049fc98 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable_multi.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable_multi.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": false + }, + "variable_type": "boolean" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -61,12 +51,8 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable_transitive.json b/tests/results/test_without_family/04_5disabled_calculation_variable_transitive.json index d83a8b2a8..9d356470d 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable_transitive.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable_transitive.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "variable1": { - "type": "variable", - "variable_type": "string", "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -55,18 +45,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -90,9 +74,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_3.json b/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_3.json index c71ad909b..e83fcf784 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_3.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_3.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "variable1": { "type": "variable", "default": { "name": "Default", - "values": "disabled" + "values": false }, - "variable_type": "string", + "variable_type": "boolean" + }, + "variable1": { "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -59,18 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - "disabled" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "disabled" + }, + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -94,9 +78,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_4.json b/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_4.json index 734c45467..3355a85ce 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_4.json +++ b/tests/results/test_without_family/04_5disabled_calculation_variable_transitive_4.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false - }, - "variable1": { "type": "variable", "default": { "name": "Default", - "values": "not_disabled" + "values": true }, - "variable_type": "string", + "variable_type": "boolean" + }, + "variable1": { "path": "variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -59,18 +45,16 @@ } ], "mode": "standard", - "gen_examples": [ - "not_disabled" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "not_disabled" + }, + "variable_type": "string" }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -94,9 +78,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5validators.json b/tests/results/test_without_family/04_5validators.json index 13cd3a94c..ecee67eac 100644 --- a/tests/results/test_without_family/04_5validators.json +++ b/tests/results/test_without_family/04_5validators.json @@ -1,17 +1,7 @@ { "int": { - "type": "variable", - "variable_type": "integer", - "validators": { - "name": "Validator", - "values": { - "description": "the max value is 100" - } - }, "path": "int", - "names": [ - "int" - ], + "name": "int", "description": "An integer.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "basic", - "gen_examples": [ - 42 - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "integer", + "validators": { + "name": "Validator", + "values": { + "description": "the max value is 100" + } + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5validators_differ.json b/tests/results/test_without_family/04_5validators_differ.json index da8d432d1..6461db247 100644 --- a/tests/results/test_without_family/04_5validators_differ.json +++ b/tests/results/test_without_family/04_5validators_differ.json @@ -1,5 +1,17 @@ { "var1": { + "path": "var1", + "name": "var1", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,40 +24,14 @@ "description": "var1 must be different than var2" } }, - "path": "var1", - "names": [ - "var1" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", "values": "another_value" - }, - "gen_examples": [ - "another_value" - ], - "mandatory_without_value": false + } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -56,9 +42,11 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5validators_multi.json b/tests/results/test_without_family/04_5validators_multi.json index 9314651ba..1a783ab5c 100644 --- a/tests/results/test_without_family/04_5validators_multi.json +++ b/tests/results/test_without_family/04_5validators_multi.json @@ -1,24 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "check length is less than 10" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -35,13 +18,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "no", "yes" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "check length is less than 10" + } + }, + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5validators_multi2.json b/tests/results/test_without_family/04_5validators_multi2.json index c83c702fb..b25952a88 100644 --- a/tests/results/test_without_family/04_5validators_multi2.json +++ b/tests/results/test_without_family/04_5validators_multi2.json @@ -1,24 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "no", - "yes" - ] - }, - "variable_type": "string", - "validators": { - "name": "Validator", - "values": { - "description": "check length is less than 3" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -35,6 +18,21 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "no", + "yes" + ] + }, + "variable_type": "string", + "validators": { + "name": "Validator", + "values": { + "description": "check length is less than 3" + } + }, "multiple": true, "examples": { "name": "Examples", @@ -42,13 +40,6 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5validators_multi3.json b/tests/results/test_without_family/04_5validators_multi3.json index ff9c853dc..74f9e2f85 100644 --- a/tests/results/test_without_family/04_5validators_multi3.json +++ b/tests/results/test_without_family/04_5validators_multi3.json @@ -1,25 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - 0, - 1, - 2 - ] - }, - "variable_type": "integer", - "validators": { - "name": "Validator", - "values": { - "description": "value must be equal to index" - } - }, "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A second variable.", "properties": [ { @@ -36,16 +18,26 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + 0, + 1, + 2 + ] + }, + "variable_type": "integer", + "validators": { + "name": "Validator", + "values": { + "description": "value must be equal to index" + } + }, "multiple": true, "examples": { "name": "Example", "values": 0 - }, - "gen_examples": [ - [ - 0 - ] - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5validators_warnings.json b/tests/results/test_without_family/04_5validators_warnings.json index a7c76ca5a..2e3c8ef66 100644 --- a/tests/results/test_without_family/04_5validators_warnings.json +++ b/tests/results/test_without_family/04_5validators_warnings.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "An integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -11,24 +23,6 @@ "values": { "description": "the max value is 100" } - }, - "path": "int", - "names": [ - "int" - ], - "description": "An integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1000 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/04_5validators_warnings_all.json b/tests/results/test_without_family/04_5validators_warnings_all.json index f734a6fec..9fd2c6562 100644 --- a/tests/results/test_without_family/04_5validators_warnings_all.json +++ b/tests/results/test_without_family/04_5validators_warnings_all.json @@ -1,5 +1,17 @@ { "int": { + "path": "int", + "name": "int", + "description": "An integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "the minimum value is 10", "the maximum value is 100" ] - }, - "path": "int", - "names": [ - "int" - ], - "description": "An integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - 1000 - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/05_0multi_not_uniq.json b/tests/results/test_without_family/05_0multi_not_uniq.json index f4818cf28..8867fa338 100644 --- a/tests/results/test_without_family/05_0multi_not_uniq.json +++ b/tests/results/test_without_family/05_0multi_not_uniq.json @@ -1,17 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -22,12 +12,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/05_0multi_uniq.json b/tests/results/test_without_family/05_0multi_uniq.json index 2efba714d..3aaf54a22 100644 --- a/tests/results/test_without_family/05_0multi_uniq.json +++ b/tests/results/test_without_family/05_0multi_uniq.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/12_1auto_save_expert.json b/tests/results/test_without_family/12_1auto_save_expert.json index 4e6ed5c2b..40914a93d 100644 --- a/tests/results/test_without_family/12_1auto_save_expert.json +++ b/tests/results/test_without_family/12_1auto_save_expert.json @@ -1,15 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -26,9 +18,11 @@ } ], "mode": "advanced", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_0redefine_description.json b/tests/results/test_without_family/16_0redefine_description.json index 77382f82b..2d7e0a50e 100644 --- a/tests/results/test_without_family/16_0redefine_description.json +++ b/tests/results/test_without_family/16_0redefine_description.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "Redefined.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_2family_redefine_calculation.json b/tests/results/test_without_family/16_2family_redefine_calculation.json index 92794b41e..daac7f402 100644 --- a/tests/results/test_without_family/16_2family_redefine_calculation.json +++ b/tests/results/test_without_family/16_2family_redefine_calculation.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [ { @@ -20,12 +18,8 @@ }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "properties": [ { "type": "property", @@ -35,10 +29,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/16_3family_empty_at_ends.json b/tests/results/test_without_family/16_3family_empty_at_ends.json index 19f9fe27b..1cb56b40b 100644 --- a/tests/results/test_without_family/16_3family_empty_at_ends.json +++ b/tests/results/test_without_family/16_3family_empty_at_ends.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "properties": [ { "type": "property", @@ -27,10 +21,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/16_5exists_nonexists.json b/tests/results/test_without_family/16_5exists_nonexists.json index f22c5f245..73b48bb2a 100644 --- a/tests/results/test_without_family/16_5exists_nonexists.json +++ b/tests/results/test_without_family/16_5exists_nonexists.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "yes" + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A new variable.", "properties": [ { @@ -46,9 +32,11 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_5redefine_calculation.json b/tests/results/test_without_family/16_5redefine_calculation.json index 9c079b363..a70f51937 100644 --- a/tests/results/test_without_family/16_5redefine_calculation.json +++ b/tests/results/test_without_family/16_5redefine_calculation.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "returns yes" - } - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -22,9 +12,13 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns yes" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_5redefine_choice.json b/tests/results/test_without_family/16_5redefine_choice.json index 079a6f041..c4b706eab 100644 --- a/tests/results/test_without_family/16_5redefine_choice.json +++ b/tests/results/test_without_family/16_5redefine_choice.json @@ -1,18 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b" - ] - }, "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -23,9 +12,14 @@ } ], "mode": "basic", - "gen_examples": [ - "a_choice" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b" + ] + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_5redefine_default.json b/tests/results/test_without_family/16_5redefine_default.json index 9f8f1f8e7..96ece61f5 100644 --- a/tests/results/test_without_family/16_5redefine_default.json +++ b/tests/results/test_without_family/16_5redefine_default.json @@ -1,15 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -20,9 +12,11 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_5redefine_default_calculation.json b/tests/results/test_without_family/16_5redefine_default_calculation.json index fa53fd8d5..5b4bd0d6a 100644 --- a/tests/results/test_without_family/16_5redefine_default_calculation.json +++ b/tests/results/test_without_family/16_5redefine_default_calculation.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_5redefine_family.json b/tests/results/test_without_family/16_5redefine_family.json index dc9aed737..e03b60005 100644 --- a/tests/results/test_without_family/16_5redefine_family.json +++ b/tests/results/test_without_family/16_5redefine_family.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "New description", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,10 +22,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/16_5redefine_help.json b/tests/results/test_without_family/16_5redefine_help.json index 37b6fe77c..27a29d9dc 100644 --- a/tests/results/test_without_family/16_5redefine_help.json +++ b/tests/results/test_without_family/16_5redefine_help.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "help": [ "Redefine help family ok." @@ -15,12 +13,8 @@ }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "Redefine help.", "help": [ "Redefine help ok." @@ -34,10 +28,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/16_5redefine_multi.json b/tests/results/test_without_family/16_5redefine_multi.json index 2efba714d..3aaf54a22 100644 --- a/tests/results/test_without_family/16_5redefine_multi.json +++ b/tests/results/test_without_family/16_5redefine_multi.json @@ -1,17 +1,7 @@ { "variable": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "non" - ] - }, - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -28,12 +18,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "non" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_5redefine_remove_disable_calculation.json b/tests/results/test_without_family/16_5redefine_remove_disable_calculation.json index 6170e09d5..2c5e848aa 100644 --- a/tests/results/test_without_family/16_5redefine_remove_disable_calculation.json +++ b/tests/results/test_without_family/16_5redefine_remove_disable_calculation.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -42,9 +32,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_5test_redefine.json b/tests/results/test_without_family/16_5test_redefine.json index 43e175309..9a657b26c 100644 --- a/tests/results/test_without_family/16_5test_redefine.json +++ b/tests/results/test_without_family/16_5test_redefine.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,26 +12,20 @@ } ], "mode": "standard", - "examples": { - "name": "Example", - "values": "test1" - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "non" + "values": "no" }, "variable_type": "string", + "examples": { + "name": "Example", + "values": "test1" + } + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -50,22 +36,20 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string", "examples": { "name": "Example", "values": "test1" - }, - "gen_examples": [ - "test1" - ], - "mandatory_without_value": false + } }, "var3": { - "type": "variable", - "variable_type": "string", "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -76,9 +60,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_6choice_redefine.json b/tests/results/test_without_family/16_6choice_redefine.json index 567bc0a26..e6609dac2 100644 --- a/tests/results/test_without_family/16_6choice_redefine.json +++ b/tests/results/test_without_family/16_6choice_redefine.json @@ -1,5 +1,17 @@ { "var": { + "path": "var", + "name": "var", + "description": "A choice.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -12,24 +24,6 @@ "a", "c" ] - }, - "path": "var", - "names": [ - "var" - ], - "description": "A choice.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "c" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/16_6exists_redefine_family.json b/tests/results/test_without_family/16_6exists_redefine_family.json index 341507773..aa9c2ba3f 100644 --- a/tests/results/test_without_family/16_6exists_redefine_family.json +++ b/tests/results/test_without_family/16_6exists_redefine_family.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family1", - "names": [ - "family1" - ], + "name": "family1", "description": "New description", "properties": [], "mode": "basic" }, "children": { "variable1": { - "type": "variable", - "variable_type": "string", "path": "family1.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A variable.", "properties": [ { @@ -28,10 +22,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -39,21 +31,15 @@ "type": "family", "informations": { "path": "family2", - "names": [ - "family2" - ], + "name": "family2", "description": "A second family", "properties": [], "mode": "basic" }, "children": { "variable2": { - "type": "variable", - "variable_type": "string", "path": "family2.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -64,10 +50,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/16exists_exists.json b/tests/results/test_without_family/16exists_exists.json index d83887252..8536932c8 100644 --- a/tests/results/test_without_family/16exists_exists.json +++ b/tests/results/test_without_family/16exists_exists.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "Description.", "properties": [ { @@ -16,9 +12,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/20_0family_append.json b/tests/results/test_without_family/20_0family_append.json index e012f519e..23283b6a5 100644 --- a/tests/results/test_without_family/20_0family_append.json +++ b/tests/results/test_without_family/20_0family_append.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "The first variable.", "properties": [ { @@ -28,18 +22,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "variable_type": "string", "path": "family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "The second variable.", "properties": [ { @@ -50,10 +38,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/20_0multi_family.json b/tests/results/test_without_family/20_0multi_family.json index f17b31189..84f616b19 100644 --- a/tests/results/test_without_family/20_0multi_family.json +++ b/tests/results/test_without_family/20_0multi_family.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "standard" @@ -15,28 +13,20 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "standard" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/20_0multi_family_basic.json b/tests/results/test_without_family/20_0multi_family_basic.json index 8729b07d3..d88556062 100644 --- a/tests/results/test_without_family/20_0multi_family_basic.json +++ b/tests/results/test_without_family/20_0multi_family_basic.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" @@ -15,21 +13,15 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -40,10 +32,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/20_0multi_family_expert.json b/tests/results/test_without_family/20_0multi_family_expert.json index 9d95cc9df..d7710af63 100644 --- a/tests/results/test_without_family/20_0multi_family_expert.json +++ b/tests/results/test_without_family/20_0multi_family_expert.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "advanced" @@ -15,28 +13,20 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "advanced" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [], "mode": "advanced", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/20_0multi_family_order.json b/tests/results/test_without_family/20_0multi_family_order.json index 08d15721b..8c1ca4578 100644 --- a/tests/results/test_without_family/20_0multi_family_order.json +++ b/tests/results/test_without_family/20_0multi_family_order.json @@ -1,11 +1,7 @@ { "variable": { - "type": "variable", - "variable_type": "string", "path": "variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -16,30 +12,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "variable1": { - "type": "variable", - "variable_type": "string", "path": "family.variable1", - "names": [ - "variable1" - ], + "name": "variable1", "description": "A first variable.", "properties": [ { @@ -50,30 +38,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "subfamily": { "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "basic" }, "children": { "variable": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.variable", - "names": [ - "variable" - ], + "name": "variable", "description": "A variable.", "properties": [ { @@ -84,20 +64,14 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "variable2": { - "type": "variable", - "variable_type": "string", "path": "family.variable2", - "names": [ - "variable2" - ], + "name": "variable2", "description": "A second variable.", "properties": [ { @@ -108,10 +82,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/20_0validators_differ_redefine.json b/tests/results/test_without_family/20_0validators_differ_redefine.json index 61294f695..a047c43f2 100644 --- a/tests/results/test_without_family/20_0validators_differ_redefine.json +++ b/tests/results/test_without_family/20_0validators_differ_redefine.json @@ -1,15 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -20,22 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -46,12 +32,26 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var3": { + "path": "var3", + "name": "var3", + "description": "A third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -64,27 +64,9 @@ "description": "var3 must be different than var2" } }, - "path": "var3", - "names": [ - "var3" - ], - "description": "A third variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", "examples": { "name": "Example", "values": "yes" - }, - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + } } } \ No newline at end of file diff --git a/tests/results/test_without_family/20_2family_looks_like_dynamic.json b/tests/results/test_without_family/20_2family_looks_like_dynamic.json index b82d6b297..a57c896f8 100644 --- a/tests/results/test_without_family/20_2family_looks_like_dynamic.json +++ b/tests/results/test_without_family/20_2family_looks_like_dynamic.json @@ -3,28 +3,15 @@ "type": "family", "informations": { "path": "my_family", - "names": [ - "my_family" - ], + "name": "my_family", "description": "my_family", "properties": [], "mode": "standard" }, "children": { "dynamic": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "my_family.dynamic", - "names": [ - "dynamic" - ], + "name": "dynamic", "properties": [ { "type": "property", @@ -40,26 +27,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var": { "type": "variable", "default": { "name": "Default", - "values": true + "values": [ + "val1", + "val2" + ] }, - "variable_type": "boolean", + "variable_type": "string", + "multiple": true + }, + "var": { "path": "my_family.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -70,10 +51,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test_without_family/20_2family_looks_like_variable.json b/tests/results/test_without_family/20_2family_looks_like_variable.json index 909118875..ab0a865c3 100644 --- a/tests/results/test_without_family/20_2family_looks_like_variable.json +++ b/tests/results/test_without_family/20_2family_looks_like_variable.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "my_family", - "names": [ - "my_family" - ], + "name": "my_family", "description": "my_family", "properties": [], "mode": "standard" }, "children": { "default": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "my_family.default", - "names": [ - "default" - ], + "name": "default", "properties": [ { "type": "property", @@ -31,10 +21,12 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/results/test_without_family/20_7help_family.json b/tests/results/test_without_family/20_7help_family.json index 65a4cf861..52e6501fc 100644 --- a/tests/results/test_without_family/20_7help_family.json +++ b/tests/results/test_without_family/20_7help_family.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "family1", - "names": [ - "family1" - ], + "name": "family1", "description": "The first family", "help": [ "Multi line\n\nHelp\n\nWith useful information." @@ -15,12 +13,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "family1.var", - "names": [ - "var" - ], + "name": "var", "properties": [ { "type": "property", @@ -30,10 +24,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -41,9 +33,7 @@ "type": "family", "informations": { "path": "family2", - "names": [ - "family2" - ], + "name": "family2", "description": "The second family", "help": [ "Multi line\nHelp\nWith useful information." @@ -53,12 +43,8 @@ }, "children": { "var": { - "type": "variable", - "variable_type": "string", "path": "family2.var", - "names": [ - "var" - ], + "name": "var", "properties": [ { "type": "property", @@ -68,10 +54,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/20_9default_information_parent.json b/tests/results/test_without_family/20_9default_information_parent.json index e09a64b2f..e159355b4 100644 --- a/tests/results/test_without_family/20_9default_information_parent.json +++ b/tests/results/test_without_family/20_9default_information_parent.json @@ -3,21 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "family", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A first variable.", "properties": [ { @@ -28,22 +22,12 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the information \"test_information\" of the variable \"family\"" - }, - "variable_type": "string", "path": "family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -54,10 +38,12 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the information \"test_information\" of the variable \"family\"" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/20_9family_absolute.json b/tests/results/test_without_family/20_9family_absolute.json index 2293a0fff..86cbfcf47 100644 --- a/tests/results/test_without_family/20_9family_absolute.json +++ b/tests/results/test_without_family/20_9family_absolute.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "First variable.", "properties": [ { @@ -16,30 +12,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var2": { - "type": "variable", - "variable_type": "string", "path": "family.var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -50,28 +38,42 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "examples": { "name": "Example", "values": "string6" - }, - "gen_examples": [ - "string6" - ], - "mandatory_without_value": true + } }, "subfamily": { "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A sub family", "properties": [], "mode": "standard" }, "children": { "variable": { + "path": "family.subfamily.variable", + "name": "variable", + "description": "Third variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -95,11 +97,86 @@ ] }, "variable_type": "string", - "path": "family.subfamily.variable", - "names": [ - "variable" - ], - "description": "Third variable.", + "multiple": true + } + } + } + } + }, + "family2": { + "type": "family", + "informations": { + "path": "family2", + "name": "family2", + "description": "A family", + "properties": [], + "mode": "standard" + }, + "children": { + "var2": { + "path": "family2.var2", + "name": "var2", + "description": "A variable2.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "family.var2", + "type": "variable" + }, + "description": "A second variable" + } + }, + "variable_type": "string" + }, + "var3": { + "path": "family2.var3", + "name": "var3", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "string4" + }, + "variable_type": "string", + "examples": { + "name": "Example", + "values": "string5" + } + }, + "subfamily": { + "type": "family", + "informations": { + "path": "family2.subfamily", + "name": "subfamily", + "description": "A sub family", + "properties": [], + "mode": "standard" + }, + "children": { + "variable": { + "path": "family2.subfamily.variable", + "name": "variable", + "description": "Fourth variable.", "properties": [ { "type": "property", @@ -115,106 +192,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false - } - } - } - } - }, - "family2": { - "type": "family", - "informations": { - "path": "family2", - "names": [ - "family2" - ], - "description": "A family", - "properties": [], - "mode": "standard" - }, - "children": { - "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "family.var2", - "type": "variable" - }, - "description": "A second variable" - } - }, - "variable_type": "string", - "path": "family2.var2", - "names": [ - "var2" - ], - "description": "A variable2.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false - }, - "var3": { - "type": "variable", - "default": { - "name": "Default", - "values": "string4" - }, - "variable_type": "string", - "path": "family2.var3", - "names": [ - "var3" - ], - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "examples": { - "name": "Example", - "values": "string5" - }, - "gen_examples": [ - "string5" - ], - "mandatory_without_value": false - }, - "subfamily": { - "type": "family", - "informations": { - "path": "family2.subfamily", - "names": [ - "subfamily" - ], - "description": "A sub family", - "properties": [], - "mode": "standard" - }, - "children": { - "variable": { "type": "variable", "default": { "name": "Default", @@ -246,35 +223,7 @@ ] }, "variable_type": "string", - "path": "family2.subfamily.variable", - "names": [ - "variable" - ], - "description": "Fourth variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null, - "string4" - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_without_family/24_0family_hidden_condition_sub_family.json b/tests/results/test_without_family/24_0family_hidden_condition_sub_family.json index cec8a4186..24b5a4470 100644 --- a/tests/results/test_without_family/24_0family_hidden_condition_sub_family.json +++ b/tests/results/test_without_family/24_0family_hidden_condition_sub_family.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -51,21 +43,15 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "subfamily", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -76,10 +62,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/24_0family_hidden_condition_variable_sub_family.json b/tests/results/test_without_family/24_0family_hidden_condition_variable_sub_family.json index 3e16a74e7..c6ab09bdc 100644 --- a/tests/results/test_without_family/24_0family_hidden_condition_variable_sub_family.json +++ b/tests/results/test_without_family/24_0family_hidden_condition_variable_sub_family.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -55,28 +47,20 @@ "type": "family", "informations": { "path": "family.subfamily", - "names": [ - "subfamily" - ], + "name": "subfamily", "description": "A subfamily", "properties": [], "mode": "standard" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.subfamily.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/24_0family_hidden_param_condition_sub_family.json b/tests/results/test_without_family/24_0family_hidden_param_condition_sub_family.json index 9fa9ca0da..7461fb058 100644 --- a/tests/results/test_without_family/24_0family_hidden_param_condition_sub_family.json +++ b/tests/results/test_without_family/24_0family_hidden_param_condition_sub_family.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "The variable use has condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "family": { "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "Possibly hidden family", "properties": [ { @@ -51,21 +43,15 @@ "type": "family", "informations": { "path": "family.sub_family", - "names": [ - "sub_family" - ], + "name": "sub_family", "description": "A subfamily", "properties": [], "mode": "basic" }, "children": { "var1": { - "type": "variable", - "variable_type": "string", "path": "family.sub_family.var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A variable.", "properties": [ { @@ -76,10 +62,8 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/24_0family_mandatory_condition.json b/tests/results/test_without_family/24_0family_mandatory_condition.json index 4dfc5e083..1a7e64bad 100644 --- a/tests/results/test_without_family/24_0family_mandatory_condition.json +++ b/tests/results/test_without_family/24_0family_mandatory_condition.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -45,9 +35,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/24_0family_mandatory_condition_variable.json b/tests/results/test_without_family/24_0family_mandatory_condition_variable.json index 3a6bb17ec..65a97bf1f 100644 --- a/tests/results/test_without_family/24_0family_mandatory_condition_variable.json +++ b/tests/results/test_without_family/24_0family_mandatory_condition_variable.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" }, "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -49,9 +39,7 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/24_7validators_variable_optional.json b/tests/results/test_without_family/24_7validators_variable_optional.json index 7406c1e8c..ba1301478 100644 --- a/tests/results/test_without_family/24_7validators_variable_optional.json +++ b/tests/results/test_without_family/24_7validators_variable_optional.json @@ -3,15 +3,25 @@ "type": "family", "informations": { "path": "general", - "names": [ - "general" - ], + "name": "general", "description": "A family", "properties": [], "mode": "basic" }, "children": { "int": { + "path": "general.int", + "name": "int", + "description": "A first integer.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", "type": "variable", "variable_type": "integer", "validators": { @@ -25,40 +35,14 @@ } ] }, - "path": "general.int", - "names": [ - "int" - ], - "description": "A first integer.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", "examples": { "name": "Example", "values": 5 - }, - "gen_examples": [ - 5 - ], - "mandatory_without_value": true + } }, "int2": { - "type": "variable", - "default": { - "name": "Default", - "values": 1 - }, - "variable_type": "integer", "path": "general.int2", - "names": [ - "int2" - ], + "name": "int2", "description": "A second integer.", "properties": [ { @@ -69,10 +53,12 @@ } ], "mode": "standard", - "gen_examples": [ - 1 - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": 1 + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_without_family/40_0leadership.json b/tests/results/test_without_family/40_0leadership.json index 7fd9d42de..5df64f007 100644 --- a/tests/results/test_without_family/40_0leadership.json +++ b/tests/results/test_without_family/40_0leadership.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -62,20 +48,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -86,12 +64,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_0leadership_diff_name.json b/tests/results/test_without_family/40_0leadership_diff_name.json index 6072d2405..f80b394c7 100644 --- a/tests/results/test_without_family/40_0leadership_diff_name.json +++ b/tests/results/test_without_family/40_0leadership_diff_name.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -62,20 +48,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -86,12 +64,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_0leadership_follower_default_calculation.json b/tests/results/test_without_family/40_0leadership_follower_default_calculation.json index 25f6ce006..e82b8b9b3 100644 --- a/tests/results/test_without_family/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_without_family/40_0leadership_follower_default_calculation.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,25 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -66,26 +48,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "returns follower1 value" - } + "values": "value" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A second follower.", "properties": [ { @@ -96,12 +68,14 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "returns follower1 value" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_0leadership_follower_default_value.json b/tests/results/test_without_family/40_0leadership_follower_default_value.json index 917d62962..ade859d17 100644 --- a/tests/results/test_without_family/40_0leadership_follower_default_value.json +++ b/tests/results/test_without_family/40_0leadership_follower_default_value.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -31,25 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "value" - }, - "variable_type": "string", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower with default value.", "properties": [ { @@ -60,12 +42,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_0leadership_leader_follower.json b/tests/results/test_without_family/40_0leadership_leader_follower.json index 2147c9cdf..4ccf1f0e7 100644 --- a/tests/results/test_without_family/40_0leadership_leader_follower.json +++ b/tests/results/test_without_family/40_0leadership_leader_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,16 +31,30 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { + "path": "leadership.follower", + "name": "follower", + "description": "A follower.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -66,28 +67,7 @@ "description": "A leader" } }, - "variable_type": "string", - "path": "leadership.follower", - "names": [ - "follower" - ], - "description": "A follower.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_0leadership_leader_not_multi.json b/tests/results/test_without_family/40_0leadership_leader_not_multi.json index d747e4e03..0390609c7 100644 --- a/tests/results/test_without_family/40_0leadership_leader_not_multi.json +++ b/tests/results/test_without_family/40_0leadership_leader_not_multi.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "general", - "names": [ - "general" - ], + "name": "general", "description": "general", "properties": [], "mode": "standard" }, "children": { "mode_conteneur_actif": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "general.mode_conteneur_actif", - "names": [ - "mode_conteneur_actif" - ], + "name": "mode_conteneur_actif", "description": "No change.", "properties": [ { @@ -32,10 +22,12 @@ } ], "mode": "standard", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } }, @@ -43,9 +35,7 @@ "type": "family", "informations": { "path": "general1", - "names": [ - "general1" - ], + "name": "general1", "description": "general1", "properties": [], "mode": "basic" @@ -55,9 +45,7 @@ "type": "leadership", "informations": { "path": "general1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leader", "properties": [], "mode": "basic", @@ -67,12 +55,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "general1.leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Leader.", "properties": [ { @@ -89,21 +73,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "general1.leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "Follower1.", "properties": [ { @@ -114,20 +90,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "general1.leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "Follower2.", "properties": [ { @@ -138,12 +106,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_0leadership_reduce.json b/tests/results/test_without_family/40_0leadership_reduce.json index 241ffa168..54a5fc961 100644 --- a/tests/results/test_without_family/40_0leadership_reduce.json +++ b/tests/results/test_without_family/40_0leadership_reduce.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,20 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value_1", - "value_2", - "value_3" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -45,6 +31,16 @@ } ], "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value_1", + "value_2", + "value_3" + ] + }, + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -52,22 +48,11 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -78,13 +63,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_1leadership_append_follower.json b/tests/results/test_without_family/40_1leadership_append_follower.json index d00968d91..07d65641e 100644 --- a/tests/results/test_without_family/40_1leadership_append_follower.json +++ b/tests/results/test_without_family/40_1leadership_append_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The follower1.", "properties": [ { @@ -62,20 +48,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The follower2.", "properties": [ { @@ -86,20 +64,12 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "follower3": { - "type": "variable", - "variable_type": "string", "path": "leader.follower3", - "names": [ - "follower3" - ], + "name": "follower3", "description": "The follower3.", "properties": [ { @@ -110,12 +80,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_2leadership_calculation_index.json b/tests/results/test_without_family/40_2leadership_calculation_index.json index c8e93b7c3..bb09a8564 100644 --- a/tests/results/test_without_family/40_2leadership_calculation_index.json +++ b/tests/results/test_without_family/40_2leadership_calculation_index.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -45,27 +31,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the index" - }, - "variable_type": "integer", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -76,14 +56,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - 0, - 1, - 2 - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the index" + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_without_family/40_2leadership_calculation_index_2.json b/tests/results/test_without_family/40_2leadership_calculation_index_2.json index c8e93b7c3..bb09a8564 100644 --- a/tests/results/test_without_family/40_2leadership_calculation_index_2.json +++ b/tests/results/test_without_family/40_2leadership_calculation_index_2.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,20 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b", - "c" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -45,27 +31,21 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b", "c" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the index" - }, - "variable_type": "integer", "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -76,14 +56,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - 0, - 1, - 2 - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the index" + }, + "variable_type": "integer" } } } diff --git a/tests/results/test_without_family/40_6leadership_follower_multi.json b/tests/results/test_without_family/40_6leadership_follower_multi.json index f9a344cea..8255b8b54 100644 --- a/tests/results/test_without_family/40_6leadership_follower_multi.json +++ b/tests/results/test_without_family/40_6leadership_follower_multi.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -37,21 +31,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The first follower.", "properties": [ { @@ -68,29 +54,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - [ - "example" - ] - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The second follower.", "properties": [ { @@ -107,15 +77,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json index 62631ee6b..e226bccc0 100644 --- a/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -31,21 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leadership.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "The first follower.", "properties": [ { @@ -62,29 +48,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - [ - "example" - ] - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower2": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value" - ] - }, - "variable_type": "string", "path": "leadership.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "The second follower.", "properties": [ { @@ -101,15 +71,15 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + "value" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_without_family/40_8calculation_boolean.json b/tests/results/test_without_family/40_8calculation_boolean.json index 2197563d6..280744dab 100644 --- a/tests/results/test_without_family/40_8calculation_boolean.json +++ b/tests/results/test_without_family/40_8calculation_boolean.json @@ -1,15 +1,7 @@ { "bool": { - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean", "path": "bool", - "names": [ - "bool" - ], + "name": "bool", "description": "A boolean variable.", "properties": [ { @@ -20,24 +12,16 @@ } ], "mode": "standard", - "gen_examples": [ - false - ], - "mandatory_without_value": false - }, - "multi1": { "type": "variable", "default": { "name": "Default", - "values": { - "description": "a calculation" - } + "values": false }, - "variable_type": "boolean", + "variable_type": "boolean" + }, + "multi1": { "path": "multi1", - "names": [ - "multi1" - ], + "name": "multi1", "description": "A first multi variable.", "properties": [ { @@ -54,15 +38,6 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - false - ] - ], - "mandatory_without_value": false - }, - "multi2": { "type": "variable", "default": { "name": "Default", @@ -71,10 +46,11 @@ } }, "variable_type": "boolean", + "multiple": true + }, + "multi2": { "path": "multi2", - "names": [ - "multi2" - ], + "name": "multi2", "description": "A second multi variable.", "properties": [ { @@ -91,13 +67,14 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - true, - false - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "a calculation" + } + }, + "variable_type": "boolean", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_8calculation_multi_variable.json b/tests/results/test_without_family/40_8calculation_multi_variable.json index 9477ae34c..1dcc9a086 100644 --- a/tests/results/test_without_family/40_8calculation_multi_variable.json +++ b/tests/results/test_without_family/40_8calculation_multi_variable.json @@ -1,5 +1,23 @@ { "var": { + "path": "var", + "name": "var", + "description": "A first variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -23,46 +41,11 @@ ] }, "variable_type": "string", - "path": "var", - "names": [ - "var" - ], - "description": "A first variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "no", - "yes" - ] - ], - "mandatory_without_value": false + "multiple": true }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A second variable.", "properties": [ { @@ -73,22 +56,16 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false - }, - "var3": { "type": "variable", "default": { "name": "Default", - "values": "yes" + "values": "no" }, - "variable_type": "string", + "variable_type": "string" + }, + "var3": { "path": "var3", - "names": [ - "var3" - ], + "name": "var3", "description": "A third variable.", "properties": [ { @@ -99,9 +76,11 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_8calculation_multi_variable_parent.json b/tests/results/test_without_family/40_8calculation_multi_variable_parent.json index 33cd14710..7e475b6f0 100644 --- a/tests/results/test_without_family/40_8calculation_multi_variable_parent.json +++ b/tests/results/test_without_family/40_8calculation_multi_variable_parent.json @@ -1,15 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -20,24 +12,36 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "fam1": { "type": "family", "informations": { "path": "fam1", - "names": [ - "fam1" - ], + "name": "fam1", "description": "A family", "properties": [], "mode": "standard" }, "children": { "var": { + "path": "fam1.var", + "name": "var", + "description": "A calculated variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -50,25 +54,7 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "fam1.var", - "names": [ - "var" - ], - "description": "A calculated variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_8calculation_multi_variable_parent2.json b/tests/results/test_without_family/40_8calculation_multi_variable_parent2.json index b68dec800..e3b9c8094 100644 --- a/tests/results/test_without_family/40_8calculation_multi_variable_parent2.json +++ b/tests/results/test_without_family/40_8calculation_multi_variable_parent2.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "fam1", - "names": [ - "fam1" - ], + "name": "fam1", "description": "First family", "properties": [], "mode": "standard" }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "fam1.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -32,10 +22,12 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" } } }, @@ -43,15 +35,25 @@ "type": "family", "informations": { "path": "fam2", - "names": [ - "fam2" - ], + "name": "fam2", "description": "Second family", "properties": [], "mode": "standard" }, "children": { "var": { + "path": "fam2.var", + "name": "var", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -64,25 +66,7 @@ "description": "A variable" } }, - "variable_type": "string", - "path": "fam2.var", - "names": [ - "var" - ], - "description": "A variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json index cc209c7b1..88666d612 100644 --- a/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,35 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "default": { "name": "Default", "values": [ - { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "leadership.leader", - "type": "variable" - }, - "description": "A leader" - } + "value1", + "value2" ] }, "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -89,18 +61,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value1" - ], - [ - "value2" - ] + "type": "variable", + "default": { + "name": "Default", + "values": [ + { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "leadership.leader", + "type": "variable" + }, + "description": "A leader" + } ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true } } } diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json index 647ff1e5e..4130d4af2 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,12 +97,12 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json index 647ff1e5e..4130d4af2 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,12 +97,12 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json index 94c123ffd..49001a32e 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "leader", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "properties": [ { "type": "property", @@ -43,35 +30,39 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "a", "b" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } }, "variable": { + "path": "variable", + "name": "variable", + "properties": [ + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -85,26 +76,6 @@ } }, "variable_type": "string", - "path": "variable", - "names": [ - "variable" - ], - "properties": [ - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json index 1684c699e..0d3807f17 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,17 +75,28 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { + "path": "calculate", + "name": "calculate", + "description": "A calculated variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -127,27 +110,6 @@ } }, "variable_type": "string", - "path": "calculate", - "names": [ - "calculate" - ], - "description": "A calculated variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json index 9828bbb63..e6891c149 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,9 +97,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json index f3e918702..e6891c149 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,27 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": "depends on a calculation" - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -134,9 +97,11 @@ } ], "mode": "standard", - "gen_examples": [ - "value2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "depends on a calculation" + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json b/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json index bb12ea51d..2d5dea33b 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": [ + "value1", + "value2" + ] }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -74,25 +55,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -103,34 +75,18 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } }, "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "leader.leader", - "type": "variable" - }, - "description": "A leader" - } - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -147,13 +103,19 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "leader.leader", + "type": "variable" + }, + "description": "A leader" + } + }, + "variable_type": "string", + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/40_9leadership-calculation-variable.json b/tests/results/test_without_family/40_9leadership-calculation-variable.json index 46688f078..da047780a 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-variable.json +++ b/tests/results/test_without_family/40_9leadership-calculation-variable.json @@ -1,18 +1,7 @@ { "calculate": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "calculate", - "names": [ - "calculate" - ], + "name": "calculate", "description": "A calculated variable.", "properties": [ { @@ -29,22 +18,22 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "leader": { "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "standard", @@ -54,23 +43,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "calculate", - "type": "variable" - }, - "description": "A calculated variable" - } - }, - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -87,26 +61,24 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "value1", - "value2" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "default": { "name": "Default", - "values": "val11" + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "calculate", + "type": "variable" + }, + "description": "A calculated variable" + } }, "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -117,25 +89,16 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val11", - "val11" - ] - ], - "mandatory_without_value": false - }, - "follower2": { "type": "variable", "default": { "name": "Default", - "values": "val21" + "values": "val11" }, - "variable_type": "string", + "variable_type": "string" + }, + "follower2": { "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "An other follower.", "properties": [ { @@ -146,13 +109,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val21", - "val21" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val21" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json index d8d4310c3..38a39ba0b 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership_1", - "names": [ - "leadership_1" - ], + "name": "leadership_1", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership_1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,22 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leadership_1.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -70,13 +55,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -84,9 +64,7 @@ "type": "leadership", "informations": { "path": "leadership_2", - "names": [ - "leadership_2" - ], + "name": "leadership_2", "description": "A second leadership", "properties": [], "mode": "standard", @@ -96,6 +74,24 @@ }, "children": { "leader": { + "path": "leadership_2.leader", + "name": "leader", + "description": "A leader.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -109,46 +105,11 @@ } }, "variable_type": "string", - "path": "leadership_2.leader", - "names": [ - "leader" - ], - "description": "A leader.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true }, "follower": { - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "path": "leadership_2.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -159,13 +120,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "val", - "val" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json index a1ffc12d2..19c19fb0a 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership_1", - "names": [ - "leadership_1" - ], + "name": "leadership_1", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership_1.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -44,22 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { - "type": "variable", - "variable_type": "string", "path": "leadership_1.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -70,13 +55,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example", - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, @@ -84,9 +64,7 @@ "type": "leadership", "informations": { "path": "leadership_2", - "names": [ - "leadership_2" - ], + "name": "leadership_2", "description": "A second leadership", "properties": [], "mode": "standard", @@ -96,19 +74,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "value1", - "value2" - ] - }, - "variable_type": "string", "path": "leadership_2.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -125,16 +92,36 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "value1", "value2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "follower": { + "path": "leadership_2.follower", + "name": "follower", + "description": "A follower.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -148,40 +135,7 @@ } }, "variable_type": "string", - "path": "leadership_2.follower", - "names": [ - "follower" - ], - "description": "A follower.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - [ - "value1", - "value2" - ], - [ - "value1", - "value2" - ] - ] - ], - "mandatory_without_value": false + "multiple": true } } } diff --git a/tests/results/test_without_family/41_0choice_leader.json b/tests/results/test_without_family/41_0choice_leader.json index ad42f5299..474687e50 100644 --- a/tests/results/test_without_family/41_0choice_leader.json +++ b/tests/results/test_without_family/41_0choice_leader.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "The leader.", "properties": [ { @@ -31,29 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "type": "variable", - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "a", - "b", - "c" - ] - }, "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [ { @@ -64,12 +42,16 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "a_choice" + "type": "variable", + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "a", + "b", + "c" ] - ], - "mandatory_without_value": true + } } } } diff --git a/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json b/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json index 526f9588d..d12b98c39 100644 --- a/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json +++ b/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leadership", - "names": [ - "leadership" - ], + "name": "leadership", "description": "A leadership", "properties": [], "mode": "standard", @@ -15,19 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "a", - "b" - ] - }, - "variable_type": "string", "path": "leadership.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "Aleader.", "properties": [ { @@ -44,26 +31,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "a", - "b" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "default": { "name": "Default", - "values": "value" + "values": [ + "a", + "b" + ] }, "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leadership.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -81,13 +62,12 @@ } ], "mode": "standard", - "gen_examples": [ - [ - "value", - "value" - ] - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/44_4leadership_mandatory.json b/tests/results/test_without_family/44_4leadership_mandatory.json index 2187db91d..0f515ec57 100644 --- a/tests/results/test_without_family/44_4leadership_mandatory.json +++ b/tests/results/test_without_family/44_4leadership_mandatory.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -37,30 +31,18 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower.", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/44_4leadership_mandatory_follower.json b/tests/results/test_without_family/44_4leadership_mandatory_follower.json index 2657dcc60..ac79d6bef 100644 --- a/tests/results/test_without_family/44_4leadership_mandatory_follower.json +++ b/tests/results/test_without_family/44_4leadership_mandatory_follower.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -31,21 +25,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -56,12 +42,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json b/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json index 699d26cc8..4f2de55ab 100644 --- a/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "no" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "no" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "no" + }, + "variable_type": "string" }, "leader": { "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [ { @@ -51,12 +43,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -67,21 +55,13 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -92,12 +72,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json b/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json index e9a9849ea..123284df6 100644 --- a/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json @@ -1,15 +1,7 @@ { "condition": { - "type": "variable", - "default": { - "name": "Default", - "values": "yes" - }, - "variable_type": "string", "path": "condition", - "names": [ - "condition" - ], + "name": "condition", "description": "A condition.", "properties": [ { @@ -20,18 +12,18 @@ } ], "mode": "standard", - "gen_examples": [ - "yes" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "yes" + }, + "variable_type": "string" }, "leader": { "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -41,12 +33,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -63,21 +51,13 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true - }, - "follower": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower": { "path": "leader.follower", - "names": [ - "follower" - ], + "name": "follower", "description": "A follower.", "properties": [ { @@ -97,12 +77,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic.json b/tests/results/test_without_family/60_0family_dynamic.json index 551479532..6beb13eae 100644 --- a/tests/results/test_without_family/60_0family_dynamic.json +++ b/tests/results/test_without_family/60_0family_dynamic.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_1_1.json b/tests/results/test_without_family/60_0family_dynamic_1_1.json index 986d92cd1..2d1e57873 100644 --- a/tests/results/test_without_family/60_0family_dynamic_1_1.json +++ b/tests/results/test_without_family/60_0family_dynamic_1_1.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_1_1_empty.json b/tests/results/test_without_family/60_0family_dynamic_1_1_empty.json index c00f5a65d..2ca9018b3 100644 --- a/tests/results/test_without_family/60_0family_dynamic_1_1_empty.json +++ b/tests/results/test_without_family/60_0family_dynamic_1_1_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,29 +51,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -92,11 +67,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_empty.json b/tests/results/test_without_family/60_0family_dynamic_empty.json index c1883f429..5c68a315b 100644 --- a/tests/results/test_without_family/60_0family_dynamic_empty.json +++ b/tests/results/test_without_family/60_0family_dynamic_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,29 +12,26 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynexample" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "example" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -48,25 +41,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "example" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -76,10 +57,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example" + "identifiers": [ + [ + "example" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_forbidden_char.json b/tests/results/test_without_family/60_0family_dynamic_forbidden_char.json index 82b1f8cf6..866a3290b 100644 --- a/tests/results/test_without_family/60_0family_dynamic_forbidden_char.json +++ b/tests/results/test_without_family/60_0family_dynamic_forbidden_char.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val.1", - "val.2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val.1", "val.2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval_1", - "dynval_2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val.1" @@ -53,10 +45,9 @@ "val.2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,17 +57,22 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" + "path": "dyn{{ identifier }}.var1", + "name": "var1", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], + "mode": "standard", "identifiers": [ [ "val.1" @@ -85,14 +81,17 @@ "val.2" ] ], - "path": "dyn{{ identifier }}.var1", - "description": "A dynamic variable.", "type": "variable", "default": { "name": "Default", "values": "the value of the identifier" }, - "variable_type": "string", + "variable_type": "string" + }, + "var2": { + "path": "dyn{{ identifier }}.var2", + "name": "var2", + "description": "A dynamic variable.", "properties": [ { "type": "property", @@ -102,17 +101,6 @@ } ], "mode": "standard", - "gen_examples": [ - "val.1", - "val.2" - ], - "mandatory_without_value": false - }, - "var2": { - "names": [ - "var2", - "var2" - ], "identifiers": [ [ "val.1" @@ -121,28 +109,12 @@ "val.2" ] ], - "path": "dyn{{ identifier }}.var2", - "description": "A dynamic variable.", "type": "variable", "default": { "name": "Default", "values": "depends on a calculation" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val.1", - "val.2" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_no_description.json b/tests/results/test_without_family/60_0family_dynamic_no_description.json index 5b54c4ba4..59f1c8866 100644 --- a/tests/results/test_without_family/60_0family_dynamic_no_description.json +++ b/tests/results/test_without_family/60_0family_dynamic_no_description.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,28 +57,12 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -97,11 +72,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_no_description_empty.json b/tests/results/test_without_family/60_0family_dynamic_no_description_empty.json index 62a372f0e..62fa21236 100644 --- a/tests/results/test_without_family/60_0family_dynamic_no_description_empty.json +++ b/tests/results/test_without_family/60_0family_dynamic_no_description_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,28 +51,12 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", - "type": "variable", - "variable_type": "string", + "name": "var", "properties": [ { "type": "property", @@ -91,11 +66,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_source_hidden.json b/tests/results/test_without_family/60_0family_dynamic_source_hidden.json index 0a4cec8a7..534118a8f 100644 --- a/tests/results/test_without_family/60_0family_dynamic_source_hidden.json +++ b/tests/results/test_without_family/60_0family_dynamic_source_hidden.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,10 +15,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "submessage": "(from an undocumented variable)", @@ -26,29 +26,13 @@ "val2" ] } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -58,11 +42,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_static.json b/tests/results/test_without_family/60_0family_dynamic_static.json index d04df4742..6dcdcaa9f 100644 --- a/tests/results/test_without_family/60_0family_dynamic_static.json +++ b/tests/results/test_without_family/60_0family_dynamic_static.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside a dynamic family.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,11 +37,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_test.json b/tests/results/test_without_family/60_0family_dynamic_test.json index aaf9d94ac..08b0888d4 100644 --- a/tests/results/test_without_family/60_0family_dynamic_test.json +++ b/tests/results/test_without_family/60_0family_dynamic_test.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -22,6 +18,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -29,22 +27,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": true + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_upper_char.json b/tests/results/test_without_family/60_0family_dynamic_upper_char.json index 1f8678e85..4c80246e5 100644 --- a/tests/results/test_without_family/60_0family_dynamic_upper_char.json +++ b/tests/results/test_without_family/60_0family_dynamic_upper_char.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "Val1", - "VAL2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "Val1", "VAL2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "Val1" @@ -53,10 +45,9 @@ "VAL2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "Val1" - ], - [ - "VAL2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +73,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "Val1" + ], + [ + "VAL2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_variable_empty.json b/tests/results/test_without_family/60_0family_dynamic_variable_empty.json index abe9b6b63..23cf318c0 100644 --- a/tests/results/test_without_family/60_0family_dynamic_variable_empty.json +++ b/tests/results/test_without_family/60_0family_dynamic_variable_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -22,29 +18,26 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynexample" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "example" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -54,29 +47,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "example" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -86,10 +63,17 @@ } ], "mode": "standard", - "gen_examples": [ - "val" + "identifiers": [ + [ + "example" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_variable_optional.json b/tests/results/test_without_family/60_0family_dynamic_variable_optional.json index ff3de1c2d..31d5b6f95 100644 --- a/tests/results/test_without_family/60_0family_dynamic_variable_optional.json +++ b/tests/results/test_without_family/60_0family_dynamic_variable_optional.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyna", - "dynb" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "a" @@ -14,40 +15,19 @@ "b" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "a", "b" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "a" - ], - [ - "b" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -57,11 +37,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "a" + ], + [ + "b" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_variable_suffix.json b/tests/results/test_without_family/60_0family_dynamic_variable_suffix.json index 0e315f8d9..1e29e5e80 100644 --- a/tests/results/test_without_family/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_without_family/60_0family_dynamic_variable_suffix.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable with suffix {{ identifier }}.", - "type": "variable", - "default": { - "name": "Default", - "values": "a value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,11 +73,20 @@ } ], "mode": "standard", - "gen_examples": [ - "a value", - "a value" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_dynamic_variable_suffix_empty.json b/tests/results/test_without_family/60_0family_dynamic_variable_suffix_empty.json index 034d21d4d..c9fb5e421 100644 --- a/tests/results/test_without_family/60_0family_dynamic_variable_suffix_empty.json +++ b/tests/results/test_without_family/60_0family_dynamic_variable_suffix_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -22,6 +18,8 @@ } ], "mode": "basic", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -29,22 +27,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": true + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable with suffix {{ identifier }}.", - "type": "variable", - "default": { - "name": "Default", - "values": "a value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,11 +73,20 @@ } ], "mode": "standard", - "gen_examples": [ - "a value", - "a value" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a value" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_0family_mode.json b/tests/results/test_without_family/60_0family_mode.json index 8dae08cbf..7782ca891 100644 --- a/tests/results/test_without_family/60_0family_mode.json +++ b/tests/results/test_without_family/60_0family_mode.json @@ -3,25 +3,15 @@ "type": "family", "informations": { "path": "family", - "names": [ - "family" - ], + "name": "family", "description": "A family", "properties": [], "mode": "basic" }, "children": { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "non" - }, - "variable_type": "string", "path": "family.var", - "names": [ - "var" - ], + "name": "var", "description": "A variable.", "properties": [ { @@ -32,10 +22,12 @@ } ], "mode": "basic", - "gen_examples": [ - "non" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "non" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_1family_dynamic_jinja.json b/tests/results/test_without_family/60_1family_dynamic_jinja.json index 94c2db583..2dc734716 100644 --- a/tests/results/test_without_family/60_1family_dynamic_jinja.json +++ b/tests/results/test_without_family/60_1family_dynamic_jinja.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn1", - "dyn2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "1" @@ -53,41 +45,20 @@ "2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "description": "index of suffix value" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "1" - ], - [ - "2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -97,11 +68,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "1" + ], + [ + "2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.json index 5a3302a6b..2c2688586 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,19 +57,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -86,30 +75,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "basic" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "With a variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -119,17 +91,34 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -146,24 +135,6 @@ ] } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json index 17b61b003..77c2beaed 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,19 +57,17 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family inside dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -86,34 +75,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family inside dynamic family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -123,29 +91,28 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of var" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A varible outside dynamic family.", "properties": [ { @@ -156,9 +123,13 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json index ee39ac645..cdc5b37d7 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_2_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,19 +51,17 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family inside dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -80,34 +69,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family inside dynamic family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -117,17 +85,31 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A varible outside dynamic family.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -135,17 +117,6 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A varible outside dynamic family.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json index 70e1ddc27..6713d4bb7 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group_empty.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,19 +51,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -80,30 +69,13 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "basic" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.family.var", + "name": "var", "description": "With a variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -113,17 +85,27 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A second variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -131,17 +113,6 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A second variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_2family_dynamic_outside_calc.json b/tests/results/test_without_family/60_2family_dynamic_outside_calc.json index 081efd1df..b84238570 100644 --- a/tests/results/test_without_family/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_without_family/60_2family_dynamic_outside_calc.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffx variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffx variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,27 +73,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "newvar": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "the value of var" - } - }, - "variable_type": "string", "path": "newvar", - "names": [ - "newvar" - ], + "name": "newvar", "description": "A second variable.", "properties": [ { @@ -133,9 +103,13 @@ } ], "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "the value of var" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_2family_dynamic_outside_calc_empty.json b/tests/results/test_without_family/60_2family_dynamic_outside_calc_empty.json index ff28c5660..ea3150476 100644 --- a/tests/results/test_without_family/60_2family_dynamic_outside_calc_empty.json +++ b/tests/results/test_without_family/60_2family_dynamic_outside_calc_empty.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffx variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,33 +51,13 @@ }, "description": "A suffx variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "val" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -96,15 +67,29 @@ } ], "mode": "standard", - "gen_examples": [ - "val", - "val" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val" + }, + "variable_type": "string" } } }, "newvar": { + "path": "newvar", + "name": "newvar", + "description": "A second variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -112,17 +97,6 @@ "description": "the value of var" } }, - "variable_type": "string", - "path": "newvar", - "names": [ - "newvar" - ], - "description": "A second variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_description.json b/tests/results/test_without_family/60_5family_dynamic_calc_description.json index 913121e13..96ffd5c89 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_description.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_description.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable for {{ identifier }}.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,21 +37,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A new variable.", "properties": [ { @@ -94,12 +79,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" }, "var2": { + "path": "var2", + "name": "var2", + "description": "A new variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -127,27 +122,6 @@ ] }, "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A new variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - null, - null - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_identifier.json b/tests/results/test_without_family/60_5family_dynamic_calc_identifier.json index 234cd2295..887e2164e 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_identifier.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_identifier.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,26 +18,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "val1" + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A suffix variable2.", "properties": [ { @@ -59,18 +42,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val1" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -79,10 +65,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -92,33 +77,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -128,15 +93,36 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var3": { + "path": "var3", + "name": "var3", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -163,24 +149,6 @@ } ] }, - "variable_type": "string", - "path": "var3", - "names": [ - "var3" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_identifier_multi.json b/tests/results/test_without_family/60_5family_dynamic_calc_identifier_multi.json index cb939c39f..08d71b2a9 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_identifier_multi.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_identifier_multi.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,26 +18,20 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false - }, - "var2": { "type": "variable", "default": { "name": "Default", - "values": "val1" + "values": [ + "val1", + "val2" + ] }, "variable_type": "string", + "multiple": true + }, + "var2": { "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A suffix variable2.", "properties": [ { @@ -59,18 +42,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val1" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -79,10 +65,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -92,35 +77,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": [ - "the value of the identifier" - ] - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -136,8 +99,7 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ "val1" ], @@ -145,11 +107,37 @@ "val2" ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": [ + "the value of the identifier" + ] + }, + "variable_type": "string", + "multiple": true } } }, "var3": { + "path": "var3", + "name": "var3", + "description": "A variable calculated.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -177,32 +165,6 @@ ] }, "variable_type": "string", - "path": "var3", - "names": [ - "var3" - ], - "description": "A variable calculated.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "multiple": true, - "gen_examples": [ - [ - "val1" - ] - ], - "mandatory_without_value": false + "multiple": true } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_suffix2.json b/tests/results/test_without_family/60_5family_dynamic_calc_suffix2.json index b580061a1..4e61a2eda 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_suffix2.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "Suffix has value.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,11 +73,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_suffix2_empty.json b/tests/results/test_without_family/60_5family_dynamic_calc_suffix2_empty.json index cb0735363..e8155d33c 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_suffix2_empty.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_suffix2_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,33 +51,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "Suffix has value.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -96,11 +67,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_suffix_disabled.json b/tests/results/test_without_family/60_5family_dynamic_calc_suffix_disabled.json index 60e0c37cb..fb5de0597 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_suffix_disabled.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_suffix_disabled.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,32 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var" - ], - "identifiers": [ - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -56,11 +44,13 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param.json index f8401f24d..b67888c2d 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,35 +57,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "from suffix" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -104,11 +73,22 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "from suffix" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param_empty.json b/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param_empty.json index c2d8aaf0e..16b1504c7 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param_empty.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_suffix_param_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A identifier variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,35 +51,13 @@ }, "description": "A identifier variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "from suffix" - } - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -98,11 +67,22 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "from suffix" + } + }, + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_variable.json b/tests/results/test_without_family/60_5family_dynamic_calc_variable.json index 93083bf8d..a4ef9f0c5 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_variable.json @@ -1,18 +1,7 @@ { "var1": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,29 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -98,35 +73,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -137,9 +99,20 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled.json b/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled.json index b6aae3865..74270cbba 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var1", + "name": "var1", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,17 +37,6 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": true - }, - "var2": { - "names": [ - "var2", - "var2" - ], "identifiers": [ [ "val1" @@ -72,10 +45,13 @@ "val2" ] ], - "path": "dyn{{ identifier }}.var2", - "description": "A new variable.", "type": "variable", - "variable_type": "string", + "variable_type": "string" + }, + "var2": { + "path": "dyn{{ identifier }}.var2", + "name": "var2", + "description": "A new variable.", "properties": [ { "type": "property", @@ -113,11 +89,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled_outside.json b/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled_outside.json index 86b72cf14..24f533c76 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled_outside.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_variable_disabled_outside.json @@ -2,10 +2,11 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic famify for {{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -14,36 +15,19 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic famify for {{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", "val2" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var1": { - "names": [ - "var1", - "var1" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var1", + "name": "var1", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -53,21 +37,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A new variable.", "properties": [ { @@ -94,9 +79,7 @@ } ], "mode": "basic", - "gen_examples": [ - "example" - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_calc_variable_empty.json b/tests/results/test_without_family/60_5family_dynamic_calc_variable_empty.json index 7f5b92288..5b641bcca 100644 --- a/tests/results/test_without_family/60_5family_dynamic_calc_variable_empty.json +++ b/tests/results/test_without_family/60_5family_dynamic_calc_variable_empty.json @@ -1,11 +1,7 @@ { "var1": { - "type": "variable", - "variable_type": "string", "path": "var1", - "names": [ - "var1" - ], + "name": "var1", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "dyn{{ identifier }}", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "dyn{{ identifier }}", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,29 +51,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.var", + "name": "var", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -92,35 +67,22 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\" if it is defined", - "path": { - "path": "dyn{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A dynamic variable" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable calculated.", "properties": [ { @@ -131,9 +93,20 @@ } ], "mode": "standard", - "gen_examples": [ - "example" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\" if it is defined", + "path": { + "path": "dyn{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A dynamic variable" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_hidden_suffix.json b/tests/results/test_without_family/60_5family_dynamic_hidden_suffix.json index a7fab8583..cdf1f3cf6 100644 --- a/tests/results/test_without_family/60_5family_dynamic_hidden_suffix.json +++ b/tests/results/test_without_family/60_5family_dynamic_hidden_suffix.json @@ -2,19 +2,8 @@ "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", "description": "A dynamic family", "properties": [ { @@ -28,20 +17,29 @@ } ], "mode": "standard", - "identifier": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], "help": [ "This family builds families dynamically" + ], + "identifier": [ + "val1", + "val2" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "dyn{{ identifier }}.var", + "name": "var", + "description": "A variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -50,25 +48,17 @@ "val2" ] ], - "path": "dyn{{ identifier }}.var", - "description": "A variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" }, "family": { "type": "family", "informations": { - "names": [ - "family", - "family" - ], + "path": "dyn{{ identifier }}.family", + "name": "family", + "description": "A family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -76,18 +66,15 @@ [ "val2" ] - ], - "path": "dyn{{ identifier }}.family", - "description": "A family", - "properties": [], - "mode": "standard" + ] }, "children": { "var": { - "names": [ - "var", - "var" - ], + "path": "dyn{{ identifier }}.family.var", + "name": "var", + "description": "A new variable.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -96,17 +83,8 @@ "val2" ] ], - "path": "dyn{{ identifier }}.family.var", - "description": "A new variable.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - "example", - "example" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix.json index 1f168c5f3..fefd99a75 100644 --- a/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_val1", - "dyn_val2" - ], + "path": "dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,33 +57,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn_{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -102,35 +73,26 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var2": { - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable \"{0}\"", - "path": { - "path": "dyn_{{ identifier }}.var", - "identifiers": [ - "val1" - ], - "type": "variable" - }, - "description": "A variable inside dynamic family" - } - }, - "variable_type": "string", "path": "var2", - "names": [ - "var2" - ], + "name": "var2", "description": "A variable.", "properties": [ { @@ -141,9 +103,20 @@ } ], "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": { + "message": "the value of the variable \"{0}\"", + "path": { + "path": "dyn_{{ identifier }}.var", + "identifiers": [ + "val1" + ] + }, + "description": "A variable inside dynamic family" + } + }, + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix_empty.json b/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix_empty.json index 201da66c2..f6892a8cc 100644 --- a/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix_empty.json +++ b/tests/results/test_without_family/60_5family_dynamic_variable_outside_suffix_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "Asuffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dyn_val1", - "dyn_val2" - ], + "path": "dyn_{{ identifier }}", + "name": "dyn_{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn_{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "standard", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,33 +51,13 @@ }, "description": "Asuffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "var": { - "names": [ - "var", - "var" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn_{{ identifier }}.var", + "name": "var", "description": "A variable inside dynamic family.", - "type": "variable", - "default": { - "name": "Default", - "values": "the value of the identifier" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -96,15 +67,29 @@ } ], "mode": "standard", - "gen_examples": [ - "val1", - "val2" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "the value of the identifier" + }, + "variable_type": "string" } } }, "var2": { + "path": "var2", + "name": "var2", + "description": "A variable.", + "properties": [], + "mode": "standard", "type": "variable", "default": { "name": "Default", @@ -114,23 +99,11 @@ "path": "dyn_{{ identifier }}.var", "identifiers": [ "val1" - ], - "type": "variable" + ] }, "description": "A variable inside dynamic family" } }, - "variable_type": "string", - "path": "var2", - "names": [ - "var2" - ], - "description": "A variable.", - "properties": [], - "mode": "standard", - "gen_examples": [ - "val1" - ], - "mandatory_without_value": false + "variable_type": "string" } } \ No newline at end of file diff --git a/tests/results/test_without_family/60_6family_dynamic_leadership.json b/tests/results/test_without_family/60_6family_dynamic_leadership.json index 3257dfae5..483600687 100644 --- a/tests/results/test_without_family/60_6family_dynamic_leadership.json +++ b/tests/results/test_without_family/60_6family_dynamic_leadership.json @@ -1,18 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": [ - "val1", - "val2" - ] - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -29,22 +18,25 @@ } ], "mode": "standard", - "multiple": true, - "gen_examples": [ - [ + "type": "variable", + "default": { + "name": "Default", + "values": [ "val1", "val2" ] - ], - "mandatory_without_value": false + }, + "variable_type": "string", + "multiple": true }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -53,10 +45,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -66,19 +57,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "leadership": { "type": "leadership", "informations": { - "names": [ - "leadership", - "leadership" - ], + "path": "dyn{{ identifier }}.leadership", + "name": "leadership", + "description": "A leadership", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -87,32 +76,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership", - "description": "A leadership", - "properties": [], - "mode": "basic", "help": [ "This family contains lists of variable blocks" ] }, "children": { "leader": { - "names": [ - "leader", - "leader" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.leadership.leader", + "name": "leader", "description": "A leader.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -128,22 +100,24 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "example" + "val1" ], [ - "example" + "val2" ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "names": [ - "follower1", - "follower1" - ], + "path": "dyn{{ identifier }}.leadership.follower1", + "name": "follower1", + "description": "A follower1.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -152,27 +126,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower1", - "description": "A follower1.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" }, "follower2": { - "names": [ - "follower2", - "follower2" - ], + "path": "dyn{{ identifier }}.leadership.follower2", + "name": "follower2", + "description": "A follower2.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -181,21 +143,8 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower2", - "description": "A follower2.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json b/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json index 6bc03850f..1792f9e74 100644 --- a/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json @@ -1,11 +1,7 @@ { "var": { - "type": "variable", - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -16,6 +12,8 @@ } ], "mode": "standard", + "type": "variable", + "variable_type": "string", "multiple": true, "examples": { "name": "Examples", @@ -23,22 +21,16 @@ "val1", "val2" ] - }, - "gen_examples": [ - [ - "val1", - "val2" - ] - ], - "mandatory_without_value": false + } }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -47,10 +39,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ { "message": "the value of the variable \"{0}\"", @@ -60,19 +51,17 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "leadership": { "type": "leadership", "informations": { - "names": [ - "leadership", - "leadership" - ], + "path": "dyn{{ identifier }}.leadership", + "name": "leadership", + "description": "A leadership", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -81,32 +70,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership", - "description": "A leadership", - "properties": [], - "mode": "basic", "help": [ "This family contains lists of variable blocks" ] }, "children": { "leader": { - "names": [ - "leader", - "leader" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.leadership.leader", + "name": "leader", "description": "A leader.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -122,22 +94,24 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ + "identifiers": [ [ - "example" + "val1" ], [ - "example" + "val2" ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string", + "multiple": true }, "follower1": { - "names": [ - "follower1", - "follower1" - ], + "path": "dyn{{ identifier }}.leadership.follower1", + "name": "follower1", + "description": "A follower1.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -146,27 +120,15 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower1", - "description": "A follower1.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" }, "follower2": { - "names": [ - "follower2", - "follower2" - ], + "path": "dyn{{ identifier }}.leadership.follower2", + "name": "follower2", + "description": "A follower2.", + "properties": [], + "mode": "standard", "identifiers": [ [ "val1" @@ -175,21 +137,8 @@ "val2" ] ], - "path": "dyn{{ identifier }}.leadership.follower2", - "description": "A follower2.", "type": "variable", - "variable_type": "string", - "properties": [], - "mode": "standard", - "gen_examples": [ - [ - "example" - ], - [ - "example" - ] - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/60_9family_dynamic_calc_both.json b/tests/results/test_without_family/60_9family_dynamic_calc_both.json index 928c6bb83..606dde925 100644 --- a/tests/results/test_without_family/60_9family_dynamic_calc_both.json +++ b/tests/results/test_without_family/60_9family_dynamic_calc_both.json @@ -1,15 +1,7 @@ { "var": { - "type": "variable", - "default": { - "name": "Default", - "values": "val2" - }, - "variable_type": "string", "path": "var", - "names": [ - "var" - ], + "name": "var", "description": "A suffix variable.", "properties": [ { @@ -20,18 +12,21 @@ } ], "mode": "standard", - "gen_examples": [ - "val2" - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "val2" + }, + "variable_type": "string" }, "dyn{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "dynval1", - "dynval2" - ], + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", "identifiers": [ [ "val1" @@ -40,10 +35,9 @@ "val2" ] ], - "path": "dyn{{ identifier }}", - "description": "A dynamic family", - "properties": [], - "mode": "basic", + "help": [ + "This family builds families dynamically" + ], "identifier": [ "val1", { @@ -54,29 +48,13 @@ }, "description": "A suffix variable" } - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "vardyn": { - "names": [ - "vardyn", - "vardyn" - ], - "identifiers": [ - [ - "val1" - ], - [ - "val2" - ] - ], "path": "dyn{{ identifier }}.vardyn", + "name": "vardyn", "description": "A dynamic variable.", - "type": "variable", - "variable_type": "string", "properties": [ { "type": "property", @@ -86,11 +64,16 @@ } ], "mode": "basic", - "gen_examples": [ - "example", - "example" + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/68_0family_leadership_mode.json b/tests/results/test_without_family/68_0family_leadership_mode.json index 96a040174..65e8c5318 100644 --- a/tests/results/test_without_family/68_0family_leadership_mode.json +++ b/tests/results/test_without_family/68_0family_leadership_mode.json @@ -3,9 +3,7 @@ "type": "leadership", "informations": { "path": "leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leadership", "properties": [], "mode": "basic", @@ -15,12 +13,8 @@ }, "children": { "leader": { - "type": "variable", - "variable_type": "string", "path": "leader.leader", - "names": [ - "leader" - ], + "name": "leader", "description": "A leader.", "properties": [ { @@ -31,38 +25,22 @@ } ], "mode": "basic", - "multiple": true, - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false - }, - "follower1": { "type": "variable", "variable_type": "string", + "multiple": true + }, + "follower1": { "path": "leader.follower1", - "names": [ - "follower1" - ], + "name": "follower1", "description": "A follower1.", "properties": [], "mode": "standard", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": false + "type": "variable", + "variable_type": "string" }, "follower2": { - "type": "variable", - "variable_type": "string", "path": "leader.follower2", - "names": [ - "follower2" - ], + "name": "follower2", "description": "A follower2.", "properties": [ { @@ -73,12 +51,8 @@ } ], "mode": "basic", - "gen_examples": [ - [ - "example" - ] - ], - "mandatory_without_value": true + "type": "variable", + "variable_type": "string" } } } diff --git a/tests/results/test_without_family/warnings_16_2family_redefine_calculation b/tests/results/test_without_family/warnings_16_2family_redefine_calculation index 3f9eeed42..df74ea6b7 100644 --- a/tests/results/test_without_family/warnings_16_2family_redefine_calculation +++ b/tests/results/test_without_family/warnings_16_2family_redefine_calculation @@ -1 +1 @@ -["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\"", "\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\""] \ No newline at end of file +["\"disabled\" is a calculation for family but has no description in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_2family_redefine_calculation/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_without_family/warnings_16_3family_empty_at_ends b/tests/results/test_without_family/warnings_16_3family_empty_at_ends index 24f1e340f..1f3058183 100644 --- a/tests/results/test_without_family/warnings_16_3family_empty_at_ends +++ b/tests/results/test_without_family/warnings_16_3family_empty_at_ends @@ -1 +1 @@ -["No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\"", "No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"family\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\" and \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/01-base.yml\"", "No attribute \"description\" for \"family.var1\" in \"../../rougail-tests/structures/16_3family_empty_at_ends/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_without_family/warnings_20_2family_looks_like_dynamic b/tests/results/test_without_family/warnings_20_2family_looks_like_dynamic index e707364ec..8a0a73d67 100644 --- a/tests/results/test_without_family/warnings_20_2family_looks_like_dynamic +++ b/tests/results/test_without_family/warnings_20_2family_looks_like_dynamic @@ -1 +1 @@ -["No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.dynamic\" in \"../../rougail-tests/structures/20_2family_looks_like_dynamic/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_without_family/warnings_20_2family_looks_like_variable b/tests/results/test_without_family/warnings_20_2family_looks_like_variable index bac0697e5..4c3a70745 100644 --- a/tests/results/test_without_family/warnings_20_2family_looks_like_variable +++ b/tests/results/test_without_family/warnings_20_2family_looks_like_variable @@ -1 +1 @@ -["No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"my_family\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\"", "No attribute \"description\" for \"my_family.default\" in \"../../rougail-tests/structures/20_2family_looks_like_variable/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory b/tests/results/test_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory index cf9783a34..02c23d08a 100644 --- a/tests/results/test_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory +++ b/tests/results/test_without_family/warnings_40_9leadership-calculation-outside-follower-no-mandatory @@ -1 +1 @@ -["No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file +["No attribute \"description\" for \"leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.leader\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"leader.follower\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\"", "No attribute \"description\" for \"variable\" in \"../../rougail-tests/structures/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/results/test_without_family/warnings_60_0family_dynamic_forbidden_char b/tests/results/test_without_family/warnings_60_0family_dynamic_forbidden_char index 7d2eda8c3..2ea96ed2b 100644 --- a/tests/results/test_without_family/warnings_60_0family_dynamic_forbidden_char +++ b/tests/results/test_without_family/warnings_60_0family_dynamic_forbidden_char @@ -1 +1 @@ -["\"default\" is a calculation for dynval_1.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file +["\"default\" is a calculation for dyn{{ identifier }}.var2 but has no description in \"../../rougail-tests/structures/60_0family_dynamic_forbidden_char/rougail/00-base.yml\""] \ No newline at end of file diff --git a/tests/root_a_dynamic_family1.a_subdyn_family4.a_variable.json b/tests/root_a_dynamic_family1.a_subdyn_family4.a_variable.json index 3b963f596..8190f4d00 100644 --- a/tests/root_a_dynamic_family1.a_subdyn_family4.a_variable.json +++ b/tests/root_a_dynamic_family1.a_subdyn_family4.a_variable.json @@ -2,17 +2,15 @@ "a_dynamic_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_dynamic_family1" - ], + "path": "a_dynamic_{{ identifier }}", + "name": "a_dynamic_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1" ] ], - "path": "a_dynamic_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], "help": [ "This family builds families dynamically" ] @@ -21,41 +19,25 @@ "a_subdyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_subdyn_family4" - ], + "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}", + "name": "a_subdyn_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1", "family4" ] ], - "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], "help": [ "This family builds families dynamically" ] }, "children": { "a_variable": { - "names": [ - "a_variable" - ], - "identifiers": [ - [ - "family1", - "family4" - ] - ], "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}.a_variable", + "name": "a_variable", "description": "A variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "a_value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -64,10 +46,18 @@ "access_control": false } ], - "gen_examples": [ - "a_value" + "identifiers": [ + [ + "family1", + "family4" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a_value" + }, + "variable_type": "string" } } } diff --git a/tests/root_a_dynamic_family1.a_subdyn_family4.json b/tests/root_a_dynamic_family1.a_subdyn_family4.json index 3b963f596..8190f4d00 100644 --- a/tests/root_a_dynamic_family1.a_subdyn_family4.json +++ b/tests/root_a_dynamic_family1.a_subdyn_family4.json @@ -2,17 +2,15 @@ "a_dynamic_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_dynamic_family1" - ], + "path": "a_dynamic_{{ identifier }}", + "name": "a_dynamic_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1" ] ], - "path": "a_dynamic_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], "help": [ "This family builds families dynamically" ] @@ -21,41 +19,25 @@ "a_subdyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_subdyn_family4" - ], + "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}", + "name": "a_subdyn_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1", "family4" ] ], - "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], "help": [ "This family builds families dynamically" ] }, "children": { "a_variable": { - "names": [ - "a_variable" - ], - "identifiers": [ - [ - "family1", - "family4" - ] - ], "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}.a_variable", + "name": "a_variable", "description": "A variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "a_value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -64,10 +46,18 @@ "access_control": false } ], - "gen_examples": [ - "a_value" + "identifiers": [ + [ + "family1", + "family4" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a_value" + }, + "variable_type": "string" } } } diff --git a/tests/root_a_dynamic_family1.a_subfamily.json b/tests/root_a_dynamic_family1.a_subfamily.json index 10b19a159..c047403d6 100644 --- a/tests/root_a_dynamic_family1.a_subfamily.json +++ b/tests/root_a_dynamic_family1.a_subfamily.json @@ -2,17 +2,15 @@ "a_dynamic_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_dynamic_family1" - ], + "path": "a_dynamic_{{ identifier }}", + "name": "a_dynamic_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1" ] ], - "path": "a_dynamic_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], "help": [ "This family builds families dynamically" ] @@ -21,36 +19,21 @@ "a_subfamily": { "type": "family", "informations": { - "names": [ - "a_subfamily" - ], + "path": "a_dynamic_{{ identifier }}.a_subfamily", + "name": "a_subfamily", + "description": "A sub family", + "properties": [], "identifiers": [ [ "family1" ] - ], - "path": "a_dynamic_{{ identifier }}.a_subfamily", - "description": "A sub family", - "properties": [] + ] }, "children": { "a_variable": { - "names": [ - "a_variable" - ], - "identifiers": [ - [ - "family1" - ] - ], "path": "a_dynamic_{{ identifier }}.a_subfamily.a_variable", + "name": "a_variable", "description": "A variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "a_value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -59,10 +42,17 @@ "access_control": false } ], - "gen_examples": [ - "a_value" + "identifiers": [ + [ + "family1" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a_value" + }, + "variable_type": "string" } } } diff --git a/tests/root_a_dynamic_family1.a_variable.json b/tests/root_a_dynamic_family1.a_variable.json index cfab92718..e198cd81d 100644 --- a/tests/root_a_dynamic_family1.a_variable.json +++ b/tests/root_a_dynamic_family1.a_variable.json @@ -2,39 +2,24 @@ "a_dynamic_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_dynamic_family1" - ], + "path": "a_dynamic_{{ identifier }}", + "name": "a_dynamic_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1" ] ], - "path": "a_dynamic_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], "help": [ "This family builds families dynamically" ] }, "children": { "a_variable": { - "names": [ - "a_variable" - ], - "identifiers": [ - [ - "family1" - ] - ], "path": "a_dynamic_{{ identifier }}.a_variable", + "name": "a_variable", "description": "A variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "a_value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -43,10 +28,17 @@ "access_control": false } ], - "gen_examples": [ - "a_value" + "identifiers": [ + [ + "family1" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a_value" + }, + "variable_type": "string" } } } diff --git a/tests/root_a_dynamic_family1.json b/tests/root_a_dynamic_family1.json index 8420b1432..06a9ecc0d 100644 --- a/tests/root_a_dynamic_family1.json +++ b/tests/root_a_dynamic_family1.json @@ -2,39 +2,24 @@ "a_dynamic_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_dynamic_family1" - ], + "path": "a_dynamic_{{ identifier }}", + "name": "a_dynamic_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1" ] ], - "path": "a_dynamic_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], "help": [ "This family builds families dynamically" ] }, "children": { "a_variable": { - "names": [ - "a_variable" - ], - "identifiers": [ - [ - "family1" - ] - ], "path": "a_dynamic_{{ identifier }}.a_variable", + "name": "a_variable", "description": "A variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "a_value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -43,44 +28,36 @@ "access_control": false } ], - "gen_examples": [ - "a_value" + "identifiers": [ + [ + "family1" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a_value" + }, + "variable_type": "string" }, "a_subfamily": { "type": "family", "informations": { - "names": [ - "a_subfamily" - ], + "path": "a_dynamic_{{ identifier }}.a_subfamily", + "name": "a_subfamily", + "description": "A sub family", + "properties": [], "identifiers": [ [ "family1" ] - ], - "path": "a_dynamic_{{ identifier }}.a_subfamily", - "description": "A sub family", - "properties": [] + ] }, "children": { "a_variable": { - "names": [ - "a_variable" - ], - "identifiers": [ - [ - "family1" - ] - ], "path": "a_dynamic_{{ identifier }}.a_subfamily.a_variable", + "name": "a_variable", "description": "A variable.", - "type": "variable", - "default": { - "name": "Default", - "values": "a_value" - }, - "variable_type": "string", "properties": [ { "type": "property", @@ -89,20 +66,27 @@ "access_control": false } ], - "gen_examples": [ - "a_value" + "identifiers": [ + [ + "family1" + ] ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": "a_value" + }, + "variable_type": "string" } } }, "a_subdyn_{{ identifier }}": { "type": "dynamic", "informations": { - "names": [ - "a_subdyn_family3", - "a_subdyn_family4" - ], + "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}", + "name": "a_subdyn_{{ identifier }}", + "description": "A dynamic {{ identifier }}", + "properties": [], "identifiers": [ [ "family1", @@ -113,22 +97,26 @@ "family4" ] ], - "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}", - "description": "A dynamic {{ identifier }}", - "properties": [], + "help": [ + "This family builds families dynamically" + ], "identifier": [ "family3", "family4" - ], - "help": [ - "This family builds families dynamically" ] }, "children": { "a_variable": { - "names": [ - "a_variable", - "a_variable" + "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}.a_variable", + "name": "a_variable", + "description": "A variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } ], "identifiers": [ [ @@ -140,27 +128,12 @@ "family4" ] ], - "path": "a_dynamic_{{ identifier }}.a_subdyn_{{ identifier }}.a_variable", - "description": "A variable.", "type": "variable", "default": { "name": "Default", "values": "a_value" }, - "variable_type": "string", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "gen_examples": [ - "a_value", - "a_value" - ], - "mandatory_without_value": false + "variable_type": "string" } } } diff --git a/tests/root_a_family.a_second_family.a_variable.json b/tests/root_a_family.a_second_family.a_variable.json index 2e74a537c..3c1762b15 100644 --- a/tests/root_a_family.a_second_family.a_variable.json +++ b/tests/root_a_family.a_second_family.a_variable.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "a_family", - "names": [ - "a_family" - ], + "name": "a_family", "description": "First family", "properties": [] }, @@ -14,24 +12,14 @@ "type": "family", "informations": { "path": "a_family.a_second_family", - "names": [ - "a_second_family" - ], + "name": "a_second_family", "description": "A second family", "properties": [] }, "children": { "a_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "a_family.a_second_family.a_variable", - "names": [ - "a_variable" - ], + "name": "a_variable", "description": "A boolean variable.", "properties": [ { @@ -41,10 +29,12 @@ "access_control": false } ], - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } } diff --git a/tests/root_a_family.an_other_family.json b/tests/root_a_family.an_other_family.json index 522fda1d5..b27476371 100644 --- a/tests/root_a_family.an_other_family.json +++ b/tests/root_a_family.an_other_family.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "a_family", - "names": [ - "a_family" - ], + "name": "a_family", "description": "First family", "properties": [] }, @@ -14,9 +12,7 @@ "type": "family", "informations": { "path": "a_family.an_other_family", - "names": [ - "an_other_family" - ], + "name": "an_other_family", "description": "An other family", "properties": [ { @@ -36,6 +32,17 @@ }, "children": { "a_variable": { + "path": "a_family.an_other_family.a_variable", + "name": "a_variable", + "description": "A new variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], "type": "variable", "default": { "name": "Default", @@ -48,24 +55,7 @@ "description": "A root variable" } }, - "variable_type": "integer", - "path": "a_family.an_other_family.a_variable", - "names": [ - "a_variable" - ], - "description": "A new variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "gen_examples": [ - 2 - ], - "mandatory_without_value": false + "variable_type": "integer" } } } diff --git a/tests/root_a_family.json b/tests/root_a_family.json index 1345168ad..fe1f58df9 100644 --- a/tests/root_a_family.json +++ b/tests/root_a_family.json @@ -3,9 +3,7 @@ "type": "family", "informations": { "path": "a_family", - "names": [ - "a_family" - ], + "name": "a_family", "description": "First family", "properties": [] }, @@ -14,24 +12,14 @@ "type": "family", "informations": { "path": "a_family.a_second_family", - "names": [ - "a_second_family" - ], + "name": "a_second_family", "description": "A second family", "properties": [] }, "children": { "a_variable": { - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean", "path": "a_family.a_second_family.a_variable", - "names": [ - "a_variable" - ], + "name": "a_variable", "description": "A boolean variable.", "properties": [ { @@ -41,10 +29,12 @@ "access_control": false } ], - "gen_examples": [ - true - ], - "mandatory_without_value": false + "type": "variable", + "default": { + "name": "Default", + "values": true + }, + "variable_type": "boolean" } } }, @@ -52,9 +42,7 @@ "type": "family", "informations": { "path": "a_family.an_other_family", - "names": [ - "an_other_family" - ], + "name": "an_other_family", "description": "An other family", "properties": [ { @@ -74,6 +62,17 @@ }, "children": { "a_variable": { + "path": "a_family.an_other_family.a_variable", + "name": "a_variable", + "description": "A new variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], "type": "variable", "default": { "name": "Default", @@ -86,24 +85,7 @@ "description": "A root variable" } }, - "variable_type": "integer", - "path": "a_family.an_other_family.a_variable", - "names": [ - "a_variable" - ], - "description": "A new variable.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "gen_examples": [ - 2 - ], - "mandatory_without_value": false + "variable_type": "integer" } } } diff --git a/tests/root_a_family_example.adoc b/tests/root_a_family_example.adoc index d92a47117..df8de3402 100644 --- a/tests/root_a_family_example.adoc +++ b/tests/root_a_family_example.adoc @@ -6,6 +6,4 @@ a_family: a_second_family: a_variable: true - an_other_family: - a_variable: 2 ---- diff --git a/tests/root_a_family_example.gitlab.md b/tests/root_a_family_example.gitlab.md index 8893dd5b1..eb26b2af9 100644 --- a/tests/root_a_family_example.gitlab.md +++ b/tests/root_a_family_example.gitlab.md @@ -5,8 +5,6 @@ a_family: a_second_family: a_variable: true - an_other_family: - a_variable: 2 ``` diff --git a/tests/root_a_family_example.html b/tests/root_a_family_example.html index f376478c5..a17245e1a 100644 --- a/tests/root_a_family_example.html +++ b/tests/root_a_family_example.html @@ -2,6 +2,4 @@ 
    a_family:
   a_second_family:
-    a_variable: true
-  an_other_family:
-    a_variable: 2
    \ No newline at end of file + a_variable: true \ No newline at end of file diff --git a/tests/root_a_family_example.md b/tests/root_a_family_example.md index 7e9da1fa5..3cd8cc014 100644 --- a/tests/root_a_family_example.md +++ b/tests/root_a_family_example.md @@ -5,6 +5,4 @@ a_family: a_second_family: a_variable: true - an_other_family: - a_variable: 2 ``` diff --git a/tests/root_a_family_example.sh b/tests/root_a_family_example.sh index b18763182..7cfc4989f 100644 --- a/tests/root_a_family_example.sh +++ b/tests/root_a_family_example.sh @@ -4,6 +4,4 @@ a_family:   a_second_family:   a_variable: true  - an_other_family:  - a_variable: 2  diff --git a/tests/test_load.py b/tests/test_load.py index 2914bf55e..b5894a11c 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -1,6 +1,6 @@ import os import warnings -from json import dumps, loads +from json import load, dumps, loads from pytest import fixture # , raises from pathlib import Path from contextlib import chdir @@ -38,7 +38,7 @@ def test_dir(request): return request.param -EXT = {'github': 'md', 'asciidoc': 'adoc', 'json': 'json', 'console': 'sh', 'gitlab': 'gitlab.md', "html": "html"} +EXT = {'json': 'json', 'github': 'md', 'asciidoc': 'adoc', 'console': 'sh', 'gitlab': 'gitlab.md', "html": "html"} #EXT = {'json': 'json'} #EXT = {'console': 'sh'} @@ -50,6 +50,7 @@ def gen_cases(ext_name): for without_family in [False, True]: for comment in [False, True]: for examples in [False, True]: + #for examples in [False]: if comment and not examples: continue if examples and ext_name == "json": @@ -75,6 +76,7 @@ def _test_structural_files(test_dir, namespace): ################################## rougailconfig['step.output'] = 'doc' doc = None + informations_file = test_dir / 'informations.json' for ext_name, ext in EXT.items(): rougailconfig['doc.output_format'] = ext_name for without_family, comment, examples, changelog in gen_cases(ext_name): @@ -102,6 +104,14 @@ def _test_structural_files(test_dir, namespace): warnings.simplefilter("always", UserWarning) rougail = Rougail(rougailconfig) config = rougail.run() + config.information.set('test_information', 'value') + config.information.set('test_information_list', ['value']) + if informations_file.is_file(): + with informations_file.open() as informations: + for key, value in load(informations).items(): + if not namespace: + key = key.split('.', 1)[-1] + config.option(key).information.set('test_information', value) doc = RougailOutput(config, rougailconfig=rougailconfig) with warnings.catch_warnings(record=True) as wn: warnings.simplefilter("always", UserWarning) diff --git a/tests/test_root.py b/tests/test_root.py index bbc851780..c21461acf 100644 --- a/tests/test_root.py +++ b/tests/test_root.py @@ -21,6 +21,8 @@ def _test_root(root, contents=None): rougail = Rougail(rougailconfig) config = rougail.run() subconfig = config.option(root) + if "an_other_family" in root: + config.option("a_family.a_second_family.a_variable").value.set(False) # rougailconfig['doc.root'] = root if contents == 'changelog': rougailconfig["doc.changelog.previous_json_file"] = str(test_dir / "empty/out.json")