astToolkit 0.1.1__tar.gz → 0.1.2__tar.gz

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astToolkit
-Version: 0.1.1
+Version: 0.1.2
 Summary: AST manipulation and transformation tools for Python code
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/astToolkit/_toolGrab.py

@@ -23,7 +23,7 @@ class Grab:
     def annotationAttribute(action: Callable[[ast.expr | (ast.expr | None)], ast.expr | (ast.expr | None)]) -> Callable[[hasDOTannotation], hasDOTannotation]:
 
         def workhorse(node: hasDOTannotation) -> hasDOTannotation:
-            node.annotation = action(node.annotation)
+            node.annotation = action(node.annotation) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -31,7 +31,7 @@ class Grab:
     def argAttribute(action: Callable[[ast_Identifier | (ast_Identifier | None)], ast_Identifier | (ast_Identifier | None)]) -> Callable[[hasDOTarg], hasDOTarg]:
 
         def workhorse(node: hasDOTarg) -> hasDOTarg:
-            node.arg = action(node.arg)
+            node.arg = action(node.arg) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -39,7 +39,7 @@ class Grab:
     def argsAttribute(action: Callable[[ast.arguments | Sequence[ast.expr] | list[ast.arg]], ast.arguments | Sequence[ast.expr] | list[ast.arg]]) -> Callable[[hasDOTargs], hasDOTargs]:
 
         def workhorse(node: hasDOTargs) -> hasDOTargs:
-            node.args = action(node.args)
+            node.args = action(node.args) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -79,7 +79,7 @@ class Grab:
     def bodyAttribute(action: Callable[[Sequence[ast.stmt] | ast.expr], Sequence[ast.stmt] | ast.expr]) -> Callable[[hasDOTbody], hasDOTbody]:
 
         def workhorse(node: hasDOTbody) -> hasDOTbody:
-            node.body = action(node.body)
+            node.body = action(node.body) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -295,7 +295,7 @@ class Grab:
     def keysAttribute(action: Callable[[Sequence[ast.expr | None] | Sequence[ast.expr]], Sequence[ast.expr | None] | Sequence[ast.expr]]) -> Callable[[hasDOTkeys], hasDOTkeys]:
 
         def workhorse(node: hasDOTkeys) -> hasDOTkeys:
-            node.keys = list(action(node.keys))
+            node.keys = list(action(node.keys)) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -407,7 +407,7 @@ class Grab:
     def nameAttribute(action: Callable[[ast_Identifier | (ast_Identifier | None) | ast_Identifier | ast.Name], ast_Identifier | (ast_Identifier | None) | ast_Identifier | ast.Name]) -> Callable[[hasDOTname], hasDOTname]:
 
         def workhorse(node: hasDOTname) -> hasDOTname:
-            node.name = action(node.name)
+            node.name = action(node.name) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -415,7 +415,7 @@ class Grab:
     def namesAttribute(action: Callable[[list[ast.alias] | list[ast_Identifier]], list[ast.alias] | list[ast_Identifier]]) -> Callable[[hasDOTnames], hasDOTnames]:
 
         def workhorse(node: hasDOTnames) -> hasDOTnames:
-            node.names = action(node.names)
+            node.names = action(node.names) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -423,7 +423,7 @@ class Grab:
     def opAttribute(action: Callable[[ast.operator | ast.boolop | ast.unaryop], ast.operator | ast.boolop | ast.unaryop]) -> Callable[[hasDOTop], hasDOTop]:
 
         def workhorse(node: hasDOTop) -> hasDOTop:
-            node.op = action(node.op)
+            node.op = action(node.op) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -455,7 +455,7 @@ class Grab:
     def orelseAttribute(action: Callable[[Sequence[ast.stmt] | ast.expr], Sequence[ast.stmt] | ast.expr]) -> Callable[[hasDOTorelse], hasDOTorelse]:
 
         def workhorse(node: hasDOTorelse) -> hasDOTorelse:
-            node.orelse = action(node.orelse)
+            node.orelse = action(node.orelse) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -463,7 +463,7 @@ class Grab:
     def patternAttribute(action: Callable[[ast.pattern | (ast.pattern | None)], ast.pattern | (ast.pattern | None)]) -> Callable[[hasDOTpattern], hasDOTpattern]:
 
         def workhorse(node: hasDOTpattern) -> hasDOTpattern:
-            node.pattern = action(node.pattern)
+            node.pattern = action(node.pattern) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -495,7 +495,7 @@ class Grab:
     def returnsAttribute(action: Callable[[ast.expr | (ast.expr | None)], ast.expr | (ast.expr | None)]) -> Callable[[hasDOTreturns], hasDOTreturns]:
 
         def workhorse(node: hasDOTreturns) -> hasDOTreturns:
-            node.returns = action(node.returns)
+            node.returns = action(node.returns) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -551,7 +551,7 @@ class Grab:
     def targetAttribute(action: Callable[[ast.Name | ast.Attribute | ast.Subscript | ast.expr | ast.Name], ast.Name | ast.Attribute | ast.Subscript | ast.expr | ast.Name]) -> Callable[[hasDOTtarget], hasDOTtarget]:
 
         def workhorse(node: hasDOTtarget) -> hasDOTtarget:
-            node.target = action(node.target)
+            node.target = action(node.target) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -615,7 +615,7 @@ class Grab:
     def valueAttribute(action: Callable[[ast.expr | None | ast.expr | Any | (Literal[True, False] | None)], ast.expr | None | ast.expr | Any | (Literal[True, False] | None)]) -> Callable[[hasDOTvalue], hasDOTvalue]:
 
         def workhorse(node: hasDOTvalue) -> hasDOTvalue:
-            node.value = action(node.value)
+            node.value = action(node.value) # type: ignore[reportAttributeAccessIssue]
             return node
         return workhorse
 
@@ -642,12 +642,4 @@ class Grab:
             for action in listOfActions:
                 node = action(node)
             return node
-        return workhorse
-
-    @staticmethod
-    def funcDOTidAttribute(action: Callable[[ast_Identifier], Any]) -> Callable[[ast.Call], ast.Call]:
-
-        def workhorse(node: ast.Call) -> ast.Call:
-            node.func = Grab.idAttribute(action)(node.func)
-            return node
         return workhorse

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/astToolkit/_toolIfThis.py

@@ -21,7 +21,7 @@ they implement a declarative approach to AST manipulation that separates node id
 
 from collections.abc import Callable
 from astToolkit import ast_Identifier, Be, DOT
-from typing import Any, TypeGuard
+from typing import Any, TypeGuard, cast
 import ast
 
 class IfThis:
@@ -91,7 +91,7 @@ class IfThis:
 	@staticmethod
 	def isCall_Identifier(identifier: ast_Identifier) -> Callable[[ast.AST], TypeGuard[ast.Call] | bool]:
 		def workhorse(node: ast.AST) -> TypeGuard[ast.Call] | bool:
-			return IfThis.isCallToName(node) and IfThis.isIdentifier(identifier)(DOT.id(DOT.func(node)))
+			return IfThis.isCallToName(node) and IfThis.isIdentifier(identifier)(DOT.id(cast(ast.Name, DOT.func(node))))
 		return workhorse
 
 	@staticmethod

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/astToolkit/transformationTools.py

@@ -1,5 +1,5 @@
 from autoflake import fix_code as autoflake_fix_code
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 from copy import deepcopy
 from astToolkit import (
 	ast_Identifier,
@@ -19,7 +19,7 @@ from astToolkit import FREAKOUT
 from Z0Z_tools import writeStringToHere
 from os import PathLike
 from pathlib import PurePath
-from typing import Any
+from typing import Any, cast
 import ast
 
 def makeDictionaryFunctionDef(module: ast.Module) -> dict[ast_Identifier, ast.FunctionDef]:
@@ -65,7 +65,7 @@ def inlineFunctionDef(identifierToInline: ast_Identifier, module: ast.Module) ->
 		raise ValueError(f"FunctionDefToInline not found in dictionaryIdentifier2FunctionDef: {identifierToInline = }") from ERRORmessage
 
 	listIdentifiersCalledFunctions: list[ast_Identifier] = []
-	findIdentifiersToInline = NodeTourist(findThis = IfThis.isCallToName, doThat = Grab.funcDOTidAttribute(Then.appendTo(listIdentifiersCalledFunctions)))
+	findIdentifiersToInline = NodeTourist(findThis = IfThis.isCallToName, doThat = Grab.funcAttribute(cast(Callable[[ast.expr], ast.expr], Grab.idAttribute(cast(Callable[[ast_Identifier], ast_Identifier], Then.appendTo(listIdentifiersCalledFunctions))))))
 	findIdentifiersToInline.visit(FunctionDefToInline)
 
 	dictionary4Inlining: dict[ast_Identifier, ast.FunctionDef] = {}

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/astToolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astToolkit
-Version: 0.1.1
+Version: 0.1.2
 Summary: AST manipulation and transformation tools for Python code
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/pyproject.toml

@@ -32,7 +32,7 @@ optional-dependencies = { testing = [
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10"
 urls = { Donate = "https://www.patreon.com/integrated", Homepage = "https://github.com/hunterhogan/astToolkit", Issues = "https://github.com/hunterhogan/astToolkit/issues", Repository = "https://github.com/hunterhogan/astToolkit.git" }
-version = "0.1.1"
+version = "0.1.2"
 
 [tool.coverage]
 report = { exclude_lines = [

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/toolFactory/astFactory.py

@@ -1,7 +1,7 @@
 from pathlib import PurePosixPath
 from string import ascii_letters
 from toolFactory import ast_Identifier, fileExtension, list_astDOTnew, pathPackage, str_nameDOTname, sys_version_infoTarget
-from toolFactory.astFactory_annex import handmadeMethodsGrab, handmadeTypeAlias_astTypes, MakeAttributeFunctionDef, MakeImportFunctionDef
+from toolFactory.astFactory_annex import handmadeMethodsGrab, handmadeTypeAlias_astTypes, listPylanceErrors, MakeAttributeFunctionDef, MakeImportFunctionDef
 from toolFactory.docstrings import docstringWarning, ClassDefDocstringBe, ClassDefDocstringDOT, ClassDefDocstringGrab, ClassDefDocstringMake
 from typing import cast, TypedDict
 from Z0Z_tools import writeStringToHere
@@ -74,6 +74,18 @@ def makeTools(astStubFile: ast.AST) -> None:
 		pythonSource: str = ast.unparse(astModule)
 		if 'Grab' in moduleIdentifier or 'DOT' in moduleIdentifier:
 			pythonSource = "# ruff: noqa: F403, F405\n" + pythonSource
+		if 'Grab' in moduleIdentifier:
+			listTypeIgnore: list[ast.TypeIgnore] = []
+			tag = '[reportAttributeAccessIssue]'
+			for attribute in listPylanceErrors:
+				for lineno, line in enumerate(pythonSource.splitlines()):
+					if 'node.'+attribute in line:
+						listTypeIgnore.append(ast.TypeIgnore(lineno+1, tag))
+						break
+			astModule = ast.parse(pythonSource)
+			astModule.type_ignores.extend(listTypeIgnore)
+			pythonSource: str = ast.unparse(astModule)
+			pythonSource = "# ruff: noqa: F403, F405\n" + pythonSource
 		pathFilenameModule = PurePosixPath(pathPackage, moduleIdentifier + fileExtension)
 		writeStringToHere(pythonSource, pathFilenameModule)
 

{asttoolkit-0.1.1 → asttoolkit-0.1.2}/toolFactory/astFactory_annex.py

@@ -21,16 +21,8 @@ def andDoAllOf(listOfActions: list[Callable[[NodeORattribute], NodeORattribute]]
 	return workhorse
 """
 
-Grab_funcDOTidAttribute: str ="""@staticmethod
-def funcDOTidAttribute(action: Callable[[ast_Identifier], Any]) -> Callable[[ast.Call], ast.Call]:
-	def workhorse(node: ast.Call) -> ast.Call:
-		node.func = Grab.idAttribute(action)(node.func)
-		return node
-	return workhorse
-"""
-
 handmadeMethodsGrab: list[ast.FunctionDef] = []
-for string in [Grab_andDoAllOf, Grab_funcDOTidAttribute]:
+for string in [Grab_andDoAllOf]:
 	astModule = ast.parse(string)
 	for node in ast.iter_child_nodes(astModule):
 		if isinstance(node, ast.FunctionDef):
@@ -55,9 +47,16 @@ MakeAttributeFunctionDef: ast.FunctionDef = ast.FunctionDef(
 
 MakeImportFunctionDef: ast.FunctionDef = ast.FunctionDef(name='Import', args=ast.arguments(args=[ast.arg(arg='moduleWithLogicalPath', annotation=ast.Name(id='str_nameDOTname', ctx=ast.Load())), ast.arg(arg='asName', annotation=ast.BinOp(left=ast.Name(id='ast_Identifier', ctx=ast.Load()), op=ast.BitOr(), right=ast.Constant(value=None)))], kwarg=ast.arg(arg='keywordArguments', annotation=ast.Name(id='int', ctx=ast.Load())), defaults=[ast.Constant(value=None)]), body=[ast.Return(value=ast.Call(func=ast.Attribute(value=ast.Name(id='ast', ctx=ast.Load()), attr='Import', ctx=ast.Load()), keywords=[ast.keyword(arg='names', value=ast.List(elts=[ast.Call(func=ast.Attribute(value=ast.Name(id='Make', ctx=ast.Load()), attr='alias', ctx=ast.Load()), args=[ast.Name(id='moduleWithLogicalPath', ctx=ast.Load()), ast.Name(id='asName', ctx=ast.Load())])], ctx=ast.Load())), ast.keyword(value=ast.Name(id='keywordArguments', ctx=ast.Load()))]))], decorator_list=[ast.Name(id='staticmethod', ctx=ast.Load())], returns=ast.Attribute(value=ast.Name(id='ast', ctx=ast.Load()), attr='Import', ctx=ast.Load()))
 
+listPylanceErrors: list[str] = ['annotation', 'arg', 'args', 'body', 'keys', 'name', 'names', 'op', 'orelse', 'pattern', 'returns', 'target', 'value',]
+
 # ww='''
-# list(targets)
+# def argAttribute(action: Callable[[ast_Identifier | (ast_Identifier | None)], ast_Identifier | (ast_Identifier | None)]) -> Callable[[hasDOTarg], hasDOTarg]:
+
+# 	def workhorse(node: hasDOTarg) -> hasDOTarg:
+# 		node.arg = action(node.arg) # type: ignore[reportAttributeAccessIssue]
+# 		return node
+# 	return workhorse
 # '''
 
-# print(ast.dump(ast.parse(ww), indent=4))
+# print(ast.dump(ast.parse(ww, type_comments=True), indent=4))
 # from ast import *