Merge branch 'feature/types' into devel

Author: idle-code

.gitignore

@@ -66,4 +66,5 @@ Session.vim
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/*.iws
+.idea/inspectionProfiles
 .mypy_cache/

.idea/ContextShell.iml

@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-coverage = "==4.5.1"
+coverage = "==5.0a1"
 
 [dev-packages]
 

.idea/fileColors.xml

@@ -3,18 +3,22 @@
 from typing import Dict, Union, Any, Tuple, List
 from collections import OrderedDict
 
-
-ActionArgsPack = Dict[Union[NodePath, int], Any]
+ArgumentValue = Any
+ActionArgsPack = Dict[Union[NodePath, int], ArgumentValue]
+PositionalArguments = List[ArgumentValue]
+KeywordArguments = Dict[str, ArgumentValue]
 
 
+# CHECK: Rename TreeRoot to ActionEndpoint or something more appropriate?
 class TreeRoot(ABC):
     @abstractmethod
-    def execute(self, target: NodePath, action: NodePath, args: ActionArgsPack):
+    def execute(self, target: NodePath, action: NodePath, args: ActionArgsPack = None):
         raise NotImplementedError()
 
-def unpack_argument_tree(action_args: ActionArgsPack) -> Tuple[List[Any], Dict[str, Any]]:
-    args = dict()
-    kwargs: Dict[str, Any] = OrderedDict()
+
+def unpack_argument_tree(action_args: ActionArgsPack) -> Tuple[PositionalArguments, KeywordArguments]:
+    args: Dict[int, ArgumentValue] = dict()
+    kwargs: KeywordArguments = OrderedDict()
     for key, value in action_args.items():
         if isinstance(key, int):
             args[key] = value
@@ -25,8 +29,8 @@ def unpack_argument_tree(action_args: ActionArgsPack) -> Tuple[List[Any], Dict[s
     return positional_args, kwargs
 
 
-def pack_argument_tree(args: List[Any], kwargs: Dict[str, Any]) -> ActionArgsPack:
-    pack_list: List[Tuple[Union[NodePath, int], Any]] = []
+def pack_argument_tree(*args: PositionalArguments, **kwargs: KeywordArguments) -> ActionArgsPack:
+    pack_list: List[Tuple[Union[NodePath, int], ArgumentValue]] = []
     for i, arg in enumerate(args):
         pack_list.append((i, arg))
     for key, value in kwargs.items():
@@ -36,7 +40,7 @@ def pack_argument_tree(args: List[Any], kwargs: Dict[str, Any]) -> ActionArgsPac
 
 def parse_argument_tree(raw_arguments: List[str]) -> ActionArgsPack:
     from contextshell.CommandParser import convert_token_type
-    pack_list: List[Tuple[Union[NodePath, int], Any]] = []
+    pack_list: List[Tuple[Union[NodePath, int], ArgumentValue]] = []
     for i, arg in enumerate(raw_arguments):
         if isinstance(arg, str) and '=' in arg:
             key, value = arg.split('=')

.idea/scopes/Sources.xml

@@ -1,32 +1,40 @@
-from contextshell.TreeRoot import TreeRoot
+from contextshell.TreeRoot import TreeRoot, ActionArgsPack
 from contextshell.NodePath import NodePath
 from collections import OrderedDict
 
 
 class VirtualTree(TreeRoot):
+    """Abstract frontend allowing embedding (mounting) of more specific tree roots"""
+
     def __init__(self):
         self.mounts: OrderedDict[NodePath, TreeRoot] = OrderedDict()
 
+    # TODO: rename to attach/detach
     def mount(self, path: NodePath, root: TreeRoot):
         if path.is_relative:
             raise ValueError("Could not mount relative path")
         if path in self.mounts:
             raise KeyError("Path '{}' is already provided by {}".format(path, self.mounts[path]))
 
+        def path_length_extractor(path_root_pair):
+            return len(path_root_pair[0])
+
+        # CHECK: use bisect module for maintaining mount point list?
         updated_items = list(self.mounts.items()) + [(path, root)]
-        path_length_extractor = lambda pair: len(pair[0])
         self.mounts = OrderedDict(sorted(updated_items, key=path_length_extractor, reverse=True))
 
     def umount(self, path: NodePath):
         del self.mounts[path]
 
-    def execute(self, target: NodePath, action: NodePath, *args):
+    def execute(self, target: NodePath, action: NodePath, args: ActionArgsPack = None):
         if target.is_relative:
-            raise ValueError("Could not execute with relative target path")
+            raise ValueError("Could not invoke action with relative target path")
+        if not args:
+            args = OrderedDict()
         for path, root in self.mounts.items():
             if path.is_parent_of(target):
                 remapped_target = target.relative_to(path)
                 remapped_target.is_absolute = True
-                return root.execute(remapped_target, action, *args)
+                return root.execute(remapped_target, action, args)
         else:
             raise RuntimeError("Could not find provider for path: '{}'".format(target))

.idea/scopes/Tests.xml

@@ -0,0 +1,15 @@
+from contextshell.NodePath import NodePath
+from contextshell.TreeRoot import TreeRoot, ActionArgsPack
+from contextshell.backends.Module import Module
+
+
+class FilesystemRoot(TreeRoot):
+    def __init__(self, root_directory_path: str):
+        self.root_directory_path = root_directory_path
+
+    def execute(self, target: NodePath, action: NodePath, args: ActionArgsPack = None):
+        pass
+
+
+class FilesystemModule(Module):
+    pass