datavalue 0.1.9__py3-none-any.whl → 0.1.10__py3-none-any.whl

datavalue/classes/primitive_data.py

@@ -2,6 +2,7 @@
 import re
 from typing import Type, Optional, Any, Iterable, Union
 from .. import exceptions
+from .complex_data import ComplexData
 import json
 
 # Classes definition
@@ -29,6 +30,21 @@ class PrimitiveData:
             self.validate()
     
     # Private methods
+    def _is_match(self, element: Any, schema: Any) -> bool:        
+        if isinstance(schema, (PrimitiveData, ComplexData)):
+            try:
+                # Si el validador hijo no lanza excepción, el match es exitoso
+                return schema.validate(element)
+            except (exceptions.DataValueException, ValueError, TypeError):
+                return False
+        
+        # 2. Caso: El esquema es un tipo de dato (clase como str, int)
+        if isinstance(schema, type):
+            return isinstance(element, schema)
+    
+        # 3. Caso: El esquema es un valor literal
+        return element == schema
+
     def __get_length(self, data: Optional[Any] = None) -> Optional[int]:
         if data is None:
             data_objective = self.value
@@ -150,10 +166,12 @@ class PrimitiveData:
                 raise exceptions.PossibleValueException(
                     f"The boolean value has to be True or False: {data_objective} != True/False"
                 )
+        
         if self.possible_values is not None:
-            if data_objective not in self.possible_values:
+            # Implementación de any() con _is_match para soportar la composición de tipos
+            if not any(self._is_match(data_objective, validator) for validator in self.possible_values):
                 raise exceptions.PossibleValueException(
-                    f"The value is not in the possible values set: {data_objective} not in {self.possible_values}"
+                    f"Value '{data_objective}' is not allowed by any of the provided validators."
                 )
         
         # Validacion de expresion regular

{datavalue-0.1.9.dist-info → datavalue-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datavalue
-Version: 0.1.9
+Version: 0.1.10
 Summary: Librería de tipos de datos primitivos y complejos
 Author: Specter
 Requires-Python: >=3.10

datavalue-0.1.10.dist-info/RECORD

@@ -0,0 +1,9 @@
+datavalue/__init__.py,sha256=-JBKpLEehjnezX3sTbpnB2px3izjHxZ_IEL_40iRHMM,112
+datavalue/classes/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+datavalue/classes/complex_data.py,sha256=fYBl-whK1MUivzoDI0aCXD1yfRPIMK-Pu9jlxQTtxiQ,10951
+datavalue/classes/primitive_data.py,sha256=J2HXHNG6ZyKGrrX4P-MWjzhK9_8SFOh7a8Yrp7cPGts,8103
+datavalue/exceptions/__init__.py,sha256=T9X1N0kAv6RNTuTNQR7aTAxxvF25ihMsrtZGD-QZrBI,361
+datavalue-0.1.10.dist-info/METADATA,sha256=9vFokPOq2w53wOFvcK6WJ34ATOvusBXwAtFcs1utX8E,1598
+datavalue-0.1.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+datavalue-0.1.10.dist-info/top_level.txt,sha256=tVZ_--yYzvlZ2XTCkdORn4KKL7BwXPZUOVpL6PBJaRY,10
+datavalue-0.1.10.dist-info/RECORD,,

datavalue-0.1.9.dist-info/RECORD

@@ -1,9 +0,0 @@
-datavalue/__init__.py,sha256=-JBKpLEehjnezX3sTbpnB2px3izjHxZ_IEL_40iRHMM,112
-datavalue/classes/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-datavalue/classes/complex_data.py,sha256=fYBl-whK1MUivzoDI0aCXD1yfRPIMK-Pu9jlxQTtxiQ,10951
-datavalue/classes/primitive_data.py,sha256=YBr0i2FRonCwK4XQsNmoWtcIjd4VxQErTmzXVIIq_qg,7304
-datavalue/exceptions/__init__.py,sha256=T9X1N0kAv6RNTuTNQR7aTAxxvF25ihMsrtZGD-QZrBI,361
-datavalue-0.1.9.dist-info/METADATA,sha256=Qf_VhSYaW5JD2MA1IAeQB6XiEqp3I_vQwMB7nFc5Lao,1597
-datavalue-0.1.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-datavalue-0.1.9.dist-info/top_level.txt,sha256=tVZ_--yYzvlZ2XTCkdORn4KKL7BwXPZUOVpL6PBJaRY,10
-datavalue-0.1.9.dist-info/RECORD,,