pr 04
This commit is contained in:
@@ -2,8 +2,9 @@ use prometeu_compiler::building::output::CompiledModule;
|
||||
use prometeu_compiler::building::output::{compile_project, CompileError, ExportKey, ExportMetadata};
|
||||
use prometeu_compiler::building::plan::{BuildStep, BuildTarget};
|
||||
use prometeu_compiler::common::files::FileManager;
|
||||
use prometeu_compiler::deps::resolver::ProjectId;
|
||||
use prometeu_compiler::deps::resolver::ProjectKey;
|
||||
use prometeu_compiler::semantics::export_surface::ExportSurfaceKind;
|
||||
use prometeu_analysis::ids::ProjectId;
|
||||
use std::collections::{BTreeMap, HashMap};
|
||||
use std::path::PathBuf;
|
||||
use tempfile::tempdir;
|
||||
@@ -16,7 +17,8 @@ fn test_local_vs_dependency_conflict() {
|
||||
let project_dir = dir.path().to_path_buf();
|
||||
|
||||
// Dependency: sdk
|
||||
let dep_id = ProjectId { name: "sdk-impl".to_string(), version: "1.0.0".to_string() };
|
||||
let dep_key = ProjectKey { name: "sdk-impl".to_string(), version: "1.0.0".to_string() };
|
||||
let dep_id = ProjectId(0);
|
||||
let mut dep_exports = BTreeMap::new();
|
||||
dep_exports.insert(ExportKey {
|
||||
module_path: "math".to_string(), // normalized path
|
||||
@@ -29,7 +31,8 @@ fn test_local_vs_dependency_conflict() {
|
||||
});
|
||||
|
||||
let dep_module = CompiledModule {
|
||||
project_id: dep_id.clone(),
|
||||
project_id: dep_id,
|
||||
project_key: dep_key.clone(),
|
||||
target: BuildTarget::Main,
|
||||
exports: dep_exports,
|
||||
imports: vec![],
|
||||
@@ -40,20 +43,22 @@ fn test_local_vs_dependency_conflict() {
|
||||
symbols: vec![],
|
||||
};
|
||||
|
||||
let mut dep_modules = HashMap::new();
|
||||
dep_modules.insert(dep_id.clone(), dep_module);
|
||||
let mut dep_modules: HashMap<ProjectId, CompiledModule> = HashMap::new();
|
||||
dep_modules.insert(dep_id, dep_module);
|
||||
|
||||
// Main project has a LOCAL module named "sdk/math"
|
||||
// By creating a file in src/main/modules/sdk/math/, the module path becomes "sdk/math"
|
||||
fs::create_dir_all(project_dir.join("src/main/modules/sdk/math")).unwrap();
|
||||
fs::write(project_dir.join("src/main/modules/sdk/math/local.pbs"), "pub declare struct Vector(x: int)").unwrap();
|
||||
|
||||
let main_id = ProjectId { name: "main".to_string(), version: "0.1.0".to_string() };
|
||||
let mut deps = BTreeMap::new();
|
||||
deps.insert("sdk".to_string(), dep_id.clone());
|
||||
let main_key = ProjectKey { name: "main".to_string(), version: "0.1.0".to_string() };
|
||||
let main_id = ProjectId(1);
|
||||
let mut deps: BTreeMap<String, ProjectId> = BTreeMap::new();
|
||||
deps.insert("sdk".to_string(), ProjectId(0));
|
||||
|
||||
let step = BuildStep {
|
||||
project_id: main_id,
|
||||
project_key: main_key,
|
||||
project_dir,
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![PathBuf::from("src/main/modules/sdk/math/local.pbs")],
|
||||
@@ -77,7 +82,8 @@ fn test_aliased_dependency_conflict() {
|
||||
let project_dir = dir.path().to_path_buf();
|
||||
|
||||
// Dependency 1: exports "b/c:Vector"
|
||||
let dep1_id = ProjectId { name: "p1".to_string(), version: "1.0.0".to_string() };
|
||||
let dep1_key = ProjectKey { name: "p1".to_string(), version: "1.0.0".to_string() };
|
||||
let dep1_id = ProjectId(0);
|
||||
let mut dep1_exports = BTreeMap::new();
|
||||
dep1_exports.insert(ExportKey {
|
||||
module_path: "b/c".to_string(),
|
||||
@@ -89,7 +95,8 @@ fn test_aliased_dependency_conflict() {
|
||||
ty: None,
|
||||
});
|
||||
let dep1_module = CompiledModule {
|
||||
project_id: dep1_id.clone(),
|
||||
project_id: dep1_id,
|
||||
project_key: dep1_key.clone(),
|
||||
target: BuildTarget::Main,
|
||||
exports: dep1_exports,
|
||||
imports: vec![],
|
||||
@@ -101,7 +108,8 @@ fn test_aliased_dependency_conflict() {
|
||||
};
|
||||
|
||||
// Dependency 2: exports "c:Vector"
|
||||
let dep2_id = ProjectId { name: "p2".to_string(), version: "1.0.0".to_string() };
|
||||
let dep2_key = ProjectKey { name: "p2".to_string(), version: "1.0.0".to_string() };
|
||||
let dep2_id = ProjectId(1);
|
||||
let mut dep2_exports = BTreeMap::new();
|
||||
dep2_exports.insert(ExportKey {
|
||||
module_path: "c".to_string(),
|
||||
@@ -113,7 +121,8 @@ fn test_aliased_dependency_conflict() {
|
||||
ty: None,
|
||||
});
|
||||
let dep2_module = CompiledModule {
|
||||
project_id: dep2_id.clone(),
|
||||
project_id: dep2_id,
|
||||
project_key: dep2_key.clone(),
|
||||
target: BuildTarget::Main,
|
||||
exports: dep2_exports,
|
||||
imports: vec![],
|
||||
@@ -124,17 +133,19 @@ fn test_aliased_dependency_conflict() {
|
||||
symbols: vec![],
|
||||
};
|
||||
|
||||
let mut dep_modules = HashMap::new();
|
||||
dep_modules.insert(dep1_id.clone(), dep1_module);
|
||||
dep_modules.insert(dep2_id.clone(), dep2_module);
|
||||
let mut dep_modules: HashMap<ProjectId, CompiledModule> = HashMap::new();
|
||||
dep_modules.insert(dep1_id, dep1_module);
|
||||
dep_modules.insert(dep2_id, dep2_module);
|
||||
|
||||
let main_id = ProjectId { name: "main".to_string(), version: "0.1.0".to_string() };
|
||||
let mut deps = BTreeMap::new();
|
||||
deps.insert("a".to_string(), dep1_id.clone());
|
||||
deps.insert("a/b".to_string(), dep2_id.clone());
|
||||
let main_key = ProjectKey { name: "main".to_string(), version: "0.1.0".to_string() };
|
||||
let main_id = ProjectId(2);
|
||||
let mut deps: BTreeMap<String, ProjectId> = BTreeMap::new();
|
||||
deps.insert("a".to_string(), ProjectId(0));
|
||||
deps.insert("a/b".to_string(), ProjectId(1));
|
||||
|
||||
let step = BuildStep {
|
||||
project_id: main_id,
|
||||
project_key: main_key,
|
||||
project_dir,
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![],
|
||||
@@ -163,9 +174,11 @@ fn test_mixed_main_test_modules() {
|
||||
fs::create_dir_all(project_dir.join("src/test/modules/foo")).unwrap();
|
||||
fs::write(project_dir.join("src/test/modules/foo/Test.pbs"), "pub declare struct Test(x: int)").unwrap();
|
||||
|
||||
let project_id = ProjectId { name: "mixed".to_string(), version: "0.1.0".to_string() };
|
||||
let project_key = ProjectKey { name: "mixed".to_string(), version: "0.1.0".to_string() };
|
||||
let project_id = ProjectId(0);
|
||||
let step = BuildStep {
|
||||
project_id,
|
||||
project_key,
|
||||
project_dir,
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![
|
||||
@@ -192,9 +205,11 @@ fn test_module_merging_same_directory() {
|
||||
fs::write(project_dir.join("src/main/modules/gfx/api.pbs"), "pub declare struct Gfx(id: int)").unwrap();
|
||||
fs::write(project_dir.join("src/main/modules/gfx/colors.pbs"), "pub declare struct Color(r: int)").unwrap();
|
||||
|
||||
let project_id = ProjectId { name: "merge".to_string(), version: "0.1.0".to_string() };
|
||||
let project_key = ProjectKey { name: "merge".to_string(), version: "0.1.0".to_string() };
|
||||
let project_id = ProjectId(0);
|
||||
let step = BuildStep {
|
||||
project_id,
|
||||
project_key,
|
||||
project_dir,
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![
|
||||
@@ -221,9 +236,11 @@ fn test_duplicate_symbol_in_same_module_different_files() {
|
||||
fs::write(project_dir.join("src/main/modules/gfx/a.pbs"), "pub declare struct Gfx(id: int)").unwrap();
|
||||
fs::write(project_dir.join("src/main/modules/gfx/b.pbs"), "pub declare struct Gfx(id: int)").unwrap();
|
||||
|
||||
let project_id = ProjectId { name: "dup".to_string(), version: "0.1.0".to_string() };
|
||||
let project_key = ProjectKey { name: "dup".to_string(), version: "0.1.0".to_string() };
|
||||
let project_id = ProjectId(0);
|
||||
let step = BuildStep {
|
||||
project_id,
|
||||
project_key,
|
||||
project_dir,
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![
|
||||
@@ -248,9 +265,11 @@ fn test_root_module_merging() {
|
||||
fs::write(project_dir.join("src/main/modules/main.pbs"), "pub declare struct Main(id: int)").unwrap();
|
||||
fs::write(project_dir.join("src/main/modules/utils.pbs"), "pub declare struct Utils(id: int)").unwrap();
|
||||
|
||||
let project_id = ProjectId { name: "root-merge".to_string(), version: "0.1.0".to_string() };
|
||||
let project_key = ProjectKey { name: "root-merge".to_string(), version: "0.1.0".to_string() };
|
||||
let project_id = ProjectId(0);
|
||||
let step = BuildStep {
|
||||
project_id,
|
||||
project_key,
|
||||
project_dir,
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![
|
||||
|
||||
Reference in New Issue
Block a user