mist-go/mist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Merge pull request #57 from mist-go/module-system

Browse Source 
Module system
This commit is contained in:
selimaj-dev
2026-06-01 13:49:21 +02:00
committed by GitHub
parent b384f55c77 be6d2de39c
commit ee40450f3a
3 changed files with 146 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/mist-api/src/modules.mist
+48 -11
View File
@@ -3,6 +3,7 @@ use <std::path::PathBuf>;
use <std::fs>;
use <std::process>;
#[derive(Debug)]
pub class Module {
pub String name;
pub PathBuf path;
@@ -14,15 +15,23 @@ pub class Module {
self.path = mist_path;
if (self.path.is_dir()) {
var entries = match (fs::read_dir(&self.path)) {
PathBuf dir = self.path.clone();
// Behavior 2: It's a directory node. Check for gateway package.mist first.
PathBuf pkg_gate = self.path.join("package.mist");
if (pkg_gate.exists()) {
self.path = pkg_gate;
}
self.scan_directory(&dir, &rust_path);
}
}
void scan_directory(self mut*, Path* search_dir, Path* rust_path) {
var entries = match (fs::read_dir(search_dir)) {
Ok[entries] => entries;
Err[e] => {
eprintln!(
"error: failed to read directory {}\n {}",
self.path.display(),
e
);
eprintln!("error: failed to read directory {}\n {}", search_dir.display(), e);
process::exit(1);
}
};
@@ -32,13 +41,16 @@ pub class Module {
Ok[entry] => entry;
Err[e] => {
eprintln!("error: failed to read directory entry\n {}", e);
process::exit(1);
}
};
PathBuf child_path = entry.path();
if (child_path == self.path) {
continue;
}
String child_name = child_path.file_stem()
.and_then(|var s| s.to_str())
.expect("Failed to get module name")
@@ -46,23 +58,48 @@ pub class Module {
PathBuf child_output = rust_path.join(&child_name).with_extension("rs");
if (should_skip(&child_path, &child_output)) {
if (!child_path.is_dir() && should_skip(&child_path, &child_output)) {
continue;
}
self.children.push(new Module(child_name, child_path, child_output));
}
}
pub PathBuf output_dir(self*, PathBuf* parent_dir) {
if (self.path.is_dir() || Some("package.mist") == self.path.file_name().unwrap().to_str()) {
parent_dir.join(&self.name)
} else {
parent_dir.clone()
}
}
pub PathBuf output_path(self*, PathBuf* parent_dir) {
if (self.path.is_dir() || Some("package.mist") == self.path.file_name().unwrap().to_str()) {
parent_dir.join(&self.name).join("mod.rs")
} else {
parent_dir.join(&self.name).with_extension("rs")
}
}
}
pub Module new_package(PathBuf mist_path, PathBuf rust_path) {
pub Module master_package(PathBuf mist_path, PathBuf rust_path) {
String name = mist_path.file_stem()
.and_then(|var s| s.to_str())
.expect("Failed to get module name")
.to_string();
new Module(name, mist_path, rust_path)
var mut root_mod = new Module(name, mist_path.clone(), rust_path.clone());
if (!mist_path.is_dir()) {
PathBuf parent_dir = mist_path.parent()
.expect("Failed to get parent directory of root file")
.to_path_buf();
root_mod.scan_directory(&parent_dir, &rust_path);
}
root_mod
}
bool should_skip(Path* source, Path* output) {
crates/mist-api/src/transpiler.mist
+31 -71
View File
@@ -6,6 +6,7 @@ use <std::time>;
use <std::env>;
use <mist_parser::error>;
use <crate::modules>;
pub PathBuf build(bool force) {
var start = time::Instant::now();
@@ -15,7 +16,9 @@ pub PathBuf build(bool force) {
PathBuf src = root.join("src");
PathBuf out = root.join(".mist/src");
build_dir(&root, &src, &src, &out, force);
var master = modules::master_package(src.join("main.mist"), out.join("main.rs"));
master.transpile(&out);
var elapsed = start.elapsed();
@@ -27,70 +30,41 @@ pub PathBuf build(bool force) {
root
}
void build_dir(Path* root, Path* base_src, Path* current, Path* out, bool force) {
var entries = match (fs::read_dir(current)) {
Ok[entries] => entries;
Err[e] => {
impl modules::Module {
String transpile(self*, PathBuf* parent_dir) {
PathBuf dir = self.output_dir(&parent_dir);
PathBuf output_file = self.output_path(&parent_dir);
var _ = fs::create_dir_all(&dir);
String mut output = String::new();
for (child : &self.children) {
output.push_str(&child.transpile(&dir));
}
if (self.path.is_dir()) {
var res = fs::write(&output_file, output);
if (res.is_err()) {
eprintln!(
"error: failed to read directory {}\n {}",
current.display(),
e
"error: failed to write output {}\n {}",
output_file.display(),
res.unwrap_err(),
);
process::exit(1);
}
};
for (entry : entries) {
var entry = match (entry) {
Ok[entry] => entry;
Err[e] => {
eprintln!("error: failed to read directory entry\n {}", e);
process::exit(1);
}
};
PathBuf path = entry.path();
if (path.is_dir()) {
build_dir(root, base_src, &path, out, force);
continue;
} else {
transpile_file(&self.path, &output_file, &output);
}
Path* relative = path.strip_prefix(base_src).expect("Failed to strip base src from path");
if (path.extension().and_then(|var e| e.to_str()) != Some("mist")) {
PathBuf dest = out.join(relative);
Option<Path*> parent = dest.parent();
if (parent.is_some()) {
fs::create_dir_all(parent.unwrap()).expect("failed to create output directory");
format!("pub mod {};\n", self.name)
}
}
if (!force && should_skip(&path, &dest)) {
continue
}
fs::copy(&path, dest).expect("Failed to copy non-mist file");
continue;
}
PathBuf output_file = out.join(relative).with_extension("rs");
if (!force && should_skip(&path, &output_file)) {
continue;
}
Option<Path*> parent = output_file.parent();
if (parent.is_some()) {
fs::create_dir_all(parent.unwrap()).expect("failed to create output directory");
}
String source = match (fs::read_to_string(&path)) {
void transpile_file(PathBuf* path, PathBuf* output_file, str* mod_decl) {
String source = match (fs::read_to_string(path)) {
Ok[s] => s;
Err[e] => {
eprintln!("error: failed to read file {}\n {}", path.display(), e);
@@ -133,7 +107,7 @@ void build_dir(Path* root, Path* base_src, Path* current, Path* out, bool force)
}
});
var res = fs::write(&output_file, output);
var res = fs::write(&output_file, format!("{mod_decl}{output}"));
if (res.is_err()) {
eprintln!(
@@ -144,19 +118,5 @@ void build_dir(Path* root, Path* base_src, Path* current, Path* out, bool force)
process::exit(1);
}
}
}
bool should_skip(Path* source, Path* output) {
var src_time = fs::metadata(source)
.ok()
.and_then(|var v| v.modified().ok());
var out_time = fs::metadata(output)
.ok()
.and_then(|var v| v.modified().ok());
out_time
.map(|var out_time| out_time >= src_time.unwrap())
.unwrap_or_default()
}
mist-test/src/main.mist
-6
View File
@@ -1,9 +1,3 @@
pub mod app;
pub mod task;
pub mod plugin;
pub mod logger;
pub mod event;
void main() {
var mut app_instance = new app::Application("mist-app");