structurize 3.5.9__tar.gz → 3.5.10__tar.gz

{structurize-3.5.9/structurize.egg-info → structurize-3.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structurize
-Version: 3.5.9
+Version: 3.5.10
 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-3.5.9 → structurize-3.5.10}/avrotize/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.5.9'
-__version_tuple__ = version_tuple = (3, 5, 9)
+__version__ = version = '3.5.10'
+__version_tuple__ = version_tuple = (3, 5, 10)
 
-__commit_id__ = commit_id = 'gb097b347e'
+__commit_id__ = commit_id = 'g974039ac5'

{structurize-3.5.9 → structurize-3.5.10}/avrotize/structuretocpp.py

@@ -295,8 +295,18 @@ class StructureToCpp:
             # Convert to C++ type
             field_type = self.convert_structure_type_to_cpp(class_name, field_name, prop_schema, schema_namespace, nullable=not is_required)
             
-            # Get source type
-            source_type = prop_schema.get('type', 'string') if isinstance(prop_schema, dict) and isinstance(prop_schema.get('type'), str) else 'object'
+            # Get source type - handle nullable unions like ["int64", "null"]
+            if isinstance(prop_schema, dict):
+                raw_type = prop_schema.get('type', 'string')
+                if isinstance(raw_type, str):
+                    source_type = raw_type
+                elif isinstance(raw_type, list):
+                    non_null_types = [t for t in raw_type if t != 'null']
+                    source_type = non_null_types[0] if len(non_null_types) == 1 and isinstance(non_null_types[0], str) else 'object'
+                else:
+                    source_type = 'object'
+            else:
+                source_type = 'object'
             all_field_info.append((field_name, prop_name, field_type, source_type))
             if source_type in ('int64', 'uint64', 'int128', 'uint128', 'decimal'):
                 string_json_fields.append((field_name, prop_name, field_type, source_type))

{structurize-3.5.9 → structurize-3.5.10}/avrotize/structuretogo.py

@@ -329,7 +329,15 @@ class StructureToGo:
             if not is_required and not field_type.startswith('*') and not field_type.startswith('[') and not field_type.startswith('map[') and field_type != 'interface{}':
                 field_type = f'*{field_type}'
             
-            source_type = prop_schema.get('type', 'string') if isinstance(prop_schema.get('type'), str) else 'object'
+            # Get source type - handle nullable unions like ["int64", "null"]
+            raw_type = prop_schema.get('type', 'string')
+            if isinstance(raw_type, str):
+                source_type = raw_type
+            elif isinstance(raw_type, list):
+                non_null_types = [t for t in raw_type if t != 'null']
+                source_type = non_null_types[0] if len(non_null_types) == 1 and isinstance(non_null_types[0], str) else 'object'
+            else:
+                source_type = 'object'
             fields.append({
                 'name': pascal(prop_name),
                 'type': field_type,

{structurize-3.5.9 → structurize-3.5.10}/avrotize/structuretojava.py

@@ -435,7 +435,15 @@ class StructureToJava:
                 prop_type = prop_type[:-1]
             const_value = self.format_const_value(const_val, prop_type)
         
-        source_type = prop_schema.get('type', 'string') if isinstance(prop_schema.get('type'), str) else 'object'
+        # Get source type - handle nullable unions like ["int64", "null"]
+        raw_type = prop_schema.get('type', 'string')
+        if isinstance(raw_type, str):
+            source_type = raw_type
+        elif isinstance(raw_type, list):
+            non_null_types = [t for t in raw_type if t != 'null']
+            source_type = non_null_types[0] if len(non_null_types) == 1 and isinstance(non_null_types[0], str) else 'object'
+        else:
+            source_type = 'object'
         return {
             'name': safe_field_name,
             'original_name': prop_name,

{structurize-3.5.9 → structurize-3.5.10}/avrotize/structuretopython.py

@@ -469,8 +469,16 @@ class StructureToPython:
         if not is_required and not prop_type.startswith('typing.Optional['):
             prop_type = f'typing.Optional[{prop_type}]'
 
-        # Get source type from structure schema
-        source_type = prop_schema.get('type', 'string') if isinstance(prop_schema.get('type'), str) else 'object'
+        # Get source type from structure schema - handle nullable unions like ["int64", "null"]
+        raw_type = prop_schema.get('type', 'string')
+        if isinstance(raw_type, str):
+            source_type = raw_type
+        elif isinstance(raw_type, list):
+            # Extract the non-null type from a nullable union
+            non_null_types = [t for t in raw_type if t != 'null']
+            source_type = non_null_types[0] if len(non_null_types) == 1 and isinstance(non_null_types[0], str) else 'object'
+        else:
+            source_type = 'object'
 
         return {
             'name': field_name,

{structurize-3.5.9 → structurize-3.5.10}/avrotize/structuretorust.py

@@ -324,7 +324,15 @@ class StructureToRust:
             
             serde_rename = field_name != original_field_name
             
-            source_type = prop_schema.get('type', 'string') if isinstance(prop_schema.get('type'), str) else 'object'
+            # Get source type - handle nullable unions like ["int64", "null"]
+            raw_type = prop_schema.get('type', 'string')
+            if isinstance(raw_type, str):
+                source_type = raw_type
+            elif isinstance(raw_type, list):
+                non_null_types = [t for t in raw_type if t != 'null']
+                source_type = non_null_types[0] if len(non_null_types) == 1 and isinstance(non_null_types[0], str) else 'object'
+            else:
+                source_type = 'object'
             fields.append({
                 'original_name': original_field_name,
                 'name': field_name,

{structurize-3.5.9 → structurize-3.5.10}/avrotize/structuretots.py

@@ -342,7 +342,18 @@ class StructureToTypeScript:
                         is_enum = True
                         break
             
-            source_type = prop_schema.get('type', 'string') if isinstance(prop_schema, dict) and isinstance(prop_schema.get('type'), str) else 'object'
+            # Get source type - handle nullable unions like ["int64", "null"]
+            if isinstance(prop_schema, dict):
+                raw_type = prop_schema.get('type', 'string')
+                if isinstance(raw_type, str):
+                    source_type = raw_type
+                elif isinstance(raw_type, list):
+                    non_null_types = [t for t in raw_type if t != 'null']
+                    source_type = non_null_types[0] if len(non_null_types) == 1 and isinstance(non_null_types[0], str) else 'object'
+                else:
+                    source_type = 'object'
+            else:
+                source_type = 'object'
             fields.append({
                 'name': self.safe_name(prop_name),
                 'original_name': prop_name,

{structurize-3.5.9 → structurize-3.5.10/structurize.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structurize
-Version: 3.5.9
+Version: 3.5.10
 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