feat: configuration of project sources

.github/workflows/python.yml

@@ -150,7 +150,7 @@ jobs:
           path: dist
       - name: pytest (native)
         if: ${{ matrix.platform.native }}
-        uses: addnab/docker-run-action@4f65fabd2431ebc8d299f8e5a018d79a769ae185 # v3
+        uses: maus007/docker-run-action-fork@5ddaad0f7eedd03f64e412b1931852bd3031b273 # v1
         with:
           image: ${{ matrix.platform.target == 'x86' && 'i386/alpine:latest' || 'alpine:latest' }}
           options: -v ${{ github.workspace }}:/io -w /io

Cargo.toml

@@ -1,6 +1,13 @@
 [workspace]
 resolver = "3"
-members = ["sysand", "core", "bindings/py", "bindings/js", "bindings/java"]
+members = [
+  "sysand",
+  "core",
+  "macros",
+  "bindings/py",
+  "bindings/js",
+  "bindings/java",
+]
 
 [workspace.package]
 version = "0.0.9"

bindings/java/src/lib.rs

@@ -162,6 +162,7 @@ pub extern "system" fn Java_com_sensmetry_sysand_Sysand_infoPath<'local>(
         return JObject::default();
     };
     let project = LocalSrcProject {
+        nominal_path: None,
         project_path: Utf8PathBuf::from(&path),
     };
 
@@ -334,6 +335,7 @@ pub extern "system" fn Java_com_sensmetry_sysand_Sysand_buildProject<'local>(
         return;
     };
     let project = LocalSrcProject {
+        nominal_path: None,
         project_path: Utf8PathBuf::from(project_path),
     };
     let command_result = sysand_core::commands::build::do_build_kpar(&project, &output_path, true);

bindings/py/src/lib.rs

@@ -33,6 +33,7 @@ use sysand_core::{
         ProjectRead as _,
         local_kpar::LocalKParProject,
         local_src::{LocalSrcError, LocalSrcProject},
+        utils::wrapfs,
     },
     remove::do_remove,
     resolve::standard::standard_resolver,
@@ -113,6 +114,7 @@ fn do_info_py_path(
     let _ = pyo3_log::try_init();
 
     let project = LocalSrcProject {
+        nominal_path: None,
         project_path: path.into(),
     };
 
@@ -184,6 +186,7 @@ fn do_build_py(output_path: String, project_path: Option<String>) -> PyResult<()
         return Err(pyo3::exceptions::PyNotImplementedError::new_err("TODO"));
     };
     let project = LocalSrcProject {
+        nominal_path: None,
         project_path: current_project_path.into(),
     };
 
@@ -336,6 +339,7 @@ pub fn do_sources_project_py(
     let mut result = vec![];
 
     let current_project = LocalSrcProject {
+        nominal_path: None,
         project_path: path.into(),
     };
 
@@ -400,6 +404,7 @@ fn do_add_py(path: String, iri: String, version: Option<String>) -> PyResult<()>
     let _ = pyo3_log::try_init();
 
     let mut project = LocalSrcProject {
+        nominal_path: None,
         project_path: path.into(),
     };
 
@@ -414,6 +419,7 @@ fn do_remove_py(path: String, iri: String) -> PyResult<()> {
     let _ = pyo3_log::try_init();
 
     let mut project = LocalSrcProject {
+        nominal_path: None,
         project_path: path.into(),
     };
 
@@ -436,6 +442,7 @@ fn do_include_py(
     let _ = pyo3_log::try_init();
 
     let mut project = LocalSrcProject {
+        nominal_path: None,
         project_path: path.into(),
     };
 
@@ -470,6 +477,7 @@ fn do_exclude_py(path: String, src_path: String) -> PyResult<()> {
     let _ = pyo3_log::try_init();
 
     let mut project = LocalSrcProject {
+        nominal_path: None,
         project_path: path.into(),
     };
 
@@ -491,7 +499,9 @@ fn do_env_install_path_py(env_path: String, iri: String, location: String) -> Py
         environment_path: env_path.into(),
     };
 
-    if location.is_file() {
+    let metadata =
+        wrapfs::metadata(&location).map_err(|e| PyErr::new::<PyIOError, _>(e.to_string()))?;
+    if metadata.is_file() {
         let project = LocalKParProject::new_guess_root(&location)
             .map_err(|e| PyErr::new::<PyIOError, _>(e.to_string()))?;
 
@@ -509,8 +519,9 @@ fn do_env_install_path_py(env_path: String, iri: String, location: String) -> Py
             clone_project(&project, to, true).map(|_| ())
         })
         .map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
-    } else if location.is_dir() {
+    } else if metadata.is_dir() {
         let project = LocalSrcProject {
+            nominal_path: None,
             project_path: location,
         };
 

core/Cargo.toml

@@ -46,6 +46,7 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.145", default-features = false, features = ["preserve_order"] }
 sha2 = { version = "0.10.9", default-features = false }
 spdx = "0.13.2"
+sysand-macros = { path = "../macros"}
 thiserror = { version = "2.0.17", default-features = false }
 toml = "0.9.8"
 typed-path = { version = "0.12.0", default-features = false }

core/src/commands/add.rs

@@ -2,7 +2,10 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 use thiserror::Error;
 
-use crate::{model::InterchangeProjectValidationError, project::ProjectMut};
+use crate::{
+    model::{InterchangeProjectUsageRaw, InterchangeProjectValidationError},
+    project::ProjectMut,
+};
 
 #[derive(Error, Debug)]
 pub enum AddError<ProjectError> {
@@ -19,19 +22,18 @@ pub fn do_add<P: ProjectMut, S: AsRef<str>>(
     iri: S,
     versions_constraint: Option<String>,
 ) -> Result<(), AddError<P::Error>> {
-    let usage: crate::model::InterchangeProjectUsageRaw =
-        crate::model::InterchangeProjectUsageRaw {
-            resource: iri.as_ref().to_owned(),
-            version_constraint: versions_constraint.clone(),
-        }
-        .validate()?
-        .into();
+    let iri = iri.as_ref();
+    let usage = InterchangeProjectUsageRaw {
+        resource: iri.to_owned(),
+        version_constraint: versions_constraint.clone(),
+    }
+    .validate()?
+    .into();
 
     let adding = "Adding";
     let header = crate::style::get_style_config().header;
     log::info!(
-        "{header}{adding:>12}{header:#} usage: `{}` {}",
-        iri.as_ref(),
+        "{header}{adding:>12}{header:#} usage: `{iri}` {}",
         versions_constraint
             .as_ref()
             .map(|vr| vr.to_string())

core/src/commands/build.rs

@@ -169,7 +169,8 @@ pub fn do_build_workspace_kpars<P: AsRef<Utf8Path>>(
     };
     for project in projects {
         let project = LocalSrcProject {
-            project_path: workspace.workspace_path.join(project.path),
+            nominal_path: None,
+            project_path: workspace.root_path().join(&project.path),
         };
         let file_name = default_kpar_file_name(&project)?;
         let output_path = path.as_ref().join(file_name);

core/src/commands/env/mod.rs

@@ -1,15 +1,18 @@
 // SPDX-FileCopyrightText: © 2025 Sysand contributors <opensource@sensmetry.com>
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::env::{
-    memory::{MemoryStorageEnvironment, MemoryWriteError},
-    utils::ErrorBound,
-};
 #[cfg(feature = "filesystem")]
 use crate::{
     env::local_directory::{ENTRIES_PATH, LocalDirectoryEnvironment, LocalWriteError},
     project::utils::{ToPathBuf, wrapfs},
 };
+use crate::{
+    env::{
+        memory::{MemoryStorageEnvironment, MemoryWriteError},
+        utils::ErrorBound,
+    },
+    project::memory::InMemoryProject,
+};
 
 #[cfg(feature = "filesystem")]
 use camino::Utf8Path;
@@ -33,7 +36,8 @@ pub enum EnvError<WriteError: ErrorBound> {
     Write(#[from] WriteError),
 }
 
-pub fn do_env_memory() -> Result<MemoryStorageEnvironment, EnvError<MemoryWriteError>> {
+pub fn do_env_memory()
+-> Result<MemoryStorageEnvironment<InMemoryProject>, EnvError<MemoryWriteError>> {
     Ok(MemoryStorageEnvironment::default())
 }
 

core/src/commands/init.rs

@@ -13,7 +13,7 @@ use crate::{
 };
 
 #[cfg(feature = "filesystem")]
-use crate::project::local_src::LocalSrcProject;
+use crate::project::local_src::{LocalSrcError, LocalSrcProject};
 
 use thiserror::Error;
 
@@ -27,14 +27,14 @@ pub enum InitError<ProjectError: ErrorBound> {
     SPDXLicenseParse(Box<str>, spdx::error::ParseError),
 }
 
-pub fn do_init_ext<S: ProjectMut>(
+pub fn do_init_ext<P: ProjectMut>(
     name: String,
     version: String,
     no_semver: bool,
     license: Option<String>,
     no_spdx: bool,
-    storage: &mut S,
-) -> Result<(), InitError<S::Error>> {
+    storage: &mut P,
+) -> Result<(), InitError<P::Error>> {
     if !no_semver {
         Version::parse(&version).map_err(|e| InitError::SemVerParse(version.as_str().into(), e))?;
     }
@@ -54,9 +54,9 @@ pub fn do_init_ext<S: ProjectMut>(
 
     storage.put_project(
         &InterchangeProjectInfoRaw {
-            name,
+            name: name.to_owned(),
             description: None,
-            version,
+            version: version.to_owned(),
             license,
             maintainer: vec![],
             topic: vec![],
@@ -78,23 +78,28 @@ pub fn do_init_ext<S: ProjectMut>(
     Ok(())
 }
 
-pub fn do_init<S: ProjectMut>(
+pub fn do_init<P: ProjectMut>(
     name: String,
     version: String,
     license: Option<String>,
-    storage: &mut S,
-) -> Result<(), InitError<S::Error>> {
+    storage: &mut P,
+) -> Result<(), InitError<P::Error>> {
     do_init_ext(name, version, false, license, false, storage)
 }
 
-pub fn do_init_memory(
-    name: String,
-    version: String,
+pub fn do_init_memory<N: AsRef<str>, V: AsRef<str>>(
+    name: N,
+    version: V,
     license: Option<String>,
 ) -> Result<InMemoryProject, InitError<crate::project::memory::InMemoryError>> {
     let mut storage = InMemoryProject::default();
 
-    do_init(name, version, license, &mut storage)?;
+    do_init(
+        name.as_ref().to_owned(),
+        version.as_ref().to_owned(),
+        license,
+        &mut storage,
+    )?;
 
     Ok(storage)
 }
@@ -105,8 +110,11 @@ pub fn do_init_local_file(
     version: String,
     license: Option<String>,
     path: Utf8PathBuf,
-) -> Result<LocalSrcProject, InitError<crate::project::local_src::LocalSrcError>> {
-    let mut storage = LocalSrcProject { project_path: path };
+) -> Result<LocalSrcProject, InitError<LocalSrcError>> {
+    let mut storage = LocalSrcProject {
+        nominal_path: None,
+        project_path: path,
+    };
 
     do_init(name, version, license, &mut storage)?;