avrotize 2.22.1__py3-none-any.whl → 3.0.0__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.1'
-__version_tuple__ = version_tuple = (2, 22, 1)
+__version__ = version = '3.0.0'
+__version_tuple__ = version_tuple = (3, 0, 0)
 
 __commit_id__ = commit_id = None

avrotize/avrotocsharp/class_test.cs.jinja

@@ -166,7 +166,18 @@ public class {{ test_class_name }}
         Assert.That(newInstance, Is.EqualTo(_instance));
     }
     {%- endif %}
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or msgpack_annotation or protobuf_net_annotation %}
+    {%- if cbor_annotation %}
+    /// <summary> Testing CBOR serializer </summary>
+    [Test]
+    public void Test_ToByteArray_FromData_Cbor()
+    {
+        var mediaType = "application/cbor";
+        var bytes = _instance.ToByteArray(mediaType);
+        var newInstance = {{ class_base_name }}.FromData(bytes, mediaType);
+        Assert.That(newInstance, Is.EqualTo(_instance));
+    }
+    {%- endif %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or msgpack_annotation or cbor_annotation or protobuf_net_annotation %}
 
     /// <summary> Testing FromData with edge cases </summary>
     [Test]
@@ -188,6 +199,9 @@ public class {{ test_class_name }}
         {%- elif msgpack_annotation %}
         // Test null data - FromData returns null for null input
         Assert.That({{ class_base_name }}.FromData((byte[])null!, "application/msgpack"), Is.Null);
+        {%- elif cbor_annotation %}
+        // Test null data - FromData returns null for null input
+        Assert.That({{ class_base_name }}.FromData((byte[])null!, "application/cbor"), Is.Null);
         {%- elif protobuf_net_annotation %}
         // Test null data - FromData returns null for null input
         Assert.That({{ class_base_name }}.FromData((byte[])null!, "application/x-protobuf"), Is.Null);
@@ -242,7 +256,24 @@ public class {{ test_class_name }}
         Assert.That(newInstance, Is.EqualTo(_instance));
     }
     {%- endif %}
-    {%- if protobuf_net_annotation and not (system_text_json_annotation or newtonsoft_json_annotation or msgpack_annotation) %}
+    {%- if cbor_annotation and not (system_text_json_annotation or newtonsoft_json_annotation or msgpack_annotation) %}
+
+    /// <summary> Testing Gzip compression with CBOR </summary>
+    [Test]
+    public void Test_ToByteArray_Gzip_Cbor()
+    {
+        var mediaType = "application/cbor";
+        var gzipMediaType = "application/cbor+gzip";
+        var plainBytes = _instance.ToByteArray(mediaType);
+        var gzipBytes = _instance.ToByteArray(gzipMediaType);
+        // Gzip compressed data should start with magic bytes 0x1f 0x8b
+        Assert.That(gzipBytes.Length >= 2 && gzipBytes[0] == 0x1f && gzipBytes[1] == 0x8b, Is.True,
+            "Gzip compressed data should have correct magic bytes");
+        var newInstance = {{ class_base_name }}.FromData(gzipBytes, gzipMediaType);
+        Assert.That(newInstance, Is.EqualTo(_instance));
+    }
+    {%- endif %}
+    {%- if protobuf_net_annotation and not (system_text_json_annotation or newtonsoft_json_annotation or msgpack_annotation or cbor_annotation) %}
 
     /// <summary> Testing Gzip compression with Protobuf </summary>
     [Test]

avrotize/avrotocsharp/dataclass_core.jinja

@@ -1,4 +1,4 @@
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
     /// <summary>
     /// Creates an object from the data
     /// </summary>
@@ -11,7 +11,7 @@
         if ( data is {{ class_name }}) return ({{ class_name }})data;
         if ( contentTypeString == null ) contentTypeString = System.Net.Mime.MediaTypeNames.Application.Octet;
         var contentType = new System.Net.Mime.ContentType(contentTypeString);
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
         if ( contentType.MediaType.EndsWith("+gzip"))
         {
             var stream = data switch
@@ -149,12 +149,25 @@
             };
             return MessagePack.MessagePackSerializer.Deserialize<{{ class_name }}>(bytes);
         }
+    {%- endif %}
+    {%- if cbor_annotation %}
+        if (contentType.MediaType.StartsWith("application/cbor"))
+        {
+            var bytes = data switch
+            {
+                byte[] b => b,
+                System.IO.Stream s => ReadStreamToBytes(s),
+                System.BinaryData bd => bd.ToArray(),
+                _ => throw new NotSupportedException("Data type not supported for CBOR")
+            };
+            return Dahomey.Cbor.Cbor.Deserialize<{{ class_name }}>(new ReadOnlySpan<byte>(bytes));
+        }
     {%- endif %}
         throw new System.NotSupportedException($"Unsupported media type {contentType.MediaType}");
     }
     {%- endif %}
 
-    {%- if msgpack_annotation %}
+    {%- if msgpack_annotation or cbor_annotation %}
     private static byte[] ReadStreamToBytes(System.IO.Stream stream)
     {
         using (var memoryStream = new System.IO.MemoryStream())
@@ -190,7 +203,7 @@
     {%- if avro_annotation %}
     {%- endif%}
 
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
     /// <summary>
     /// Converts the object to a byte array
     /// </summary>
@@ -263,7 +276,15 @@
             result = MessagePack.MessagePackSerializer.Serialize(this);
         }
     {%- endif %}
-    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation %}
+    {%- if cbor_annotation %}
+        if (contentType.MediaType.StartsWith("application/cbor"))
+        {
+            var bufferWriter = new System.Buffers.ArrayBufferWriter<byte>();
+            Dahomey.Cbor.Cbor.Serialize(this, bufferWriter);
+            result = bufferWriter.WrittenSpan.ToArray();
+        }
+    {%- endif %}
+    {%- if avro_annotation or system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or protobuf_net_annotation or msgpack_annotation or cbor_annotation %}
     if (result != null && contentType.MediaType.EndsWith("+gzip"))
         {
             var stream = new System.IO.MemoryStream();

avrotize/avrotocsharp/project.csproj.jinja

@@ -20,6 +20,9 @@
         {%- if msgpack_annotation %}
         <PackageReference Include="MessagePack" Version="{{ MSGPACK_VERSION }}" />
         {%- endif %}
+        {%- if cbor_annotation %}
+        <PackageReference Include="Dahomey.Cbor" Version="{{ CBOR_VERSION }}" />
+        {%- endif %}
         <PackageReference Include="System.Memory.Data" Version="{{ SYSTEM_MEMORY_DATA_VERSION }}" />
     </ItemGroup>
     <ItemGroup>

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/avrotocsv.py

@@ -39,7 +39,23 @@ class AvroToCSVSchemaConverter:
 
         :param avro_schema: Avro schema as a dictionary.
         :return: CSV schema as a dictionary.
+        :raises ValueError: If the schema is not a single record type.
         """
+        # Handle schema arrays (unions of records) - not supported
+        if isinstance(avro_schema, list):
+            raise ValueError(
+                "CSV schema conversion only supports single record schemas. "
+                "The provided schema is an array/union of multiple types. "
+                "Use --record-type to specify a single record type if available."
+            )
+        
+        # Ensure it's a record type with fields
+        if not isinstance(avro_schema, dict) or 'fields' not in avro_schema:
+            raise ValueError(
+                "CSV schema conversion only supports Avro record types with 'fields'. "
+                f"The provided schema has type: {avro_schema.get('type', 'unknown') if isinstance(avro_schema, dict) else type(avro_schema).__name__}"
+            )
+        
         csv_schema = {
             "fields": []
         }

avrotize/commands.json

@@ -649,6 +649,108 @@
       }
     ]
   },
+  {
+    "command": "s2k",
+    "description": "Convert JSON Structure schema to Kusto table schemas",
+    "group": "4_RTDB",
+    "function": {
+      "name": "avrotize.structuretokusto.convert_structure_to_kusto",
+      "args": {
+        "structure_schema_path": "input_file_path",
+        "kusto_file_path": "output_file_path",
+        "kusto_uri": "args.kusto_uri",
+        "kusto_database": "args.kusto_database",
+        "structure_record_type": "args.record_type",
+        "emit_cloudevents_columns": "args.emit_cloudevents_columns",
+        "emit_cloudevents_dispatch_table": "args.emit_cloudevents_dispatch"
+      }
+    },
+    "extensions": [
+      ".struct.json",
+      ".json"
+    ],
+    "args": [
+      {
+        "name": "input",
+        "type": "str",
+        "nargs": "?",
+        "help": "Path to the JSON Structure schema file (or read from stdin if omitted)",
+        "required": false
+      },
+      {
+        "name": "--out",
+        "type": "str",
+        "help": "Path to the Kusto table schema file",
+        "required": false
+      },
+      {
+        "name": "--struct",
+        "type": "str",
+        "help": "Deprecated: Path to the JSON Structure schema file (for backcompat)",
+        "required": false
+      },
+      {
+        "name": "--kusto-uri",
+        "type": "str",
+        "help": "Kusto Cluster URI to apply the generated schema to.",
+        "required": false
+      },
+      {
+        "name": "--kusto-database",
+        "type": "str",
+        "help": "Kusto database name to apply the generated schema to",
+        "required": false
+      },
+      {
+        "name": "--record-type",
+        "type": "str",
+        "help": "Record type in the JSON Structure schema",
+        "required": false
+      },
+      {
+        "name": "--emit-cloudevents-columns",
+        "type": "bool",
+        "help": "Add CloudEvents columns to the Kusto table",
+        "default": false,
+        "required": false
+      },
+      {
+        "name": "--emit-cloudevents-dispatch",
+        "type": "bool",
+        "help": "Emit a _cloudevents_dispatch ingestion table and update policies for each generated table",
+        "required": false
+      }
+    ],
+    "suggested_output_file_path": "{input_file_name}.kql",
+    "prompts": [
+      {
+        "name": "--kusto-uri",
+        "message": "Enter the Kusto Cluster URI (optional)",
+        "type": "str",
+        "required": false
+      },
+      {
+        "name": "--kusto-database",
+        "message": "Enter the Kusto database name (optional)",
+        "type": "str",
+        "required": false
+      },
+      {
+        "name": "--emit-cloudevents-columns",
+        "message": "Add CloudEvents columns to the Kusto table?",
+        "type": "bool",
+        "default": false,
+        "required": false
+      },
+      {
+        "name": "--emit-cloudevents-dispatch",
+        "message": "Emit a _cloudevents_dispatch ingestion table and update policies?",
+        "type": "bool",
+        "default": false,
+        "required": false
+      }
+    ]
+  },
   {
     "command": "k2a",
     "description": "Convert Kusto schema to Avrotize schema",
@@ -836,7 +938,7 @@
     ]
   },
   {
-    "command": "struct2sql",
+    "command": "s2sql",
     "description": "Convert JSON Structure schema to SQL schema",
     "group": "5_SQL",
     "function": {
@@ -1255,6 +1357,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 +1427,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 +1493,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 +1556,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 +1594,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?",
@@ -1790,6 +1923,44 @@
     "suggested_output_file_path": "{input_file_name}.csv.json",
     "prompts": []
   },
+  {
+    "command": "a2csv",
+    "description": "Convert Avrotize schema to CSV schema",
+    "group": "1_Schemas",
+    "function": {
+      "name": "avrotize.avrotocsv.convert_avro_to_csv_schema",
+      "args": {
+        "avro_schema_path": "input_file_path",
+        "csv_schema_path": "output_file_path"
+      }
+    },
+    "extensions": [
+      ".avsc"
+    ],
+    "args": [
+      {
+        "name": "input",
+        "type": "str",
+        "nargs": "?",
+        "help": "Path to the Avrotize schema file (or read from stdin if omitted)",
+        "required": false
+      },
+      {
+        "name": "--out",
+        "type": "str",
+        "help": "Output path for the CSV schema file",
+        "required": false
+      },
+      {
+        "name": "--avsc",
+        "type": "str",
+        "help": "Deprecated: Path to the Avrotize schema file (for backcompat)",
+        "required": false
+      }
+    ],
+    "suggested_output_file_path": "{input_file_name}.csv.json",
+    "prompts": []
+  },
   {
     "command": "s2rust",
     "description": "Convert JSON Structure to Rust classes",
@@ -2116,7 +2287,7 @@
     ]
   },
   {
-    "command": "struct2gql",
+    "command": "s2graphql",
     "description": "Convert JSON Structure schema to GraphQL schema",
     "group": "1_Schemas",
     "function": {
@@ -2148,6 +2319,44 @@
     "suggested_output_file_path": "{input_file_name}.graphql",
     "prompts": []
   },
+  {
+    "command": "a2graphql",
+    "description": "Convert Avrotize schema to GraphQL schema",
+    "group": "1_Schemas",
+    "function": {
+      "name": "avrotize.avrotographql.convert_avro_to_graphql",
+      "args": {
+        "avro_schema_path": "input_file_path",
+        "graphql_schema_path": "output_file_path"
+      }
+    },
+    "extensions": [
+      ".avsc"
+    ],
+    "args": [
+      {
+        "name": "input",
+        "type": "str",
+        "nargs": "?",
+        "help": "Path to the Avrotize schema file (or read from stdin if omitted)",
+        "required": false
+      },
+      {
+        "name": "--out",
+        "type": "str",
+        "help": "Path to the GraphQL schema file",
+        "required": false
+      },
+      {
+        "name": "--avsc",
+        "type": "str",
+        "help": "Deprecated: Path to the Avrotize schema file (for backcompat)",
+        "required": false
+      }
+    ],
+    "suggested_output_file_path": "{input_file_name}.graphql",
+    "prompts": []
+  },
   {
     "command": "a2ts",
     "description": "Convert Avrotize schema to TypeScript classes",
@@ -2793,7 +3002,7 @@
     ]
   },
   {
-    "command": "struct2cassandra",
+    "command": "s2cassandra",
     "description": "Convert JSON Structure schema to Cassandra schema",
     "group": "5_SQL",
     "function": {
@@ -3337,7 +3546,7 @@
     "prompts": []
   },
   {
-    "command": "struct2md",
+    "command": "s2md",
     "description": "Convert JSON Structure schema to Markdown documentation",
     "group": "7_Utility",
     "function": {

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/dependencies/cs/net90/dependencies.csproj

@@ -18,6 +18,7 @@
         <PackageReference Include="System.Memory.Data" Version="9.0.3" />
         <PackageReference Include="protobuf-net" Version="3.2.30" />
         <PackageReference Include="MessagePack" Version="3.1.4" />
+        <PackageReference Include="Dahomey.Cbor" Version="1.25.1" />
     </ItemGroup>
 
     <!-- Testing -->

avrotize/structuretocsharp/dataclass_core.jinja

@@ -1,4 +1,11 @@
-    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation %}
+    {%- if avro_annotation %}
+    /// <summary>
+    /// The Avro schema for this class
+    /// </summary>
+    private static readonly Avro.Schema AvroSchema = Avro.Schema.Parse("{{ avro_schema_json }}");
+    {%- endif %}
+
+    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or avro_annotation %}
     /// <summary>
     /// Creates an object from the data
     /// </summary>
@@ -11,7 +18,7 @@
         if ( data is {{ class_name }}) return ({{ class_name }})data;
         if ( contentTypeString == null ) contentTypeString = System.Net.Mime.MediaTypeNames.Application.Octet;
         var contentType = new System.Net.Mime.ContentType(contentTypeString);
-    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation %}
+    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or avro_annotation %}
         if ( contentType.MediaType.EndsWith("+gzip"))
         {
             var stream = data switch
@@ -92,12 +99,72 @@
                 return ({{ class_name }}?)serializer.Deserialize(memoryStream);
             }
         }
+    {%- endif %}
+    {%- if avro_annotation %}
+        if ( contentType.MediaType == "avro/binary" || contentType.MediaType == "application/vnd.apache.avro+avro")
+        {
+            if (data is byte[])
+            {
+                using (var stream = new System.IO.MemoryStream((byte[])data))
+                {
+                    var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+                    var decoder = new Avro.IO.BinaryDecoder(stream);
+                    var record = reader.Read(null, decoder);
+                    return FromAvroRecord(record);
+                }
+            }
+            else if (data is System.IO.Stream)
+            {
+                var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+                var decoder = new Avro.IO.BinaryDecoder((System.IO.Stream)data);
+                var record = reader.Read(null, decoder);
+                return FromAvroRecord(record);
+            }
+            else if (data is System.BinaryData)
+            {
+                using (var stream = new System.IO.MemoryStream(((System.BinaryData)data).ToArray()))
+                {
+                    var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+                    var decoder = new Avro.IO.BinaryDecoder(stream);
+                    var record = reader.Read(null, decoder);
+                    return FromAvroRecord(record);
+                }
+            }
+        }
     {%- endif %}
         throw new System.NotSupportedException($"Unsupported media type {contentType.MediaType}");
     }
     {%- endif %}
 
-    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation %}
+    {%- if avro_annotation %}
+    /// <summary>
+    /// Creates an instance from an Avro GenericRecord
+    /// </summary>
+    /// <param name="record">The Avro record</param>
+    /// <returns>The converted object</returns>
+    /// <remarks>
+    /// This method uses JSON as an intermediate format for conversion. This approach works well
+    /// for simple types but may have limitations with complex Avro union types that use 
+    /// different JSON encoding than System.Text.Json. For complex schemas with unions,
+    /// consider implementing custom mapping logic directly from GenericRecord properties.
+    /// </remarks>
+    private static {{ class_name }}? FromAvroRecord(Avro.Generic.GenericRecord record)
+    {
+        // Convert Avro record to JSON and then deserialize
+        // This approach works for simple cases; for complex types, you may need custom mapping
+        using (var jsonStream = new System.IO.MemoryStream())
+        {
+            var jsonEncoder = new Avro.IO.JsonEncoder(AvroSchema, jsonStream);
+            var writer = new Avro.Generic.GenericDatumWriter<Avro.Generic.GenericRecord>(AvroSchema);
+            writer.Write(record, jsonEncoder);
+            jsonEncoder.Flush();
+            jsonStream.Position = 0;
+            return System.Text.Json.JsonSerializer.Deserialize<{{ class_name }}>(jsonStream);
+        }
+    }
+    {%- endif %}
+
+    {%- if system_text_json_annotation or newtonsoft_json_annotation or system_xml_annotation or avro_annotation %}
     /// <summary>
     /// Converts the object to a byte array
     /// </summary>
@@ -138,6 +205,20 @@
                 }
             }
         }
+    {%- endif %}
+    {%- if avro_annotation %}
+        if (contentType.MediaType == "avro/binary" || contentType.MediaType == "application/vnd.apache.avro+avro")
+        {
+            using (var stream = new System.IO.MemoryStream())
+            {
+                var record = ToAvroRecord();
+                var writer = new Avro.Generic.GenericDatumWriter<Avro.Generic.GenericRecord>(AvroSchema);
+                var encoder = new Avro.IO.BinaryEncoder(stream);
+                writer.Write(record, encoder);
+                encoder.Flush();
+                result = stream.ToArray();
+            }
+        }
     {%- endif %}
         if ( result == null ) throw new System.NotSupportedException($"Unsupported media type {contentType.MediaType}");
         if ( contentType.MediaType.EndsWith("+gzip"))
@@ -154,3 +235,29 @@
         return result;
     }
     {%- endif %}
+
+    {%- if avro_annotation %}
+    /// <summary>
+    /// Converts this object to an Avro GenericRecord
+    /// </summary>
+    /// <returns>The Avro record</returns>
+    /// <remarks>
+    /// This method uses JSON as an intermediate format for conversion. This approach works well
+    /// for simple types but may have limitations with complex types containing unions, as
+    /// Avro's JSON encoding for unions differs from System.Text.Json's encoding. For complex
+    /// schemas with unions or other advanced Avro features, consider implementing custom
+    /// mapping logic directly to GenericRecord properties.
+    /// </remarks>
+    private Avro.Generic.GenericRecord ToAvroRecord()
+    {
+        // Convert to JSON first, then use Avro's JSON decoder
+        // This approach works for simple cases; for complex types, you may need custom mapping
+        var jsonBytes = System.Text.Json.JsonSerializer.SerializeToUtf8Bytes(this, this.GetType());
+        using (var jsonStream = new System.IO.MemoryStream(jsonBytes))
+        {
+            var decoder = new Avro.IO.JsonDecoder(AvroSchema, jsonStream);
+            var reader = new Avro.Generic.GenericDatumReader<Avro.Generic.GenericRecord>(AvroSchema, AvroSchema);
+            return reader.Read(reuse: null, decoder);
+        }
+    }
+    {%- endif %}

avrotize/structuretocsharp/project.csproj.jinja

@@ -11,6 +11,9 @@
         {%- if system_text_json_annotation %}
         <PackageReference Include="System.Text.Json" Version="{{ SYSTEM_TEXT_JSON_VERSION }}" />
         {%- endif %}
+        {%- if avro_annotation %}
+        <PackageReference Include="Apache.Avro" Version="{{ CSHARP_AVRO_VERSION }}" />
+        {%- endif %}
         <PackageReference Include="System.Memory.Data" Version="{{ SYSTEM_MEMORY_DATA_VERSION }}" />
     </ItemGroup>
 </Project>  

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)

{avrotize-2.22.1.dist-info → avrotize-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avrotize
-Version: 2.22.1
+Version: 3.0.0
 Summary: Tools to convert from and to Avro Schema from various other schema languages.
 Author-email: Clemens Vasters <clemensv@microsoft.com>
 Requires-Python: >=3.10
@@ -90,13 +90,13 @@ Converting from Avrotize Schema:
 - [`avrotize a2k`](#convert-avrotize-schema-to-kusto-table-declaration) - Convert Avrotize Schema to Kusto table definition.
 - [`avrotize s2k`](#convert-json-structure-schema-to-kusto-table-declaration) - Convert JSON Structure Schema to Kusto table definition.
 - [`avrotize a2sql`](#convert-avrotize-schema-to-sql-table-definition) - Convert Avrotize Schema to SQL table definition.
-- [`avrotize struct2sql`](#convert-json-structure-schema-to-sql-schema) - Convert JSON Structure Schema to SQL table definition.
+- [`avrotize s2sql`](#convert-json-structure-schema-to-sql-schema) - Convert JSON Structure Schema to SQL table definition.
 - [`avrotize a2pq`](#convert-avrotize-schema-to-empty-parquet-file) - Convert Avrotize Schema to Parquet or Iceberg schema.
 - [`avrotize a2ib`](#convert-avrotize-schema-to-iceberg-schema) - Convert Avrotize Schema to Iceberg schema.
 - [`avrotize s2ib`](#convert-json-structure-to-iceberg-schema) - Convert JSON Structure to Iceberg schema.
 - [`avrotize a2mongo`](#convert-avrotize-schema-to-mongodb-schema) - Convert Avrotize Schema to MongoDB schema.
 - [`avrotize a2cassandra`](#convert-avrotize-schema-to-cassandra-schema) - Convert Avrotize Schema to Cassandra schema.
-- [`avrotize struct2cassandra`](#convert-json-structure-schema-to-cassandra-schema) - Convert JSON Structure Schema to Cassandra schema.
+- [`avrotize s2cassandra`](#convert-json-structure-schema-to-cassandra-schema) - Convert JSON Structure Schema to Cassandra schema.
 - [`avrotize a2es`](#convert-avrotize-schema-to-elasticsearch-schema) - Convert Avrotize Schema to Elasticsearch schema.
 - [`avrotize a2dynamodb`](#convert-avrotize-schema-to-dynamodb-schema) - Convert Avrotize Schema to DynamoDB schema.
 - [`avrotize a2cosmos`](#convert-avrotize-schema-to-cosmosdb-schema) - Convert Avrotize Schema to CosmosDB schema.
@@ -106,7 +106,7 @@ Converting from Avrotize Schema:
 - [`avrotize a2neo4j`](#convert-avrotize-schema-to-neo4j-schema) - Convert Avrotize Schema to Neo4j schema.
 - [`avrotize a2dp`](#convert-avrotize-schema-to-datapackage-schema) - Convert Avrotize Schema to Datapackage schema.
 - [`avrotize a2md`](#convert-avrotize-schema-to-markdown-documentation) - Convert Avrotize Schema to Markdown documentation.
-- [`avrotize struct2md`](#convert-json-structure-schema-to-markdown-documentation) - Convert JSON Structure schema to Markdown documentation.
+- [`avrotize s2md`](#convert-json-structure-schema-to-markdown-documentation) - Convert JSON Structure schema to Markdown documentation.
 
 Direct conversions (JSON Structure):
 
@@ -137,7 +137,10 @@ Generate code from JSON Structure:
 Direct JSON Structure conversions:
 
 - [`avrotize s2csv`](#convert-json-structure-to-csv-schema) - Convert JSON Structure schema to CSV schema.
+- [`avrotize a2csv`](#convert-avrotize-schema-to-csv-schema) - Convert Avrotize schema to CSV schema.
 - [`avrotize s2x`](#convert-json-structure-to-xml-schema-xsd) - Convert JSON Structure to XML Schema (XSD).
+- [`avrotize s2graphql`](#convert-json-structure-schema-to-graphql-schema) - Convert JSON Structure schema to GraphQL schema.
+- [`avrotize a2graphql`](#convert-avrotize-schema-to-graphql-schema) - Convert Avrotize schema to GraphQL schema.
 
 Other commands:
 
@@ -147,10 +150,6 @@ JSON Structure conversions:
 
 - [`avrotize s2dp`](#convert-json-structure-schema-to-datapackage-schema) - Convert JSON Structure schema to Datapackage schema.
 
-Direct conversions (not via Avrotize Schema):
-
-- [`avrotize struct2gql`](#convert-json-structure-schema-to-graphql-schema) - Convert JSON Structure schema to GraphQL schema.
-
 ## Overview
 
 You can use Avrotize to convert between Avro/Avrotize Schema and other schema formats like JSON Schema, XML Schema (XSD), Protocol Buffers (Protobuf), ASN.1, and database schema formats like Kusto Data Table Definition (KQL) and SQL Table Definition. That means you can also convert from JSON Schema to Protobuf going via Avrotize Schema.
@@ -489,7 +488,7 @@ For detailed conversion rules and type mappings for each SQL dialect, refer to t
 ### Convert JSON Structure Schema to SQL Schema
 
 ```bash
-avrotize struct2sql [input] --out <path_to_sql_script> --dialect <dialect> [--emit-cloudevents-columns]
+avrotize s2sql [input] --out <path_to_sql_script> --dialect <dialect> [--emit-cloudevents-columns]
 ```
 
 Parameters:
@@ -545,7 +544,7 @@ Refer to the detailed conversion notes for Cassandra in the [NoSQL Conversion No
 ### Convert JSON Structure Schema to Cassandra Schema
 
 ```bash
-avrotize struct2cassandra [input] --out <output_file> [--emit-cloudevents-columns]
+avrotize s2cassandra [input] --out <output_file> [--emit-cloudevents-columns]
 ```
 
 Parameters:
@@ -1153,7 +1152,7 @@ Conversion notes:
 ### Convert JSON Structure schema to Markdown documentation
 
 ```bash
-avrotize struct2md <path_to_structure_schema_file> [--out <path_to_markdown_file>]
+avrotize s2md <path_to_structure_schema_file> [--out <path_to_markdown_file>]
 ```
 
 Parameters:
@@ -1201,6 +1200,25 @@ Conversion notes:
 - Enum and const keywords are supported and preserved in the output.
 - JSON Structure-specific features like `$ref`, `$extends`, definitions, and namespaces are resolved during conversion.
 
+### Convert Avrotize Schema to CSV Schema
+
+```bash
+avrotize a2csv <path_to_avro_schema_file> [--out <path_to_csv_schema_file>]
+```
+
+Parameters:
+
+- `<path_to_avro_schema_file>`: The path to the Avrotize schema file to be converted. If omitted, the file is read from stdin.
+- `--out`: The path to the CSV schema file to write the conversion result to. If omitted, the output is directed to stdout.
+
+Conversion notes:
+
+- The tool converts Avrotize schemas to CSV Schema format.
+- Avro primitive types (string, int, long, float, double, boolean, bytes) are mapped to appropriate CSV schema types.
+- Avro logical types (date, timestamp-millis, decimal, uuid) are preserved in the output.
+- Complex types (records, arrays, maps) are represented as strings in CSV schema, as CSV format doesn't have native support for nested structures.
+- Only single record types can be converted to CSV schema.
+
 ### Convert JSON Structure to Protocol Buffers
 
 ```bash
@@ -1283,7 +1301,7 @@ Conversion notes:
 ### Convert JSON Structure schema to GraphQL schema
 
 ```bash
-avrotize struct2gql [input] --out <path_to_graphql_schema_file>
+avrotize s2graphql [input] --out <path_to_graphql_schema_file>
 ```
 
 Parameters:
@@ -1308,12 +1326,43 @@ Example:
 
 ```bash
 # Convert a JSON Structure schema to GraphQL
-avrotize struct2gql myschema.struct.json --out myschema.graphql
+avrotize s2graphql myschema.struct.json --out myschema.graphql
 
 # Read from stdin and write to stdout
-cat myschema.struct.json | avrotize struct2gql > myschema.graphql
+cat myschema.struct.json | avrotize s2graphql > myschema.graphql
+```
+
+### Convert Avrotize schema to GraphQL schema
+
+```bash
+avrotize a2graphql [input] --out <path_to_graphql_schema_file>
 ```
 
+Parameters:
+
+- `[input]`: The path to the Avrotize schema file. If omitted, the file is read from stdin.
+- `--out <path_to_graphql_schema_file>`: The path to the output GraphQL schema file.
+
+Conversion notes:
+
+- Converts Avrotize schema to GraphQL schema language (SDL)
+- Avro primitive types (string, int, long, float, double, boolean, bytes) are mapped to GraphQL scalar types
+- Avro logical types (date, timestamp-millis, decimal, uuid) are mapped to custom GraphQL scalars
+- Avro record types become GraphQL object types
+- Avro arrays become GraphQL lists `[Type]`
+- Avro maps are represented using the JSON scalar type
+- Avro unions are converted to GraphQL union types
+- Avro enums become GraphQL enum types
+
+Example:
+
+```bash
+# Convert an Avrotize schema to GraphQL
+avrotize a2graphql myschema.avsc --out myschema.graphql
+
+# Read from stdin and write to stdout
+cat myschema.avsc | avrotize a2graphql > myschema.graphql
+```
 
 This document provides an overview of the usage and functionality of Avrotize. For more detailed information, please refer to the [Avrotize Schema documentation](specs/avrotize-schema.md) and the individual command help messages.
 

{avrotize-2.22.1.dist-info → avrotize-3.0.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 avrotize/__init__.py,sha256=t5h5wkHXr6M0mmHAB5rhjZ3Gxy9xutGTGIfojfao9rI,3820
 avrotize/__main__.py,sha256=5pY8dYAURcOnFRvgb6fgaOIa_SOzPLIWbU8-ZTQ0jG4,88
-avrotize/_version.py,sha256=2Rc4v0v4QLr2kVq6V3tQOneBqZW00NrqxdxCLKrfD00,706
+avrotize/_version.py,sha256=9fL11DDeXfhKmxyz_HrYU3Yy7BjMWrJklCddPlmAj6A,704
 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/avrotocsv.py,sha256=PaDEW2aGRFVNLwewWhJ3OwxbKFI3PBg_mTgtT4uLMko,3689
+avrotize/avrotocsharp.py,sha256=jOx9ctuUSsdpNDEXnNNfFHOb8zWWHclUvYTF5rInOaM,72339
+avrotize/avrotocsv.py,sha256=yqVbP4Ar8bZyEgOAmHuHAsQKfCVjIO5_pa5dtaKLZKE,4575
 avrotize/avrotodatapackage.py,sha256=zSCphLvCYiBKRAUCdccsr-4JysH3PyAS6fSgwa65Tss,7259
 avrotize/avrotodb.py,sha256=5fNJgz00VMimyOl7eI0lIxlcaN_JnN0mb2Q9lzCRecw,46989
 avrotize/avrotogo.py,sha256=H4jxdO7laRWKJuU6mytz2sgUa_20hZUlsBrUGrCe_UU,22405
@@ -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=3N1Jblh-_o2GRbhcrMXLUEf0pijsYu6ff-nAbT5nhTE,98316
 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,7 +59,7 @@ 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/avrotocpp/CMakeLists.txt.jinja,sha256=t2ADvvi3o20xfVrsRBaUvZlpVCDR4h6Szsf0GcuSkH0,3015
@@ -68,10 +68,10 @@ avrotize/avrotocpp/build.sh.jinja,sha256=kBTv3w1iwSFzwI_MLS6nOjezcUC2mOI0yWndfyn
 avrotize/avrotocpp/dataclass_body.jinja,sha256=miwbmWNPFn5wv_ncgphXAtAeaB5yx1023lj7bbsbB9I,4621
 avrotize/avrotocpp/vcpkg.json.jinja,sha256=gEBg8px6sPwdyVTFf8RuLCaz4tkgbiantnLyToUvtxo,464
 avrotize/avrotocsharp/README.md.jinja,sha256=g1TRA1bV2wEudRGDasHQrwlVmxd2HGTmH3itk8pTCoQ,4518
-avrotize/avrotocsharp/class_test.cs.jinja,sha256=D8u6RtMdD-A_ZYSJU_NIojpEAF5HrQrEePXKEoUjM40,12152
-avrotize/avrotocsharp/dataclass_core.jinja,sha256=oNy8_m4C9FgWWd8jJS7_HuVTOzVM1-JiZd4U2NNqe9U,14107
+avrotize/avrotocsharp/class_test.cs.jinja,sha256=sjXOrnBydaFwAaS_4mBqz4EyA0nlLfRMFAkfSx3Wqyo,13661
+avrotize/avrotocsharp/dataclass_core.jinja,sha256=7sL70Djt7PNgbN1AYsby-VrblUtvvne62J9YkwUYX14,15061
 avrotize/avrotocsharp/enum_test.cs.jinja,sha256=BUiBLe1yvnxs-4cgwEjYXqkWmR94iVJsRIhBd_quFYc,579
-avrotize/avrotocsharp/project.csproj.jinja,sha256=3Iqv2_CdtEiThyE0_nun4RH_Ox6itqSvgqW7d18FOio,1435
+avrotize/avrotocsharp/project.csproj.jinja,sha256=TjbHNnPVlSLTJaFiUZWCc0bKMwzDNl05tFkqhl3qJ48,1571
 avrotize/avrotocsharp/project.sln.jinja,sha256=a5DcTeRa63bf9mOQzczMrYgmjHCOhdHMB7wVFPagnWU,1480
 avrotize/avrotocsharp/run_coverage.ps1.jinja,sha256=oydzkAqmxYij3vH64q3FxLI8T3lPiYop8B3qyyXdqlI,3988
 avrotize/avrotocsharp/run_coverage.sh.jinja,sha256=ua7Bfj4SAwb4JWz2bYbP85LXLNfzvVAR7ktW-XGslk4,4480
@@ -101,7 +101,7 @@ avrotize/avrotots/index.ts.jinja,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 avrotize/avrotots/package.json.jinja,sha256=3ZqMVLP1ALkyXcVVA5j8Kyi5obNLJBv7dlgwKzYZfa8,555
 avrotize/avrotots/tsconfig.json.jinja,sha256=Job00bmIiHEWQjA-Ze2-OdoTzT-GjVbL36fYuqtXLNs,537
 avrotize/dependencies/cpp/vcpkg/vcpkg.json,sha256=se5qnUVQ1Q6wN_DqgIioqKg_y7ouh9oly2iBAJJXkgw,414
-avrotize/dependencies/cs/net90/dependencies.csproj,sha256=etdV6bv9kgaNIrwnUpfB_Gghp8Qa8feJmP_0xoJFfZI,1169
+avrotize/dependencies/cs/net90/dependencies.csproj,sha256=R5wHAApZubbG0QBwWXHARxPBQB0XNX_W1CmuUNT-544,1238
 avrotize/dependencies/go/go121/go.mod,sha256=ZHjoQNugEIJdkfwwLupG5x6KpUyDp8HxyVnJfHG3wuE,203
 avrotize/dependencies/java/jdk21/pom.xml,sha256=Tbq8arhxXD4GEnSA_Y4NYuG9H4aqAdNVX3VoQBUef5I,3177
 avrotize/dependencies/python/py312/requirements.txt,sha256=zMr7YjvCg75g66b-HURTr-n_vjxSv0J7A97aydoyYLA,336
@@ -122,11 +122,11 @@ avrotize/structuretocpp/build.sh.jinja,sha256=EAzRK0jkoSUV9e9kVIB6tDYPEzf3vemrQz
 avrotize/structuretocpp/dataclass_body.jinja,sha256=B978Gdi1btO_EUJH5j0DjbHanQdX7jHEkd-MuQU89dA,2472
 avrotize/structuretocpp/vcpkg.json.jinja,sha256=Oo4SyS8X4CdCnZPqqit-D8TeoNQ-cG5JYQJJUoFLZf0,201
 avrotize/structuretocsharp/class_test.cs.jinja,sha256=7vwHcu745wLsxVrx__QfWzztvlr29oN5bw2BDKMkZtI,8171
-avrotize/structuretocsharp/dataclass_core.jinja,sha256=R1bjLPi246cUfZ5sG2L_DUjveiV_RtHFJIuC8fiB11c,7321
+avrotize/structuretocsharp/dataclass_core.jinja,sha256=UeXsMDScZCsfsGDeTCBkL_XMvlwEd0_9RCxgZGEpfCs,12448
 avrotize/structuretocsharp/enum_test.cs.jinja,sha256=euS5w2I3NiHBY7PSNY7bPF0JBEVLagZ423cZiYPn-iY,1238
 avrotize/structuretocsharp/json_structure_converters.cs.jinja,sha256=JqDu9_h97A4QFFk_j3IVLkcYjCh2_HxiAee7VVZrkWc,12810
 avrotize/structuretocsharp/program.cs.jinja,sha256=E6KrgNAdKY_Xh3tRKL-IMMPcGrWshtteBPmXrcg-nYk,2405
-avrotize/structuretocsharp/project.csproj.jinja,sha256=cbKLGG1mMAEmvq1RuR8JUu5AA2hH6iC_ag_IOKkgBhQ,702
+avrotize/structuretocsharp/project.csproj.jinja,sha256=ZYy0zgqASyi-Tb_yP84iq1Xc8ciwFRORWd-Nj7ZIEgM,844
 avrotize/structuretocsharp/project.sln.jinja,sha256=QKNG10hUo3sPCajx213TEUfZIMftxjRWqEhDyrSlJtM,1481
 avrotize/structuretocsharp/testproject.csproj.jinja,sha256=7SDzEM0wNV4a7JfCWG5AYiZT7KyJA-9gq_57tHqifRI,756
 avrotize/structuretocsharp/tuple_converter.cs.jinja,sha256=b2dsU7-5HcYdUMb1xpDAogBnKvKp7H86euT6EDrwLdc,3975
@@ -164,8 +164,8 @@ avrotize/structuretots/index.ts.jinja,sha256=-R4R_En1N4W_BEN3z3bLts9Xi4KnBTDLrYM
 avrotize/structuretots/package.json.jinja,sha256=OfJn4g68VhBP-yvJCdsWm_1RHx1kphsmdWpxu_Fst1E,819
 avrotize/structuretots/test_class.ts.jinja,sha256=7tJ6hPo3A9zToTkwolVyXYhmZ_E4uI_OnnYsUUzUEdQ,1180
 avrotize/structuretots/tsconfig.json.jinja,sha256=8Pl65JW8uOMEexxkteobo0ZEqsJBO31HegNRUrf8XGQ,515
-avrotize-2.22.1.dist-info/entry_points.txt,sha256=m8J2TWiqbZh7SBQezc1CNrM_GVPWf01zOFcAKhzCC0U,51
-avrotize-2.22.1.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
-avrotize-2.22.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-avrotize-2.22.1.dist-info/METADATA,sha256=VlqM6wO1RE7NuEFnJMM2Gcdy3ZCJRVt1jhw6Um3pzig,80208
-avrotize-2.22.1.dist-info/RECORD,,
+avrotize-3.0.0.dist-info/entry_points.txt,sha256=m8J2TWiqbZh7SBQezc1CNrM_GVPWf01zOFcAKhzCC0U,51
+avrotize-3.0.0.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
+avrotize-3.0.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+avrotize-3.0.0.dist-info/METADATA,sha256=08ps9dsDdgQiglCf7idjcYMovejdlViYENVZf0Xtqc8,82284
+avrotize-3.0.0.dist-info/RECORD,,