avrotize 2.22.1__tar.gz → 3.0.0__tar.gz

{avrotize-2.22.1 → avrotize-3.0.0}/PKG-INFO

@@ -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 → avrotize-3.0.0}/README.md

@@ -42,13 +42,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.
@@ -58,7 +58,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):
 
@@ -89,7 +89,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:
 
@@ -99,10 +102,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.
@@ -441,7 +440,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:
@@ -497,7 +496,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:
@@ -1105,7 +1104,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:
@@ -1153,6 +1152,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
@@ -1235,7 +1253,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:
@@ -1260,11 +1278,42 @@ 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 → avrotize-3.0.0}/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 = 'g09745f1ba'
+__commit_id__ = commit_id = 'gb201f8a65'

{avrotize-2.22.1 → avrotize-3.0.0}/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-2.22.1 → avrotize-3.0.0}/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-2.22.1 → avrotize-3.0.0}/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-2.22.1 → avrotize-3.0.0}/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-2.22.1 → avrotize-3.0.0}/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": []
         }