anoy 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

{anoy-0.3.2.dist-info → anoy-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anoy
-Version: 0.3.2
+Version: 0.3.3
 Summary: This is a library that provides simple type checking for YAML.
 Author-email: masaniki <masaniki.software@gmail.com>
 License-Expression: MIT

anoy-0.3.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+cli.py,sha256=7nBKcOYABjhlAoKfQyoqUyQ8ALJKyrJJhqWC950Ks2g,912
+anoy-0.3.3.dist-info/licenses/LICENSE.txt,sha256=nsHvySI1U7YZgAX4K3rJsWli_GfXy2syPI-MtGPwjlo,1062
+modules/__init__.py,sha256=WSvUse7H-6ConliG5plmNLGHjeHWXqHR9t901plrWM0,133
+modules/dictTraversal.py,sha256=1O74wxiuCEd7J_PZXXC7T0AyspmRwXoAE1ioddd6AjA,32170
+modules/errors.py,sha256=P9KwBhPdPGdujCMA00Ep37RvPLwGYsNip4RidT7oMdg,2091
+anoy-0.3.3.dist-info/METADATA,sha256=bSXScAcxgWKiW6KG9PcaiIcsixLqZa4GhY-fs8GJPPs,3873
+anoy-0.3.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+anoy-0.3.3.dist-info/entry_points.txt,sha256=_lpL6R97giGseZcV0r5QwdX4zRwoZLzRHUxyBZl_iYI,34
+anoy-0.3.3.dist-info/top_level.txt,sha256=jfF8JYDvxB66wJSH2sWhdDiR0GGzxt5x-1k2vxwZKqA,12
+anoy-0.3.3.dist-info/RECORD,,

cli.py

@@ -5,7 +5,7 @@ import yaml
 
 from modules import DictTraversal
 
-VERSION="v0.3.2"
+VERSION="v0.3.3"
 
 def main():
     """

modules/dictTraversal.py

@@ -134,57 +134,48 @@ class DictTraversal():
           @Type: Dict
         """
         if(type(value)==str):
+            newConfPath=confPath+[value]
             match value:
                 case "!Str":
-                    newConfPath=confPath+["!Str"]
                     validType=cls.checkConfStr(newConfPath,None)
                 case "!Bool":
                     validType={"!Bool":{}}
                 case "!Int":
-                    newConfPath=confPath+["!Int"]
                     validType=cls.checkConfInt(newConfPath,None)
                 case "!Float":
-                    newConfPath=confPath+["!Float"]
                     validType=cls.checkConfFloat(newConfPath,None)
                 case "!List":
-                    newConfPath=confPath+["!List"]
                     validType=cls.checkConfList(newConfPath,None)
                 case "!FreeMap":
                     validType={"!FreeMap":{}}
                 case "!AnnoMap":
-                    newConfPath=confPath+["!AnnoMap"]
                     validType=cls.checkConfAnnoMap(newConfPath,None)
                 case _:
-                    raise ConfigYamlError(confPath,"Invalid data type.")
+                    raise ConfigYamlError(newConfPath,"Invalid data type.")
         elif(type(value)==dict):
             confChildKey=list(value.keys())
             if(len(confChildKey)!=1):
                 raise ConfigYamlError(confPath,"Invalid data type.")
             typeStr=confChildKey[0]
+            newConfPath=confPath+[typeStr]
             typeOption=value[typeStr]
             match typeStr:
                 case "!Str":
-                    newConfPath=confPath+["!Str"]
                     validType=cls.checkConfStr(newConfPath,typeOption)
                 case "!Int":
-                    newConfPath=confPath+["!Int"]
                     validType=cls.checkConfInt(newConfPath,typeOption)
                 case "!Float":
-                    newConfPath=confPath+["!Float"]
                     validType=cls.checkConfFloat(newConfPath,typeOption)
                 case "!Enum":
-                    newConfPath=confPath+["!Enum"]
                     validType=cls.checkConfEnum(newConfPath,typeOption)
                 case "!List":
-                    newConfPath=confPath+["!List"]
                     validType=cls.checkConfList(newConfPath,typeOption)
                 case "!AnnoMap":
-                    newConfPath=confPath+["!AnnoMap"]
                     validType=cls.checkConfAnnoMap(newConfPath,typeOption)
                 case _:
-                    raise ConfigYamlError(confPath, "Invalid data type.")
+                    raise ConfigYamlError(newConfPath,"Invalid data type.")
         else:
-            raise ConfigYamlError(confPath, "Invalid data type.")
+            raise ConfigYamlError(confPath,"Invalid data type.")
         return validType
 
 
@@ -379,7 +370,7 @@ class DictTraversal():
                         raise ConfigYamlError(newConfPath)
         return {"!Str":{"min":lenMin,"max":lenMax}}
 
-    def checkAnoyStr(self,anoyValue,length=None,min=None,max=None):
+    def checkAnoyStr(self,anoyValue,min=None,max=None):
         """
         @Summ: ANOY上で!Str型を型確認する関数。
 
@@ -390,9 +381,6 @@ class DictTraversal():
         @Args:
           anoyValue:
             @Summ: 型確認する値。
-          length:
-            @Summ: 文字列の長さ。
-            @Desc: min,maxとの両立は不可能。
           min:
             @Summ: 文字列の長さの最小値。
             @Desc:
@@ -405,19 +393,12 @@ class DictTraversal():
             - max+1からerror.
         """
         if(type(anoyValue)==str):
-            if(length is not None):
-                if(len(anoyValue)==length):
-                    return
-                else:
-                    raise AnnotationTypeError(self._curAnoy,self._anoyPath,"!Str",)
-            else:
-                if(min is not None):
-                    if(len(anoyValue)<min):
-                        raise AnnotationTypeError(self._curAnoy,self._anoyPath,"!Str")
-                if(max is not None):
-                    if(max<len(anoyValue)):
-                        raise AnnotationTypeError(self._curAnoy,self._anoyPath,"!Str")
-                return
+            if(min is not None):
+                if(len(anoyValue)<min):
+                    raise AnnotationTypeError(self._curAnoy,self._anoyPath,"!Str")
+            if(max is not None):
+                if(max<len(anoyValue)):
+                    raise AnnotationTypeError(self._curAnoy,self._anoyPath,"!Str")
         else:
             raise AnnotationTypeError(self._curAnoy,self._anoyPath,"!Str")
 
@@ -433,14 +414,14 @@ class DictTraversal():
             raise AnnotationTypeError(self._curAnoy,self._anoyPath,"!Bool")
 
     @classmethod
-    def checkConfInt(cls,annoKey,typeOption):
+    def checkConfInt(cls,confPath,typeOption):
         """
         @Summ: config yaml上で!Int型のtype optionを確認する関数。
         
         @Args:
-          annoKey:
-            @Summ: `!Child!Str`を格納するannotation key。
-            @Type: Str
+          confPath:
+            @Summ: config yaml上の位置。
+            @Type: List
           typeOption:
             @Summ: !Intに対応するtype option。
             @Desc: Noneの時はstring_formatとして処理する。
@@ -454,16 +435,29 @@ class DictTraversal():
         if(typeOption is None):
             pass
         elif(type(typeOption)!=dict):
-            raise ConfigYamlError([annoKey,"!Child","!Str"], "Required `!Map` type.")
+            raise ConfigYamlError(configPath, "Required `!Map` type.")
         else:
-            for intKey,intVal in typeOption.items():
-                match intKey:
+            for key,value in typeOption.items():
+                newConfPath=confPath+[key]
+                match key:
                     case "min":
-                        intMin=intVal
+                        intMin=value
+                        if(type(value)==int):
+                            if(intMax is not None):
+                                if(intMax<value):
+                                    raise ConfigYamlError(newConfPath)
+                        else:
+                            raise ConfigYamlError(newConfPath)
                     case "max":
-                        intMax=intVal
+                        intMax=value
+                        if(type(value)==int):
+                            if(intMax is not None):
+                                if(value<intMin):
+                                    raise ConfigYamlError(newConfPath)
+                        else:
+                            raise ConfigYamlError(newConfPath)
                     case _:
-                        raise ConfigYamlError([annoKey,"!Child","!Int"])
+                        raise ConfigYamlError(newConfPath)
         return {"!Int":{"min":intMin,"max":intMax}}
 
     def checkAnoyInt(self,anoyValue,min=None,max=None):

anoy-0.3.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-cli.py,sha256=-gCbboBrSGor9uOvwySsFSswkxw1iSVKm5oM1GMhtLY,912
-anoy-0.3.2.dist-info/licenses/LICENSE.txt,sha256=nsHvySI1U7YZgAX4K3rJsWli_GfXy2syPI-MtGPwjlo,1062
-modules/__init__.py,sha256=WSvUse7H-6ConliG5plmNLGHjeHWXqHR9t901plrWM0,133
-modules/dictTraversal.py,sha256=KVWbjZr0tHt5htOsYEka9zZq2WBowrxsW0jQxMwUegw,32442
-modules/errors.py,sha256=P9KwBhPdPGdujCMA00Ep37RvPLwGYsNip4RidT7oMdg,2091
-anoy-0.3.2.dist-info/METADATA,sha256=xUD8KQozCr8wUgMos5akGBELHAWOAe6gJBFgB6Ka4hs,3873
-anoy-0.3.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-anoy-0.3.2.dist-info/entry_points.txt,sha256=_lpL6R97giGseZcV0r5QwdX4zRwoZLzRHUxyBZl_iYI,34
-anoy-0.3.2.dist-info/top_level.txt,sha256=jfF8JYDvxB66wJSH2sWhdDiR0GGzxt5x-1k2vxwZKqA,12
-anoy-0.3.2.dist-info/RECORD,,