structurize 3.7.2__tar.gz → 3.7.3__tar.gz

{structurize-3.7.2/structurize.egg-info → structurize-3.7.3}/PKG-INFO

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

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.7.2'
-__version_tuple__ = version_tuple = (3, 7, 2)
+__version__ = version = '3.7.3'
+__version_tuple__ = version_tuple = (3, 7, 3)
 
-__commit_id__ = commit_id = 'gd9f31b3df'
+__commit_id__ = commit_id = 'g4eb36ac42'

{structurize-3.7.2 → structurize-3.7.3}/avrotize/avrotojstruct.py

@@ -148,7 +148,11 @@ class AvroToJsonStructure:
                 
                 resolved_field_type = self.resolve_avro_type(field_type_schema, record_fields_namespace, definitions)
 
-                if "default" in field:
+                if "default" in field and field["default"] is not None:
+                    # Optionality/nullability is conveyed by absence from ``required``;
+                    # a redundant ``default: null`` is meaningless in JSON Structure Core
+                    # (and would decorate a non-nullable type reference), so only concrete
+                    # defaults are emitted.
                     resolved_field_type["default"] = self.encode_default_value(field["default"], resolved_field_type.get("type", "unknown"))
                 
                 if not self.is_nullable_union(field_type_schema):
@@ -231,7 +235,10 @@ class AvroToJsonStructure:
                 ref_fqn = avro_type_schema.replace(".", "/")
             else:
                 ref_fqn = self.get_fqn(context_namespace, self.clean_name(avro_type_schema))
-            return {"$ref": f"#/definitions/{ref_fqn}"}
+            # JSON Structure Core requires a type reference to be the value of the
+            # ``type`` keyword (``{"type": {"$ref": ...}}``); a bare ``{"$ref": ...}``
+            # is only permitted inside a type-union array. See spec 3.3.6 / 3.7.1.
+            return {"type": {"$ref": f"#/definitions/{ref_fqn}"}}
 
         # ------------------ UNION ----------------------------------------
         if isinstance(avro_type_schema, list):
@@ -263,7 +270,9 @@ class AvroToJsonStructure:
                 self.register_definition(avro_type_schema, inline_ns, definitions)
                 ref_name = self.clean_name(avro_type_schema["name"])
                 ref_fqn = self.get_fqn(inline_ns, ref_name)
-                return {"$ref": f"#/definitions/{ref_fqn}"}
+                # Wrap the reference under ``type`` (see note above) so the emitted
+                # property/items/values/choice node is a valid JSON Structure schema.
+                return {"type": {"$ref": f"#/definitions/{ref_fqn}"}}
 
             if category == "array":
                 return {

{structurize-3.7.2 → structurize-3.7.3}/avrotize/structuretographql.py

@@ -199,6 +199,19 @@ class StructureToGraphQLConverter:
         # Handle type keyword
         struct_type = schema.get('type')
         
+        # A property whose ``type`` value is itself a schema object — the JSON Structure
+        # Core canonical form for references, e.g. ``{"type": {"$ref": ...}}`` — or a union
+        # array that contains such objects. Recurse so referenced named types are discovered
+        # as dependencies BEFORE their referrer (preserving declaration order).
+        if isinstance(struct_type, dict):
+            self.extract_named_types_from_structure(struct_type, parent_namespace)
+            return
+        if isinstance(struct_type, list):
+            for member in struct_type:
+                if isinstance(member, dict):
+                    self.extract_named_types_from_structure(member, parent_namespace)
+            return
+        
         if struct_type == 'object':
             # Process nested properties FIRST to ensure dependencies come before this type
             if 'properties' in schema and isinstance(schema['properties'], dict):
@@ -405,6 +418,11 @@ class StructureToGraphQLConverter:
             if isinstance(struct_type, list):
                 return self.get_graphql_type(struct_type)
             
+            # Handle a type reference (or nested type object) that is the value of
+            # ``type`` — the JSON Structure Core canonical form ``{"type": {"$ref": ...}}``.
+            if isinstance(struct_type, dict):
+                return self.get_graphql_type(struct_type)
+            
             if struct_type == 'array':
                 items_type = self.get_graphql_type(structure_type.get('items', {'type': 'any'}))
                 return f"[{items_type}]"

{structurize-3.7.2 → structurize-3.7.3/structurize.egg-info}/PKG-INFO

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