From 9741cda535f9c6925b94f0706a9bf051b7fedeb4 Mon Sep 17 00:00:00 2001 From: Lionel Untereiner Date: Wed, 7 Feb 2024 16:34:04 +0100 Subject: [PATCH 1/2] change config settings --- xsdata/models/config.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/xsdata/models/config.py b/xsdata/models/config.py index efa89aa89..a0129c825 100644 --- a/xsdata/models/config.py +++ b/xsdata/models/config.py @@ -268,7 +268,8 @@ class GeneratorOutput: structure_style: StructureStyle = element( default=StructureStyle.FILENAMES, name="Structure" ) - docstring_style: DocstringStyle = element(default=DocstringStyle.RST) + docstring_ + style: DocstringStyle = element(default=DocstringStyle.RST) filter_strategy: ClassFilterStrategy = element( default=ClassFilterStrategy.ALL_GLOBALS ) @@ -491,6 +492,24 @@ class GeneratorExtensions: extension: List[GeneratorExtension] = array_element() +@dataclass +class GeneratorSimpleType: + """ + SimpleType to keep + + :param type: The target object type + """ + + type: ObjectType = attribute(required=True) + +@dataclass +class GeneratorTypesKeeping: + """ + Generator simple types keeping. + + :param types: The list of types to keep + """ + simple_types: List[GeneratorSimpleType] = array_element() @dataclass class GeneratorConfig: @@ -520,6 +539,7 @@ class Meta: default_factory=GeneratorSubstitutions ) extensions: GeneratorExtensions = element(default_factory=GeneratorExtensions) + keep: GeneratorTypesKeeping = element(default_factory=GeneratorTypesKeeping) def __post_init__(self): if self.aliases: From 8bd754c4821540aad98c7cfd34f1b00365d54002 Mon Sep 17 00:00:00 2001 From: Lionel Untereiner Date: Wed, 7 Feb 2024 17:46:02 +0100 Subject: [PATCH 2/2] fix config and test --- tests/models/test_config.py | 5 ++++- xsdata/models/config.py | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/models/test_config.py b/tests/models/test_config.py index 5bde12fe5..f7351769d 100644 --- a/tests/models/test_config.py +++ b/tests/models/test_config.py @@ -50,7 +50,7 @@ def test_create(self): ' \n' ' \n' ' \n' - " \n" + " \n" " \n" ' \n' ' \n' @@ -64,6 +64,7 @@ def test_create(self): ' \n' " \n" " \n" + " \n" "\n" ) self.assertEqual(expected, file_path.read_text()) @@ -81,6 +82,7 @@ def test_read(self): " \n" " \n" " \n" + " \n" "\n" ) file_path = Path(tempfile.mktemp()) @@ -116,6 +118,7 @@ def test_read(self): " \n" " \n" " \n" + " \n" "\n" ) self.assertEqual(expected, file_path.read_text()) diff --git a/xsdata/models/config.py b/xsdata/models/config.py index a0129c825..6d7dcda23 100644 --- a/xsdata/models/config.py +++ b/xsdata/models/config.py @@ -268,8 +268,7 @@ class GeneratorOutput: structure_style: StructureStyle = element( default=StructureStyle.FILENAMES, name="Structure" ) - docstring_ - style: DocstringStyle = element(default=DocstringStyle.RST) + docstring_style: DocstringStyle = element(default=DocstringStyle.RST) filter_strategy: ClassFilterStrategy = element( default=ClassFilterStrategy.ALL_GLOBALS ) @@ -539,7 +538,7 @@ class Meta: default_factory=GeneratorSubstitutions ) extensions: GeneratorExtensions = element(default_factory=GeneratorExtensions) - keep: GeneratorTypesKeeping = element(default_factory=GeneratorTypesKeeping) + types_to_keep: GeneratorTypesKeeping = element(default_factory=GeneratorTypesKeeping) def __post_init__(self): if self.aliases: