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

Fixed package gen

Browse Source
This commit is contained in:
selimaj-dev
2026-06-11 21:13:59 +02:00
parent c06eebe50b
commit 05fc8fa7f3
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/mist-api/src/modules.mist
+6 -2
View File
@@ -63,8 +63,12 @@ pub class Module {
} }
} }
pub fn is_package(*self, parent_dir *PathBuf) bool {
self.path.file_name().map(fn(v) -> v.to_str()).unwrap_or_default() == Some("package.mist")
}
pub fn output_dir(*self, parent_dir *PathBuf) PathBuf { pub fn output_dir(*self, parent_dir *PathBuf) PathBuf {
if (self.path.is_dir() || Some("package.mist") == self.path.file_name().unwrap().to_str()) { if (self.path.is_dir() || self.is_package(parent_dir)) {
parent_dir.join(&self.name) parent_dir.join(&self.name)
} else { } else {
parent_dir.clone() parent_dir.clone()
@@ -72,7 +76,7 @@ pub class Module {
} }
pub fn output_path(*self, parent_dir *PathBuf) PathBuf { pub fn output_path(*self, parent_dir *PathBuf) PathBuf {
if (self.path.is_dir() || Some("package.mist") == self.path.file_name().unwrap().to_str()) { if (self.path.is_dir() || self.is_package(parent_dir)) {
parent_dir.join(&self.name).join("mod.rs") parent_dir.join(&self.name).join("mod.rs")
} else { } else {
parent_dir.join(&self.name).with_extension("rs") parent_dir.join(&self.name).with_extension("rs")
crates/mist-api/src/transpiler.mist
+11 -11
View File
@@ -184,18 +184,20 @@ fn transpile_file(path *PathBuf, mut output_file PathBuf, mod_decl *str) String
} }
}; };
if (let [Some[[vis, name]], ast] = parsed) { let output = gc.generate(parsed.1);
let output = gc.generate(ast);
if (let Some[ext] = output_file.extension().map(fn(e) -> e.to_owned())) { if (let [Some[[vis, name]], _] = parsed) {
let mut new_name = std::ffi::OsString::from(&name.0); if (output_file.file_name().map(fn(v) -> v.to_str()).unwrap_or_default() != Some("mod.rs")) {
if (let Some[ext] = output_file.extension().map(fn(e) -> e.to_owned())) {
let mut new_name = std::ffi::OsString::from(&name.0);
new_name.push("."); new_name.push(".");
new_name.push(ext); new_name.push(ext);
output_file.set_file_name(new_name); output_file.set_file_name(new_name);
} else { } else {
output_file.set_file_name(&name.0); output_file.set_file_name(&name.0);
}
} }
let res = fs::write(&output_file, format!("{mod_decl}{output}")); let res = fs::write(&output_file, format!("{mod_decl}{output}"));
@@ -212,8 +214,6 @@ fn transpile_file(path *PathBuf, mut output_file PathBuf, mod_decl *str) String
format!("{}mod {};\n", vis.get_rust(), name.get_rust()) format!("{}mod {};\n", vis.get_rust(), name.get_rust())
} else { } else {
let output = gc.generate(parsed.1);
let res = fs::write(&output_file, format!("{mod_decl}{output}")); let res = fs::write(&output_file, format!("{mod_decl}{output}"));
if (res.is_err()) { if (res.is_err()) {