Updated cpl structure model json handling

cpl.workspace.json

@@ -3,7 +3,7 @@
   "projects": [
     "src/cli/cpl.project.json",
     "src/core/cpl.project.json",
-    "test/cpl.project.json"
+    "src/mail/cpl.project.json"
   ],
   "defaultProject": "cpl-cli",
   "scripts": {

src/cli/cpl/cli/command/structure/init.py

@@ -31,7 +31,7 @@ def init(target: str, name: str, verbose: bool = False):
     if target in ["workspace", "ws"]:
         workspace = Structure.init_workspace("./", name or click.prompt("Workspace name", default="my-workspace"))
     elif target in PROJECT_TYPES:
-        workspace = Structure.find_workspace_in_path(Path(name or "./").parent, with_parents=True)
+        workspace = Structure.find_workspace_in_path(Path(name or "./").parent)
         project = Structure.init_project(
             "./", name or click.prompt("Project name", default=f"my-{target}"), target, workspace, verbose=verbose
         )

src/cli/cpl/cli/command/structure/new.py

@@ -44,7 +44,7 @@ def new(type: str, name: str, in_name: str | None, project: list[str] | None, ve
         path = Path(workspace.path).parent / Path(project[1]).parent
         project_name = Path(project[1]).stem
 
-    workspace = Structure.find_workspace_in_path(path, with_parents=False)
+    workspace = Structure.find_workspace_in_path(path)
     if workspace is None:
         Console.error("No workspace found. Please run 'cpl init workspace' first.")
         raise SystemExit(1)

src/cli/cpl/cli/model/cpl_structure_model.py

@@ -11,9 +11,13 @@ T = TypeVar("T", bound="CPLStructureModel")
 
 
 class CPLStructureModel:
-    def __init__(self, path: Optional[str] = None):
+    def __init__(self, path: Optional[str] = None, ignore_fields: Optional[List[str]] = None):
         self._path = path
 
+        self._ignore = {"_ignore", "_path"}
+        if ignore_fields is not None:
+            self._ignore.update(ignore_fields)
+
     @property
     def path(self) -> Optional[str]:
         return self._path
@@ -68,7 +72,7 @@ class CPLStructureModel:
     def to_json(self) -> Dict[str, Any]:
         result: Dict[str, Any] = {}
         for key, value in self.__dict__.items():
-            if not key.startswith("_") or key == "_path":
+            if not key.startswith("_") or key in self._ignore:
                 continue
             out_key = _self_or_cls_snake_to_camel(key[1:])
 

src/cli/cpl/cli/model/workspace.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from typing import Optional, List, Dict
 
 from cpl.cli.model.cpl_structure_model import CPLStructureModel
@@ -23,11 +24,25 @@ class Workspace(CPLStructureModel):
         default_project: Optional[str],
         scripts: Dict[str, str],
     ):
-        CPLStructureModel.__init__(self, path)
+        CPLStructureModel.__init__(self, path, ["_actual_projects", "_project_names"])
 
         self._name = name
         self._projects = projects
         self._default_project = default_project
+
+        self._actual_projects = []
+        self._project_names = []
+        for project in projects:
+            if Path(project).is_dir() or not Path(project).exists():
+                raise ValueError(f"Project path '{project}' does not exist or is a directory.")
+
+            p = Project.from_file(project)
+            self._actual_projects.append(p)
+            self._project_names.append(p.name)
+
+        if default_project is not None and default_project not in self._project_names:
+            raise ValueError(f"Default project '{default_project}' not found in workspace projects.")
+
         self._scripts = scripts
 
     @property
@@ -48,11 +63,11 @@ class Workspace(CPLStructureModel):
 
     @property
     def actual_projects(self) -> List[Project]:
-        return [Project.from_file(p) for p in self._projects]
+        return self._actual_projects
 
     @property
     def project_names(self) -> List[str]:
-        return [Project.from_file(p).name for p in self._projects]
+        return self._project_names
 
     @property
     def default_project(self) -> Optional[str]:

src/cli/cpl/cli/utils/structure.py

@@ -32,11 +32,9 @@ class Structure:
     }
 
     @staticmethod
-    def find_workspace_in_path(path: Path, with_parents=False) -> Workspace | None:
+    def find_workspace_in_path(path: Path) -> Workspace | None:
         current_path = path.resolve()
-        paths = [current_path]
-        if with_parents:
-            paths.extend(current_path.parents)
+        paths = [current_path, *current_path.parents]
 
         for parent in paths:
             workspace_file = parent / "cpl.workspace.json"
@@ -116,7 +114,7 @@ class Structure:
         return workspace
 
     @staticmethod
-    def init_project(rel_path: str, name: str, project_type: str, workspace: Workspace | None, install_deps=False, verbose=False):
+    def init_project(rel_path: str, name: str, project_type: str, workspace: Workspace | None, verbose=False):
         if not Path(rel_path).exists():
             rel_path = click.prompt("Project directory", type=click.Path(exists=True, file_okay=False), default="src")
 
@@ -138,21 +136,10 @@ class Structure:
             )
 
         project.save()
-
-        if install_deps:
-            from cpl.cli.command.package.install import install
-
-            old_cwd = os.getcwd()
-            os.chdir(Path(workspace.path).parent)
-            install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose)
-            if project_type in Structure._dependency_map:
-                for package in Structure._dependency_map[project_type]:
-                    install.callback(package, project.name, dev=False, verbose=verbose)
-
-            os.chdir(old_cwd)
+        Console.write_line(f"Created {project_type} project '{name}'")
 
         if workspace is not None:
-            rel_path = str(path.resolve().absolute().relative_to(Path(workspace.path).parent))
+            rel_path = str(path.resolve().absolute().relative_to(Path(workspace.path).parent)).replace("\\", "/")
             if rel_path not in workspace.projects:
                 workspace.projects.append(rel_path)
                 workspace.save()
@@ -160,7 +147,16 @@ class Structure:
             if verbose:
                 Console.write_line(f"Registered '{name}' in workspace.json")
 
-        Console.write_line(f"Created {project_type} project '{name}'")
+        from cpl.cli.command.package.install import install
+
+        old_cwd = os.getcwd()
+        os.chdir(Path(workspace.path).parent)
+        install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose)
+        if project_type in Structure._dependency_map:
+            for package in Structure._dependency_map[project_type]:
+                install.callback(package, project.name, dev=False, verbose=verbose)
+
+        os.chdir(old_cwd)
         return project
 
     @staticmethod
@@ -200,4 +196,4 @@ class Structure:
                 shutil.copy(src_file, tgt_file)
 
         Console.write_line()
-        Structure.init_project(str(path), name, project_type, workspace, install_deps=True, verbose=verbose)
+        Structure.init_project(str(path), name, project_type, workspace, verbose=verbose)

src/mail/cpl.project.json

@@ -0,0 +1,23 @@
+{
+  "name": "cpl-mail",
+  "version": "0.1.0",
+  "type": "library",
+  "license": "",
+  "author": "",
+  "description": "",
+  "homepage": "",
+  "keywords": [],
+  "dependencies": {
+    "cpl-core": "~2024.7.0"
+  },
+  "devDependencies": {
+    "cpl-cli": ">2024.7.0"
+  },
+  "references": [],
+  "main": null,
+  "directory": "./",
+  "build": {
+    "include": [],
+    "exclude": []
+  }
+}