!squash wip

Author: tony

src/tmuxp/_internal/types.py

@@ -59,9 +59,10 @@ class PaneConfig(TypedDict, total=False):
     environment: NotRequired[dict[str, str]]
     focus: NotRequired[str | bool]
     suppress_history: NotRequired[bool]
+    target: NotRequired[str]
 
 
-PaneValue = t.Union[str, PaneConfig]
+PaneValue = t.Union[str, PaneConfig, None]
 
 
 class WindowConfig(TypedDict, total=False):
@@ -70,7 +71,9 @@ class WindowConfig(TypedDict, total=False):
     window_name: str
     start_directory: NotRequired[str]
     shell_command_before: NotRequired[ShellCommandValue]
+    shell_command_after: NotRequired[ShellCommandValue]
     layout: NotRequired[str]
+    clear: NotRequired[bool]
     options: NotRequired[dict[str, t.Any]]
     options_after: NotRequired[dict[str, t.Any]]
     environment: NotRequired[dict[str, str]]

src/tmuxp/cli/import_config.py

@@ -134,7 +134,7 @@ def create_import_subparser(
 class ImportConfigFn(t.Protocol):
     """Typing for import configuration callback function."""
 
-    def __call__(self, workspace_dict: dict[str, t.Any]) -> dict[str, t.Any]:
+    def __call__(self, workspace_dict: dict[str, t.Any]) -> WorkspaceConfig:
         """Execute tmuxp import function."""
         ...
 
@@ -146,7 +146,9 @@ def import_config(
 ) -> None:
     """Import a configuration from a workspace_file."""
     existing_workspace_file = ConfigReader._from_file(pathlib.Path(workspace_file))
-    cfg_reader = ConfigReader(importfunc(existing_workspace_file))
+    cfg_reader = ConfigReader(
+        t.cast(dict[t.Any, t.Any], importfunc(existing_workspace_file))
+    )
 
     workspace_file_format = prompt_choices(
         "Convert to",

src/tmuxp/workspace/importers.py

@@ -55,7 +55,6 @@ def import_tmuxinator(workspace_dict: dict[str, t.Any]) -> WorkspaceConfig:
     if "socket_name" in workspace_dict:
         tmuxp_workspace["socket_name"] = workspace_dict["socket_name"]
 
-
     if "tabs" in workspace_dict:
         workspace_dict["windows"] = workspace_dict.pop("tabs")
 
@@ -92,14 +91,10 @@ def import_tmuxinator(workspace_dict: dict[str, t.Any]) -> WorkspaceConfig:
         for k, v in window_item.items():
             new_window: WindowConfig = {"window_name": k}
 
-            if isinstance(v, str):
+            if isinstance(v, str) or v is None:
                 new_window["panes"] = [v]
                 tmuxp_workspace["windows"].append(new_window)
                 continue
-            if v is None:
-                new_window["panes"] = [""]  # Empty pane
-                tmuxp_workspace["windows"].append(new_window)
-                continue
             if isinstance(v, list):
                 new_window["panes"] = v
                 tmuxp_workspace["windows"].append(new_window)
@@ -153,20 +148,17 @@ def import_teamocil(workspace_dict: dict[str, t.Any]) -> WorkspaceConfig:
     if "root" in workspace_dict:
         tmuxp_workspace["start_directory"] = workspace_dict.pop("root")
 
-
     for w in workspace_dict["windows"]:
         window_dict: WindowConfig = {"window_name": w["name"]}
 
         if "clear" in w:
-            # TODO: handle clear attribute
-            pass
+            window_dict["clear"] = w["clear"]
 
         if "filters" in w:
             if "before" in w["filters"]:
                 window_dict["shell_command_before"] = w["filters"]["before"]
             if "after" in w["filters"]:
-                # TODO: handle shell_command_after
-                pass
+                window_dict["shell_command_after"] = w["filters"]["after"]
 
         if "root" in w:
             window_dict["start_directory"] = w.pop("root")