structurize 2.22.0__py3-none-any.whl → 2.22.1__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.1'
+__version_tuple__ = version_tuple = (2, 22, 1)
 
-__commit_id__ = commit_id = 'g5d3e04df0'
+__commit_id__ = commit_id = 'g09745f1ba'

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
             }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structurize
-Version: 2.22.0
+Version: 2.22.1
 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.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 avrotize/__init__.py,sha256=t5h5wkHXr6M0mmHAB5rhjZ3Gxy9xutGTGIfojfao9rI,3820
 avrotize/__main__.py,sha256=5pY8dYAURcOnFRvgb6fgaOIa_SOzPLIWbU8-ZTQ0jG4,88
-avrotize/_version.py,sha256=RizwlnbP9gT9Cli8S3AsqYTckMr4Y8rczsBdG4bV938,714
+avrotize/_version.py,sha256=bVtkjzpTqgXVpMS2Ucy6CWAGuw5P6M7BUl7VGAIPpb8,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
@@ -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
@@ -64,9 +64,9 @@ avrotize/structuretoxsd.py,sha256=01VpasyWSMOx04sILHLP7H-WkhGdXAEGKohUUfgrNf0,32
 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.1.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
+structurize-2.22.1.dist-info/METADATA,sha256=yjYBCdZGNjX3gB8xyaGSKI7g8eA67yH62Ej0w1JrbLY,3670
+structurize-2.22.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+structurize-2.22.1.dist-info/entry_points.txt,sha256=biIH7jA5auhVqfbwHVk2gmD_gvrPYKgjpCAn0JWZ-Rs,55
+structurize-2.22.1.dist-info/top_level.txt,sha256=yn-yQ0Cm1O9fbF8KJgv4IIvX4YRGelKgPqZF1wS5P50,9
+structurize-2.22.1.dist-info/RECORD,,