structurize 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 = 'geec8f9840'
+__commit_id__ = commit_id = 'gd4e6f7652'

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/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"
   }
 }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structurize
-Version: 2.19.0
+Version: 2.20.0
 Summary: Tools to convert from and to JSON Structure from various other schema languages.
 Author-email: Clemens Vasters <clemensv@microsoft.com>
 Classifier: Programming Language :: Python :: 3

{structurize-2.19.0.dist-info → structurize-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=whWmGdYhR_wJ7JC69oWgfcPaP80_UeZLbA-k7pBts8I,714
+avrotize/_version.py,sha256=k6AktVcjkwCwPVjLLE5w1umWJ_ZzoBYOaSjo2XT-C7E,714
 avrotize/asn1toavro.py,sha256=QDNwfBfXMxSH-k487CA3CaGCGDzOLs4PpVbbENm5uF0,8386
 avrotize/avrotize.py,sha256=VHFpBltMVBpyt0ju3ZWW725BKjQ4Fk-nrAy8udW-X44,5713
 avrotize/avrotocpp.py,sha256=hRZV247_TDD7Sm6_8sFx-UH5SueLLx2Wg6TvAVUX0iE,25693
@@ -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
@@ -61,10 +61,10 @@ avrotize/structuretots.py,sha256=PLV6W8k-yd7xkspUaQ-Vj90F26PTkB5HO0OkPJolkJ0,308
 avrotize/structuretoxsd.py,sha256=01VpasyWSMOx04sILHLP7H-WkhGdXAEGKohUUfgrNf0,32797
 avrotize/xsdtoavro.py,sha256=nQtNH_3pEZBp67oUCPqzhvItEExHTe-8obsIfNRXt8Y,19064
 avrotize/dependencies/cpp/vcpkg/vcpkg.json,sha256=se5qnUVQ1Q6wN_DqgIioqKg_y7ouh9oly2iBAJJXkgw,414
-avrotize/dependencies/typescript/node22/package.json,sha256=qAJ_dHE0YefuIRqkuN5tsXsHWSL8u6qZGRbYwVB_zq0,388
-structurize-2.19.0.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
-structurize-2.19.0.dist-info/METADATA,sha256=9e5yUdsXaK2Vy7TPQCPfHhbzqlQfOfwxTgHoIgG7WGc,3670
-structurize-2.19.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-structurize-2.19.0.dist-info/entry_points.txt,sha256=biIH7jA5auhVqfbwHVk2gmD_gvrPYKgjpCAn0JWZ-Rs,55
-structurize-2.19.0.dist-info/top_level.txt,sha256=yn-yQ0Cm1O9fbF8KJgv4IIvX4YRGelKgPqZF1wS5P50,9
-structurize-2.19.0.dist-info/RECORD,,
+avrotize/dependencies/typescript/node22/package.json,sha256=oAW_2X-b715kV7aajwuONZEMkyQUJGviG3GwnoUa7hU,387
+structurize-2.20.0.dist-info/licenses/LICENSE,sha256=xGtQGygTETTtDQJafZCUbpsed3GxO6grmqig-jGEuSk,11348
+structurize-2.20.0.dist-info/METADATA,sha256=W6TemISuPyp8M-b1MYe0rednFusDl4dCLblyFti6BQ8,3670
+structurize-2.20.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+structurize-2.20.0.dist-info/entry_points.txt,sha256=biIH7jA5auhVqfbwHVk2gmD_gvrPYKgjpCAn0JWZ-Rs,55
+structurize-2.20.0.dist-info/top_level.txt,sha256=yn-yQ0Cm1O9fbF8KJgv4IIvX4YRGelKgPqZF1wS5P50,9
+structurize-2.20.0.dist-info/RECORD,,