avrotize 2.19.0__py3-none-any.whl → 2.20.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.19.0'
-__version_tuple__ = version_tuple = (2, 19, 0)
+__version__ = version = '2.20.0'
+__version_tuple__ = version_tuple = (2, 20, 0)
 
 __commit_id__ = commit_id = None

avrotize/avrotots/class_core.ts.jinja

@@ -123,4 +123,16 @@ export class {{ class_name }} {
     }
     {%- endif %}
     {%- endif %}
+
+    /**
+     * Creates an instance of {{ class_name }} with sample data for testing.
+     * @returns A new {{ class_name }} instance with sample values.
+     */
+    public static createInstance(): {{ class_name }} {
+        return new {{ class_name }}(
+            {%- for field in fields %}
+            {{ field.test_value }}{% if not loop.last %},{% endif %}  // {{ field.name }}
+            {%- endfor %}
+        );
+    }
 }

avrotize/avrotots/class_test.ts.jinja

@@ -0,0 +1,77 @@
+/** Test file for {{ class_name }} */
+import { {{ class_name }} } from './{{ class_name }}.js';
+{%- for import_type, import_path in imports.items() %}
+import { {{ import_type }} } from '{{ import_path }}';
+{%- endfor %}
+
+describe('{{ class_name }}', () => {
+    let instance: {{ class_name }};
+
+    beforeEach(() => {
+        instance = {{ class_name }}.createInstance();
+    });
+
+    describe('createInstance', () => {
+        it('should create a valid instance', () => {
+            expect(instance).toBeInstanceOf({{ class_name }});
+        });
+
+        it('should create instances with consistent values', () => {
+            const instance1 = {{ class_name }}.createInstance();
+            const instance2 = {{ class_name }}.createInstance();
+            {%- for field in fields %}
+            expect(instance1.{{ field.name }}).toEqual(instance2.{{ field.name }});
+            {%- endfor %}
+        });
+    });
+
+    {%- for field in fields %}
+
+    describe('{{ field.name }} property', () => {
+        it('should have a valid {{ field.name }} value', () => {
+            expect(instance.{{ field.name }}).toBeDefined();
+        });
+
+        it('should accept assigned values', () => {
+            const testValue = {{ field.test_value }};
+            instance.{{ field.name }} = testValue;
+            expect(instance.{{ field.name }}).toEqual(testValue);
+        });
+    });
+    {%- endfor %}
+
+    {%- if typed_json_annotation %}
+
+    describe('JSON serialization', () => {
+        it('should serialize to JSON and deserialize back', () => {
+            const bytes = instance.toByteArray('application/json');
+            const restored = {{ class_name }}.fromData(bytes, 'application/json');
+            {%- for field in fields %}
+            expect(restored.{{ field.name }}).toEqual(instance.{{ field.name }});
+            {%- endfor %}
+        });
+
+        it('should match JSON structure', () => {
+            const jsonObj = {
+                {%- for field in fields %}
+                {{ field.original_name }}: instance.{{ field.name }}{% if not loop.last %},{% endif %}
+                {%- endfor %}
+            };
+            expect({{ class_name }}.isJsonMatch(jsonObj)).toBe(true);
+        });
+    });
+    {%- endif %}
+
+    {%- if avro_annotation %}
+
+    describe('Avro serialization', () => {
+        it('should serialize to Avro and deserialize back', () => {
+            const bytes = instance.toByteArray('application/vnd.apache.avro+avro');
+            const restored = {{ class_name }}.fromData(bytes, 'application/vnd.apache.avro+avro');
+            {%- for field in fields %}
+            expect(restored.{{ field.name }}).toEqual(instance.{{ field.name }});
+            {%- endfor %}
+        });
+    });
+    {%- endif %}
+});

avrotize/avrotots.py

@@ -31,6 +31,7 @@ class AvroToTypeScript:
         self.output_dir = os.getcwd()
         self.src_dir = os.path.join(self.output_dir, "src")
         self.generated_types: Dict[str, str] = {}
+        self.generated_type_fields: Dict[str, List[Dict]] = {}  # Store fields for test generation
         self.main_schema = None
         self.type_dict = None
         self.INDENT = ' ' * 4
@@ -160,6 +161,7 @@ class AvroToTypeScript:
             'is_array': field['definition']['is_array'],
             'is_union': field['definition']['is_union'],
             'docstring': field['docstring'],
+            'test_value': self.generate_test_value(field['definition']['type'], field['definition']['is_enum']),
         } for field in fields]
 
         imports_with_paths: Dict[str, str] = {}
@@ -201,6 +203,7 @@ class AvroToTypeScript:
         if write_file:
             self.write_to_file(namespace, class_name, class_definition)
         self.generated_types[ts_qualified_name] = 'class'
+        self.generated_type_fields[ts_qualified_name] = fields  # Store fields for test generation
         return ts_qualified_name
 
     def generate_enum(self, avro_schema: Dict, parent_namespace: str, write_file: bool = True) -> str:
@@ -242,6 +245,47 @@ class AvroToTypeScript:
             'is_enum': self.generated_types.get(import_name, '') == 'enum',
         }
 
+    def generate_test_value(self, field_type: str, is_enum: bool = False) -> str:
+        """Generate a test value for a TypeScript field type."""
+        # Strip nullable marker
+        is_nullable = field_type.endswith('?')
+        field_type = self.strip_nullable(field_type)
+        
+        # Handle arrays
+        if field_type.endswith('[]'):
+            inner_type = field_type[:-2]
+            inner_value = self.generate_test_value(inner_type, is_enum)
+            return f'[{inner_value}]'
+        
+        # Handle map/dict types
+        if field_type.startswith('{ [key: string]:'):
+            return "{ 'key': 'value' }"
+        
+        # Handle union types (pipe-separated)
+        if '|' in field_type:
+            first_type = field_type.split('|')[0].strip()
+            return self.generate_test_value(first_type, is_enum)
+        
+        # Handle enums - use first value (will be set via template)
+        if is_enum:
+            return f'{field_type}.values()[0]'
+        
+        # Handle primitive types
+        primitive_values = {
+            'string': "'sample-string'",
+            'number': '42',
+            'boolean': 'true',
+            'null': 'null',
+            'Date': "new Date('2024-01-01T00:00:00Z')",
+            'any': "{ test: 'data' }",
+        }
+        
+        if field_type in primitive_values:
+            return primitive_values[field_type]
+        
+        # For complex types (classes), call their createInstance method
+        return f'{field_type}.createInstance()'
+
     def get_is_json_match_clause(self, field_name: str, field_type: str, field_is_enum: bool) -> str:
         """Generates the isJsonMatch clause for a field."""
         field_name_js = field_name.rstrip('_')
@@ -556,6 +600,57 @@ class AvroToTypeScript:
         with open(types_file_path, 'w', encoding='utf-8') as file:
             file.write(avro_js_types)
 
+    def generate_tests(self, output_dir: str):
+        """Generate Jest test files for all generated TypeScript classes."""
+        test_directory_path = os.path.join(output_dir, "test")
+        if not os.path.exists(test_directory_path):
+            os.makedirs(test_directory_path, exist_ok=True)
+
+        for qualified_name, type_kind in self.generated_types.items():
+            if type_kind == 'class':
+                self.generate_test_class(qualified_name, test_directory_path)
+
+    def generate_test_class(self, qualified_name: str, test_directory_path: str):
+        """Generate a Jest test file for a TypeScript class."""
+        parts = qualified_name.split('.')
+        class_name = parts[-1]
+        namespace = '.'.join(parts[:-1])
+        test_class_name = f"{class_name}.test"
+        
+        fields = self.generated_type_fields.get(qualified_name, [])
+        
+        # Build imports for nested types
+        imports_with_paths: Dict[str, str] = {}
+        for field in fields:
+            field_type = field.get('type_no_null', '')
+            if not self.is_typescript_primitive(field_type.replace('[]', '')):
+                # It's a reference type, need to import it
+                type_name = field_type.replace('[]', '').replace('?', '')
+                if type_name and type_name not in ['null', 'any', 'Date']:
+                    # Build relative path from test dir to src dir
+                    src_path = '/'.join(parts)
+                    imports_with_paths[type_name] = f'../src/{src_path.rsplit("/", 1)[0]}/{type_name}.js' if '/' in src_path else f'../src/{parts[0]}/{type_name}.js'
+        
+        # Calculate relative path from test directory to class file
+        class_path_parts = namespace.split('.') if namespace else []
+        relative_path = '../src/' + '/'.join(class_path_parts + [class_name]) + '.js'
+        
+        test_definition = process_template(
+            "avrotots/class_test.ts.jinja",
+            class_name=class_name,
+            fields=fields,
+            imports=imports_with_paths,
+            typed_json_annotation=self.typed_json_annotation,
+            avro_annotation=self.avro_annotation,
+        )
+        
+        # Update the import path in the generated test
+        test_definition = test_definition.replace(f"from './{class_name}.js'", f"from '{relative_path}'")
+        
+        test_file_path = os.path.join(test_directory_path, f"{test_class_name}.ts")
+        with open(test_file_path, 'w', encoding='utf-8') as file:
+            file.write(test_definition)
+
     def convert_schema(self, schema: Union[List[Dict], Dict], output_dir: str, write_file: bool = True):
         """Convert Avro schema to TypeScript classes with namespace support."""
         self.output_dir = output_dir
@@ -571,6 +666,7 @@ class AvroToTypeScript:
                 self.generate_enum(avro_schema, '', write_file)
         self.generate_index_file()
         self.generate_project_files(output_dir)
+        self.generate_tests(output_dir)
 
     def convert(self, avro_schema_path: str, output_dir: str):
         """Convert Avro schema to TypeScript classes."""

avrotize/dependencies/cs/net90/dependencies.csproj

@@ -13,15 +13,15 @@
     <!-- Serialization -->
     <ItemGroup>
         <PackageReference Include="Apache.Avro" Version="1.12.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="System.Text.Json" Version="9.0.3" />
         <PackageReference Include="System.Memory.Data" Version="9.0.3" />
     </ItemGroup>
 
     <!-- Testing -->
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="4.3.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="NUnit" Version="4.4.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     </ItemGroup>
 </Project>

avrotize/dependencies/go/go121/go.mod

@@ -4,9 +4,3 @@
 module avrotize_dependencies
 
 go 1.21
-
-require (
-	github.com/linkedin/goavro/v2 v2.13.0
-	github.com/confluentinc/confluent-kafka-go/v2 v2.6.1
-	github.com/stretchr/testify v1.9.0
-)

avrotize/dependencies/java/jdk21/pom.xml

@@ -29,14 +29,14 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
         </dependency>
 
         <!-- Jackson BOM for version consistency -->
         <dependency>
             <groupId>com.fasterxml.jackson</groupId>
             <artifactId>jackson-bom</artifactId>
-            <version>2.18.2</version>
+            <version>2.20.1</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.18.2</version>
+            <version>2.20.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -60,19 +60,19 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.11.4</version>
+            <version>6.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.11.4</version>
+            <version>6.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.11.4</version>
+            <version>6.0.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -80,12 +80,12 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.5.2</version>
+            <version>3.5.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.13.0</version>
+            <version>3.14.1</version>
         </dependency>
     </dependencies>
 </project>

avrotize/dependencies/rust/stable/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-apache-avro = "0.17.0"
+apache-avro = "0.21.0"
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
 chrono = { version = "0.4.38", features = ["serde"] }

avrotize/dependencies/typescript/node22/package.json

@@ -8,9 +8,9 @@
     "kafkajs": "^2.2.4"
   },
   "devDependencies": {
-    "@types/node": "^22.10.0",
+    "@types/node": "^24.10.1",
     "typescript": "^5.7.2",
-    "jest": "^29.7.0",
-    "@types/jest": "^29.5.14"
+    "jest": "^30.2.0",
+    "@types/jest": "^30.0.0"
   }
 }

{avrotize-2.19.0.dist-info → avrotize-2.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avrotize
-Version: 2.19.0
+Version: 2.20.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

{avrotize-2.19.0.dist-info → avrotize-2.20.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 avrotize/__init__.py,sha256=JjPSX7c686TV00J_x0Py9JwXS0aJl8vpLn81Y0ondkw,3606
 avrotize/__main__.py,sha256=5pY8dYAURcOnFRvgb6fgaOIa_SOzPLIWbU8-ZTQ0jG4,88
-avrotize/_version.py,sha256=qMko39rXn6muHGFJMYJGPVd81d_aGmdcCvOEsyMY7h0,706
+avrotize/_version.py,sha256=lINSLhOT4N0riU7Dl_hviY26AewaFD4umVigR9oN4aw,706
 avrotize/asn1toavro.py,sha256=QDNwfBfXMxSH-k487CA3CaGCGDzOLs4PpVbbENm5uF0,8386
 avrotize/avrotize.py,sha256=VHFpBltMVBpyt0ju3ZWW725BKjQ4Fk-nrAy8udW-X44,5713
 avrotize/avrotocpp.py,sha256=hRZV247_TDD7Sm6_8sFx-UH5SueLLx2Wg6TvAVUX0iE,25693
@@ -22,7 +22,7 @@ avrotize/avrotoparquet.py,sha256=qm5hfia5elW1Yn4KACG8bbudLAqQSwGk3fIkTvdT5Rg,908
 avrotize/avrotoproto.py,sha256=STqbdGjVrgKrlKXt-6dZlekW_Oq0W0StRx80St1XqIc,22486
 avrotize/avrotopython.py,sha256=sPsSLseSq-toKHnsFsYRRtGePGYospRz2mwGLep-POw,31147
 avrotize/avrotorust.py,sha256=QMIBNkFpDlH44kuQo24k5D-f0lmdhoA5b7hEbhKsnMw,22214
-avrotize/avrotots.py,sha256=EalaA9feiHMyw7lfD8rifs24LsUVigmuPOu7nPh-wUc,29002
+avrotize/avrotots.py,sha256=81k-6ZiIeRJENPXuUzPZchBGxr9Oper4Ra4GdFypWnA,33418
 avrotize/avrotoxsd.py,sha256=iGQq_8kC0kfKsqvqS6s_mO-kJ8N5G8vXOwqRI_DZUxc,17744
 avrotize/cddltostructure.py,sha256=MA2c-P3CIEAxEaBX-FF299gR55xcLEV3FrfTr2QfayM,74491
 avrotize/commands.json,sha256=afZ36gTItJdtM8z-qOTOw0MazKz1WKZMztY86JUHcgU,88538
@@ -88,19 +88,20 @@ avrotize/avrotopython/test_enum.jinja,sha256=PeVxzC-gV5bizVnRs58RPoUDbXGI696B-VO
 avrotize/avrotorust/dataclass_enum.rs.jinja,sha256=-1-73XnG1k1eONMq7_aENVpoHOsMnj55CyjU3PT8M7U,2232
 avrotize/avrotorust/dataclass_struct.rs.jinja,sha256=AXFqCCW8fVdJXnSYTfpwKQeGG9JH8Goc3g1ILKEU-mE,7853
 avrotize/avrotorust/dataclass_union.rs.jinja,sha256=HuDKlM03hOkVx9Lm5p93IzQfUCokHz8wOu9iyEkwkUk,3801
-avrotize/avrotots/class_core.ts.jinja,sha256=wUMNd5cbbfnG0QBVrEmioOx698gU3td7tCbkXxr8Now,4613
+avrotize/avrotots/class_core.ts.jinja,sha256=YwhQLSnUqlmGUGk9zamEx758nKstXf_IKBNvOaPLrEk,5039
+avrotize/avrotots/class_test.ts.jinja,sha256=zm3wXaSJ225y7knLj6I9zjrkPTEROLHYmBr8eDo7pCo,2752
 avrotize/avrotots/enum_core.ts.jinja,sha256=6NN_nF2y9us2saM7Wag8IN73BdIF0vxhPxq83NQEnm8,1522
 avrotize/avrotots/gitignore.jinja,sha256=iYEkEO7BDDeNPTG8RSGJruh0Ol7HdYG4otQHhYLvC1c,376
 avrotize/avrotots/index.ts.jinja,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=6v_C4cLLZulQQbV30Lo0soX0Wqdb6SvGS__KzLjLouA,1034
-avrotize/dependencies/go/go121/go.mod,sha256=wNfSMPb0FJC2eDGG-HxuPWATl1uAwhPpfva-VX14mSg,345
-avrotize/dependencies/java/jdk21/pom.xml,sha256=vWb_t6-onk4XZS9OpXbtvXbuSBoncSjYRoMpsPemFbE,3182
+avrotize/dependencies/cs/net90/dependencies.csproj,sha256=zkgAfzGfJ9v8SzdoYDkBXs0ZJoQ7k1qK8mCH2GOT1jw,1033
+avrotize/dependencies/go/go121/go.mod,sha256=ZHjoQNugEIJdkfwwLupG5x6KpUyDp8HxyVnJfHG3wuE,203
+avrotize/dependencies/java/jdk21/pom.xml,sha256=Hi4RjYJsRLqF0v-2YJOFYdzV0nqWaOmFEEgpOmWxO1k,3179
 avrotize/dependencies/python/py312/requirements.txt,sha256=zMr7YjvCg75g66b-HURTr-n_vjxSv0J7A97aydoyYLA,336
-avrotize/dependencies/rust/stable/Cargo.toml,sha256=NE8fzUxg00AA09LirpyEcQoT9dqy8SUfOTJl_kiZA7E,506
-avrotize/dependencies/typescript/node22/package.json,sha256=qAJ_dHE0YefuIRqkuN5tsXsHWSL8u6qZGRbYwVB_zq0,388
+avrotize/dependencies/rust/stable/Cargo.toml,sha256=p2s1Q-dzyV7QUkJUkUW3mr4yDAdnLQc3C9f6E_iZZB0,506
+avrotize/dependencies/typescript/node22/package.json,sha256=oAW_2X-b715kV7aajwuONZEMkyQUJGviG3GwnoUa7hU,387
 avrotize/generic/generic.avsc,sha256=GwLLCGBdu6H3fwInIfrvGdebDWrbXEFgnsnFJNrCT4E,1272
 avrotize/prototypes/any.avsc,sha256=8bNmD-5j43YSoNTOQ4VIFjuH93a46-LOApf-L-ha1P8,3390
 avrotize/prototypes/api.avsc,sha256=5sFP8jEqDAUbcfZup-YurhKAwR6U3dee09CeFPAhexM,6521
@@ -152,8 +153,8 @@ avrotize/structuretots/index.ts.jinja,sha256=-R4R_En1N4W_BEN3z3bLts9Xi4KnBTDLrYM
 avrotize/structuretots/package.json.jinja,sha256=fYC2mguywpYf1-poALreCK4kH_OGWMUF6-7KWBzTprk,751
 avrotize/structuretots/test_class.ts.jinja,sha256=GHNzFdv3V-gYnk-rAnGS74JZD_3hSdiWzp3i_pPyGsQ,1059
 avrotize/structuretots/tsconfig.json.jinja,sha256=8Pl65JW8uOMEexxkteobo0ZEqsJBO31HegNRUrf8XGQ,515
-avrotize-2.19.0.dist-info/entry_points.txt,sha256=m8J2TWiqbZh7SBQezc1CNrM_GVPWf01zOFcAKhzCC0U,51
-avrotize-2.19.0.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
-avrotize-2.19.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-avrotize-2.19.0.dist-info/METADATA,sha256=u85OAjAPwhrByOvX5Hq-anusTvTYbFGAHuj9JLSTZz8,76788
-avrotize-2.19.0.dist-info/RECORD,,
+avrotize-2.20.0.dist-info/entry_points.txt,sha256=m8J2TWiqbZh7SBQezc1CNrM_GVPWf01zOFcAKhzCC0U,51
+avrotize-2.20.0.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
+avrotize-2.20.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+avrotize-2.20.0.dist-info/METADATA,sha256=p2hLPJ-w2DtlBn2MEQ3zUsG4MKOLVWaMPqRGm1hPVY0,76788
+avrotize-2.20.0.dist-info/RECORD,,