apunkt/nyx
1
0
Fork 0
mirror of https://github.com/elicpeter/nyx.git synced 2026-06-15 20:05:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor(dynamic): centralize runtime dependency handling across frameworks, enhance manifest generation for Rust, Java, Python, Go, and PHP, and improve framework adapter integration

Browse source
This commit is contained in:
elipeter 2026-05-26 15:07:51 -05:00
parent ed398e2834
commit ed96f94bb5
12 changed files with 1202 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/dynamic/lang/js_shared.rs
View file

@ -380,6 +380,14 @@ pub fn materialize_node(env: &Environment) -> RuntimeArtifacts {
let mut deps: Vec<(String, &'static str)> = Vec::new();
let mut seen: std::collections::HashSet<String> = std::collections::HashSet::new();
if let Some(adapter) = env.framework_adapter.as_deref() {
for dep in crate::dynamic::framework::runtime_deps::deps_for_adapter(adapter).node_packages
{
if seen.insert(dep.name.to_owned()) {
deps.push((dep.name.to_owned(), dep.version));
}
}
}
for d in &env.direct_deps {
if is_node_builtin(d) {
continue;
@ -1039,7 +1047,7 @@ if (_h == null) {{
source: body,
filename: "harness.js".to_owned(),
command: vec!["node".to_owned(), "harness.js".to_owned()],
extra_files: Vec::new(),
extra_files: framework_dependency_files(spec),
entry_subpath: Some(entry_subpath),
}
}
@ -1081,7 +1089,7 @@ if (_h == null) {{
source: body,
filename: "harness.js".to_owned(),
command: vec!["node".to_owned(), "harness.js".to_owned()],
extra_files: Vec::new(),
extra_files: framework_dependency_files(spec),
entry_subpath: Some(entry_subpath),
}
}
@ -1125,7 +1133,7 @@ if (_h == null) {{
source: body,
filename: "harness.js".to_owned(),
command: vec!["node".to_owned(), "harness.js".to_owned()],
extra_files: Vec::new(),
extra_files: framework_dependency_files(spec),
entry_subpath: Some(entry_subpath),
}
}
@ -1161,7 +1169,7 @@ const _res = {{ statusCode: 200, headers: {{}}, end: function(d){{ if (d != null
source: body,
filename: "harness.js".to_owned(),
command: vec!["node".to_owned(), "harness.js".to_owned()],
extra_files: Vec::new(),
extra_files: framework_dependency_files(spec),
entry_subpath: Some(entry_subpath),
}
}
@ -1222,7 +1230,7 @@ const _prisma = {{
source: body,
filename: "harness.js".to_owned(),
command: vec!["node".to_owned(), "harness.js".to_owned()],
extra_files: Vec::new(),
extra_files: framework_dependency_files(spec),
entry_subpath: Some(entry_subpath),
}
}
@ -2527,10 +2535,19 @@ fn message_handler_dependency_files(spec: &HarnessSpec) -> Vec<(String, String)>
return Vec::new();
}
let source = read_entry_source(&spec.entry_file);
let deps = js_message_handler_deps(&source);
let mut deps = js_message_handler_deps(&source);
if let Some(adapter) = spec.framework.as_ref().map(|b| b.adapter.as_str()) {
for dep in crate::dynamic::framework::runtime_deps::deps_for_adapter(adapter).node_packages
{
if !deps.iter().any(|(name, _)| *name == dep.name) {
deps.push((dep.name, dep.version));
}
}
}
if deps.is_empty() {
return Vec::new();
}
deps.sort_by(|a, b| a.0.cmp(b.0));
vec![
(
"package.json".to_owned(),
@ -2543,6 +2560,36 @@ fn message_handler_dependency_files(spec: &HarnessSpec) -> Vec<(String, String)>
]
}
fn framework_dependency_files(spec: &HarnessSpec) -> Vec<(String, String)> {
if spec.expected_cap != crate::labels::Cap::CODE_EXEC {
return Vec::new();
}
let Some(adapter) = spec.framework.as_ref().map(|b| b.adapter.as_str()) else {
return Vec::new();
};
let mut deps: Vec<(&'static str, &'static str)> =
crate::dynamic::framework::runtime_deps::deps_for_adapter(adapter)
.node_packages
.iter()
.map(|dep| (dep.name, dep.version))
.collect();
if deps.is_empty() {
return Vec::new();
}
deps.sort_by(|a, b| a.0.cmp(b.0));
deps.dedup_by(|a, b| a.0 == b.0);
vec![
(
"package.json".to_owned(),
package_json_multi("nyx-harness-framework", &deps),
),
(
"package-lock.json".to_owned(),
package_lock_skeleton("nyx-harness-framework"),
),
]
}
fn js_message_handler_deps(source: &str) -> Vec<(&'static str, &'static str)> {
let mut deps = Vec::new();
for raw_line in source.lines() {