structurize 2.22.0__py3-none-any.whl → 2.22.2__py3-none-any.whl

avrotize/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.22.0'
-__version_tuple__ = version_tuple = (2, 22, 0)
+__version__ = version = '2.22.2'
+__version_tuple__ = version_tuple = (2, 22, 2)
 
-__commit_id__ = commit_id = 'g5d3e04df0'
+__commit_id__ = commit_id = 'g25efcf5da'

avrotize/avrotocsharp.py

@@ -16,6 +16,7 @@ from avrotize.constants import (
     SYSTEM_MEMORY_DATA_VERSION,
     PROTOBUF_NET_VERSION,
     MSGPACK_VERSION,
+    CBOR_VERSION,
     NUNIT_VERSION,
     NUNIT_ADAPTER_VERSION,
     MSTEST_SDK_VERSION,
@@ -53,6 +54,7 @@ class AvroToCSharp:
         self.newtonsoft_json_annotation = False
         self.system_xml_annotation = False
         self.msgpack_annotation = False
+        self.cbor_annotation = False
         self.avro_annotation = False
         self.protobuf_net_annotation = False
         self.generated_types: Dict[str,str] = {}
@@ -267,6 +269,7 @@ class AvroToCSharp:
             newtonsoft_json_annotation=self.newtonsoft_json_annotation,
             system_xml_annotation=self.system_xml_annotation,
             msgpack_annotation=self.msgpack_annotation,
+            cbor_annotation=self.cbor_annotation,
             json_match_clauses=self.create_is_json_match_clauses(avro_schema, avro_namespace, class_name)
         )
 
@@ -768,6 +771,10 @@ class AvroToCSharp:
         if self.msgpack_annotation:
             prop += f"{INDENT}[Key({field_index})]\n"
 
+        # Add CBOR serialization attribute if enabled
+        if self.cbor_annotation:
+            prop += f"{INDENT}[Dahomey.Cbor.Attributes.CborProperty(\"{annotation_name}\")]\n"
+
         if self.system_text_json_annotation:
             prop += f"{INDENT}[System.Text.Json.Serialization.JsonPropertyName(\"{annotation_name}\")]\n"
             if is_enum_type:
@@ -831,6 +838,8 @@ class AvroToCSharp:
                 file_content += "using System.Xml.Serialization;\n"
             if self.msgpack_annotation:  # Add MessagePack serialization using directive
                 file_content += "using MessagePack;\n"
+            if self.cbor_annotation:  # Add CBOR serialization using directive
+                file_content += "using Dahomey.Cbor.Attributes;\n"
 
             if namespace:
                 # Namespace declaration with correct indentation for the definition
@@ -874,7 +883,8 @@ class AvroToCSharp:
                 system_text_json_annotation=self.system_text_json_annotation,
                 newtonsoft_json_annotation=self.newtonsoft_json_annotation,
                 protobuf_net_annotation=self.protobuf_net_annotation,
-                msgpack_annotation=self.msgpack_annotation
+                msgpack_annotation=self.msgpack_annotation,
+                cbor_annotation=self.cbor_annotation
             )
         elif type_kind == "enum":
             test_class_definition = process_template(
@@ -1028,12 +1038,14 @@ class AvroToCSharp:
                         newtonsoft_json_annotation=self.newtonsoft_json_annotation,
                         protobuf_net_annotation=self.protobuf_net_annotation,
                         msgpack_annotation=self.msgpack_annotation,
+                        cbor_annotation=self.cbor_annotation,
                         CSHARP_AVRO_VERSION=CSHARP_AVRO_VERSION,
                         NEWTONSOFT_JSON_VERSION=NEWTONSOFT_JSON_VERSION,
                         SYSTEM_TEXT_JSON_VERSION=SYSTEM_TEXT_JSON_VERSION,
                         SYSTEM_MEMORY_DATA_VERSION=SYSTEM_MEMORY_DATA_VERSION,
                         PROTOBUF_NET_VERSION=PROTOBUF_NET_VERSION,
                         MSGPACK_VERSION=MSGPACK_VERSION,
+                        CBOR_VERSION=CBOR_VERSION,
                         NUNIT_VERSION=NUNIT_VERSION,
                         NUNIT_ADAPTER_VERSION=NUNIT_ADAPTER_VERSION,
                         MSTEST_SDK_VERSION=MSTEST_SDK_VERSION))
@@ -1107,6 +1119,7 @@ def convert_avro_to_csharp(
     newtonsoft_json_annotation=False, 
     system_xml_annotation=False,
     msgpack_annotation=False,
+    cbor_annotation=False,
     avro_annotation=False,
     protobuf_net_annotation=False
 ):
@@ -1122,6 +1135,7 @@ def convert_avro_to_csharp(
         newtonsoft_json_annotation (bool, optional): Use Newtonsoft.Json annotations. Defaults to False.
         system_xml_annotation (bool, optional): Use System.Xml.Serialization annotations. Defaults to False.
         msgpack_annotation (bool, optional): Use MessagePack annotations. Defaults to False.
+        cbor_annotation (bool, optional): Use Dahomey.Cbor annotations. Defaults to False.
         avro_annotation (bool, optional): Use Avro annotations. Defaults to False.
         protobuf_net_annotation (bool, optional): Use protobuf-net annotations. Defaults to False.
     """
@@ -1135,6 +1149,7 @@ def convert_avro_to_csharp(
     avrotocs.newtonsoft_json_annotation = newtonsoft_json_annotation
     avrotocs.system_xml_annotation = system_xml_annotation
     avrotocs.msgpack_annotation = msgpack_annotation
+    avrotocs.cbor_annotation = cbor_annotation
     avrotocs.avro_annotation = avro_annotation
     avrotocs.protobuf_net_annotation = protobuf_net_annotation
     avrotocs.convert(avro_schema_path, cs_file_path)
@@ -1150,6 +1165,7 @@ def convert_avro_schema_to_csharp(
     newtonsoft_json_annotation: bool = False, 
     system_xml_annotation: bool = False,
     msgpack_annotation: bool = False,
+    cbor_annotation: bool = False,
     avro_annotation: bool = False,
     protobuf_net_annotation: bool = False
 ):
@@ -1165,6 +1181,7 @@ def convert_avro_schema_to_csharp(
         newtonsoft_json_annotation (bool, optional): Use Newtonsoft.Json annotations. Defaults to False.
         system_xml_annotation (bool, optional): Use System.Xml.Serialization annotations. Defaults to False.
         msgpack_annotation (bool, optional): Use MessagePack annotations. Defaults to False.
+        cbor_annotation (bool, optional): Use Dahomey.Cbor annotations. Defaults to False.
         avro_annotation (bool, optional): Use Avro annotations. Defaults to False.
         protobuf_net_annotation (bool, optional): Use protobuf-net annotations. Defaults to False.
     """
@@ -1175,6 +1192,7 @@ def convert_avro_schema_to_csharp(
     avrotocs.newtonsoft_json_annotation = newtonsoft_json_annotation
     avrotocs.system_xml_annotation = system_xml_annotation
     avrotocs.msgpack_annotation = msgpack_annotation
+    avrotocs.cbor_annotation = cbor_annotation
     avrotocs.avro_annotation = avro_annotation
     avrotocs.protobuf_net_annotation = protobuf_net_annotation
     avrotocs.convert_schema(avro_schema, output_dir)

avrotize/avrotojsons.py

@@ -184,16 +184,38 @@ class AvroToJsonSchemaConverter:
     def handle_type_union(self, types: List[Union[str, Dict[str, Any]]]) -> Dict[str, Any] | List[Dict[str, Any]| str] | str:
         """
         Handle Avro type unions, returning a JSON schema that validates against any of the types.
+        Preserves nullability from Avro unions containing 'null'.
         """
+        is_nullable = 'null' in types
         non_null_types = [t for t in types if t != 'null']
+        
         if len(non_null_types) == 1:
-            # Single non-null type
-            return self.parse_avro_schema(non_null_types[0])
+            # Single non-null type - check if it's a primitive that can use type array
+            single_type = non_null_types[0]
+            json_schema = self.parse_avro_schema(single_type)
+            
+            if is_nullable and isinstance(json_schema, dict):
+                # For primitives with a simple 'type' field, we can use type array notation
+                if 'type' in json_schema and isinstance(json_schema['type'], str) and '$ref' not in json_schema:
+                    # Primitive type - add null to type array
+                    json_schema = copy.deepcopy(json_schema)
+                    json_schema['type'] = [json_schema['type'], 'null']
+                elif '$ref' in json_schema:
+                    # Reference type - use oneOf with null
+                    json_schema = {
+                        'oneOf': [
+                            {'type': 'null'},
+                            json_schema
+                        ]
+                    }
+            return json_schema
         else:
             # Multiple non-null types
-            union_types = [self.convert_reference(t) if isinstance(t,str) and t in self.defined_types else self.avro_primitive_to_json_type(t)
+            union_types = [self.convert_reference(t) if isinstance(t, str) and t in self.defined_types else self.avro_primitive_to_json_type(t)
                             if isinstance(t, str) else self.parse_avro_schema(t)
                                 for t in non_null_types]
+            if is_nullable:
+                union_types.insert(0, {'type': 'null'})
             return {
                 'oneOf': union_types
             }

avrotize/commands.json

@@ -1255,6 +1255,8 @@
         "system_text_json_annotation": "args.system_text_json_annotation",
         "newtonsoft_json_annotation": "args.newtonsoft_json_annotation",
         "system_xml_annotation": "args.system_xml_annotation",
+        "msgpack_annotation": "args.msgpack_annotation",
+        "cbor_annotation": "args.cbor_annotation",
         "pascal_properties": "args.pascal_properties",
         "base_namespace": "args.namespace"
       }
@@ -1323,6 +1325,20 @@
         "default": false,
         "required": false
       },
+      {
+        "name": "--msgpack-annotation",
+        "type": "bool",
+        "help": "Use MessagePack annotations",
+        "default": false,
+        "required": false
+      },
+      {
+        "name": "--cbor-annotation",
+        "type": "bool",
+        "help": "Use Dahomey.Cbor annotations",
+        "default": false,
+        "required": false
+      },
       {
         "name": "--pascal-properties",
         "type": "bool",
@@ -1375,6 +1391,7 @@
         "system_text_json_annotation": "args.system_text_json_annotation",
         "newtonsoft_json_annotation": "args.newtonsoft_json_annotation",
         "system_xml_annotation": "args.system_xml_annotation",
+        "avro_annotation": "args.avro_annotation",
         "pascal_properties": "args.pascal_properties",
         "base_namespace": "args.namespace",
         "project_name": "args.project_name"
@@ -1437,6 +1454,13 @@
         "default": false,
         "required": false
       },
+      {
+        "name": "--avro-annotation",
+        "type": "bool",
+        "help": "Use Avro annotations",
+        "default": false,
+        "required": false
+      },
       {
         "name": "--pascal-properties",
         "type": "bool",
@@ -1468,6 +1492,13 @@
         "default": false,
         "required": false
       },
+      {
+        "name": "--avro-annotation",
+        "message": "Use Avro annotations?",
+        "type": "bool",
+        "default": false,
+        "required": false
+      },
       {
         "name": "--pascal-properties",
         "message": "Use PascalCase properties?",

avrotize/constants.py

@@ -70,6 +70,11 @@ try:
 except ValueError:
     MSGPACK_VERSION = '2.5.187'
 
+try:
+    CBOR_VERSION = get_dependency_version('cs', 'net90', 'Dahomey.Cbor')
+except ValueError:
+    CBOR_VERSION = '1.25.1'
+
 # Java test dependencies
 try:
     JUNIT_VERSION = get_dependency_version('java', 'jdk21', 'org.junit.jupiter:junit-jupiter-api')

avrotize/structuretocsharp.py

@@ -9,10 +9,12 @@ from typing import Any, Dict, List, Tuple, Union, cast, Optional
 import uuid
 
 from avrotize.common import pascal, process_template
+from avrotize.jstructtoavro import JsonStructureToAvro
 from avrotize.constants import (
     NEWTONSOFT_JSON_VERSION,
     SYSTEM_TEXT_JSON_VERSION,
     SYSTEM_MEMORY_DATA_VERSION,
+    CSHARP_AVRO_VERSION,
     NUNIT_VERSION,
     NUNIT_ADAPTER_VERSION,
     MSTEST_SDK_VERSION,
@@ -37,6 +39,7 @@ class StructureToCSharp:
         self.system_text_json_annotation = False
         self.newtonsoft_json_annotation = False
         self.system_xml_annotation = False
+        self.avro_annotation = False
         self.generated_types: Dict[str,str] = {}
         self.generated_structure_types: Dict[str, Dict[str, Union[str, Dict, List]]] = {}
         self.type_dict: Dict[str, Dict] = {}
@@ -419,14 +422,30 @@ class StructureToCSharp:
             constructor_modifier = "protected" if is_abstract else "public"
             class_definition += f"{INDENT}{constructor_modifier} {class_name}()\n{INDENT}{{\n{INDENT}}}"
 
+        # Convert JSON Structure schema to Avro schema if avro_annotation is enabled
+        avro_schema_json = ''
+        if self.avro_annotation:
+            # Use JsonStructureToAvro to convert the schema
+            converter = JsonStructureToAvro()
+            schema_copy = structure_schema.copy()
+            avro_schema = converter.convert(schema_copy)
+            # Escape the JSON for C# string literal
+            # json.dumps produces compact JSON that only needs backslash and quote escaping
+            avro_schema_json = json.dumps(avro_schema, separators=(',', ':')).replace('\\', '\\\\').replace('"', '\\"')
+            # Also enable system_text_json_annotation internally for Avro serialization helpers
+            # since ToAvroRecord and FromAvroRecord use System.Text.Json
+            needs_json_for_avro = not self.system_text_json_annotation and not self.newtonsoft_json_annotation
+
         # Add helper methods from template if any annotations are enabled
-        if self.system_text_json_annotation or self.newtonsoft_json_annotation or self.system_xml_annotation:
+        if self.system_text_json_annotation or self.newtonsoft_json_annotation or self.system_xml_annotation or self.avro_annotation:
             class_definition += process_template(
                 "structuretocsharp/dataclass_core.jinja",
                 class_name=class_name,
-                system_text_json_annotation=self.system_text_json_annotation,
+                system_text_json_annotation=self.system_text_json_annotation or (self.avro_annotation and needs_json_for_avro),
                 newtonsoft_json_annotation=self.newtonsoft_json_annotation,
-                system_xml_annotation=self.system_xml_annotation
+                system_xml_annotation=self.system_xml_annotation,
+                avro_annotation=self.avro_annotation,
+                avro_schema_json=avro_schema_json
             )
 
         # Generate Equals and GetHashCode
@@ -522,18 +541,39 @@ class StructureToCSharp:
                 self.needs_json_structure_converters = True
         
         # Add validation attributes based on schema constraints
-        # StringLength attribute for maxLength
-        if 'maxLength' in prop_schema:
-            max_length = prop_schema['maxLength']
-            if 'minLength' in prop_schema:
+        # Get the property type to determine which attributes to apply
+        prop_type_base = prop_schema.get('type', '')
+        if isinstance(prop_type_base, list):
+            # Handle type unions - use the first non-null type
+            non_null_types = [t for t in prop_type_base if t != 'null']
+            prop_type_base = non_null_types[0] if non_null_types else ''
+        
+        # EmailAddress attribute for format: "email"
+        if prop_schema.get('format') == 'email':
+            property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.EmailAddress]\n'
+        
+        # String length constraints (for string types)
+        if prop_type_base == 'string' or (not prop_type_base and ('minLength' in prop_schema or 'maxLength' in prop_schema)):
+            if 'maxLength' in prop_schema:
+                max_length = prop_schema['maxLength']
+                if 'minLength' in prop_schema:
+                    min_length = prop_schema['minLength']
+                    property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.StringLength({max_length}, MinimumLength = {min_length})]\n'
+                else:
+                    property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.StringLength({max_length})]\n'
+            elif 'minLength' in prop_schema:
+                # MinLength only (no max)
                 min_length = prop_schema['minLength']
-                property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.StringLength({max_length}, MinimumLength = {min_length})]\n'
-            else:
-                property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.StringLength({max_length})]\n'
-        elif 'minLength' in prop_schema:
-            # MinLength only (no max)
-            min_length = prop_schema['minLength']
-            property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.MinLength({min_length})]\n'
+                property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.MinLength({min_length})]\n'
+        
+        # Array length constraints (for array types)
+        if prop_type_base == 'array':
+            if 'minItems' in prop_schema:
+                min_items = prop_schema['minItems']
+                property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.MinLength({min_items})]\n'
+            if 'maxItems' in prop_schema:
+                max_items = prop_schema['maxItems']
+                property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.MaxLength({max_items})]\n'
         
         # RegularExpression attribute for pattern
         if 'pattern' in prop_schema:
@@ -541,22 +581,49 @@ class StructureToCSharp:
             property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.RegularExpression(@"{pattern}")]\n'
         
         # Range attribute for minimum/maximum on numeric types
-        if 'minimum' in prop_schema or 'maximum' in prop_schema:
-            min_val = prop_schema.get('minimum', prop_schema.get('exclusiveMinimum', 'double.MinValue'))
-            max_val = prop_schema.get('maximum', prop_schema.get('exclusiveMaximum', 'double.MaxValue'))
+        if 'minimum' in prop_schema or 'maximum' in prop_schema or 'exclusiveMinimum' in prop_schema or 'exclusiveMaximum' in prop_schema:
+            # Determine the minimum and maximum values
+            has_min = 'minimum' in prop_schema
+            has_max = 'maximum' in prop_schema
+            has_exclusive_min = 'exclusiveMinimum' in prop_schema
+            has_exclusive_max = 'exclusiveMaximum' in prop_schema
             
-            # Convert to appropriate format
-            if isinstance(min_val, (int, float)):
-                min_str = str(min_val)
+            # Use minimum/maximum if present, otherwise use exclusiveMinimum/exclusiveMaximum
+            if has_min:
+                min_val = prop_schema['minimum']
+                min_is_exclusive = False
+            elif has_exclusive_min:
+                min_val = prop_schema['exclusiveMinimum']
+                min_is_exclusive = True
             else:
-                min_str = str(min_val)
+                min_val = 'double.MinValue'
+                min_is_exclusive = False
             
-            if isinstance(max_val, (int, float)):
-                max_str = str(max_val)
+            if has_max:
+                max_val = prop_schema['maximum']
+                max_is_exclusive = False
+            elif has_exclusive_max:
+                max_val = prop_schema['exclusiveMaximum']
+                max_is_exclusive = True
             else:
-                max_str = str(max_val)
+                max_val = 'double.MaxValue'
+                max_is_exclusive = False
+            
+            # Convert to appropriate format
+            min_str = str(min_val)
+            max_str = str(max_val)
             
-            property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.Range({min_str}, {max_str})]\n'
+            # Build the Range attribute with exclusive parameters if needed
+            range_params = f'{min_str}, {max_str}'
+            if min_is_exclusive or max_is_exclusive:
+                extra_params = []
+                if min_is_exclusive:
+                    extra_params.append('MinimumIsExclusive = true')
+                if max_is_exclusive:
+                    extra_params.append('MaximumIsExclusive = true')
+                range_params += ', ' + ', '.join(extra_params)
+            
+            property_definition += f'{INDENT}[System.ComponentModel.DataAnnotations.Range({range_params})]\n'
         
         # Add Obsolete attribute if deprecated
         if prop_schema.get('deprecated', False):
@@ -1486,6 +1553,10 @@ class StructureToCSharp:
                 file_content += "using Newtonsoft.Json;\n"
             if self.system_xml_annotation:  # Add XML serialization using directive
                 file_content += "using System.Xml.Serialization;\n"
+            if self.avro_annotation:  # Add Avro using directives
+                file_content += "using Avro;\n"
+                file_content += "using Avro.Generic;\n"
+                file_content += "using Avro.IO;\n"
 
             if namespace:
                 # Namespace declaration with correct indentation for the definition
@@ -1560,11 +1631,14 @@ class StructureToCSharp:
                         "structuretocsharp/project.csproj.jinja",
                         project_name=project_name, 
                         system_xml_annotation=self.system_xml_annotation,
-                        system_text_json_annotation=self.system_text_json_annotation,
+                        # Avro annotation requires System.Text.Json for intermediate conversions
+                        system_text_json_annotation=self.system_text_json_annotation or self.avro_annotation,
                         newtonsoft_json_annotation=self.newtonsoft_json_annotation,
+                        avro_annotation=self.avro_annotation,
                         NEWTONSOFT_JSON_VERSION=NEWTONSOFT_JSON_VERSION,
                         SYSTEM_TEXT_JSON_VERSION=SYSTEM_TEXT_JSON_VERSION,
                         SYSTEM_MEMORY_DATA_VERSION=SYSTEM_MEMORY_DATA_VERSION,
+                        CSHARP_AVRO_VERSION=CSHARP_AVRO_VERSION,
                         NUNIT_VERSION=NUNIT_VERSION,
                         NUNIT_ADAPTER_VERSION=NUNIT_ADAPTER_VERSION,
                         MSTEST_SDK_VERSION=MSTEST_SDK_VERSION))
@@ -2268,7 +2342,8 @@ def convert_structure_to_csharp(
     pascal_properties: bool = False, 
     system_text_json_annotation: bool = False, 
     newtonsoft_json_annotation: bool = False, 
-    system_xml_annotation: bool = False
+    system_xml_annotation: bool = False,
+    avro_annotation: bool = False
 ):
     """Converts JSON Structure schema to C# classes
 
@@ -2281,6 +2356,7 @@ def convert_structure_to_csharp(
         system_text_json_annotation (bool, optional): Use System.Text.Json annotations. Defaults to False.
         newtonsoft_json_annotation (bool, optional): Use Newtonsoft.Json annotations. Defaults to False.
         system_xml_annotation (bool, optional): Use System.Xml.Serialization annotations. Defaults to False.
+        avro_annotation (bool, optional): Use Avro annotations. Defaults to False.
     """
 
     if not base_namespace:
@@ -2292,6 +2368,7 @@ def convert_structure_to_csharp(
     structtocs.system_text_json_annotation = system_text_json_annotation
     structtocs.newtonsoft_json_annotation = newtonsoft_json_annotation
     structtocs.system_xml_annotation = system_xml_annotation
+    structtocs.avro_annotation = avro_annotation
     structtocs.convert(structure_schema_path, cs_file_path)
 
 
@@ -2303,7 +2380,8 @@ def convert_structure_schema_to_csharp(
     pascal_properties: bool = False, 
     system_text_json_annotation: bool = False, 
     newtonsoft_json_annotation: bool = False, 
-    system_xml_annotation: bool = False
+    system_xml_annotation: bool = False,
+    avro_annotation: bool = False
 ):
     """Converts JSON Structure schema to C# classes
 
@@ -2316,6 +2394,7 @@ def convert_structure_schema_to_csharp(
         system_text_json_annotation (bool, optional): Use System.Text.Json annotations. Defaults to False.
         newtonsoft_json_annotation (bool, optional): Use Newtonsoft.Json annotations. Defaults to False.
         system_xml_annotation (bool, optional): Use System.Xml.Serialization annotations. Defaults to False.
+        avro_annotation (bool, optional): Use Avro annotations. Defaults to False.
     """
     structtocs = StructureToCSharp(base_namespace)
     structtocs.project_name = project_name
@@ -2323,4 +2402,5 @@ def convert_structure_schema_to_csharp(
     structtocs.system_text_json_annotation = system_text_json_annotation
     structtocs.newtonsoft_json_annotation = newtonsoft_json_annotation
     structtocs.system_xml_annotation = system_xml_annotation
+    structtocs.avro_annotation = avro_annotation
     structtocs.convert_schema(structure_schema, output_dir)

avrotize/structuretots.py

@@ -125,7 +125,7 @@ class StructureToTypeScript:
             namespace_package = '.'.join([part.lower() for part in namespace.split('.')]) if namespace else ''
             package = namespace_package
         if self.base_package:
-            package = self.base_package + ('.' if package else '') + package
+            package = self.base_package.lower() + ('.' if package else '') + package
         return package
 
     def typescript_type_from_structure_type(self, type_name: str) -> str:
@@ -738,4 +738,4 @@ def convert_structure_schema_to_typescript(structure_schema: JsonNode, output_di
         avro_annotation: Whether to include Avro annotations
     """
     converter = StructureToTypeScript(package_name, typedjson_annotation, avro_annotation)
-    converter.convert_schema(structure_schema, output_dir, package_name)
+    converter.convert_schema(structure_schema, output_dir, package_name)

{structurize-2.22.0.dist-info → structurize-2.22.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structurize
-Version: 2.22.0
+Version: 2.22.2
 Summary: Tools to convert from and to JSON Structure from various other schema languages.
 Author-email: Clemens Vasters <clemensv@microsoft.com>
 Classifier: Programming Language :: Python :: 3

{structurize-2.22.0.dist-info → structurize-2.22.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 avrotize/__init__.py,sha256=t5h5wkHXr6M0mmHAB5rhjZ3Gxy9xutGTGIfojfao9rI,3820
 avrotize/__main__.py,sha256=5pY8dYAURcOnFRvgb6fgaOIa_SOzPLIWbU8-ZTQ0jG4,88
-avrotize/_version.py,sha256=RizwlnbP9gT9Cli8S3AsqYTckMr4Y8rczsBdG4bV938,714
+avrotize/_version.py,sha256=Tzal6KLkKmissU9BbKc9vPD8BYI6Pb3CVLukFXfsTYY,714
 avrotize/asn1toavro.py,sha256=QDNwfBfXMxSH-k487CA3CaGCGDzOLs4PpVbbENm5uF0,8386
 avrotize/avrotize.py,sha256=VHFpBltMVBpyt0ju3ZWW725BKjQ4Fk-nrAy8udW-X44,5713
 avrotize/avrotocpp.py,sha256=hRZV247_TDD7Sm6_8sFx-UH5SueLLx2Wg6TvAVUX0iE,25693
-avrotize/avrotocsharp.py,sha256=k-tBex_vT-79yKZNetP9pKF63206NlT7KKBIXies9Cg,71400
+avrotize/avrotocsharp.py,sha256=jOx9ctuUSsdpNDEXnNNfFHOb8zWWHclUvYTF5rInOaM,72339
 avrotize/avrotocsv.py,sha256=PaDEW2aGRFVNLwewWhJ3OwxbKFI3PBg_mTgtT4uLMko,3689
 avrotize/avrotodatapackage.py,sha256=zSCphLvCYiBKRAUCdccsr-4JysH3PyAS6fSgwa65Tss,7259
 avrotize/avrotodb.py,sha256=5fNJgz00VMimyOl7eI0lIxlcaN_JnN0mb2Q9lzCRecw,46989
@@ -13,7 +13,7 @@ avrotize/avrotographql.py,sha256=i6G7xWjH_Lsn_CLiM4BCPb8OyZuCCpsYjXwXNTRMwEE,739
 avrotize/avrotoiceberg.py,sha256=plVHGWkED1YDLcMDxL7NMdJl2f8G32hwlNWFrBLcsD8,9057
 avrotize/avrotojava.py,sha256=NZZ7mUFVzvp7HBsU0XPiCwl4GVXE1RtS86pfNFJsIq8,135427
 avrotize/avrotojs.py,sha256=QjB6XjFnDrpZBZrrWqS0TN8fQfRXBfhHabfG73FOIo8,12249
-avrotize/avrotojsons.py,sha256=WXWniQqwcl8eU35VibDv7qJJwbiLV_yoWZ4JxiZ8mHA,21588
+avrotize/avrotojsons.py,sha256=I7EJz_IaCYLNzcycYXDOLAexHRHQfyb4yoWcxJ02vb0,22697
 avrotize/avrotojstruct.py,sha256=-Hs4Ta958bRKmOfSTzRFENABCZ6lQPSPbIBEXvOQD1M,14660
 avrotize/avrotokusto.py,sha256=D6AiRPa5uiZbqo9dqrFvAknsF5oNXgIzk8_08uZTZ2M,17636
 avrotize/avrotomd.py,sha256=WHPHnfmkI3xDNIHKZ3ReYxj6tib1eCny3JOznNSN6r8,5348
@@ -25,9 +25,9 @@ avrotize/avrotorust.py,sha256=HEcDirRBCbXQNNs_FmkT-sp1dWQgZ8A23qkQYUxVuXE,24255
 avrotize/avrotots.py,sha256=u_XLjlHN0Gof5QYlpqK4X9WoX9rL30TjQMPg4TiyYnI,33241
 avrotize/avrotoxsd.py,sha256=iGQq_8kC0kfKsqvqS6s_mO-kJ8N5G8vXOwqRI_DZUxc,17744
 avrotize/cddltostructure.py,sha256=MA2c-P3CIEAxEaBX-FF299gR55xcLEV3FrfTr2QfayM,74491
-avrotize/commands.json,sha256=pD9H4fyT7nG2QBj-yLZc5JW-8JQsf2mnVjQ0k-Ubc5o,92489
+avrotize/commands.json,sha256=I36P5rEoL8cqcx4P8a_VhXyGsg6NHRPiByQbofYYWj8,93350
 avrotize/common.py,sha256=enqNR1I9-SbW7fNJE3w7N2R87kiN6_9Oa7VB4b2AUBc,31913
-avrotize/constants.py,sha256=AH9ITnLsGs-izJWhlZA30ADHYjV1P7NWumyvtU3mqrg,2627
+avrotize/constants.py,sha256=LlgHrvT6RsRPrhFGRNHmFuIj3b1bSd45yC4rBCIGGVA,2753
 avrotize/csvtoavro.py,sha256=TuIYm_Xv8gioEHl1YgWQKOYkFGGHfuwmK5RuEAEXbt8,4293
 avrotize/datapackagetoavro.py,sha256=lw1S3H6UpKtjJj9ywDTuRw-qcihFx0vFJNPK7SlgKvY,2607
 avrotize/dependency_resolver.py,sha256=LGOTutpobJ4kMjAwvs-l0Mt2tEoZFaXCazs-u38qnYk,19374
@@ -44,7 +44,7 @@ avrotize/proto3parser.py,sha256=MfE84c-oAWWuzYmKlEZ5g5LUF7YzZaASFh2trX3UCaw,1560
 avrotize/prototoavro.py,sha256=hqXBGRxYojaEbEgoHZxXwMG4R1nWC7UMl_XNLWfqH38,17346
 avrotize/structuretocddl.py,sha256=RK_dTJf0oAo6BIBM48NHRcWC96OtUjlgUC6HzXs5Lkk,21234
 avrotize/structuretocpp.py,sha256=tBWOvyZPYQ1CHN6RgDnWlmzJ1giOyQ9SlHBHWvhPyiw,35898
-avrotize/structuretocsharp.py,sha256=Hi6C2HAIB3DxKZ4s8Q2_rK9QOqI_cLmObLkpwI3iO1o,123681
+avrotize/structuretocsharp.py,sha256=NnHzeJcOWDbZ_LnGV6AW9hXgP7rQW6Lld9utzxO8l-g,128208
 avrotize/structuretocsv.py,sha256=w9cwXAnnakKaeTtXsLWWO8KwYnXUxyXvC7a-ZKs-E94,13851
 avrotize/structuretodatapackage.py,sha256=NEHRt30KfVDWH1EQakvuMdRZTtfVXx8fsaYud0ofb2g,29768
 avrotize/structuretodb.py,sha256=uk4hKSRNw1JwOsWSZGECjSwvmTFUipRvMgTGlKnviCo,44860
@@ -59,14 +59,14 @@ avrotize/structuretomd.py,sha256=exfCldYbieVdduhotSoLrxsbphmyJQyeQso9qv4qyUw,136
 avrotize/structuretoproto.py,sha256=Aq0-fwMXSjjAxgZ5mq1kpo_TauigMRrJK9LNyoN-YGs,42679
 avrotize/structuretopython.py,sha256=d9EZVDHq7r-x0ZYZIRYfCP6kub7MkEROuvzjTJfNVv0,43958
 avrotize/structuretorust.py,sha256=ChRmO7uzU-pMdDdS0Vtg-MVUaOaNhNUPwH-ZKKOHglU,35134
-avrotize/structuretots.py,sha256=7jKoMOWwSJG_T_uZuEcPu-4d0dMuydAHvUhE86QSEJU,35274
+avrotize/structuretots.py,sha256=zpdFlhYlwAcaQP4jX0r5tR5KpygXF-dPbuSbEm4O0-E,35283
 avrotize/structuretoxsd.py,sha256=01VpasyWSMOx04sILHLP7H-WkhGdXAEGKohUUfgrNf0,32797
 avrotize/xsdtoavro.py,sha256=nQtNH_3pEZBp67oUCPqzhvItEExHTe-8obsIfNRXt8Y,19064
 avrotize/dependencies/cpp/vcpkg/vcpkg.json,sha256=se5qnUVQ1Q6wN_DqgIioqKg_y7ouh9oly2iBAJJXkgw,414
 avrotize/dependencies/typescript/node22/package.json,sha256=oAW_2X-b715kV7aajwuONZEMkyQUJGviG3GwnoUa7hU,387
-structurize-2.22.0.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
-structurize-2.22.0.dist-info/METADATA,sha256=nWSfeORdr2Q5aH2WjWQxw5-HcdXVAbGl7xmKrewxZNs,3670
-structurize-2.22.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-structurize-2.22.0.dist-info/entry_points.txt,sha256=biIH7jA5auhVqfbwHVk2gmD_gvrPYKgjpCAn0JWZ-Rs,55
-structurize-2.22.0.dist-info/top_level.txt,sha256=yn-yQ0Cm1O9fbF8KJgv4IIvX4YRGelKgPqZF1wS5P50,9
-structurize-2.22.0.dist-info/RECORD,,
+structurize-2.22.2.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
+structurize-2.22.2.dist-info/METADATA,sha256=VbLggwPdkdLWlW4sh9kH8tAIsDI44006ZLwfbP71bvw,3670
+structurize-2.22.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+structurize-2.22.2.dist-info/entry_points.txt,sha256=biIH7jA5auhVqfbwHVk2gmD_gvrPYKgjpCAn0JWZ-Rs,55
+structurize-2.22.2.dist-info/top_level.txt,sha256=yn-yQ0Cm1O9fbF8KJgv4IIvX4YRGelKgPqZF1wS5P50,9
+structurize-2.22.2.dist-info/RECORD,,