fix: support suffix (in version 1.0 format) in calculation
This commit is contained in:
parent
97a8653b28
commit
604cfa0a1d
10 changed files with 315 additions and 4 deletions
|
@ -328,4 +328,6 @@ class Annotator(Walk):
|
||||||
variable_path,
|
variable_path,
|
||||||
path,
|
path,
|
||||||
)
|
)
|
||||||
|
elif version == '1.0' and '{{ suffix }}' in variable_path:
|
||||||
|
variable_path = variable_path.replace("{{ suffix }}", "{{ identifier }}")
|
||||||
return variable_path
|
return variable_path
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
== Variables for "Rougail"
|
||||||
|
|
||||||
|
[cols="1a,1a"]
|
||||||
|
|====
|
||||||
|
| Variable | Description
|
||||||
|
|
|
||||||
|
|
||||||
|
**rougail.var** +
|
||||||
|
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` |
|
||||||
|
A suffix variable. +
|
||||||
|
**Default**:
|
||||||
|
|
||||||
|
* val1
|
||||||
|
* val2
|
||||||
|
|====
|
||||||
|
|
||||||
|
=== a dynamic family
|
||||||
|
|
||||||
|
`standard`
|
||||||
|
|
||||||
|
This family builds families dynamically.
|
||||||
|
|
||||||
|
**Identifiers**: the value of the variable "rougail.var".
|
||||||
|
|
||||||
|
[cols="1a,1a"]
|
||||||
|
|====
|
||||||
|
| Variable | Description
|
||||||
|
|
|
||||||
|
|
||||||
|
**rougail.my_dyn_family___val1__.var** +
|
||||||
|
**rougail.my_dyn_family___val2__.var** +
|
||||||
|
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` |
|
||||||
|
A variable inside a dynamic family. +
|
||||||
|
**Default**: the value of the identifier.
|
||||||
|
|====
|
||||||
|
|
||||||
|
[cols="1a,1a"]
|
||||||
|
|====
|
||||||
|
| Variable | Description
|
||||||
|
|
|
||||||
|
|
||||||
|
**rougail.var2** +
|
||||||
|
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` `unique` `multiple` |
|
||||||
|
A variable. +
|
||||||
|
**Default**:
|
||||||
|
|
||||||
|
* the value of the variable "rougail.my_dyn_family___val1__.var"
|
||||||
|
* the value of the variable "rougail.my_dyn_family___val2__.var"
|
||||||
|
|====
|
||||||
|
|
|
@ -0,0 +1,149 @@
|
||||||
|
{
|
||||||
|
"rougail": {
|
||||||
|
"type": "namespace",
|
||||||
|
"informations": {
|
||||||
|
"paths": [
|
||||||
|
"rougail"
|
||||||
|
],
|
||||||
|
"names": [
|
||||||
|
"rougail"
|
||||||
|
],
|
||||||
|
"description": "Rougail",
|
||||||
|
"properties": [
|
||||||
|
{
|
||||||
|
"type": "mode",
|
||||||
|
"name": "standard"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"children": {
|
||||||
|
"rougail.var": {
|
||||||
|
"type": "variable",
|
||||||
|
"default": [
|
||||||
|
"val1",
|
||||||
|
"val2"
|
||||||
|
],
|
||||||
|
"properties": [
|
||||||
|
{
|
||||||
|
"type": "type",
|
||||||
|
"name": "string"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "mode",
|
||||||
|
"name": "standard"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "property",
|
||||||
|
"name": "mandatory"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "property",
|
||||||
|
"name": "unique"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "multiple",
|
||||||
|
"name": "multiple"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"paths": [
|
||||||
|
"rougail.var"
|
||||||
|
],
|
||||||
|
"names": [
|
||||||
|
"var"
|
||||||
|
],
|
||||||
|
"descriptions": [
|
||||||
|
"A suffix variable."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"my_dyn_family_{{ identifier }}": {
|
||||||
|
"type": "dynamic",
|
||||||
|
"informations": {
|
||||||
|
"paths": [
|
||||||
|
"rougail.my_dyn_family_val1",
|
||||||
|
"rougail.my_dyn_family_val2"
|
||||||
|
],
|
||||||
|
"names": [
|
||||||
|
"my_dyn_family_val1",
|
||||||
|
"my_dyn_family_val2"
|
||||||
|
],
|
||||||
|
"description": "a dynamic family",
|
||||||
|
"properties": [
|
||||||
|
{
|
||||||
|
"type": "mode",
|
||||||
|
"name": "standard"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"identifiers": "the value of the variable \"rougail.var\".",
|
||||||
|
"help": [
|
||||||
|
"This family builds families dynamically."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"children": {
|
||||||
|
"rougail.my_dyn_family_{{ identifier }}.var": {
|
||||||
|
"paths": [
|
||||||
|
"rougail.my_dyn_family_val1.var",
|
||||||
|
"rougail.my_dyn_family_val2.var"
|
||||||
|
],
|
||||||
|
"names": [
|
||||||
|
"var",
|
||||||
|
"var"
|
||||||
|
],
|
||||||
|
"type": "variable",
|
||||||
|
"default": "the value of the identifier.",
|
||||||
|
"properties": [
|
||||||
|
{
|
||||||
|
"type": "type",
|
||||||
|
"name": "string"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "mode",
|
||||||
|
"name": "standard"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"descriptions": [
|
||||||
|
"A variable inside a dynamic family."
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"rougail.var2": {
|
||||||
|
"type": "variable",
|
||||||
|
"default": [
|
||||||
|
"the value of the variable \"rougail.my_dyn_family_val1.var\"",
|
||||||
|
"the value of the variable \"rougail.my_dyn_family_val2.var\""
|
||||||
|
],
|
||||||
|
"properties": [
|
||||||
|
{
|
||||||
|
"type": "type",
|
||||||
|
"name": "string"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "mode",
|
||||||
|
"name": "standard"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "property",
|
||||||
|
"name": "mandatory"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "property",
|
||||||
|
"name": "unique"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "multiple",
|
||||||
|
"name": "multiple"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"paths": [
|
||||||
|
"rougail.var2"
|
||||||
|
],
|
||||||
|
"names": [
|
||||||
|
"var2"
|
||||||
|
],
|
||||||
|
"descriptions": [
|
||||||
|
"A variable."
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
gitea: none
|
||||||
|
include_toc: true
|
||||||
|
---
|
||||||
|
# Variables for "Rougail"
|
||||||
|
|
||||||
|
| Variable | Description |
|
||||||
|
|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
|
| **rougail.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A suffix variable.<br/>**Default**: <br/>- val1<br/>- val2 |
|
||||||
|
|
||||||
|
## a dynamic family
|
||||||
|
|
||||||
|
`standard`
|
||||||
|
|
||||||
|
This family builds families dynamically.
|
||||||
|
|
||||||
|
**Identifiers**: the value of the variable "rougail.var".
|
||||||
|
|
||||||
|
| Variable | Description |
|
||||||
|
|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
|
| **rougail.my_dyn_family_*val1*.var**<br/>**rougail.my_dyn_family_*val2*.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` | A variable inside a dynamic family.<br/>**Default**: the value of the identifier. |
|
||||||
|
|
||||||
|
| Variable | Description |
|
||||||
|
|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
|
| **rougail.var2**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` `unique` `multiple` | A variable.<br/>**Default**: <br/>- the value of the variable "rougail.my_dyn_family_*val1*.var"<br/>- the value of the variable "rougail.my_dyn_family_*val2*.var" |
|
||||||
|
|
|
@ -0,0 +1,55 @@
|
||||||
|
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
|
||||||
|
┃ [1mVariables for "Rougail"[0m ┃
|
||||||
|
┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[1m [0m[1mVariable [0m[1m [0m [1m [0m[1mDescription [0m[1m [0m
|
||||||
|
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
||||||
|
[1mrougail.var[0m
|
||||||
|
[1;36;40mstring[0m [1;36;40mstandard[0m [1;36;40mmandatory[0m [1;36;40munique[0m A suffix variable.
|
||||||
|
[1;36;40mmultiple[0m
|
||||||
|
[1mDefault[0m:
|
||||||
|
|
||||||
|
|
||||||
|
[1;33m • [0mval1
|
||||||
|
[1;33m • [0mval2
|
||||||
|
[1;33m [0m|
|
||||||
|
|
||||||
|
|
||||||
|
[1;4ma dynamic family[0m
|
||||||
|
|
||||||
|
[1;36;40mstandard[0m
|
||||||
|
|
||||||
|
This family builds families dynamically.
|
||||||
|
|
||||||
|
[1mIdentifiers[0m: the value of the variable "rougail.var".
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[1m [0m[1mVariable [0m[1m [0m [1m [0m[1mDescription [0m[1m [0m
|
||||||
|
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
||||||
|
[1mrougail.my_dyn_family_[0m[1;3mval1[0m[1m.var[0m
|
||||||
|
[1mrougail.my_dyn_family_[0m[1;3mval2[0m[1m.var[0m
|
||||||
|
[1;36;40mstring[0m [1;36;40mstandard[0m A variable inside a dynamic family.
|
||||||
|
[1mDefault[0m: the value of the
|
||||||
|
identifier.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[1m [0m[1mVariable [0m[1m [0m [1m [0m[1mDescription [0m[1m [0m
|
||||||
|
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
||||||
|
[1mrougail.var2[0m
|
||||||
|
[1;36;40mstring[0m [1;36;40mstandard[0m [1;36;40mmandatory[0m [1;36;40munique[0m A variable.
|
||||||
|
[1;36;40mmultiple[0m
|
||||||
|
[1mDefault[0m:
|
||||||
|
|
||||||
|
|
||||||
|
[1;33m • [0mthe value of the variable "rougail.my_dyn_family_[3mval1[0m.var"
|
||||||
|
[1;33m • [0mthe value of the variable "rougail.my_dyn_family_[3mval2[0m.var"
|
||||||
|
[1;33m [0m|
|
|
@ -40,7 +40,10 @@ A dynamic variable. +
|
||||||
|
|
||||||
This family builds families dynamically.
|
This family builds families dynamically.
|
||||||
|
|
||||||
**Identifiers**: the value of the variable "rougail.dyn{{ suffix }}.var".
|
**Identifiers**:
|
||||||
|
|
||||||
|
* the value of the variable "rougail.dyn__val1__.var"
|
||||||
|
* the value of the variable "rougail.dyn__val2__.var"
|
||||||
|
|
||||||
[cols="1a,1a"]
|
[cols="1a,1a"]
|
||||||
|====
|
|====
|
||||||
|
|
|
@ -138,7 +138,10 @@
|
||||||
"name": "standard"
|
"name": "standard"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"identifiers": "the value of the variable \"rougail.dyn{{ suffix }}.var\".",
|
"identifiers": [
|
||||||
|
"the value of the variable \"rougail.dynval1.var\"",
|
||||||
|
"the value of the variable \"rougail.dynval2.var\""
|
||||||
|
],
|
||||||
"help": [
|
"help": [
|
||||||
"This family builds families dynamically."
|
"This family builds families dynamically."
|
||||||
]
|
]
|
||||||
|
|
|
@ -26,7 +26,7 @@ This family builds families dynamically.
|
||||||
|
|
||||||
This family builds families dynamically.
|
This family builds families dynamically.
|
||||||
|
|
||||||
**Identifiers**: the value of the variable "rougail.dyn{{ suffix }}.var".
|
**Identifiers**: <br/>- the value of the variable "rougail.dyn*val1*.var"<br/>- the value of the variable "rougail.dyn*val2*.var"
|
||||||
|
|
||||||
| Variable | Description |
|
| Variable | Description |
|
||||||
|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
|
|
|
@ -45,7 +45,10 @@ This family builds families dynamically.
|
||||||
|
|
||||||
This family builds families dynamically.
|
This family builds families dynamically.
|
||||||
|
|
||||||
[1mIdentifiers[0m: the value of the variable "rougail.dyn{{ suffix }}.var".
|
[1mIdentifiers[0m:
|
||||||
|
|
||||||
|
[1;33m • [0mthe value of the variable "rougail.dyn[3mval1[0m.var"
|
||||||
|
[1;33m • [0mthe value of the variable "rougail.dyn[3mval2[0m.var"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
---
|
||||||
|
gitea: none
|
||||||
|
include_toc: true
|
||||||
|
---
|
||||||
|
# Example with all variables modifiable
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
---
|
||||||
|
rougail:
|
||||||
|
var:
|
||||||
|
- val1
|
||||||
|
- val2
|
||||||
|
my_dyn_family_val1:
|
||||||
|
var: val1
|
||||||
|
my_dyn_family_val2:
|
||||||
|
var: val2
|
||||||
|
var2:
|
||||||
|
- val1
|
||||||
|
- val2
|
||||||
|
```
|
Loading…
Reference in a new issue