CHANGELOG.md

@@ -1,9 +1,3 @@
-## 1.2.0a33 (2025-09-29)
-
-### Fix
-
-- better doc for calculation with unknown variable
-
 ## 1.2.0a32 (2025-09-29)
 
 ### Feat

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rougail"
-version = "1.2.0a33"
+version = "1.2.0a32"
 
 [tool.commitizen]
 name = "cz_conventional_commits"

rougail-base-pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail-base"
-version = "1.2.0a33"
+version = "1.2.0a32"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "A consistency handling system that was initially designed in the configuration management"

rougail-pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail"
-version = "1.2.0a33"
+version = "1.2.0a32"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 description = "A consistency handling system that was initially designed in the configuration management"
 classifiers = [
@@ -18,7 +18,7 @@ classifiers = [
 dependencies = [
     "ruamel.yaml ~= 0.18.6",
     "pydantic ~= 2.9.2",
-    "rougail-base == 1.2.0a33",
+    "rougail-base == 1.2.0a32",
 ]
 
 [tool.flit.sdist]

src/rougail/__version__.py

@@ -1 +1 @@
-__version__ = "1.2.0a33"
+__version__ = "1.2.0a32"

src/rougail/convert/object_model.py

@@ -674,13 +674,11 @@ class VariableCalculation(_VariableCalculation):
         ) = self.get_variable(objectspace)
         if (
             not variable_in_calculation
-            and (self.optional
-            or objectspace.force_optional)
+            and self.optional
+            or (objectspace.force_optional and self.attribute_name == "default")
         ):
             if self.default is not undefined:
                 return self.get_default_value_optional(objectspace, self.default)
-            if self.default_values is not None:
-                return self.default_values
             raise VariableCalculationDependencyError()
         if variable_in_calculation and self.attribute_name == "default":
             local_variable = objectspace.paths[self.path]
@@ -722,8 +720,8 @@ class VariablePropertyCalculation(_VariableCalculation):
         if (
 #            self.default is not undefined and
             not variable_in_calculation
-            and (self.optional
-            or objectspace.force_optional)
+            and self.optional
+            or (objectspace.force_optional)
         ):
             if self.default is undefined:
                 default = False

src/rougail/convert/tiramisureflector.py

@@ -226,8 +226,7 @@ class Common:
             for val in value:
                 ret = self.calculation_property(val)
                 if isinstance(ret, bool):
-                    if ret:
-                        properties.append(self.convert_str(property_))
+                    properties.append(self.convert_str(property_))
                 elif ret is not None:
                     calc_properties.append(ret)
         if properties or calc_properties:
@@ -245,7 +244,6 @@ class Common:
                 return None
         return value
 
-
     def calc_properties(
         self,
         prop,
@@ -464,14 +462,9 @@ class Variable(Common):
             )
             return
         if self.elt.type == "choice":
-            try:
-                keys["values"] = self.populate_calculation(
-                    self.elt.choices, return_a_tuple=True
-                )
-                if keys["values"] == '(,)':
-                    keys["values"] = tuple()
-            except VariableCalculationDependencyError:
-                keys["values"] = tuple()
+            keys["values"] = self.populate_calculation(
+                self.elt.choices, return_a_tuple=True
+            )
         if self.elt.type == "regexp":
             self.object_type = "Regexp_" + self.option_name
             self.tiramisu.text["header"].append(
@@ -544,10 +537,7 @@ class Family(Common):
         if self.group_type:
             keys["group_type"] = self.group_type
         if self.elt.type == "dynamic":
-            try:
-                keys["identifiers"] = self.populate_calculation(self.elt.dynamic)
-            except VariableCalculationDependencyError:
-                keys["identifiers"] = []
+            keys["identifiers"] = self.populate_calculation(self.elt.dynamic)
         children = []
         for path in self.objectspace.parents[self.elt.path]:
             children.append(self.objectspace.paths[path])

src/rougail/tiramisu.py

@@ -433,7 +433,7 @@ class ConvertDynOptionDescription(DynOptionDescription):
         if "{{ identifier }}" in display:
             return display.replace(
                 "{{ identifier }}",
-                self.convert_identifier_to_path(self.get_identifiers(subconfig, from_display_name=True)[-1]),
+                self.convert_identifier_to_path(self.get_identifiers(subconfig)[-1]),
             )
         return display