diff --git a/src/rougail/output_doc/annotator.py b/src/rougail/output_doc/annotator.py index 171027c1b..bad6e3cef 100644 --- a/src/rougail/output_doc/annotator.py +++ b/src/rougail/output_doc/annotator.py @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from typing import Union +from re import compile from rougail.utils import undefined, PROPERTY_ATTRIBUTE from rougail.annotator.variable import Walk @@ -55,6 +56,7 @@ class Annotator(Walk): self.change_default_value = self.objectspace.rougailconfig[ "doc.change_default_value" ] + self.regexp_description_get_paths = None self.populate_family() self.populate_variable() @@ -233,7 +235,30 @@ class Annotator(Walk): if not isinstance(values, Calculation): return {"value": values} if values.description: - return {"description": values.description} + if not self.regexp_description_get_paths: + self.regexp_description_get_paths = compile('"(.*?)"') + index = 0 + description = values.description + variables = [] + for r_path in self.regexp_description_get_paths.findall(description): + variable, identifiers = self.objectspace.paths.get_with_dynamic( + r_path, + path, + values.version, + values.namespace, + values.xmlfiles, + ) + if variable: + description = description.replace(f'"{r_path}"', f'"{{{index}}}"') + v = {"path": variable.path, "description": variable.description} + if identifiers: + v["identifiers"] = identifiers + variables.append(v) + index += 1 + ret = {"description": description} + if variables: + ret["variables"] = variables + return ret if isinstance(values, JinjaCalculation): if values.description: value = values.description diff --git a/src/rougail/output_doc/doc.py b/src/rougail/output_doc/doc.py index 468b0f9fe..ef45e4b2c 100644 --- a/src/rougail/output_doc/doc.py +++ b/src/rougail/output_doc/doc.py @@ -664,7 +664,7 @@ class RougailOutputDoc(Examples, Changelog): values = calculation["description"] # if not values.endswith("."): # values += "." - return values + return calculation if "type" not in calculation: return calculation["value"] if calculation["type"] == "jinja": diff --git a/src/rougail/output_doc/utils.py b/src/rougail/output_doc/utils.py index fce23e99e..7db769bda 100644 --- a/src/rougail/output_doc/utils.py +++ b/src/rougail/output_doc/utils.py @@ -766,7 +766,7 @@ class CommonFormatter: if p not in new: properties.append(self.prop(p, italic=False, delete=True, underline=False)) if annotation is not None: - local_calculated_properties[p] = [self.delete(annotation)] + local_calculated_properties[p] = [{"annotation": annotation, "delete": True}] else: previous = new = [] @@ -788,9 +788,12 @@ class CommonFormatter: prop_name not in previous or new[prop_name] != previous[prop_name] ): - prop_annotation = self.underline(prop_annotation) + underline_ = True +# prop_annotation = self.underline(prop_annotation) + else: + underline_ = False local_calculated_properties.setdefault(prop["name"], []).append( - prop_annotation + {"annotation": prop_annotation, "underline": underline_} ) else: italic = False @@ -800,10 +803,19 @@ class CommonFormatter: calculated_property_name, calculated_property, ) in local_calculated_properties.items(): +# calculated_property = calculated_property_data["annotation"] + data = [] + for calc in calculated_property: + annotation = self.message_to_string(calc["annotation"], None)[1] + if calc.get("underline", False): + annotation = self.underline(annotation) + if calc.get("delete", False): + annotation = self.delete(annotation) + data.append(annotation) if len(calculated_property) > 1: - calculated_property = self.join(calculated_property) + calculated_property = self.join(data) else: - calculated_property = calculated_property[0] + calculated_property = data[0] calculated_properties.append( self.section( calculated_property_name.capitalize(), calculated_property @@ -862,6 +874,23 @@ class CommonFormatter: 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) msg = msg["message"].format(path) + elif "description" in msg: + if "variables" in msg: + paths = [] + for variable in msg["variables"]: + filename = None + if self.other_root_filenames: + path = msg["path"] + for root in self.other_root_filenames: + 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)) + msg = msg["description"].format(*paths) + else: + msg = msg["description"] return ret, msg def section( diff --git a/tests/mode_advanced.adoc b/tests/mode_advanced.adoc index b40457d3a..bb71fa8eb 100644 --- a/tests/mode_advanced.adoc +++ b/tests/mode_advanced.adoc @@ -1,16 +1,10 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**var1** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | -My var1. -| - -**var2** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | -My var2. + +| **var1** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | My var1. +| **var2** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | My var2. + **Default**: the value of the variable "var1" |==== diff --git a/tests/mode_basic.adoc b/tests/mode_basic.adoc index d54c1a78d..6c7d28234 100644 --- a/tests/mode_basic.adoc +++ b/tests/mode_basic.adoc @@ -1,17 +1,11 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**var2** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | -My var2. + +| **var2** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | My var2. + **Default**: depends on an undocumented variable -| - -**var3** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `advanced` `mandatory` `__hidden__` | -My var3. + +| **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 640c3e600..26289760c 100644 --- a/tests/mode_basic_advanced.adoc +++ b/tests/mode_basic_advanced.adoc @@ -1,11 +1,8 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**var2** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | -My var2. + +| **var2** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | My var2. + **Default**: depends on an undocumented variable |==== diff --git a/tests/mode_basic_standard.adoc b/tests/mode_basic_standard.adoc index cdc52a9ee..488096c10 100644 --- a/tests/mode_basic_standard.adoc +++ b/tests/mode_basic_standard.adoc @@ -1,11 +1,8 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**var3** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `advanced` `mandatory` `__hidden__` | -My var3. + +| **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_standard.adoc b/tests/mode_standard.adoc index 548bd6d64..1fdba5566 100644 --- a/tests/mode_standard.adoc +++ b/tests/mode_standard.adoc @@ -1,16 +1,10 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**var1** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | -My var1. -| - -**var3** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `advanced` `mandatory` `__hidden__` | -My var3. + +| **var1** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | My var1. +| **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_standard_advanced.adoc b/tests/mode_standard_advanced.adoc index c08f0254e..cb4a4ad28 100644 --- a/tests/mode_standard_advanced.adoc +++ b/tests/mode_standard_advanced.adoc @@ -1,10 +1,7 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**var1** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | -My var1. +| **var1** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | My var1. |==== diff --git a/tests/results/test/00_2default_calculated.json b/tests/results/test/00_2default_calculated.json index 2d6dfe3c5..bfadaae64 100644 --- a/tests/results/test/00_2default_calculated.json +++ b/tests/results/test/00_2default_calculated.json @@ -33,7 +33,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var1" + "values": { + "description": "the value of var1" + } }, "properties": [ { diff --git a/tests/results/test/00_2default_calculated_multi.adoc b/tests/results/test/00_2default_calculated_multi.adoc index ac7d04384..09e330f02 100644 --- a/tests/results/test/00_2default_calculated_multi.adoc +++ b/tests/results/test/00_2default_calculated_multi.adoc @@ -10,6 +10,6 @@ * maybe | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | A second variable. + -**Default**: the value of _.var1 +**Default**: the value of "var1" |==== diff --git a/tests/results/test/00_2default_calculated_multi.gitlab.md b/tests/results/test/00_2default_calculated_multi.gitlab.md index 388f05e58..3bcd94297 100644 --- a/tests/results/test/00_2default_calculated_multi.gitlab.md +++ b/tests/results/test/00_2default_calculated_multi.gitlab.md @@ -1,5 +1,5 @@ -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------| -| **var1**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
**Default**:
• no
• yes
• maybe | -| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of _.var1 | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------| +| **var1**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
**Default**:
• no
• yes
• maybe | +| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of "[a first variable](#var1)" | diff --git a/tests/results/test/00_2default_calculated_multi.html b/tests/results/test/00_2default_calculated_multi.html index 3bad76f66..13dc8c5b6 100644 --- a/tests/results/test/00_2default_calculated_multi.html +++ b/tests/results/test/00_2default_calculated_multi.html @@ -6,7 +6,7 @@ var1
string standard mandatory unique multipleA first variable.
Default: -var2
string standard mandatory unique multipleA second variable.
Default: the value of _.var1 +var2
string standard mandatory unique multipleA second variable.
Default: the value of "var1" diff --git a/tests/results/test/00_2default_calculated_multi.json b/tests/results/test/00_2default_calculated_multi.json index ed6f77f6a..72f75f565 100644 --- a/tests/results/test/00_2default_calculated_multi.json +++ b/tests/results/test/00_2default_calculated_multi.json @@ -49,7 +49,15 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of _.var1" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "var1", + "description": "a first variable" + } + ] + } }, "properties": [ { diff --git a/tests/results/test/00_2default_calculated_multi.md b/tests/results/test/00_2default_calculated_multi.md index 0e11e98bb..8cc162906 100644 --- a/tests/results/test/00_2default_calculated_multi.md +++ b/tests/results/test/00_2default_calculated_multi.md @@ -1,5 +1,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
**Default**:
• no
• yes
• maybe | -| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of _.var1 | +| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of "[a first variable](#var1)" | diff --git a/tests/results/test/00_2default_calculated_multi.sh b/tests/results/test/00_2default_calculated_multi.sh index 30eba9482..bac9c2c9e 100644 --- a/tests/results/test/00_2default_calculated_multi.sh +++ b/tests/results/test/00_2default_calculated_multi.sh @@ -8,6 +8,6 @@ │ │ • maybe │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var2 │ A second variable. │ -│  string   standard   mandatory    │ Default: the value of _.var1 │ +│  string   standard   mandatory    │ Default: the value of "var1" │ │ unique   multiple  │ │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test/00_2default_calculated_variable_description.json b/tests/results/test/00_2default_calculated_variable_description.json index 5026a349e..b2cd45bfd 100644 --- a/tests/results/test/00_2default_calculated_variable_description.json +++ b/tests/results/test/00_2default_calculated_variable_description.json @@ -29,7 +29,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value of a variable!" + "values": { + "description": "value of a variable!" + } }, "properties": [ { 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 b876da470..321dcfb59 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 @@ -29,7 +29,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value\nof\na\nvariable!" + "values": { + "description": "value\nof\na\nvariable!" + } }, "properties": [ { diff --git a/tests/results/test/00_6choice_calculation.json b/tests/results/test/00_6choice_calculation.json index 82ef8fd37..fdaff7905 100644 --- a/tests/results/test/00_6choice_calculation.json +++ b/tests/results/test/00_6choice_calculation.json @@ -21,7 +21,9 @@ ], "choices": { "name": "Choices", - "values": "choices is 0 to 9" + "values": { + "description": "choices is 0 to 9" + } }, "path": "var", "names": [ diff --git a/tests/results/test/00_8calculation_information.json b/tests/results/test/00_8calculation_information.json index 2b811dcc9..af19861e3 100644 --- a/tests/results/test/00_8calculation_information.json +++ b/tests/results/test/00_8calculation_information.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { diff --git a/tests/results/test/00_9default_calculation.json b/tests/results/test/00_9default_calculation.json index 3b4c6d25b..d6239bae0 100644 --- a/tests/results/test/00_9default_calculation.json +++ b/tests/results/test/00_9default_calculation.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "concat all parameters" + "values": { + "description": "concat all parameters" + } }, "properties": [ { diff --git a/tests/results/test/00_9default_calculation_information.json b/tests/results/test/00_9default_calculation_information.json index d897da249..d8ceb4c39 100644 --- a/tests/results/test/00_9default_calculation_information.json +++ b/tests/results/test/00_9default_calculation_information.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the information" + "values": { + "description": "returns the information" + } }, "properties": [ { diff --git a/tests/results/test/00_9default_calculation_param_optional.json b/tests/results/test/00_9default_calculation_param_optional.json index cfe0c0b13..2cf9f135c 100644 --- a/tests/results/test/00_9default_calculation_param_optional.json +++ b/tests/results/test/00_9default_calculation_param_optional.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns a value" + "values": { + "description": "returns a value" + } }, "properties": [ { diff --git a/tests/results/test/00_9default_integer.json b/tests/results/test/00_9default_integer.json index 3a7205645..387c2e116 100644 --- a/tests/results/test/00_9default_integer.json +++ b/tests/results/test/00_9default_integer.json @@ -21,7 +21,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "var", "names": [ diff --git a/tests/results/test/00_9default_number.json b/tests/results/test/00_9default_number.json index 3a7205645..387c2e116 100644 --- a/tests/results/test/00_9default_number.json +++ b/tests/results/test/00_9default_number.json @@ -21,7 +21,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "var", "names": [ diff --git a/tests/results/test/01_6string_multi_length.json b/tests/results/test/01_6string_multi_length.json index f0f3dc5c3..8d44c8fff 100644 --- a/tests/results/test/01_6string_multi_length.json +++ b/tests/results/test/01_6string_multi_length.json @@ -33,7 +33,9 @@ ], "validators": { "name": "Validator", - "values": "needs exactly 3 values" + "values": { + "description": "needs exactly 3 values" + } }, "path": "var1", "names": [ @@ -83,8 +85,12 @@ "validators": { "name": "Validators", "values": [ - "needs a minimum of 1 values", - "needs a maximum of 4 values" + { + "description": "needs a minimum of 1 values" + }, + { + "description": "needs a maximum of 4 values" + } ] }, "path": "var2", diff --git a/tests/results/test/01_8calculation_information_multi.json b/tests/results/test/01_8calculation_information_multi.json index 88c9a09f1..7024fb9d6 100644 --- a/tests/results/test/01_8calculation_information_multi.json +++ b/tests/results/test/01_8calculation_information_multi.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { 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 6ab7ea67b..0c9df0e9e 100644 --- a/tests/results/test/04_1auto_save_and_calculated_hidden.json +++ b/tests/results/test/04_1auto_save_and_calculated_hidden.json @@ -33,7 +33,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value is always yes" + "values": { + "description": "the value is always yes" + } }, "properties": [ { @@ -51,7 +53,9 @@ { "type": "property", "name": "hidden", - "annotation": "only if the variable var1 has value \"yes\"" + "annotation": { + "description": "only if the variable var1 has value \"yes\"" + } }, { "type": "property", diff --git a/tests/results/test/04_5disabled_calculation_boolean.json b/tests/results/test/04_5disabled_calculation_boolean.json index 9ff1de993..d0ffa6f75 100644 --- a/tests/results/test/04_5disabled_calculation_boolean.json +++ b/tests/results/test/04_5disabled_calculation_boolean.json @@ -47,7 +47,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "variable1", @@ -78,7 +80,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is not egal to \"yes\"" + "annotation": { + "description": "if condition is not egal to \"yes\"" + } } ], "path": "variable2", diff --git a/tests/results/test/04_5disabled_calculation_optional.json b/tests/results/test/04_5disabled_calculation_optional.json index 28772f7f4..40e5ed812 100644 --- a/tests/results/test/04_5disabled_calculation_optional.json +++ b/tests/results/test/04_5disabled_calculation_optional.json @@ -43,7 +43,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an unknown variable" + "annotation": { + "description": "calculation from an unknown variable" + } } ], "path": "var1", @@ -70,7 +72,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an condition variable" + "annotation": { + "description": "calculation from an condition variable" + } } ], "path": "var2", diff --git a/tests/results/test/04_5validators.json b/tests/results/test/04_5validators.json index fb2ab49c7..2f5b61664 100644 --- a/tests/results/test/04_5validators.json +++ b/tests/results/test/04_5validators.json @@ -17,7 +17,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "int", "names": [ diff --git a/tests/results/test/04_5validators_differ.json b/tests/results/test/04_5validators_differ.json index cd0d64c5f..1a7492acf 100644 --- a/tests/results/test/04_5validators_differ.json +++ b/tests/results/test/04_5validators_differ.json @@ -21,7 +21,9 @@ ], "validators": { "name": "Validator", - "values": "var1 must be different than var2" + "values": { + "description": "var1 must be different than var2" + } }, "path": "var1", "names": [ diff --git a/tests/results/test/04_5validators_multi.json b/tests/results/test/04_5validators_multi.json index d466a1e86..abb33a002 100644 --- a/tests/results/test/04_5validators_multi.json +++ b/tests/results/test/04_5validators_multi.json @@ -32,7 +32,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 10" + "values": { + "description": "check length is less than 10" + } }, "path": "var1", "names": [ diff --git a/tests/results/test/04_5validators_multi2.json b/tests/results/test/04_5validators_multi2.json index e92041f9d..066c4f98b 100644 --- a/tests/results/test/04_5validators_multi2.json +++ b/tests/results/test/04_5validators_multi2.json @@ -32,7 +32,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 3" + "values": { + "description": "check length is less than 3" + } }, "path": "var1", "names": [ diff --git a/tests/results/test/04_5validators_multi3.json b/tests/results/test/04_5validators_multi3.json index c4cf0732e..b1fdc890e 100644 --- a/tests/results/test/04_5validators_multi3.json +++ b/tests/results/test/04_5validators_multi3.json @@ -33,7 +33,9 @@ ], "validators": { "name": "Validator", - "values": "value must be equal to index" + "values": { + "description": "value must be equal to index" + } }, "path": "var1", "names": [ diff --git a/tests/results/test/04_5validators_warnings.json b/tests/results/test/04_5validators_warnings.json index d7e1d1188..c82e023b4 100644 --- a/tests/results/test/04_5validators_warnings.json +++ b/tests/results/test/04_5validators_warnings.json @@ -21,7 +21,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "int", "names": [ diff --git a/tests/results/test/16_5redefine_calculation.json b/tests/results/test/16_5redefine_calculation.json index 5eaa4ac30..986d227dd 100644 --- a/tests/results/test/16_5redefine_calculation.json +++ b/tests/results/test/16_5redefine_calculation.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns yes" + "values": { + "description": "returns yes" + } }, "properties": [ { diff --git a/tests/results/test/20_0validators_differ_redefine.json b/tests/results/test/20_0validators_differ_redefine.json index 947f37732..4e67f9078 100644 --- a/tests/results/test/20_0validators_differ_redefine.json +++ b/tests/results/test/20_0validators_differ_redefine.json @@ -81,7 +81,9 @@ ], "validators": { "name": "Validator", - "values": "var3 must be different than var2" + "values": { + "description": "var3 must be different than var2" + } }, "path": "var3", "names": [ 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 7b3178cff..0106951d5 100644 --- a/tests/results/test/24_0family_hidden_condition_sub_family.json +++ b/tests/results/test/24_0family_hidden_condition_sub_family.json @@ -45,7 +45,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 39aa237c3..9519b96d5 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 @@ -45,7 +45,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, diff --git a/tests/results/test/24_0family_mandatory_condition.json b/tests/results/test/24_0family_mandatory_condition.json index bd5731bf1..8e110485d 100644 --- a/tests/results/test/24_0family_mandatory_condition.json +++ b/tests/results/test/24_0family_mandatory_condition.json @@ -43,7 +43,9 @@ { "type": "property", "name": "mandatory", - "annotation": "only if rougail.condition has the value \"yes\"" + "annotation": { + "description": "only if rougail.condition has the value \"yes\"" + } } ], "path": "var", diff --git a/tests/results/test/24_7validators_variable_optional.json b/tests/results/test/24_7validators_variable_optional.json index 56440ca53..8f75a0295 100644 --- a/tests/results/test/24_7validators_variable_optional.json +++ b/tests/results/test/24_7validators_variable_optional.json @@ -34,8 +34,12 @@ "validators": { "name": "Validators", "values": [ - "int and int2 must be different", - "int and int3 must be different" + { + "description": "int and int2 must be different" + }, + { + "description": "int and int3 must be different" + } ] }, "path": "general.int", diff --git a/tests/results/test/40_0leadership_follower_default_calculation.json b/tests/results/test/40_0leadership_follower_default_calculation.json index 28527d4fe..afdfc9aa7 100644 --- a/tests/results/test/40_0leadership_follower_default_calculation.json +++ b/tests/results/test/40_0leadership_follower_default_calculation.json @@ -90,7 +90,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns follower1 value" + "values": { + "description": "returns follower1 value" + } }, "properties": [ { diff --git a/tests/results/test/40_8calculation_boolean.json b/tests/results/test/40_8calculation_boolean.json index 04b14cad0..a56bde7cf 100644 --- a/tests/results/test/40_8calculation_boolean.json +++ b/tests/results/test/40_8calculation_boolean.json @@ -33,7 +33,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { @@ -73,7 +75,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { diff --git a/tests/results/test/44_5leadership_leader_hidden_calculation.json b/tests/results/test/44_5leadership_leader_hidden_calculation.json index ac66906d0..969fcdcb3 100644 --- a/tests/results/test/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test/44_5leadership_leader_hidden_calculation.json @@ -45,7 +45,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is no" + "annotation": { + "description": "if condition is no" + } } ], "help": [ diff --git a/tests/results/test/44_6leadership_follower_disabled_calculation.json b/tests/results/test/44_6leadership_follower_disabled_calculation.json index 2d08a9b30..81e72de9a 100644 --- a/tests/results/test/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test/44_6leadership_follower_disabled_calculation.json @@ -102,7 +102,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "leader.follower", diff --git a/tests/results/test/60_1family_dynamic_jinja.json b/tests/results/test/60_1family_dynamic_jinja.json index f824bf2eb..7d8f66033 100644 --- a/tests/results/test/60_1family_dynamic_jinja.json +++ b/tests/results/test/60_1family_dynamic_jinja.json @@ -67,7 +67,9 @@ } ], "identifier": [ - "index of suffix value" + { + "description": "index of suffix value" + } ], "help": [ "This family builds families dynamically" diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.adoc b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.adoc index 23bafc59e..a3db045b8 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.adoc +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.adoc @@ -42,6 +42,6 @@ This family builds families dynamically. + | Variable | Description | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A second variable. + -**Default**: the value of var +**Default**: the value of "dyn__val1__.family.var" |==== diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.gitlab.md b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.gitlab.md index 006482612..d95352f96 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.gitlab.md +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.gitlab.md @@ -26,7 +26,7 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------| -| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
**Default**: the value of var | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------| +| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
**Default**: the value of "[with a variable](#dyn:::identifier:::.family.var)" | diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.html b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.html index 85a1d2f1f..22634a224 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.html +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.html @@ -39,10 +39,10 @@ This family builds families dynamically. - + - +
Variable Description
Variable Description
var2
string standard mandatory		A second variable.
Default: the value of var
var2
string standard mandatory		A second variable.
Default: the value of "dynval1.family.var"
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 ae80f6b38..94dc75bdf 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 @@ -149,7 +149,18 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "dyn{{ identifier }}.family.var", + "description": "with a variable", + "identifiers": [ + "val1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.md b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.md index f166b134f..02af63509 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.md +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.md @@ -26,5 +26,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
**Default**: the value of var | +| **var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
**Default**: the value of "[with a variable](#dyn:::identifier:::.family.var)" | diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.sh b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.sh index 3187c2e62..4f44ce8ee 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.sh +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.sh @@ -37,5 +37,6 @@ ┃ Variable  ┃ Description  ┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ │ var2 │ A second variable. │ -│  string   standard   mandatory  │ Default: the value of var │ +│  string   standard   mandatory  │ Default: the value of │ +│ │ "dynval1.family.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 d4f7b3aaa..219a20f0c 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 @@ -153,7 +153,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 64e6c73d9..7577d59c5 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 @@ -149,7 +149,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 4ed99d11e..5b37babb6 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 @@ -145,7 +145,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { diff --git a/tests/results/test/60_2family_dynamic_outside_calc.json b/tests/results/test/60_2family_dynamic_outside_calc.json index 0ef5784d7..fee09b1ff 100644 --- a/tests/results/test/60_2family_dynamic_outside_calc.json +++ b/tests/results/test/60_2family_dynamic_outside_calc.json @@ -126,7 +126,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 9c9eb2555..099eefb8f 100644 --- a/tests/results/test/60_2family_dynamic_outside_calc_empty.json +++ b/tests/results/test/60_2family_dynamic_outside_calc_empty.json @@ -122,7 +122,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 65b663828..a999ecdaa 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix_param.json @@ -98,7 +98,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { 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 f5a1f4982..60cfb9009 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 @@ -94,7 +94,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { diff --git a/tests/results/test/60_5family_dynamic_hidden_suffix.json b/tests/results/test/60_5family_dynamic_hidden_suffix.json index 0fbf78a1c..d4282338c 100644 --- a/tests/results/test/60_5family_dynamic_hidden_suffix.json +++ b/tests/results/test/60_5family_dynamic_hidden_suffix.json @@ -24,7 +24,9 @@ { "type": "property", "name": "hidden", - "annotation": "if suffix == 'val2'" + "annotation": { + "description": "if suffix == 'val2'" + } } ], "identifier": [ diff --git a/tests/results/test_namespace/00_2default_calculated.json b/tests/results/test_namespace/00_2default_calculated.json index bfe2d5309..c2330a8bc 100644 --- a/tests/results/test_namespace/00_2default_calculated.json +++ b/tests/results/test_namespace/00_2default_calculated.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var1" + "values": { + "description": "the value of var1" + } }, "properties": [ { diff --git a/tests/results/test_namespace/00_2default_calculated_multi.adoc b/tests/results/test_namespace/00_2default_calculated_multi.adoc index 8aab769a4..c7e3876a8 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.adoc +++ b/tests/results/test_namespace/00_2default_calculated_multi.adoc @@ -18,6 +18,6 @@ * maybe | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | A second variable. + -**Default**: the value of _.var1 +**Default**: the value of "rougail.var1" |==== diff --git a/tests/results/test_namespace/00_2default_calculated_multi.gitlab.md b/tests/results/test_namespace/00_2default_calculated_multi.gitlab.md index f1ce270ec..c351a8c1d 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.gitlab.md +++ b/tests/results/test_namespace/00_2default_calculated_multi.gitlab.md @@ -4,10 +4,10 @@ > **rougail**\ > `standard` -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------| -| **rougail.var1**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
**Default**:
• no
• yes
• maybe | -| **rougail.var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of _.var1 | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------| +| **rougail.var1**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
**Default**:
• no
• yes
• maybe | +| **rougail.var2**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
**Default**: the value of "[a first variable](#rougail.var1)" | diff --git a/tests/results/test_namespace/00_2default_calculated_multi.html b/tests/results/test_namespace/00_2default_calculated_multi.html index 07fe0b918..a9e2934f6 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.html +++ b/tests/results/test_namespace/00_2default_calculated_multi.html @@ -6,13 +6,13 @@ - + - +
  • maybe
    • +
    Variable Description
    Variable Description
    rougail.var1
    string standard mandatory unique multiple    		A first variable.
    Default:
    • no
    • yes
      • -
    • maybe
    rougail.var2
    string standard mandatory unique multiple    		A second variable.
    Default: the value of _.var1
    rougail.var2
    string standard mandatory unique multiple    		A second variable.
    Default: the value of "rougail.var1"
    diff --git a/tests/results/test_namespace/00_2default_calculated_multi.json b/tests/results/test_namespace/00_2default_calculated_multi.json index 39a1b16bc..933bb6933 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.json +++ b/tests/results/test_namespace/00_2default_calculated_multi.json @@ -65,7 +65,15 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of _.var1" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "rougail.var1", + "description": "a first variable" + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace/00_2default_calculated_multi.md b/tests/results/test_namespace/00_2default_calculated_multi.md index 84ff2e8c5..4f0890f85 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.md +++ b/tests/results/test_namespace/00_2default_calculated_multi.md @@ -8,5 +8,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#rougail.var1)" | diff --git a/tests/results/test_namespace/00_2default_calculated_multi.sh b/tests/results/test_namespace/00_2default_calculated_multi.sh index b07307fac..fa3aedb05 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.sh +++ b/tests/results/test_namespace/00_2default_calculated_multi.sh @@ -15,7 +15,7 @@ │ │ • maybe │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A second variable. │ -│  string   standard   mandatory    │ Default: the value of _.var1 │ +│  string   standard   mandatory    │ Default: the value of "rougail.var1" │ │ unique   multiple  │ │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 640a3dfd5..0fea256a8 100644 --- a/tests/results/test_namespace/00_2default_calculated_variable_description.json +++ b/tests/results/test_namespace/00_2default_calculated_variable_description.json @@ -45,7 +45,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value of a variable!" + "values": { + "description": "value of a variable!" + } }, "properties": [ { 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 00b84de42..f4796fd96 100644 --- a/tests/results/test_namespace/00_2default_calculated_variable_description_multi_line.json +++ b/tests/results/test_namespace/00_2default_calculated_variable_description_multi_line.json @@ -45,7 +45,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value\nof\na\nvariable!" + "values": { + "description": "value\nof\na\nvariable!" + } }, "properties": [ { diff --git a/tests/results/test_namespace/00_6choice_calculation.json b/tests/results/test_namespace/00_6choice_calculation.json index 477df1334..528a733ce 100644 --- a/tests/results/test_namespace/00_6choice_calculation.json +++ b/tests/results/test_namespace/00_6choice_calculation.json @@ -37,7 +37,9 @@ ], "choices": { "name": "Choices", - "values": "choices is 0 to 9" + "values": { + "description": "choices is 0 to 9" + } }, "path": "rougail.var", "names": [ diff --git a/tests/results/test_namespace/00_8calculation_information.json b/tests/results/test_namespace/00_8calculation_information.json index 1e2151257..7bc0d0e01 100644 --- a/tests/results/test_namespace/00_8calculation_information.json +++ b/tests/results/test_namespace/00_8calculation_information.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { diff --git a/tests/results/test_namespace/00_9default_calculation.json b/tests/results/test_namespace/00_9default_calculation.json index 366d845cd..612a38beb 100644 --- a/tests/results/test_namespace/00_9default_calculation.json +++ b/tests/results/test_namespace/00_9default_calculation.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "concat all parameters" + "values": { + "description": "concat all parameters" + } }, "properties": [ { diff --git a/tests/results/test_namespace/00_9default_calculation_information.json b/tests/results/test_namespace/00_9default_calculation_information.json index 523986a8f..ba2da21da 100644 --- a/tests/results/test_namespace/00_9default_calculation_information.json +++ b/tests/results/test_namespace/00_9default_calculation_information.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the information" + "values": { + "description": "returns the information" + } }, "properties": [ { 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 93c1e4f4f..07b198831 100644 --- a/tests/results/test_namespace/00_9default_calculation_param_optional.json +++ b/tests/results/test_namespace/00_9default_calculation_param_optional.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns a value" + "values": { + "description": "returns a value" + } }, "properties": [ { diff --git a/tests/results/test_namespace/00_9default_integer.json b/tests/results/test_namespace/00_9default_integer.json index d202e469b..4a97af95a 100644 --- a/tests/results/test_namespace/00_9default_integer.json +++ b/tests/results/test_namespace/00_9default_integer.json @@ -37,7 +37,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "rougail.var", "names": [ diff --git a/tests/results/test_namespace/00_9default_number.json b/tests/results/test_namespace/00_9default_number.json index d202e469b..4a97af95a 100644 --- a/tests/results/test_namespace/00_9default_number.json +++ b/tests/results/test_namespace/00_9default_number.json @@ -37,7 +37,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "rougail.var", "names": [ diff --git a/tests/results/test_namespace/00_9extra.json b/tests/results/test_namespace/00_9extra.json index 905d40100..66eb579b1 100644 --- a/tests/results/test_namespace/00_9extra.json +++ b/tests/results/test_namespace/00_9extra.json @@ -67,7 +67,9 @@ "type": "variable", "default": { "name": "Default", - "values": "return no" + "values": { + "description": "return no" + } }, "properties": [ { diff --git a/tests/results/test_namespace/00_9extra_calculation.json b/tests/results/test_namespace/00_9extra_calculation.json index e609f3bea..d200fe3db 100644 --- a/tests/results/test_namespace/00_9extra_calculation.json +++ b/tests/results/test_namespace/00_9extra_calculation.json @@ -103,7 +103,9 @@ "type": "variable", "default": { "name": "Default", - "values": "copy the value of rougail.variable" + "values": { + "description": "copy the value of rougail.variable" + } }, "properties": [ { @@ -133,7 +135,9 @@ "type": "variable", "default": { "name": "Default", - "values": "copy the value of rougail.variable" + "values": { + "description": "copy the value of rougail.variable" + } }, "properties": [ { diff --git a/tests/results/test_namespace/01_6string_multi_length.json b/tests/results/test_namespace/01_6string_multi_length.json index e118e53a2..966923886 100644 --- a/tests/results/test_namespace/01_6string_multi_length.json +++ b/tests/results/test_namespace/01_6string_multi_length.json @@ -49,7 +49,9 @@ ], "validators": { "name": "Validator", - "values": "needs exactly 3 values" + "values": { + "description": "needs exactly 3 values" + } }, "path": "rougail.var1", "names": [ @@ -99,8 +101,12 @@ "validators": { "name": "Validators", "values": [ - "needs a minimum of 1 values", - "needs a maximum of 4 values" + { + "description": "needs a minimum of 1 values" + }, + { + "description": "needs a maximum of 4 values" + } ] }, "path": "rougail.var2", diff --git a/tests/results/test_namespace/01_8calculation_information_multi.json b/tests/results/test_namespace/01_8calculation_information_multi.json index 3e76d452e..87df7198a 100644 --- a/tests/results/test_namespace/01_8calculation_information_multi.json +++ b/tests/results/test_namespace/01_8calculation_information_multi.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { 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 fb3ce0c1f..c9e713fef 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 @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value is always yes" + "values": { + "description": "the value is always yes" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "hidden", - "annotation": "only if the variable var1 has value \"yes\"" + "annotation": { + "description": "only if the variable var1 has value \"yes\"" + } }, { "type": "property", diff --git a/tests/results/test_namespace/04_5disabled_calculation.json b/tests/results/test_namespace/04_5disabled_calculation.json index ed52efdcf..c869baf86 100644 --- a/tests/results/test_namespace/04_5disabled_calculation.json +++ b/tests/results/test_namespace/04_5disabled_calculation.json @@ -63,7 +63,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "rougail.variable1", @@ -94,7 +96,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "rougail.variable2", diff --git a/tests/results/test_namespace/04_5disabled_calculation_boolean.json b/tests/results/test_namespace/04_5disabled_calculation_boolean.json index 932316be0..3e5a82db9 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_boolean.json +++ b/tests/results/test_namespace/04_5disabled_calculation_boolean.json @@ -63,7 +63,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "rougail.variable1", @@ -94,7 +96,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is not egal to \"yes\"" + "annotation": { + "description": "if condition is not egal to \"yes\"" + } } ], "path": "rougail.variable2", diff --git a/tests/results/test_namespace/04_5disabled_calculation_default.json b/tests/results/test_namespace/04_5disabled_calculation_default.json index b33e322a0..0cb2c1223 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_default.json +++ b/tests/results/test_namespace/04_5disabled_calculation_default.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -84,7 +88,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -102,7 +108,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", diff --git a/tests/results/test_namespace/04_5disabled_calculation_multi.json b/tests/results/test_namespace/04_5disabled_calculation_multi.json index 527e786de..7953c0559 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_multi.json +++ b/tests/results/test_namespace/04_5disabled_calculation_multi.json @@ -63,7 +63,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } }, { "type": "property", @@ -104,7 +106,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } }, { "type": "property", diff --git a/tests/results/test_namespace/04_5disabled_calculation_optional.json b/tests/results/test_namespace/04_5disabled_calculation_optional.json index 0a537df54..944893e84 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_optional.json +++ b/tests/results/test_namespace/04_5disabled_calculation_optional.json @@ -59,7 +59,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an unknown variable" + "annotation": { + "description": "calculation from an unknown variable" + } } ], "path": "rougail.var1", @@ -86,7 +88,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an condition variable" + "annotation": { + "description": "calculation from an condition variable" + } } ], "path": "rougail.var2", diff --git a/tests/results/test_namespace/04_5hidden_calculation.json b/tests/results/test_namespace/04_5hidden_calculation.json index c9e7db63d..93b007fe4 100644 --- a/tests/results/test_namespace/04_5hidden_calculation.json +++ b/tests/results/test_namespace/04_5hidden_calculation.json @@ -67,7 +67,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -102,7 +104,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", diff --git a/tests/results/test_namespace/04_5hidden_calculation2.json b/tests/results/test_namespace/04_5hidden_calculation2.json index 411d3e0dc..7dd4066bc 100644 --- a/tests/results/test_namespace/04_5hidden_calculation2.json +++ b/tests/results/test_namespace/04_5hidden_calculation2.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -84,7 +88,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -102,7 +108,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", 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 e76fbac1c..5f41fe203 100644 --- a/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json +++ b/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the condition value" + "values": { + "description": "returns the condition value" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -84,7 +88,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the condition value" + "values": { + "description": "returns the condition value" + } }, "properties": [ { @@ -102,7 +108,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", diff --git a/tests/results/test_namespace/04_5validators.json b/tests/results/test_namespace/04_5validators.json index e146e12f6..2de327f08 100644 --- a/tests/results/test_namespace/04_5validators.json +++ b/tests/results/test_namespace/04_5validators.json @@ -33,7 +33,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "rougail.int", "names": [ diff --git a/tests/results/test_namespace/04_5validators_differ.json b/tests/results/test_namespace/04_5validators_differ.json index 12b516d16..81db2dfd1 100644 --- a/tests/results/test_namespace/04_5validators_differ.json +++ b/tests/results/test_namespace/04_5validators_differ.json @@ -37,7 +37,9 @@ ], "validators": { "name": "Validator", - "values": "var1 must be different than var2" + "values": { + "description": "var1 must be different than var2" + } }, "path": "rougail.var1", "names": [ diff --git a/tests/results/test_namespace/04_5validators_multi.json b/tests/results/test_namespace/04_5validators_multi.json index 096e41e6f..529b0bad3 100644 --- a/tests/results/test_namespace/04_5validators_multi.json +++ b/tests/results/test_namespace/04_5validators_multi.json @@ -48,7 +48,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 10" + "values": { + "description": "check length is less than 10" + } }, "path": "rougail.var1", "names": [ diff --git a/tests/results/test_namespace/04_5validators_multi2.json b/tests/results/test_namespace/04_5validators_multi2.json index 3060e36b2..e02ee4fb0 100644 --- a/tests/results/test_namespace/04_5validators_multi2.json +++ b/tests/results/test_namespace/04_5validators_multi2.json @@ -48,7 +48,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 3" + "values": { + "description": "check length is less than 3" + } }, "path": "rougail.var1", "names": [ diff --git a/tests/results/test_namespace/04_5validators_multi3.json b/tests/results/test_namespace/04_5validators_multi3.json index 55b2c151d..7baaacc7c 100644 --- a/tests/results/test_namespace/04_5validators_multi3.json +++ b/tests/results/test_namespace/04_5validators_multi3.json @@ -49,7 +49,9 @@ ], "validators": { "name": "Validator", - "values": "value must be equal to index" + "values": { + "description": "value must be equal to index" + } }, "path": "rougail.var1", "names": [ diff --git a/tests/results/test_namespace/04_5validators_warnings.json b/tests/results/test_namespace/04_5validators_warnings.json index bc922da03..aad1d7e0b 100644 --- a/tests/results/test_namespace/04_5validators_warnings.json +++ b/tests/results/test_namespace/04_5validators_warnings.json @@ -37,7 +37,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "rougail.int", "names": [ diff --git a/tests/results/test_namespace/16_5redefine_calculation.json b/tests/results/test_namespace/16_5redefine_calculation.json index 8056e3449..85c3d1540 100644 --- a/tests/results/test_namespace/16_5redefine_calculation.json +++ b/tests/results/test_namespace/16_5redefine_calculation.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns yes" + "values": { + "description": "returns yes" + } }, "properties": [ { diff --git a/tests/results/test_namespace/20_0validators_differ_redefine.json b/tests/results/test_namespace/20_0validators_differ_redefine.json index cffd06b51..086a97f88 100644 --- a/tests/results/test_namespace/20_0validators_differ_redefine.json +++ b/tests/results/test_namespace/20_0validators_differ_redefine.json @@ -97,7 +97,9 @@ ], "validators": { "name": "Validator", - "values": "var3 must be different than var2" + "values": { + "description": "var3 must be different than var2" + } }, "path": "rougail.var3", "names": [ diff --git a/tests/results/test_namespace/24_0family_hidden_condition.json b/tests/results/test_namespace/24_0family_hidden_condition.json index abb5f04f6..163756e20 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition.json +++ b/tests/results/test_namespace/24_0family_hidden_condition.json @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 5bcf69e3c..4af66c604 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_boolean.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_boolean.json @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if not condition" + "annotation": { + "description": "if not condition" + } } ] }, 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 e66ce1b59..b4f98e498 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 @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 c05d71759..18b036b5d 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 @@ -91,7 +91,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition1 is false" + "annotation": { + "description": "if condition1 is false" + } } ] }, @@ -110,7 +112,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition2 is false" + "annotation": { + "description": "if condition2 is false" + } } ], "path": "rougail.family.variable", 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 654dade8e..8e6b95a93 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 @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, diff --git a/tests/results/test_namespace/24_0family_mandatory_condition.json b/tests/results/test_namespace/24_0family_mandatory_condition.json index ddef7f50f..38b13192f 100644 --- a/tests/results/test_namespace/24_0family_mandatory_condition.json +++ b/tests/results/test_namespace/24_0family_mandatory_condition.json @@ -59,7 +59,9 @@ { "type": "property", "name": "mandatory", - "annotation": "only if rougail.condition has the value \"yes\"" + "annotation": { + "description": "only if rougail.condition has the value \"yes\"" + } } ], "path": "rougail.var", diff --git a/tests/results/test_namespace/24_7validators_variable_optional.json b/tests/results/test_namespace/24_7validators_variable_optional.json index f09752a94..8bcc90267 100644 --- a/tests/results/test_namespace/24_7validators_variable_optional.json +++ b/tests/results/test_namespace/24_7validators_variable_optional.json @@ -50,8 +50,12 @@ "validators": { "name": "Validators", "values": [ - "int and int2 must be different", - "int and int3 must be different" + { + "description": "int and int2 must be different" + }, + { + "description": "int and int3 must be different" + } ] }, "path": "rougail.general.int", 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 dc400a306..fe54c6471 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json @@ -106,7 +106,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns follower1 value" + "values": { + "description": "returns follower1 value" + } }, "properties": [ { 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 facb2174e..1c973796d 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_param_index.json +++ b/tests/results/test_namespace/40_2leadership_calculation_param_index.json @@ -84,7 +84,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns index" + "values": { + "description": "returns index" + } }, "properties": [ { diff --git a/tests/results/test_namespace/40_2leadership_leader_calculation.json b/tests/results/test_namespace/40_2leadership_leader_calculation.json index 0ef1aa3ab..8420d60d6 100644 --- a/tests/results/test_namespace/40_2leadership_leader_calculation.json +++ b/tests/results/test_namespace/40_2leadership_leader_calculation.json @@ -38,7 +38,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns val1 and val2" + "values": { + "description": "returns val1 and val2" + } }, "properties": [ { diff --git a/tests/results/test_namespace/40_8calculation_boolean.json b/tests/results/test_namespace/40_8calculation_boolean.json index 96e74b95b..46aae3370 100644 --- a/tests/results/test_namespace/40_8calculation_boolean.json +++ b/tests/results/test_namespace/40_8calculation_boolean.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { @@ -89,7 +91,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { 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 9869a5533..906fb36a4 100644 --- a/tests/results/test_namespace/40_8calculation_boolean_return_none.json +++ b/tests/results/test_namespace/40_8calculation_boolean_return_none.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "return false if the value of var1 is \"no\"" + "values": { + "description": "return false if the value of var1 is \"no\"" + } }, "properties": [ { diff --git a/tests/results/test_namespace/40_8calculation_integer.json b/tests/results/test_namespace/40_8calculation_integer.json index e9aad5859..0e6baf5fc 100644 --- a/tests/results/test_namespace/40_8calculation_integer.json +++ b/tests/results/test_namespace/40_8calculation_integer.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "if bool returns 1 otherwise return 2" + "values": { + "description": "if bool returns 1 otherwise return 2" + } }, "properties": [ { @@ -79,7 +81,9 @@ "type": "variable", "default": { "name": "Default", - "values": "if bool returns 3 otherwise return 4" + "values": { + "description": "if bool returns 3 otherwise return 4" + } }, "properties": [ { diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower.json b/tests/results/test_namespace/44_4disabled_calcultion_follower.json index 19020adfd..783a298c8 100644 --- a/tests/results/test_namespace/44_4disabled_calcultion_follower.json +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower.json @@ -124,7 +124,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.leader.follower", 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 ccf602bc5..ac266c930 100644 --- a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is no" + "annotation": { + "description": "if condition is no" + } } ], "help": [ 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 69733f9c8..7f1aafb4f 100644 --- a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json @@ -118,7 +118,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.leader.follower", diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.adoc b/tests/results/test_namespace/44_9calculated_default_leadership_leader.adoc index c6622f2c0..a117eefc3 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.adoc +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.adoc @@ -27,6 +27,6 @@ This family contains lists of variable blocks. + | **rougail.leader.follower** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `__disabled__` | A follower. + **Default**: the value of the variable "rougail.leader.leader" + -**Disabled**: if the value of "leader" is "a" +**Disabled**: if the value of "rougail.leader.leader" is "a" |==== diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.gitlab.md b/tests/results/test_namespace/44_9calculated_default_leadership_leader.gitlab.md index 5d7cf8509..ea3cab622 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.gitlab.md +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.gitlab.md @@ -11,10 +11,10 @@ > This family contains lists of variable blocks.\ > `standard` -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | -| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "leader" is "a" | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | +| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "[a leader](#rougail.leader.leader)" is "a" | diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.html b/tests/results/test_namespace/44_9calculated_default_leadership_leader.html index 7aa205dd5..cff0e8f69 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.html +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.html @@ -14,12 +14,12 @@ This family contains lists of variable blocks. - + - +
  • b
    • +
    Variable Description
    Variable Description
    rougail.leader.leader
    string standard mandatory unique multiple    		A leader.
    Default:
    • a
      • -
    • b
    rougail.leader.follower
    string standard mandatory disabled     		A follower.
    Default: the value of the variable "rougail.leader.leader"
    Disabled: if the value of "leader" is "a"
    rougail.leader.follower
    string standard mandatory disabled     		A follower.
    Default: the value of the variable "rougail.leader.leader"
    Disabled: if the value of "rougail.leader.leader" is "a"
    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 e945c7e70..10a7e70cd 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json @@ -106,7 +106,15 @@ { "type": "property", "name": "disabled", - "annotation": "if the value of \"leader\" is \"a\"" + "annotation": { + "description": "if the value of \"{0}\" is \"a\"", + "variables": [ + { + "path": "rougail.leader.leader", + "description": "a leader" + } + ] + } } ], "path": "rougail.leader.follower", diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.md b/tests/results/test_namespace/44_9calculated_default_leadership_leader.md index a9e0f007a..c77cc4c70 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.md +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.md @@ -16,5 +16,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | -| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "leader" is "a" | +| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "[a leader](#rougail.leader.leader)" is "a" | diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.sh b/tests/results/test_namespace/44_9calculated_default_leadership_leader.sh index edc8eabc6..445a63b3c 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.sh +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.sh @@ -24,8 +24,8 @@ │ rougail.leader.follower │ A follower. │ │  string   standard   mandatory    │ Default: the value of the variable │ │ disabled  │ "rougail.leader.leader" │ -│ │ Disabled: if the value of "leader" │ -│ │ is "a" │ +│ │ Disabled: if the value of │ +│ │ "rougail.leader.leader" is "a" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.adoc b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.adoc index 339d310a3..90d7aadad 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.adoc +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.adoc @@ -42,6 +42,6 @@ This family builds families dynamically. + | Variable | Description | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable. + -**Default**: get the value of rougail.dyn1.var +**Default**: get the value of "rougail.dyn__1__.var" |==== diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.gitlab.md b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.gitlab.md index 484897a00..ddbc6feb3 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.gitlab.md +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.gitlab.md @@ -23,9 +23,9 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------| -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.html b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.html index 7956caec9..9017a8bbc 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.html +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.html @@ -37,10 +37,10 @@ This family builds families dynamically. - + - +
    Variable Description
    Variable Description
    rougail.var2
    string standard mandatory    		A variable.
    Default: get the value of rougail.dyn1.var
    rougail.var2
    string standard mandatory    		A variable.
    Default: get the value of "rougail.dyn1.var"
    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 2798a4e85..ae9fd75e2 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 @@ -138,7 +138,18 @@ "type": "variable", "default": { "name": "Default", - "values": "get the value of rougail.dyn1.var" + "values": { + "description": "get the value of \"{0}\"", + "variables": [ + { + "path": "rougail.dyn{{ identifier }}.var", + "description": "a variable inside dynamic family", + "identifiers": [ + "1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.md b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.md index d3b993e60..965184262 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.md +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.md @@ -25,5 +25,5 @@ | Variable                                                                                                            | Description                                                                                                         | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.sh b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.sh index e4137a140..beed5d7bf 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.sh +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_integer_empty.sh @@ -36,6 +36,6 @@ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ │ rougail.var2 │ A variable. │ │  string   standard   mandatory  │ Default: get the value of │ -│ │ rougail.dyn1.var │ +│ │ "rougail.dyn1.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.adoc b/tests/results/test_namespace/60_0family_dynamic_jinja_number.adoc index 11fe311a1..6499d3412 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.adoc +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.adoc @@ -42,6 +42,6 @@ This family builds families dynamically. + | Variable | Description | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable. + -**Default**: get the value of rougail.dyn1.var +**Default**: get the value of "rougail.dyn__1__.var" |==== diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.gitlab.md b/tests/results/test_namespace/60_0family_dynamic_jinja_number.gitlab.md index 3258b121f..1825e1db9 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.gitlab.md +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.gitlab.md @@ -23,9 +23,9 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------| -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.html b/tests/results/test_namespace/60_0family_dynamic_jinja_number.html index b522a8908..c2c8e021e 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.html +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.html @@ -37,10 +37,10 @@ This family builds families dynamically. - + - +
    Variable Description
    Variable Description
    rougail.var2
    string standard mandatory    		A variable.
    Default: get the value of rougail.dyn1.var
    rougail.var2
    string standard mandatory    		A variable.
    Default: get the value of "rougail.dyn1.var"
    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 4b1e3ef04..756f5e614 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json @@ -142,7 +142,18 @@ "type": "variable", "default": { "name": "Default", - "values": "get the value of rougail.dyn1.var" + "values": { + "description": "get the value of \"{0}\"", + "variables": [ + { + "path": "rougail.dyn{{ identifier }}.var", + "description": "a variable inside dynamic family", + "identifiers": [ + "1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.md b/tests/results/test_namespace/60_0family_dynamic_jinja_number.md index 152a799ed..836d4b490 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.md +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.md @@ -25,5 +25,5 @@ | Variable                                                                                                                        | Description                                                                                                                     | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.sh b/tests/results/test_namespace/60_0family_dynamic_jinja_number.sh index 06634664e..a38ee64a3 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.sh +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.sh @@ -36,6 +36,6 @@ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ │ rougail.var2 │ A variable. │ │  string   standard   mandatory  │ Default: get the value of │ -│ │ rougail.dyn1.var │ +│ │ "rougail.dyn1.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace/60_1family_dynamic_jinja.json b/tests/results/test_namespace/60_1family_dynamic_jinja.json index 64f443a4c..67a97fe17 100644 --- a/tests/results/test_namespace/60_1family_dynamic_jinja.json +++ b/tests/results/test_namespace/60_1family_dynamic_jinja.json @@ -83,7 +83,9 @@ } ], "identifier": [ - "index of suffix value" + { + "description": "index of suffix value" + } ], "help": [ "This family builds families dynamically" diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.adoc b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.adoc index d3443df21..119edcdd1 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.adoc +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.adoc @@ -50,6 +50,6 @@ This family builds families dynamically. + | Variable | Description | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A second variable. + -**Default**: the value of var +**Default**: the value of "rougail.dyn__val1__.family.var" |==== diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.gitlab.md b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.gitlab.md index fe13d109d..af270a47b 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.gitlab.md +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.gitlab.md @@ -32,9 +32,9 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------| -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------| +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#rougail.dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.html b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.html index f60af0d21..0ec8f4ec3 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.html +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.html @@ -45,10 +45,10 @@ This family builds families dynamically. - + - +
    Variable Description
    Variable Description
    rougail.var2
    string standard mandatory    		A second variable.
    Default: the value of var
    rougail.var2
    string standard mandatory    		A second variable.
    Default: the value of "rougail.dynval1.family.var"
    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 1762552ce..e2a6fa22a 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 @@ -165,7 +165,18 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "rougail.dyn{{ identifier }}.family.var", + "description": "with a variable", + "identifiers": [ + "val1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.md b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.md index 0210b7bee..7c117298d 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.md +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.md @@ -33,5 +33,5 @@ | Variable                                                                                                                           | Description                                                                                                                        | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#rougail.dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.sh b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.sh index b61fe5f1d..8279601e8 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.sh +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.sh @@ -44,6 +44,7 @@ ┃ Variable  ┃ Description  ┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ │ rougail.var2 │ A second variable. │ -│  string   standard   mandatory  │ Default: the value of var │ +│  string   standard   mandatory  │ Default: the value of │ +│ │ "rougail.dynval1.family.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 ab1eab722..d0d6d4d45 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 @@ -169,7 +169,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 fb3d1fbdb..a350bb150 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 @@ -165,7 +165,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 6ca0e6707..e16f82429 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 @@ -161,7 +161,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 af2879afa..087d71685 100644 --- a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json @@ -142,7 +142,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 a099d2b74..014de7e43 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 @@ -138,7 +138,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { diff --git a/tests/results/test_namespace/60_5family_dynamic_calc2.json b/tests/results/test_namespace/60_5family_dynamic_calc2.json index 7a0d2c7bb..dd330c802 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc2.json @@ -110,7 +110,9 @@ { "type": "property", "name": "hidden", - "annotation": "if var2 is no" + "annotation": { + "description": "if var2 is no" + } } ], "identifier": [ 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 c8466a2c3..460b566c0 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json @@ -106,7 +106,9 @@ { "type": "property", "name": "hidden", - "annotation": "if var2 is no" + "annotation": { + "description": "if var2 is no" + } } ], "identifier": [ 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 7f8230e5e..3c6148f9f 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 @@ -114,7 +114,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { 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 fe2b83cbf..c4d1bc8c9 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 @@ -110,7 +110,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { 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 32783726d..b2d16862e 100644 --- a/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json @@ -40,7 +40,9 @@ { "type": "property", "name": "hidden", - "annotation": "if suffix == 'val2'" + "annotation": { + "description": "if suffix == 'val2'" + } } ], "identifier": [ 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 c64f0c373..14beb23da 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json @@ -114,7 +114,9 @@ "type": "variable", "default": { "name": "Default", - "values": "add 't' to each var value" + "values": { + "description": "add 't' to each var value" + } }, "properties": [ { @@ -350,7 +352,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { 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 c64f0c373..14beb23da 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 @@ -114,7 +114,9 @@ "type": "variable", "default": { "name": "Default", - "values": "add 't' to each var value" + "values": { + "description": "add 't' to each var value" + } }, "properties": [ { @@ -350,7 +352,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { 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 17b995959..cdc0940e7 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 @@ -110,7 +110,9 @@ "type": "variable", "default": { "name": "Default", - "values": "add 't' to each var value" + "values": { + "description": "add 't' to each var value" + } }, "properties": [ { @@ -346,7 +348,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { 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 01077729c..b91ed4ac5 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 @@ -292,7 +292,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { 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 bfe2d5309..c2330a8bc 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated.json +++ b/tests/results/test_namespace_without_family/00_2default_calculated.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var1" + "values": { + "description": "the value of var1" + } }, "properties": [ { diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.adoc b/tests/results/test_namespace_without_family/00_2default_calculated_multi.adoc index 502e3a718..fcceab677 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.adoc +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.adoc @@ -10,6 +10,6 @@ * maybe | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | A second variable. + -**Default**: the value of _.var1 +**Default**: the value of "rougail.var1" |==== diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.adoc b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.adoc index fab20d71d..70ed9f778 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.adoc +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.adoc @@ -12,6 +12,6 @@ * maybe | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | A second variable. + -**Default**: the value of _.var1 +**Default**: the value of "rougail.var1" |==== diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.gitlab.md b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.gitlab.md index 21e9cb8d8..c08407bbd 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.gitlab.md @@ -1,9 +1,9 @@
    New variables -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#rougail.var1)" |
    diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.html b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.html index 32b6f82b1..eedd8864e 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.html +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.html @@ -2,13 +2,13 @@ - + - +
  • maybe
    • +
    Variable Description
    Variable Description
    rougail.var1
    string standard mandatory unique multiple    		A first variable.
    Default:
    • no
    • yes
      • -
    • maybe
    rougail.var2
    string standard mandatory unique multiple    		A second variable.
    Default: the value of _.var1
    rougail.var2
    string standard mandatory unique multiple    		A second variable.
    Default: the value of "rougail.var1"
    diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.md b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.md index 2e8c29029..4cc0676dd 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.md +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.md @@ -3,5 +3,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#rougail.var1)" | diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.sh b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.sh index c2382623f..d6d35be4d 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.sh +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.changelog.sh @@ -10,7 +10,7 @@ │ │ • maybe │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A second variable. │ -│  string   standard   mandatory    │ Default: the value of _.var1 │ +│  string   standard   mandatory    │ Default: the value of "rougail.var1" │ │ unique   multiple  │ │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.gitlab.md b/tests/results/test_namespace_without_family/00_2default_calculated_multi.gitlab.md index 1be332274..227b5d9b9 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.gitlab.md +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.gitlab.md @@ -1,5 +1,5 @@ -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#rougail.var1)" | diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.html b/tests/results/test_namespace_without_family/00_2default_calculated_multi.html index 3b83ef8a7..f5abd6757 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.html +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.html @@ -1,12 +1,12 @@ - + - +
  • maybe
    • +
    Variable Description
    Variable Description
    rougail.var1
    string standard mandatory unique multiple    		A first variable.
    Default:
    • no
    • yes
      • -
    • maybe
    rougail.var2
    string standard mandatory unique multiple    		A second variable.
    Default: the value of _.var1
    rougail.var2
    string standard mandatory unique multiple    		A second variable.
    Default: the value of "rougail.var1"
    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 39a1b16bc..933bb6933 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 @@ -65,7 +65,15 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of _.var1" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "rougail.var1", + "description": "a first variable" + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.md b/tests/results/test_namespace_without_family/00_2default_calculated_multi.md index 81549daec..55c31bdf3 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.md +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.md @@ -1,5 +1,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#rougail.var1)" | diff --git a/tests/results/test_namespace_without_family/00_2default_calculated_multi.sh b/tests/results/test_namespace_without_family/00_2default_calculated_multi.sh index 4ae898e49..e7a9817ef 100644 --- a/tests/results/test_namespace_without_family/00_2default_calculated_multi.sh +++ b/tests/results/test_namespace_without_family/00_2default_calculated_multi.sh @@ -8,6 +8,6 @@ │ │ • maybe │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A second variable. │ -│  string   standard   mandatory    │ Default: the value of _.var1 │ +│  string   standard   mandatory    │ Default: the value of "rougail.var1" │ │ unique   multiple  │ │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 640a3dfd5..0fea256a8 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 @@ -45,7 +45,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value of a variable!" + "values": { + "description": "value of a variable!" + } }, "properties": [ { 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 00b84de42..f4796fd96 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 @@ -45,7 +45,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value\nof\na\nvariable!" + "values": { + "description": "value\nof\na\nvariable!" + } }, "properties": [ { 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 477df1334..528a733ce 100644 --- a/tests/results/test_namespace_without_family/00_6choice_calculation.json +++ b/tests/results/test_namespace_without_family/00_6choice_calculation.json @@ -37,7 +37,9 @@ ], "choices": { "name": "Choices", - "values": "choices is 0 to 9" + "values": { + "description": "choices is 0 to 9" + } }, "path": "rougail.var", "names": [ 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 1e2151257..7bc0d0e01 100644 --- a/tests/results/test_namespace_without_family/00_8calculation_information.json +++ b/tests/results/test_namespace_without_family/00_8calculation_information.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { 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 366d845cd..612a38beb 100644 --- a/tests/results/test_namespace_without_family/00_9default_calculation.json +++ b/tests/results/test_namespace_without_family/00_9default_calculation.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "concat all parameters" + "values": { + "description": "concat all parameters" + } }, "properties": [ { 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 523986a8f..ba2da21da 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 @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the information" + "values": { + "description": "returns the information" + } }, "properties": [ { 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 93c1e4f4f..07b198831 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 @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns a value" + "values": { + "description": "returns a value" + } }, "properties": [ { 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 d202e469b..4a97af95a 100644 --- a/tests/results/test_namespace_without_family/00_9default_integer.json +++ b/tests/results/test_namespace_without_family/00_9default_integer.json @@ -37,7 +37,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "rougail.var", "names": [ 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 d202e469b..4a97af95a 100644 --- a/tests/results/test_namespace_without_family/00_9default_number.json +++ b/tests/results/test_namespace_without_family/00_9default_number.json @@ -37,7 +37,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "rougail.var", "names": [ diff --git a/tests/results/test_namespace_without_family/00_9extra.json b/tests/results/test_namespace_without_family/00_9extra.json index 905d40100..66eb579b1 100644 --- a/tests/results/test_namespace_without_family/00_9extra.json +++ b/tests/results/test_namespace_without_family/00_9extra.json @@ -67,7 +67,9 @@ "type": "variable", "default": { "name": "Default", - "values": "return no" + "values": { + "description": "return no" + } }, "properties": [ { 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 e609f3bea..d200fe3db 100644 --- a/tests/results/test_namespace_without_family/00_9extra_calculation.json +++ b/tests/results/test_namespace_without_family/00_9extra_calculation.json @@ -103,7 +103,9 @@ "type": "variable", "default": { "name": "Default", - "values": "copy the value of rougail.variable" + "values": { + "description": "copy the value of rougail.variable" + } }, "properties": [ { @@ -133,7 +135,9 @@ "type": "variable", "default": { "name": "Default", - "values": "copy the value of rougail.variable" + "values": { + "description": "copy the value of rougail.variable" + } }, "properties": [ { 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 e118e53a2..966923886 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 @@ -49,7 +49,9 @@ ], "validators": { "name": "Validator", - "values": "needs exactly 3 values" + "values": { + "description": "needs exactly 3 values" + } }, "path": "rougail.var1", "names": [ @@ -99,8 +101,12 @@ "validators": { "name": "Validators", "values": [ - "needs a minimum of 1 values", - "needs a maximum of 4 values" + { + "description": "needs a minimum of 1 values" + }, + { + "description": "needs a maximum of 4 values" + } ] }, "path": "rougail.var2", 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 3e76d452e..87df7198a 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 @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { 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 fb3ce0c1f..c9e713fef 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 @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value is always yes" + "values": { + "description": "the value is always yes" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "hidden", - "annotation": "only if the variable var1 has value \"yes\"" + "annotation": { + "description": "only if the variable var1 has value \"yes\"" + } }, { "type": "property", 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 ed52efdcf..c869baf86 100644 --- a/tests/results/test_namespace_without_family/04_5disabled_calculation.json +++ b/tests/results/test_namespace_without_family/04_5disabled_calculation.json @@ -63,7 +63,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "rougail.variable1", @@ -94,7 +96,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "rougail.variable2", 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 932316be0..3e5a82db9 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 @@ -63,7 +63,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "rougail.variable1", @@ -94,7 +96,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is not egal to \"yes\"" + "annotation": { + "description": "if condition is not egal to \"yes\"" + } } ], "path": "rougail.variable2", 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 b33e322a0..0cb2c1223 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 @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -84,7 +88,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -102,7 +108,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", 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 527e786de..7953c0559 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 @@ -63,7 +63,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } }, { "type": "property", @@ -104,7 +106,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } }, { "type": "property", 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 0a537df54..944893e84 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 @@ -59,7 +59,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an unknown variable" + "annotation": { + "description": "calculation from an unknown variable" + } } ], "path": "rougail.var1", @@ -86,7 +88,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an condition variable" + "annotation": { + "description": "calculation from an condition variable" + } } ], "path": "rougail.var2", 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 c9e7db63d..93b007fe4 100644 --- a/tests/results/test_namespace_without_family/04_5hidden_calculation.json +++ b/tests/results/test_namespace_without_family/04_5hidden_calculation.json @@ -67,7 +67,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -102,7 +104,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", 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 411d3e0dc..7dd4066bc 100644 --- a/tests/results/test_namespace_without_family/04_5hidden_calculation2.json +++ b/tests/results/test_namespace_without_family/04_5hidden_calculation2.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -84,7 +88,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of condition" + "values": { + "description": "the value of condition" + } }, "properties": [ { @@ -102,7 +108,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", 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 e76fbac1c..5f41fe203 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 @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the condition value" + "values": { + "description": "returns the condition value" + } }, "properties": [ { @@ -67,7 +69,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var1", @@ -84,7 +88,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the condition value" + "values": { + "description": "returns the condition value" + } }, "properties": [ { @@ -102,7 +108,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.var2", diff --git a/tests/results/test_namespace_without_family/04_5validators.json b/tests/results/test_namespace_without_family/04_5validators.json index e146e12f6..2de327f08 100644 --- a/tests/results/test_namespace_without_family/04_5validators.json +++ b/tests/results/test_namespace_without_family/04_5validators.json @@ -33,7 +33,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "rougail.int", "names": [ 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 12b516d16..81db2dfd1 100644 --- a/tests/results/test_namespace_without_family/04_5validators_differ.json +++ b/tests/results/test_namespace_without_family/04_5validators_differ.json @@ -37,7 +37,9 @@ ], "validators": { "name": "Validator", - "values": "var1 must be different than var2" + "values": { + "description": "var1 must be different than var2" + } }, "path": "rougail.var1", "names": [ 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 096e41e6f..529b0bad3 100644 --- a/tests/results/test_namespace_without_family/04_5validators_multi.json +++ b/tests/results/test_namespace_without_family/04_5validators_multi.json @@ -48,7 +48,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 10" + "values": { + "description": "check length is less than 10" + } }, "path": "rougail.var1", "names": [ 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 3060e36b2..e02ee4fb0 100644 --- a/tests/results/test_namespace_without_family/04_5validators_multi2.json +++ b/tests/results/test_namespace_without_family/04_5validators_multi2.json @@ -48,7 +48,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 3" + "values": { + "description": "check length is less than 3" + } }, "path": "rougail.var1", "names": [ 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 55b2c151d..7baaacc7c 100644 --- a/tests/results/test_namespace_without_family/04_5validators_multi3.json +++ b/tests/results/test_namespace_without_family/04_5validators_multi3.json @@ -49,7 +49,9 @@ ], "validators": { "name": "Validator", - "values": "value must be equal to index" + "values": { + "description": "value must be equal to index" + } }, "path": "rougail.var1", "names": [ 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 bc922da03..aad1d7e0b 100644 --- a/tests/results/test_namespace_without_family/04_5validators_warnings.json +++ b/tests/results/test_namespace_without_family/04_5validators_warnings.json @@ -37,7 +37,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "rougail.int", "names": [ 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 8056e3449..85c3d1540 100644 --- a/tests/results/test_namespace_without_family/16_5redefine_calculation.json +++ b/tests/results/test_namespace_without_family/16_5redefine_calculation.json @@ -19,7 +19,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns yes" + "values": { + "description": "returns yes" + } }, "properties": [ { 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 cffd06b51..086a97f88 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 @@ -97,7 +97,9 @@ ], "validators": { "name": "Validator", - "values": "var3 must be different than var2" + "values": { + "description": "var3 must be different than var2" + } }, "path": "rougail.var3", "names": [ 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 abb5f04f6..163756e20 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 @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 5bcf69e3c..4af66c604 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 @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if not condition" + "annotation": { + "description": "if not condition" + } } ] }, 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 e66ce1b59..b4f98e498 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 @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 c05d71759..18b036b5d 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 @@ -91,7 +91,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition1 is false" + "annotation": { + "description": "if condition1 is false" + } } ] }, @@ -110,7 +112,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition2 is false" + "annotation": { + "description": "if condition2 is false" + } } ], "path": "rougail.family.variable", 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 654dade8e..8e6b95a93 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 @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 ddef7f50f..38b13192f 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 @@ -59,7 +59,9 @@ { "type": "property", "name": "mandatory", - "annotation": "only if rougail.condition has the value \"yes\"" + "annotation": { + "description": "only if rougail.condition has the value \"yes\"" + } } ], "path": "rougail.var", 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 f09752a94..8bcc90267 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 @@ -50,8 +50,12 @@ "validators": { "name": "Validators", "values": [ - "int and int2 must be different", - "int and int3 must be different" + { + "description": "int and int2 must be different" + }, + { + "description": "int and int3 must be different" + } ] }, "path": "rougail.general.int", 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 dc400a306..fe54c6471 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 @@ -106,7 +106,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns follower1 value" + "values": { + "description": "returns follower1 value" + } }, "properties": [ { 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 facb2174e..1c973796d 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 @@ -84,7 +84,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns index" + "values": { + "description": "returns index" + } }, "properties": [ { 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 0ef1aa3ab..8420d60d6 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 @@ -38,7 +38,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns val1 and val2" + "values": { + "description": "returns val1 and val2" + } }, "properties": [ { 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 96e74b95b..46aae3370 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_boolean.json +++ b/tests/results/test_namespace_without_family/40_8calculation_boolean.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { @@ -89,7 +91,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { 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 9869a5533..906fb36a4 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 @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "return false if the value of var1 is \"no\"" + "values": { + "description": "return false if the value of var1 is \"no\"" + } }, "properties": [ { 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 e9aad5859..0e6baf5fc 100644 --- a/tests/results/test_namespace_without_family/40_8calculation_integer.json +++ b/tests/results/test_namespace_without_family/40_8calculation_integer.json @@ -49,7 +49,9 @@ "type": "variable", "default": { "name": "Default", - "values": "if bool returns 1 otherwise return 2" + "values": { + "description": "if bool returns 1 otherwise return 2" + } }, "properties": [ { @@ -79,7 +81,9 @@ "type": "variable", "default": { "name": "Default", - "values": "if bool returns 3 otherwise return 4" + "values": { + "description": "if bool returns 3 otherwise return 4" + } }, "properties": [ { 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 19020adfd..783a298c8 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 @@ -124,7 +124,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.leader.follower", 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 ccf602bc5..ac266c930 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 @@ -61,7 +61,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is no" + "annotation": { + "description": "if condition is no" + } } ], "help": [ 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 69733f9c8..7f1aafb4f 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 @@ -118,7 +118,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "rougail.leader.follower", diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.adoc b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.adoc index c22fadc0f..b2acbc771 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.adoc +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.adoc @@ -10,6 +10,6 @@ | **rougail.leader.follower** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `__disabled__` | A follower. + **Default**: the value of the variable "rougail.leader.leader" + -**Disabled**: if the value of "leader" is "a" +**Disabled**: if the value of "rougail.leader.leader" is "a" |==== diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.adoc b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.adoc index 3da47468e..76cc0fe3f 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.adoc +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.adoc @@ -12,6 +12,6 @@ | **rougail.leader.follower** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `__disabled__` | A follower. + **Default**: the value of the variable "rougail.leader.leader" + -**Disabled**: if the value of "leader" is "a" +**Disabled**: if the value of "rougail.leader.leader" is "a" |==== diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.gitlab.md b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.gitlab.md index 22220734c..7fcba288d 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.gitlab.md @@ -1,9 +1,9 @@
    New variables -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | -| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "leader" is "a" | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | +| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "[a leader](#rougail.leader.leader)" is "a" |
    diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.html b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.html index 9583870a9..f7c45ed92 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.html +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.html @@ -2,12 +2,12 @@ - + - +
  • b
    • +
    Variable Description
    Variable Description
    rougail.leader.leader
    string standard mandatory unique multiple    		A leader.
    Default:
    • a
      • -
    • b
    rougail.leader.follower
    string standard mandatory disabled     		A follower.
    Default: the value of the variable "rougail.leader.leader"
    Disabled: if the value of "leader" is "a"
    rougail.leader.follower
    string standard mandatory disabled     		A follower.
    Default: the value of the variable "rougail.leader.leader"
    Disabled: if the value of "rougail.leader.leader" is "a"
    diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.md b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.md index 557b290c0..d3a0cafeb 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.md +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.md @@ -3,5 +3,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | -| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "leader" is "a" | +| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "[a leader](#rougail.leader.leader)" is "a" | diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.sh b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.sh index f730976ad..0015655a1 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.sh +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.changelog.sh @@ -11,7 +11,7 @@ │ rougail.leader.follower │ A follower. │ │  string   standard   mandatory    │ Default: the value of the variable │ │ disabled  │ "rougail.leader.leader" │ -│ │ Disabled: if the value of "leader" │ -│ │ is "a" │ +│ │ Disabled: if the value of │ +│ │ "rougail.leader.leader" is "a" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.gitlab.md b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.gitlab.md index f36a91910..50f76ace8 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.gitlab.md +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.gitlab.md @@ -1,5 +1,5 @@ -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------| -| **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | -| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "leader" is "a" | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | +| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "[a leader](#rougail.leader.leader)" is "a" | diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.html b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.html index ebd4ab6fc..59d59cf51 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.html +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.html @@ -1,11 +1,11 @@ - + - +
  • b
    • +
    Variable Description
    Variable Description
    rougail.leader.leader
    string standard mandatory unique multiple    		A leader.
    Default:
    • a
      • -
    • b
    rougail.leader.follower
    string standard mandatory disabled     		A follower.
    Default: the value of the variable "rougail.leader.leader"
    Disabled: if the value of "leader" is "a"
    rougail.leader.follower
    string standard mandatory disabled     		A follower.
    Default: the value of the variable "rougail.leader.leader"
    Disabled: if the value of "rougail.leader.leader" is "a"
    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 e945c7e70..10a7e70cd 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 @@ -106,7 +106,15 @@ { "type": "property", "name": "disabled", - "annotation": "if the value of \"leader\" is \"a\"" + "annotation": { + "description": "if the value of \"{0}\" is \"a\"", + "variables": [ + { + "path": "rougail.leader.leader", + "description": "a leader" + } + ] + } } ], "path": "rougail.leader.follower", diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.md b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.md index 3c1c9ea53..59fd13d4d 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.md +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.md @@ -1,5 +1,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.leader.leader**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A leader.
    **Default**:
    • a
    • b | -| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "leader" is "a" | +| **rougail.leader.follower**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` *`disabled`* | A follower.
    **Default**: the value of the variable "[A leader](#rougail.leader.leader)"
    **Disabled**: if the value of "[a leader](#rougail.leader.leader)" is "a" | diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.sh b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.sh index cba4f968d..58b067930 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.sh +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.sh @@ -9,6 +9,6 @@ │ rougail.leader.follower │ A follower. │ │  string   standard   mandatory    │ Default: the value of the variable │ │ disabled  │ "rougail.leader.leader" │ -│ │ Disabled: if the value of "leader" │ -│ │ is "a" │ +│ │ Disabled: if the value of │ +│ │ "rougail.leader.leader" is "a" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.adoc b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.adoc index 2d3bd80ce..ef340b6dd 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.adoc +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.adoc @@ -13,6 +13,6 @@ **Default**: val | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable. + -**Default**: get the value of rougail.dyn1.var +**Default**: get the value of "rougail.dyn__1__.var" |==== diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.adoc b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.adoc index 109666ca2..033bc48d0 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.adoc +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.adoc @@ -15,6 +15,6 @@ **Default**: val | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable. + -**Default**: get the value of rougail.dyn1.var +**Default**: get the value of "rougail.dyn__1__.var" |==== diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.gitlab.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.gitlab.md index a71c9c8fd..bfa5767d0 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.gitlab.md @@ -1,10 +1,10 @@
    New variables -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------| -| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `unique` `multiple` | A suffix variable.
    **Examples**:
    • 1
    • 2 | -| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| +| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `unique` `multiple` | A suffix variable.
    **Examples**:
    • 1
    • 2 | +| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" |
    diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.html b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.html index 4133950f9..7ae5d8d72 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.html +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.html @@ -2,13 +2,13 @@ - + - - +
  • 2
    • + +
    Variable Description
    Variable Description
    rougail.var
    integer standard unique multiple     		A suffix variable.
    Examples:
    • 1
      • -
    • 2
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of rougail.dyn1.var
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of "rougail.dyn1.var"
    diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.md index 52a05b163..98700c119 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.md @@ -4,5 +4,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `unique` `multiple` | A suffix variable.
    **Examples**:
    • 1
    • 2 | | **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.sh b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.sh index fd82d730e..cac52bf70 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.sh +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.changelog.sh @@ -14,6 +14,6 @@ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A variable. │ │  string   standard   mandatory  │ Default: get the value of │ -│ │ rougail.dyn1.var │ +│ │ "rougail.dyn1.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.gitlab.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.gitlab.md index 8d83486d5..7bb7fba02 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.gitlab.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.gitlab.md @@ -1,6 +1,6 @@ -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------| -| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `unique` `multiple` | A suffix variable.
    **Examples**:
    • 1
    • 2 | -| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| +| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `unique` `multiple` | A suffix variable.
    **Examples**:
    • 1
    • 2 | +| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.html b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.html index 65a338e70..205790191 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.html +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.html @@ -1,12 +1,12 @@ - + - - +
  • 2
    • + +
    Variable Description
    Variable Description
    rougail.var
    integer standard unique multiple     		A suffix variable.
    Examples:
    • 1
      • -
    • 2
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of rougail.dyn1.var
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of "rougail.dyn1.var"
    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 2798a4e85..ae9fd75e2 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 @@ -138,7 +138,18 @@ "type": "variable", "default": { "name": "Default", - "values": "get the value of rougail.dyn1.var" + "values": { + "description": "get the value of \"{0}\"", + "variables": [ + { + "path": "rougail.dyn{{ identifier }}.var", + "description": "a variable inside dynamic family", + "identifiers": [ + "1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.md index 21309af1d..bb88522f9 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.md @@ -2,5 +2,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `unique` `multiple` | A suffix variable.
    **Examples**:
    • 1
    • 2 | | **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.sh b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.sh index 745111657..a552553ef 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.sh +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_integer_empty.sh @@ -12,5 +12,5 @@ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A variable. │ │  string   standard   mandatory  │ Default: get the value of │ -│ │ rougail.dyn1.var │ +│ │ "rougail.dyn1.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.adoc b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.adoc index 83b997952..95ed3c4a8 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.adoc +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.adoc @@ -13,6 +13,6 @@ **Default**: val | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable. + -**Default**: get the value of rougail.dyn1.var +**Default**: get the value of "rougail.dyn__1__.var" |==== diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.adoc b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.adoc index 3735b056b..f5dcc0fc0 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.adoc +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.adoc @@ -15,6 +15,6 @@ **Default**: val | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A variable. + -**Default**: get the value of rougail.dyn1.var +**Default**: get the value of "rougail.dyn__1__.var" |==== diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.gitlab.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.gitlab.md index 4541edd35..098cba542 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.gitlab.md @@ -1,10 +1,10 @@
    New variables -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------| -| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • 1
    • 2 | -| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| +| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • 1
    • 2 | +| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" |
    diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.html b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.html index d6aa07064..0a28d1062 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.html +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.html @@ -2,13 +2,13 @@ - + - - +
  • 2
    • + +
    Variable Description
    Variable Description
    rougail.var
    integer standard mandatory unique multiple     		A suffix variable.
    Default:
    • 1
      • -
    • 2
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of rougail.dyn1.var
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of "rougail.dyn1.var"
    diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.md index 1af7736cc..d8a9387ec 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.md @@ -4,5 +4,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • 1
    • 2 | | **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.sh b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.sh index 40424401a..bc428f99d 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.sh +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.changelog.sh @@ -14,6 +14,6 @@ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A variable. │ │  string   standard   mandatory  │ Default: get the value of │ -│ │ rougail.dyn1.var │ +│ │ "rougail.dyn1.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.gitlab.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.gitlab.md index ea30adcf2..3fca0c903 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.gitlab.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.gitlab.md @@ -1,6 +1,6 @@ -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------| -| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • 1
    • 2 | -| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| +| **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • 1
    • 2 | +| **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.html b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.html index 6fd8d3005..56527a69a 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.html +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.html @@ -1,12 +1,12 @@ - + - - +
  • 2
    • + +
    Variable Description
    Variable Description
    rougail.var
    integer standard mandatory unique multiple     		A suffix variable.
    Default:
    • 1
      • -
    • 2
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of rougail.dyn1.var
    rougail.dyn1.var
    rougail.dyn2.var
    string standard mandatory    		A variable inside dynamic family.
    Default: val
    rougail.var2
    string standard mandatory     		A variable.
    Default: get the value of "rougail.dyn1.var"
    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 4b1e3ef04..756f5e614 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 @@ -142,7 +142,18 @@ "type": "variable", "default": { "name": "Default", - "values": "get the value of rougail.dyn1.var" + "values": { + "description": "get the value of \"{0}\"", + "variables": [ + { + "path": "rougail.dyn{{ identifier }}.var", + "description": "a variable inside dynamic family", + "identifiers": [ + "1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.md b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.md index 81445c608..7ad92440c 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.md +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.md @@ -2,5 +2,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • 1
    • 2 | | **rougail.dyn*1*.var**
    **rougail.dyn*2*.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable inside dynamic family.
    **Default**: val | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of rougail.dyn1.var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable.
    **Default**: get the value of "[a variable inside dynamic family](#rougail.dyn:::identifier:::.var)" | diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.sh b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.sh index 7fa0fe78b..0128f91d3 100644 --- a/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.sh +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_jinja_number.sh @@ -12,5 +12,5 @@ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A variable. │ │  string   standard   mandatory  │ Default: get the value of │ -│ │ rougail.dyn1.var │ +│ │ "rougail.dyn1.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 64f443a4c..67a97fe17 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 @@ -83,7 +83,9 @@ } ], "identifier": [ - "index of suffix value" + { + "description": "index of suffix value" + } ], "help": [ "This family builds families dynamically" diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc index 97a397552..634cc529d 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc @@ -12,6 +12,6 @@ `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | With a variable. | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A second variable. + -**Default**: the value of var +**Default**: the value of "rougail.dyn__val1__.family.var" |==== diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc index 951e8b4b5..ea02efc31 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc @@ -14,6 +14,6 @@ `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | With a variable. | **rougail.var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A second variable. + -**Default**: the value of var +**Default**: the value of "rougail.dyn__val1__.family.var" |==== diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md index bf8b21352..1e67598c1 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md @@ -1,10 +1,10 @@
    New variables -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | -| **rougail.dyn*val1*.family.var**
    **rougail.dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | +| **rougail.dyn*val1*.family.var**
    **rougail.dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#rougail.dyn:::identifier:::.family.var)" |
    diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html index 4504ca6e2..f640c3075 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html @@ -2,13 +2,13 @@ - + - - +
  • val2
    • + +
    Variable Description
    Variable Description
    rougail.var1
    string standard mandatory unique multiple     		A suffix variable.
    Default:
    • val1
      • -
    • val2
    rougail.dynval1.family.var
    rougail.dynval2.family.var
    string basic mandatory    		With a variable.
    rougail.var2
    string standard mandatory     		A second variable.
    Default: the value of var
    rougail.dynval1.family.var
    rougail.dynval2.family.var
    string basic mandatory    		With a variable.
    rougail.var2
    string standard mandatory     		A second variable.
    Default: the value of "rougail.dynval1.family.var"
    diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md index 6b2957b98..ba5205241 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md @@ -4,5 +4,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | | **rougail.dyn*val1*.family.var**
    **rougail.dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#rougail.dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh index 24bdef694..69951eef1 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh @@ -13,6 +13,7 @@ │  string   basic   mandatory  │ │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A second variable. │ -│  string   standard   mandatory  │ Default: the value of var │ +│  string   standard   mandatory  │ Default: the value of │ +│ │ "rougail.dynval1.family.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md index 54bd0fcbe..61b5f5a9a 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md @@ -1,6 +1,6 @@ -| Variable | Description | -|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------| -| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | -| **rougail.dyn*val1*.family.var**
    **rougail.dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| Variable | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------| +| **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | +| **rougail.dyn*val1*.family.var**
    **rougail.dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#rougail.dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.html b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.html index 95c90f920..1dff084d3 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.html +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.html @@ -1,12 +1,12 @@ - + - - +
  • val2
    • + +
    Variable Description
    Variable Description
    rougail.var1
    string standard mandatory unique multiple     		A suffix variable.
    Default:
    • val1
      • -
    • val2
    rougail.dynval1.family.var
    rougail.dynval2.family.var
    string basic mandatory    		With a variable.
    rougail.var2
    string standard mandatory     		A second variable.
    Default: the value of var
    rougail.dynval1.family.var
    rougail.dynval2.family.var
    string basic mandatory    		With a variable.
    rougail.var2
    string standard mandatory     		A second variable.
    Default: the value of "rougail.dynval1.family.var"
    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 1762552ce..e2a6fa22a 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 @@ -165,7 +165,18 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "rougail.dyn{{ identifier }}.family.var", + "description": "with a variable", + "identifiers": [ + "val1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.md b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.md index 6f133062c..588a1914a 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.md +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.md @@ -2,5 +2,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **rougail.var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | | **rougail.dyn*val1*.family.var**
    **rougail.dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| **rougail.var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#rougail.dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.sh b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.sh index 6a38a44b4..b9d257b61 100644 --- a/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.sh +++ b/tests/results/test_namespace_without_family/60_2family_dynamic_jinja_fill_sub_group.sh @@ -11,5 +11,6 @@ │  string   basic   mandatory  │ │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ rougail.var2 │ A second variable. │ -│  string   standard   mandatory  │ Default: the value of var │ +│  string   standard   mandatory  │ Default: the value of │ +│ │ "rougail.dynval1.family.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 ab1eab722..d0d6d4d45 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 @@ -169,7 +169,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 fb3d1fbdb..a350bb150 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 @@ -165,7 +165,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 6ca0e6707..e16f82429 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 @@ -161,7 +161,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 af2879afa..087d71685 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 @@ -142,7 +142,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 a099d2b74..014de7e43 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 @@ -138,7 +138,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 7a0d2c7bb..dd330c802 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 @@ -110,7 +110,9 @@ { "type": "property", "name": "hidden", - "annotation": "if var2 is no" + "annotation": { + "description": "if var2 is no" + } } ], "identifier": [ 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 c8466a2c3..460b566c0 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 @@ -106,7 +106,9 @@ { "type": "property", "name": "hidden", - "annotation": "if var2 is no" + "annotation": { + "description": "if var2 is no" + } } ], "identifier": [ 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 7f8230e5e..3c6148f9f 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 @@ -114,7 +114,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { 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 fe2b83cbf..c4d1bc8c9 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 @@ -110,7 +110,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { 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 32783726d..b2d16862e 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 @@ -40,7 +40,9 @@ { "type": "property", "name": "hidden", - "annotation": "if suffix == 'val2'" + "annotation": { + "description": "if suffix == 'val2'" + } } ], "identifier": [ 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 c64f0c373..14beb23da 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 @@ -114,7 +114,9 @@ "type": "variable", "default": { "name": "Default", - "values": "add 't' to each var value" + "values": { + "description": "add 't' to each var value" + } }, "properties": [ { @@ -350,7 +352,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { 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 c64f0c373..14beb23da 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 @@ -114,7 +114,9 @@ "type": "variable", "default": { "name": "Default", - "values": "add 't' to each var value" + "values": { + "description": "add 't' to each var value" + } }, "properties": [ { @@ -350,7 +352,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { 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 17b995959..cdc0940e7 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 @@ -110,7 +110,9 @@ "type": "variable", "default": { "name": "Default", - "values": "add 't' to each var value" + "values": { + "description": "add 't' to each var value" + } }, "properties": [ { @@ -346,7 +348,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { 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 01077729c..b91ed4ac5 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 @@ -292,7 +292,9 @@ "type": "variable", "default": { "name": "Default", - "values": "join identifier 1 and identifier 2" + "values": { + "description": "join identifier 1 and identifier 2" + } }, "properties": [ { diff --git a/tests/results/test_without_family/00_2default_calculated.json b/tests/results/test_without_family/00_2default_calculated.json index 2d6dfe3c5..bfadaae64 100644 --- a/tests/results/test_without_family/00_2default_calculated.json +++ b/tests/results/test_without_family/00_2default_calculated.json @@ -33,7 +33,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var1" + "values": { + "description": "the value of var1" + } }, "properties": [ { diff --git a/tests/results/test_without_family/00_2default_calculated_multi.adoc b/tests/results/test_without_family/00_2default_calculated_multi.adoc index ac7d04384..09e330f02 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.adoc +++ b/tests/results/test_without_family/00_2default_calculated_multi.adoc @@ -10,6 +10,6 @@ * maybe | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | A second variable. + -**Default**: the value of _.var1 +**Default**: the value of "var1" |==== diff --git a/tests/results/test_without_family/00_2default_calculated_multi.changelog.adoc b/tests/results/test_without_family/00_2default_calculated_multi.changelog.adoc index 9439ae18c..80d2882a3 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.changelog.adoc +++ b/tests/results/test_without_family/00_2default_calculated_multi.changelog.adoc @@ -12,6 +12,6 @@ * maybe | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` | A second variable. + -**Default**: the value of _.var1 +**Default**: the value of "var1" |==== diff --git a/tests/results/test_without_family/00_2default_calculated_multi.changelog.gitlab.md b/tests/results/test_without_family/00_2default_calculated_multi.changelog.gitlab.md index a1ff44b86..28ac07568 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.changelog.gitlab.md +++ b/tests/results/test_without_family/00_2default_calculated_multi.changelog.gitlab.md @@ -1,9 +1,9 @@
    New variables -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------| -| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------| +| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#var1)" |
    diff --git a/tests/results/test_without_family/00_2default_calculated_multi.changelog.html b/tests/results/test_without_family/00_2default_calculated_multi.changelog.html index 52d6a3f65..b0d71442e 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.changelog.html +++ b/tests/results/test_without_family/00_2default_calculated_multi.changelog.html @@ -8,7 +8,7 @@ var1
    string standard mandatory unique multipleA first variable.
    Default: -var2
    string standard mandatory unique multipleA second variable.
    Default: the value of _.var1 +var2
    string standard mandatory unique multipleA second variable.
    Default: the value of "var1" diff --git a/tests/results/test_without_family/00_2default_calculated_multi.changelog.md b/tests/results/test_without_family/00_2default_calculated_multi.changelog.md index b9fefaf37..83b15ccc3 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.changelog.md +++ b/tests/results/test_without_family/00_2default_calculated_multi.changelog.md @@ -3,5 +3,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#var1)" | diff --git a/tests/results/test_without_family/00_2default_calculated_multi.changelog.sh b/tests/results/test_without_family/00_2default_calculated_multi.changelog.sh index 730512250..ed36b9775 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.changelog.sh +++ b/tests/results/test_without_family/00_2default_calculated_multi.changelog.sh @@ -10,7 +10,7 @@ │ │ • maybe │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var2 │ A second variable. │ -│  string   standard   mandatory    │ Default: the value of _.var1 │ +│  string   standard   mandatory    │ Default: the value of "var1" │ │ unique   multiple  │ │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_without_family/00_2default_calculated_multi.gitlab.md b/tests/results/test_without_family/00_2default_calculated_multi.gitlab.md index 388f05e58..3bcd94297 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.gitlab.md +++ b/tests/results/test_without_family/00_2default_calculated_multi.gitlab.md @@ -1,5 +1,5 @@ -| Variable | Description | -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------| -| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------| +| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#var1)" | diff --git a/tests/results/test_without_family/00_2default_calculated_multi.html b/tests/results/test_without_family/00_2default_calculated_multi.html index 3bad76f66..13dc8c5b6 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.html +++ b/tests/results/test_without_family/00_2default_calculated_multi.html @@ -6,7 +6,7 @@ var1
    string standard mandatory unique multipleA first variable.
    Default: -var2
    string standard mandatory unique multipleA second variable.
    Default: the value of _.var1 +var2
    string standard mandatory unique multipleA second variable.
    Default: the value of "var1" 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 ed6f77f6a..72f75f565 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.json +++ b/tests/results/test_without_family/00_2default_calculated_multi.json @@ -49,7 +49,15 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of _.var1" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "var1", + "description": "a first variable" + } + ] + } }, "properties": [ { diff --git a/tests/results/test_without_family/00_2default_calculated_multi.md b/tests/results/test_without_family/00_2default_calculated_multi.md index 0e11e98bb..8cc162906 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.md +++ b/tests/results/test_without_family/00_2default_calculated_multi.md @@ -1,5 +1,5 @@ | Variable                                                                                                                       | Description                                                                                                                    | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A first variable.
    **Default**:
    • no
    • yes
    • maybe | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of _.var1 | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A second variable.
    **Default**: the value of "[a first variable](#var1)" | diff --git a/tests/results/test_without_family/00_2default_calculated_multi.sh b/tests/results/test_without_family/00_2default_calculated_multi.sh index 30eba9482..bac9c2c9e 100644 --- a/tests/results/test_without_family/00_2default_calculated_multi.sh +++ b/tests/results/test_without_family/00_2default_calculated_multi.sh @@ -8,6 +8,6 @@ │ │ • maybe │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var2 │ A second variable. │ -│  string   standard   mandatory    │ Default: the value of _.var1 │ +│  string   standard   mandatory    │ Default: the value of "var1" │ │ unique   multiple  │ │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 5026a349e..b2cd45bfd 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 @@ -29,7 +29,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value of a variable!" + "values": { + "description": "value of a variable!" + } }, "properties": [ { 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 b876da470..321dcfb59 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 @@ -29,7 +29,9 @@ "type": "variable", "default": { "name": "Default", - "values": "value\nof\na\nvariable!" + "values": { + "description": "value\nof\na\nvariable!" + } }, "properties": [ { diff --git a/tests/results/test_without_family/00_6choice_calculation.json b/tests/results/test_without_family/00_6choice_calculation.json index 82ef8fd37..fdaff7905 100644 --- a/tests/results/test_without_family/00_6choice_calculation.json +++ b/tests/results/test_without_family/00_6choice_calculation.json @@ -21,7 +21,9 @@ ], "choices": { "name": "Choices", - "values": "choices is 0 to 9" + "values": { + "description": "choices is 0 to 9" + } }, "path": "var", "names": [ diff --git a/tests/results/test_without_family/00_8calculation_information.json b/tests/results/test_without_family/00_8calculation_information.json index 2b811dcc9..af19861e3 100644 --- a/tests/results/test_without_family/00_8calculation_information.json +++ b/tests/results/test_without_family/00_8calculation_information.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { diff --git a/tests/results/test_without_family/00_9default_calculation.json b/tests/results/test_without_family/00_9default_calculation.json index 3b4c6d25b..d6239bae0 100644 --- a/tests/results/test_without_family/00_9default_calculation.json +++ b/tests/results/test_without_family/00_9default_calculation.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "concat all parameters" + "values": { + "description": "concat all parameters" + } }, "properties": [ { 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 d897da249..d8ceb4c39 100644 --- a/tests/results/test_without_family/00_9default_calculation_information.json +++ b/tests/results/test_without_family/00_9default_calculation_information.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns the information" + "values": { + "description": "returns the information" + } }, "properties": [ { 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 cfe0c0b13..2cf9f135c 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 @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns a value" + "values": { + "description": "returns a value" + } }, "properties": [ { diff --git a/tests/results/test_without_family/00_9default_integer.json b/tests/results/test_without_family/00_9default_integer.json index 3a7205645..387c2e116 100644 --- a/tests/results/test_without_family/00_9default_integer.json +++ b/tests/results/test_without_family/00_9default_integer.json @@ -21,7 +21,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "var", "names": [ diff --git a/tests/results/test_without_family/00_9default_number.json b/tests/results/test_without_family/00_9default_number.json index 3a7205645..387c2e116 100644 --- a/tests/results/test_without_family/00_9default_number.json +++ b/tests/results/test_without_family/00_9default_number.json @@ -21,7 +21,9 @@ ], "choices": { "name": "Choices", - "values": "choice for 0 to 9" + "values": { + "description": "choice for 0 to 9" + } }, "path": "var", "names": [ 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 f0f3dc5c3..8d44c8fff 100644 --- a/tests/results/test_without_family/01_6string_multi_length.json +++ b/tests/results/test_without_family/01_6string_multi_length.json @@ -33,7 +33,9 @@ ], "validators": { "name": "Validator", - "values": "needs exactly 3 values" + "values": { + "description": "needs exactly 3 values" + } }, "path": "var1", "names": [ @@ -83,8 +85,12 @@ "validators": { "name": "Validators", "values": [ - "needs a minimum of 1 values", - "needs a maximum of 4 values" + { + "description": "needs a minimum of 1 values" + }, + { + "description": "needs a maximum of 4 values" + } ] }, "path": "var2", 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 88c9a09f1..7024fb9d6 100644 --- a/tests/results/test_without_family/01_8calculation_information_multi.json +++ b/tests/results/test_without_family/01_8calculation_information_multi.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "get information test_information" + "values": { + "description": "get information test_information" + } }, "properties": [ { 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 6ab7ea67b..0c9df0e9e 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 @@ -33,7 +33,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value is always yes" + "values": { + "description": "the value is always yes" + } }, "properties": [ { @@ -51,7 +53,9 @@ { "type": "property", "name": "hidden", - "annotation": "only if the variable var1 has value \"yes\"" + "annotation": { + "description": "only if the variable var1 has value \"yes\"" + } }, { "type": "property", 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 9ff1de993..d0ffa6f75 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_boolean.json +++ b/tests/results/test_without_family/04_5disabled_calculation_boolean.json @@ -47,7 +47,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is egal to \"yes\"" + "annotation": { + "description": "if condition is egal to \"yes\"" + } } ], "path": "variable1", @@ -78,7 +80,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is not egal to \"yes\"" + "annotation": { + "description": "if condition is not egal to \"yes\"" + } } ], "path": "variable2", 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 28772f7f4..40e5ed812 100644 --- a/tests/results/test_without_family/04_5disabled_calculation_optional.json +++ b/tests/results/test_without_family/04_5disabled_calculation_optional.json @@ -43,7 +43,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an unknown variable" + "annotation": { + "description": "calculation from an unknown variable" + } } ], "path": "var1", @@ -70,7 +72,9 @@ { "type": "property", "name": "hidden", - "annotation": "calculation from an condition variable" + "annotation": { + "description": "calculation from an condition variable" + } } ], "path": "var2", diff --git a/tests/results/test_without_family/04_5validators.json b/tests/results/test_without_family/04_5validators.json index fb2ab49c7..2f5b61664 100644 --- a/tests/results/test_without_family/04_5validators.json +++ b/tests/results/test_without_family/04_5validators.json @@ -17,7 +17,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "int", "names": [ diff --git a/tests/results/test_without_family/04_5validators_differ.json b/tests/results/test_without_family/04_5validators_differ.json index cd0d64c5f..1a7492acf 100644 --- a/tests/results/test_without_family/04_5validators_differ.json +++ b/tests/results/test_without_family/04_5validators_differ.json @@ -21,7 +21,9 @@ ], "validators": { "name": "Validator", - "values": "var1 must be different than var2" + "values": { + "description": "var1 must be different than var2" + } }, "path": "var1", "names": [ diff --git a/tests/results/test_without_family/04_5validators_multi.json b/tests/results/test_without_family/04_5validators_multi.json index d466a1e86..abb33a002 100644 --- a/tests/results/test_without_family/04_5validators_multi.json +++ b/tests/results/test_without_family/04_5validators_multi.json @@ -32,7 +32,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 10" + "values": { + "description": "check length is less than 10" + } }, "path": "var1", "names": [ diff --git a/tests/results/test_without_family/04_5validators_multi2.json b/tests/results/test_without_family/04_5validators_multi2.json index e92041f9d..066c4f98b 100644 --- a/tests/results/test_without_family/04_5validators_multi2.json +++ b/tests/results/test_without_family/04_5validators_multi2.json @@ -32,7 +32,9 @@ ], "validators": { "name": "Validator", - "values": "check length is less than 3" + "values": { + "description": "check length is less than 3" + } }, "path": "var1", "names": [ diff --git a/tests/results/test_without_family/04_5validators_multi3.json b/tests/results/test_without_family/04_5validators_multi3.json index c4cf0732e..b1fdc890e 100644 --- a/tests/results/test_without_family/04_5validators_multi3.json +++ b/tests/results/test_without_family/04_5validators_multi3.json @@ -33,7 +33,9 @@ ], "validators": { "name": "Validator", - "values": "value must be equal to index" + "values": { + "description": "value must be equal to index" + } }, "path": "var1", "names": [ diff --git a/tests/results/test_without_family/04_5validators_warnings.json b/tests/results/test_without_family/04_5validators_warnings.json index d7e1d1188..c82e023b4 100644 --- a/tests/results/test_without_family/04_5validators_warnings.json +++ b/tests/results/test_without_family/04_5validators_warnings.json @@ -21,7 +21,9 @@ ], "validators": { "name": "Validator", - "values": "the max value is 100" + "values": { + "description": "the max value is 100" + } }, "path": "int", "names": [ diff --git a/tests/results/test_without_family/16_5redefine_calculation.json b/tests/results/test_without_family/16_5redefine_calculation.json index 5eaa4ac30..986d227dd 100644 --- a/tests/results/test_without_family/16_5redefine_calculation.json +++ b/tests/results/test_without_family/16_5redefine_calculation.json @@ -3,7 +3,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns yes" + "values": { + "description": "returns yes" + } }, "properties": [ { 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 947f37732..4e67f9078 100644 --- a/tests/results/test_without_family/20_0validators_differ_redefine.json +++ b/tests/results/test_without_family/20_0validators_differ_redefine.json @@ -81,7 +81,9 @@ ], "validators": { "name": "Validator", - "values": "var3 must be different than var2" + "values": { + "description": "var3 must be different than var2" + } }, "path": "var3", "names": [ 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 7b3178cff..0106951d5 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 @@ -45,7 +45,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 39aa237c3..9519b96d5 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 @@ -45,7 +45,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ] }, 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 bd5731bf1..8e110485d 100644 --- a/tests/results/test_without_family/24_0family_mandatory_condition.json +++ b/tests/results/test_without_family/24_0family_mandatory_condition.json @@ -43,7 +43,9 @@ { "type": "property", "name": "mandatory", - "annotation": "only if rougail.condition has the value \"yes\"" + "annotation": { + "description": "only if rougail.condition has the value \"yes\"" + } } ], "path": "var", 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 56440ca53..8f75a0295 100644 --- a/tests/results/test_without_family/24_7validators_variable_optional.json +++ b/tests/results/test_without_family/24_7validators_variable_optional.json @@ -34,8 +34,12 @@ "validators": { "name": "Validators", "values": [ - "int and int2 must be different", - "int and int3 must be different" + { + "description": "int and int2 must be different" + }, + { + "description": "int and int3 must be different" + } ] }, "path": "general.int", 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 28527d4fe..afdfc9aa7 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 @@ -90,7 +90,9 @@ "type": "variable", "default": { "name": "Default", - "values": "returns follower1 value" + "values": { + "description": "returns follower1 value" + } }, "properties": [ { diff --git a/tests/results/test_without_family/40_8calculation_boolean.json b/tests/results/test_without_family/40_8calculation_boolean.json index 04b14cad0..a56bde7cf 100644 --- a/tests/results/test_without_family/40_8calculation_boolean.json +++ b/tests/results/test_without_family/40_8calculation_boolean.json @@ -33,7 +33,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { @@ -73,7 +75,9 @@ "type": "variable", "default": { "name": "Default", - "values": "a calculation" + "values": { + "description": "a calculation" + } }, "properties": [ { 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 ac66906d0..969fcdcb3 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 @@ -45,7 +45,9 @@ { "type": "property", "name": "hidden", - "annotation": "if condition is no" + "annotation": { + "description": "if condition is no" + } } ], "help": [ 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 2d08a9b30..81e72de9a 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 @@ -102,7 +102,9 @@ { "type": "property", "name": "disabled", - "annotation": "if condition is yes" + "annotation": { + "description": "if condition is yes" + } } ], "path": "leader.follower", 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 f824bf2eb..7d8f66033 100644 --- a/tests/results/test_without_family/60_1family_dynamic_jinja.json +++ b/tests/results/test_without_family/60_1family_dynamic_jinja.json @@ -67,7 +67,9 @@ } ], "identifier": [ - "index of suffix value" + { + "description": "index of suffix value" + } ], "help": [ "This family builds families dynamically" diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc index 84af4eca0..9c634aba3 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.adoc @@ -12,6 +12,6 @@ `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | With a variable. | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A second variable. + -**Default**: the value of var +**Default**: the value of "dyn__val1__.family.var" |==== diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc index 317faaed2..ffae636ad 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.adoc @@ -14,6 +14,6 @@ `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | With a variable. | **var2** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` | A second variable. + -**Default**: the value of var +**Default**: the value of "dyn__val1__.family.var" |==== diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md index bf616521c..6a1d8ce5e 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.gitlab.md @@ -1,10 +1,10 @@
    New variables -| Variable | Description | -|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------| -| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | -| **dyn*val1*.family.var**
    **dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------| +| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | +| **dyn*val1*.family.var**
    **dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#dyn:::identifier:::.family.var)" |
    diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html index cd8d9d95a..f9ce59450 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.html @@ -2,13 +2,13 @@ - + - - +
  • val2
    • + +
    Variable Description
    Variable Description
    var1
    string standard mandatory unique multiple     		A suffix variable.
    Default:
    • val1
      • -
    • val2
    dynval1.family.var
    dynval2.family.var
    string basic mandatory    		With a variable.
    var2
    string standard mandatory     		A second variable.
    Default: the value of var
    dynval1.family.var
    dynval2.family.var
    string basic mandatory    		With a variable.
    var2
    string standard mandatory     		A second variable.
    Default: the value of "dynval1.family.var"
    diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md index 41a9c9bbb..463b6cc4f 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.md @@ -4,5 +4,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | | **dyn*val1*.family.var**
    **dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh index 2db421107..42e30778e 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.changelog.sh @@ -13,6 +13,7 @@ │  string   basic   mandatory  │ │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var2 │ A second variable. │ -│  string   standard   mandatory  │ Default: the value of var │ +│  string   standard   mandatory  │ Default: the value of │ +│ │ "dynval1.family.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md index 92e17b5c4..c2e4226e4 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.gitlab.md @@ -1,6 +1,6 @@ -| Variable | Description | -|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------| -| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | -| **dyn*val1*.family.var**
    **dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------| +| **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | +| **dyn*val1*.family.var**
    **dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.html b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.html index db233c6f4..a70f14710 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.html +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.html @@ -1,12 +1,12 @@ - + - - +
  • val2
    • + +
    Variable Description
    Variable Description
    var1
    string standard mandatory unique multiple     		A suffix variable.
    Default:
    • val1
      • -
    • val2
    dynval1.family.var
    dynval2.family.var
    string basic mandatory    		With a variable.
    var2
    string standard mandatory     		A second variable.
    Default: the value of var
    dynval1.family.var
    dynval2.family.var
    string basic mandatory    		With a variable.
    var2
    string standard mandatory     		A second variable.
    Default: the value of "dynval1.family.var"
    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 ae80f6b38..94dc75bdf 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 @@ -149,7 +149,18 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of \"{0}\"", + "variables": [ + { + "path": "dyn{{ identifier }}.family.var", + "description": "with a variable", + "identifiers": [ + "val1" + ] + } + ] + } }, "properties": [ { diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.md b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.md index afa252a62..13f6ba5b5 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.md +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.md @@ -2,5 +2,5 @@ |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **var1**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.
    **Default**:
    • val1
    • val2 | | **dyn*val1*.family.var**
    **dyn*val2*.family.var**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | With a variable. | -| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of var | +| **var2**
    [`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A second variable.
    **Default**: the value of "[with a variable](#dyn:::identifier:::.family.var)" | diff --git a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.sh b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.sh index 44dea8adc..ea2926e12 100644 --- a/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.sh +++ b/tests/results/test_without_family/60_2family_dynamic_jinja_fill_sub_group.sh @@ -11,5 +11,6 @@ │  string   basic   mandatory  │ │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ var2 │ A second variable. │ -│  string   standard   mandatory  │ Default: the value of var │ +│  string   standard   mandatory  │ Default: the value of │ +│ │ "dynval1.family.var" │ └───────────────────────────────────────┴──────────────────────────────────────┘ 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 d4f7b3aaa..219a20f0c 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 @@ -153,7 +153,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 64e6c73d9..7577d59c5 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 @@ -149,7 +149,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 4ed99d11e..5b37babb6 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 @@ -145,7 +145,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 0ef5784d7..fee09b1ff 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 @@ -126,7 +126,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 9c9eb2555..099eefb8f 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 @@ -122,7 +122,9 @@ "type": "variable", "default": { "name": "Default", - "values": "the value of var" + "values": { + "description": "the value of var" + } }, "properties": [ { 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 65b663828..a999ecdaa 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 @@ -98,7 +98,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { 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 f5a1f4982..60cfb9009 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 @@ -94,7 +94,9 @@ "type": "variable", "default": { "name": "Default", - "values": "from suffix" + "values": { + "description": "from suffix" + } }, "properties": [ { 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 0fbf78a1c..d4282338c 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 @@ -24,7 +24,9 @@ { "type": "property", "name": "hidden", - "annotation": "if suffix == 'val2'" + "annotation": { + "description": "if suffix == 'val2'" + } } ], "identifier": [ diff --git a/tests/root_a_family.adoc b/tests/root_a_family.adoc index c7b7e2723..8583629ec 100644 --- a/tests/root_a_family.adoc +++ b/tests/root_a_family.adoc @@ -1,37 +1,32 @@ == A second family +==== +**🛈 Informations** **a_family.a_second_family** - +==== [cols="1a,1a"] |==== | Variable | Description -| - -**a_family.a_second_family.a_variable** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[boolean]` `mandatory` | -A boolean variable. + +| **a_family.a_second_family.a_variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[boolean]` `mandatory` | A boolean variable. + **Default**: true |==== == An other family +==== +**🛈 Informations** -**a_family.an_other_family** - -`__hidden__` - - +**a_family.an_other_family** + +`__hidden__` + **Hidden**: when the variable "a_family.a_second_family.a_variable" has the value "true" - +==== [cols="1a,1a"] |==== | Variable | Description -| - -**a_family.an_other_family.a_variable** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | -A new variable. + +| **a_family.an_other_family.a_variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | A new variable. + **Default**: the value of the variable "a_variable" |==== diff --git a/tests/root_a_family.an_other_family.adoc b/tests/root_a_family.an_other_family.adoc index b8f14adc5..3d24d600f 100644 --- a/tests/root_a_family.an_other_family.adoc +++ b/tests/root_a_family.an_other_family.adoc @@ -1,11 +1,8 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**a_family.an_other_family.a_variable** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | -A new variable. + +| **a_family.an_other_family.a_variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | A new variable. + **Default**: the value of the variable "a_variable" |==== diff --git a/tests/root_a_family.an_other_family.gitlab.md b/tests/root_a_family.an_other_family.gitlab.md index 3d0989635..90878ebbe 100644 --- a/tests/root_a_family.an_other_family.gitlab.md +++ b/tests/root_a_family.an_other_family.gitlab.md @@ -1,4 +1,4 @@ -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------| -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[`A root variable`](#a_variable)" | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------| +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" | diff --git a/tests/root_a_family.an_other_family.md b/tests/root_a_family.an_other_family.md index 0188aa626..954ad46d4 100644 --- a/tests/root_a_family.an_other_family.md +++ b/tests/root_a_family.an_other_family.md @@ -1,4 +1,4 @@ -| Variable                                                                                         | Description                                                                                      | -|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "a_variable" | +| Variable                                                                                                                            | Description                                                                                                                         | +|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" | diff --git a/tests/root_a_family.an_other_family_changelog.adoc b/tests/root_a_family.an_other_family_changelog.adoc index 065b56759..eb3b66839 100644 --- a/tests/root_a_family.an_other_family_changelog.adoc +++ b/tests/root_a_family.an_other_family_changelog.adoc @@ -3,11 +3,8 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**a_family.an_other_family.a_variable** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | -A new variable. + +| **a_family.an_other_family.a_variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | A new variable. + **Default**: the value of the variable "a_variable" |==== diff --git a/tests/root_a_family.an_other_family_changelog.gitlab.md b/tests/root_a_family.an_other_family_changelog.gitlab.md index 52d2ac6a3..739dfb453 100644 --- a/tests/root_a_family.an_other_family_changelog.gitlab.md +++ b/tests/root_a_family.an_other_family_changelog.gitlab.md @@ -1,8 +1,8 @@
    New variable -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------| -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[`A root variable`](#a_variable)" | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------| +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" |
    diff --git a/tests/root_a_family.an_other_family_changelog.md b/tests/root_a_family.an_other_family_changelog.md index 9e541f787..cb35b7da3 100644 --- a/tests/root_a_family.an_other_family_changelog.md +++ b/tests/root_a_family.an_other_family_changelog.md @@ -1,6 +1,6 @@ # New variable -| Variable                                                                                         | Description                                                                                      | -|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "a_variable" | +| Variable                                                                                                                            | Description                                                                                                                         | +|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" | diff --git a/tests/root_a_family.an_other_family_changelog.sh b/tests/root_a_family.an_other_family_changelog.sh index 54a3bbc7a..745e3b45d 100644 --- a/tests/root_a_family.an_other_family_changelog.sh +++ b/tests/root_a_family.an_other_family_changelog.sh @@ -1,8 +1,5 @@ - - New variable - ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ ┃ Variable  ┃ Description  ┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ diff --git a/tests/root_a_family.an_other_family_example.sh b/tests/root_a_family.an_other_family_example.sh index 363f7a6c7..51e73feec 100644 --- a/tests/root_a_family.an_other_family_example.sh +++ b/tests/root_a_family.an_other_family_example.sh @@ -1,8 +1,5 @@ - - Example with all variables modifiable - ---  a_family:   an_other_family:  diff --git a/tests/root_a_family.gitlab.md b/tests/root_a_family.gitlab.md index 20d644ff1..96add6eba 100644 --- a/tests/root_a_family.gitlab.md +++ b/tests/root_a_family.gitlab.md @@ -1,8 +1,8 @@
    A second family ->>> [!note] Informations -**a_family.a_second_family** ->>> +> [!note] 🛈 Informations +> **a_family.a_second_family** + | Variable | Description | |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------| | **a_family.a_second_family.a_variable**
    [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A boolean variable.
    **Default**: true | @@ -11,12 +11,14 @@
    An other family ->>> [!note] Informations -**a_family.an_other_family**
    *`hidden`*
    **Hidden**: when the variable "[`A boolean variable`](#a_family.a_second_family.a_variable)" has the value "true" ->>> -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------| -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[`A root variable`](#a_variable)" | +> [!note] 🛈 Informations +> **a_family.an_other_family**\ +> *`hidden`*\ +> **Hidden**: when the variable "[A boolean variable](#a_family.a_second_family.a_variable)" has the value "true" + +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------| +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" |
    diff --git a/tests/root_a_family.md b/tests/root_a_family.md index 00acf0aff..374d85de6 100644 --- a/tests/root_a_family.md +++ b/tests/root_a_family.md @@ -1,20 +1,22 @@ # A second family -> ℹ Informations -> **a_family.a_second_family** +> **🛈 Informations** +> +> **a_family.a_second_family** -| Variable                                                                                         | Description                                                                                      | -|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **a_family.a_second_family.a_variable**
    [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A boolean variable.
    **Default**: true | +| Variable                                                                                                                            | Description                                                                                                                         | +|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **a_family.a_second_family.a_variable**
    [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A boolean variable.
    **Default**: true | # An other family -> ℹ Informations -> **a_family.an_other_family** -> *`hidden`* -> **Hidden**: when the variable "a_family.a_second_family.a_variable" has the value "true" +> **🛈 Informations** +> +> **a_family.an_other_family**\ +> *`hidden`*\ +> **Hidden**: when the variable "[A boolean variable](#a_family.a_second_family.a_variable)" has the value "true" -| Variable                                                                                         | Description                                                                                      | -|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "a_variable" | +| Variable                                                                                                                            | Description                                                                                                                         | +|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" | diff --git a/tests/root_a_family.sh b/tests/root_a_family.sh index 1731ee1aa..8e31af7a2 100644 --- a/tests/root_a_family.sh +++ b/tests/root_a_family.sh @@ -1,10 +1,8 @@ - - A second family - -a_family.a_second_family - +▌ 🛈 Informations +▌  +▌ a_family.a_second_family ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ ┃ Variable  ┃ Description  ┃ @@ -13,19 +11,15 @@ │  boolean   mandatory  │ Default: true │ └───────────────────────────────────────┴──────────────────────────────────────┘ - - An other family - -a_family.an_other_family - - hidden  - -Hidden: when the variable "a_family.a_second_family.a_variable" has the value +▌ 🛈 Informations +▌  +▌ a_family.an_other_family +▌  hidden  +▌ Hidden: when the variable "a_family.a_second_family.a_variable" has the value "true" - ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ ┃ Variable  ┃ Description  ┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ diff --git a/tests/root_a_family_changelog.adoc b/tests/root_a_family_changelog.adoc index ad70a154b..4688ae3f5 100644 --- a/tests/root_a_family_changelog.adoc +++ b/tests/root_a_family_changelog.adoc @@ -3,17 +3,11 @@ [cols="1a,1a"] |==== | Variable | Description -| - -**a_family.a_second_family.a_variable** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[boolean]` `mandatory` | -A boolean variable. + +| **a_family.a_second_family.a_variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[boolean]` `mandatory` | A boolean variable. + **Default**: true -| - -**a_family.an_other_family.a_variable** + -`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | -A new variable. + +| **a_family.an_other_family.a_variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[integer]` `mandatory` | A new variable. + **Default**: the value of the variable "a_variable" |==== diff --git a/tests/root_a_family_changelog.gitlab.md b/tests/root_a_family_changelog.gitlab.md index 41a7ae84d..a61fe884b 100644 --- a/tests/root_a_family_changelog.gitlab.md +++ b/tests/root_a_family_changelog.gitlab.md @@ -1,9 +1,9 @@
    New variables -| Variable | Description | -|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------| -| **a_family.a_second_family.a_variable**
    [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A boolean variable.
    **Default**: true | -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[`A root variable`](#a_variable)" | +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------| +| **a_family.a_second_family.a_variable**
    [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A boolean variable.
    **Default**: true | +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" |
    diff --git a/tests/root_a_family_changelog.md b/tests/root_a_family_changelog.md index 38c1e15a6..00631f121 100644 --- a/tests/root_a_family_changelog.md +++ b/tests/root_a_family_changelog.md @@ -1,7 +1,7 @@ # New variables -| Variable                                                                                         | Description                                                                                      | -|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **a_family.a_second_family.a_variable**
    [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A boolean variable.
    **Default**: true | -| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "a_variable" | +| Variable                                                                                                                            | Description                                                                                                                         | +|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **a_family.a_second_family.a_variable**
    [`boolean`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A boolean variable.
    **Default**: true | +| **a_family.an_other_family.a_variable**
    [`integer`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | A new variable.
    **Default**: the value of the variable "[A root variable](#a_variable)" | diff --git a/tests/root_a_family_changelog.sh b/tests/root_a_family_changelog.sh index 4ae9390c9..e04d9c674 100644 --- a/tests/root_a_family_changelog.sh +++ b/tests/root_a_family_changelog.sh @@ -1,8 +1,5 @@ - - New variables - ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ ┃ Variable  ┃ Description  ┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ diff --git a/tests/root_a_family_example.sh b/tests/root_a_family_example.sh index bec238c46..b18763182 100644 --- a/tests/root_a_family_example.sh +++ b/tests/root_a_family_example.sh @@ -1,8 +1,5 @@ - - Example with all variables modifiable - ---  a_family:   a_second_family:  diff --git a/tests/test_load.py b/tests/test_load.py index 7f53f4e58..5e15f387c 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -20,8 +20,7 @@ excludes = [ ] test_ok = get_structures_list(excludes) -# test_ok = [HERE.parent.parent / "rougail-tests" / "structures" / "60_5family_dynamic_calc_description"] - +# test_ok = [HERE.parent.parent / "rougail-tests" / "structures" / "00_2default_calculated_variable"] os.environ['COLUMNS'] = '80'