stove/rougail-output-doc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

fix: better identifier support

Browse source
This commit is contained in:
egarette@silique.fr 2026-03-14 21:24:57 +01:00
parent 48668bce75
commit 0271bf430a
1 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/rougail/output_doc/annotator.py
View file

@ -38,6 +38,10 @@ from rougail.convert.object_model import (
NamespaceCalculation,
CONVERT_OPTION,
)
try:
from rougail.user_data_risotto.utils import RisottoCalculation
except ImportError as err:
RisottoCalculation = None
class Annotator(Walk):
@ -290,13 +294,13 @@ class Annotator(Walk):
return self.calculation_to_information_information(
values, version, path
)
if isinstance(values, (IdentifierCalculation, IdentifierPropertyCalculation)):
return {
"type": "identifier",
"value": self.calculation_to_information_identifier(
values, prop, version
),
}
if isinstance(values, IdentifierPropertyCalculation):
ret = {}
self.when_to_condition(values, ret)
ret["type"] = "identifier"
return ret
if isinstance(values, IdentifierCalculation):
return {"type": "identifier"}
if isinstance(values, IndexCalculation):
return {
"type": "index",
@ -307,25 +311,38 @@ class Annotator(Walk):
"type": "namespace",
"value": True,
}
if RisottoCalculation and isinstance(values, RisottoCalculation):
# FIXME
return {
"type": "risotto",
"value": True,
}
raise Exception(f'unknown calculation {type(values)} "{values}"')
def calculation_to_information_variable(
self, variable_path: str, values, prop: str, version: str, path: str
) -> str:
# is optional
variable = self.objectspace.paths.get_with_dynamic(
variable, identifiers = self.objectspace.paths.get_with_dynamic(
variable_path,
path,
values.version,
values.namespace,
values.xmlfiles,
)[0]
)
if not variable or (isinstance(values, VariableCalculation) and values.optional and not variable):
return None
values_calculation = {"path": variable.path}
if identifiers:
values_calculation["identifiers"] = identifiers
if prop in PROPERTY_ATTRIBUTE:
# get comparative value
# values_calculation["transitive"] = values.propertyerror == "transitive"
self.when_to_condition(values, values_calculation)
else:
values_calculation["type"] = "variable"
return values_calculation
def when_to_condition(self, values, values_calculation):
if values.when_not is not undefined:
values_calculation["type"] = "condition"
values_calculation["value"] = values.when_not
@ -340,9 +357,6 @@ class Annotator(Walk):
values_calculation["type"] = "condition"
values_calculation["value"] = True
values_calculation["condition"] = "when"
else:
values_calculation["type"] = "variable"
return values_calculation
def calculation_to_information_information(
self, values, version: str, path: str
@ -363,16 +377,6 @@ class Annotator(Walk):
values_calculation["path"] = variable.path
return values_calculation
def calculation_to_information_identifier(
self, values, prop: str, version: str
) -> Union[str, bool]:
if version != "1.0" and prop in PROPERTY_ATTRIBUTE:
if values.when is not undefined:
return _('when the identifier is "{0}"').format(values.when)
if values.when_not is not undefined:
return _('when the identifier is not "{0}"').format(values.when_not)
return True
def get_path_from_variable(self, values, version: str, path: str) -> str:
variable_path = values.variable
paths = self.objectspace.paths