Release 0.1.7-alpha.2

[email protected]
[email protected]

Generated by cargo-workspaces

Cargo.lock

@@ -442,7 +442,7 @@ dependencies = [
 
 [[package]]
 name = "mist-analyzer"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.1"
 dependencies = [
  "cargo_metadata",
  "dashmap 6.1.0",
@@ -457,7 +457,7 @@ dependencies = [
 
 [[package]]
 name = "mist-api"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.1"
 dependencies = [
  "cargo_metadata",
  "mist-codegen",
@@ -475,7 +475,7 @@ dependencies = [
 
 [[package]]
 name = "mist-lang"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.2"
 dependencies = [
  "mist-analyzer",
  "mist-api",
@@ -483,7 +483,7 @@ dependencies = [
 
 [[package]]
 name = "mist-parser"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.2"
 dependencies = [
  "pest",
  "pest_derive",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mist-lang"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.2"
 edition = "2024"
 description = "The Mist programming language compiler"
 license = "Apache-2.0"
@@ -41,10 +41,6 @@ mist-api = { path = "crates/mist-api", version = "0.1.7-alpha.0" }
 name = "mist"
 path = ".mist/src/main.rs"
 
-[[bin]]
-name = "mist-lsp"
-path = ".mist/lsp/main.rs"
-
 [[bin]]
 name = "mist-analyzer"
 path = ".mist/src/analyzer.rs"

crates/analyzer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mist-analyzer"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.1"
 edition = "2024"
 description = "The Mist programming language Analyzer LSP"
 license = "Apache-2.0"

crates/analyzer/src/lib.rs

@@ -573,7 +573,7 @@ pub fn from_mist_to_rust(mut path: PathBuf) -> PathBuf {
     let mut comps: Vec<Component> = path.components().collect();
 
     if let Some(pos) = comps.iter().rposition(|c| c.as_os_str() == "src") {
-        let replacement = std::path::Path::new(".mist/lsp");
+        let replacement = std::path::Path::new(".mist/src");
         comps.splice(pos..=pos, replacement.components());
         comps.iter().collect()
     } else {
@@ -587,8 +587,7 @@ pub fn from_rust_to_mist(mut path: PathBuf) -> PathBuf {
 
     let comps: Vec<Component> = path.components().collect();
 
-    // pattern we originally inserted: ".mist/lsp"
-    let pattern: Vec<Component> = std::path::Path::new(".mist/lsp").components().collect();
+    let pattern: Vec<Component> = std::path::Path::new(".mist/src").components().collect();
 
     // find the last occurrence of the pattern
     if let Some(pos) = comps

crates/analyzer/src/transpiler.rs

@@ -7,7 +7,7 @@ use mist_parser::{ast::TopLevel, error::ParseError};
 
 pub fn build(root: &PathBuf) {
     let src_dir = root.join("src");
-    let out_dir = root.join(".mist/lsp");
+    let out_dir = root.join(".mist/src");
 
     if let Err(e) = build_dir(root, &src_dir, &src_dir, &out_dir) {
         eprintln!("Warning: Build directory run aborted safely: {e}");

crates/mist-api/Cargo.toml

@@ -1,7 +1,18 @@
 [package]
 name = "mist-api"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.1"
 edition = "2024"
+description = "The Mist programming language module system"
+license = "Apache-2.0"
+repository = "https://github.com/mist-go/mist"
+keywords = ["compiler", "language", "mist", "module-system"]
+categories = ["compilers"]
+
+include = [
+    ".mist/src/**",
+    "Cargo.toml",
+    "README.md",
+]
 
 [dependencies]
 serde = { version = "1.0.228", features = ["serde_derive"] }
@@ -13,7 +24,3 @@ mist-codegen = { workspace = true }
 [lib]
 name = "mist_api"
 path = ".mist/src/lib.rs"
-
-[[bin]]
-name = "mist_lsp"
-path = ".mist/lsp/main.rs"

crates/mist-api/src/modules.mist

@@ -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,55 +15,91 @@ pub class Module {
         self.path = mist_path;
 
         if (self.path.is_dir()) {
-            var entries = match (fs::read_dir(&self.path)) {
-                Ok[entries] => entries;
-                Err[e] => {
-                    eprintln!(
-                        "error: failed to read directory {}\n  {}",
-                        self.path.display(),
-                        e
-                    );
+            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  {}", search_dir.display(), e);
+                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);
                 }
             };
 
-            for (entry : entries) {
-                var entry = match (entry) {
-                    Ok[entry] => entry;
-                    Err[e] => {
-                        eprintln!("error: failed to read directory entry\n  {}", e);
+            PathBuf child_path = entry.path();
 
-                        process::exit(1);
-                    }
-                };
-
-                PathBuf child_path = entry.path();
-
-                String child_name = child_path.file_stem()
-                    .and_then(|var s| s.to_str())
-                    .expect("Failed to get module name")
-                    .to_string();
-
-                PathBuf child_output = rust_path.join(&child_name).with_extension("rs");
-
-                if (should_skip(&child_path, &child_output)) {
-                    continue;
-                }
-
-                self.children.push(new Module(child_name, child_path, child_output));
+            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")
+                .to_string();
+
+            PathBuf child_output = rust_path.join(&child_name).with_extension("rs");
+
+            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

@@ -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,136 +30,93 @@ 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;
+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 write output {}\n  {}",
+                    output_file.display(),
+                    res.unwrap_err(),
+                );
+
+                process::exit(1);
+            }
+        } else {
+            transpile_file(&self.path, &output_file, &output);
+        }
+
+        format!("pub mod {};\n", self.name)
+    }
+}
+
+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 directory {}\n  {}",
-                current.display(),
-                e
-            );
+            eprintln!("error: failed to read file {}\n  {}", path.display(), e);
 
             process::exit(1);
         }
     };
 
-    for (entry : entries) {
-        var entry = match (entry) {
-            Ok[entry] => entry;
-            Err[e] => {
-                eprintln!("error: failed to read directory entry\n  {}", e);
+    var mut gc = mist_codegen::RustCodegen::new();
 
-                process::exit(1);
-            }
-        };
+    String output = gc.generate(match (mist_parser::parse(&source)) {
+        Ok[ast] => ast;
+        Err[e] => {
+            match (e) {
+                error::ParseError::Ast[e] => {
+                    var start_pos = e.span.start_pos().line_col();
 
-        PathBuf path = entry.path();
+                    var span = e.span.as_str();
 
-        if (path.is_dir()) {
-            build_dir(root, base_src, &path, out, force);
-            continue;
-        }
+                    eprintln!(
+                        "\n{}:{}:{}\n \x1b[31mError\x1b[0m: {}\n\t{}{}\t{}",
+                        path.as_os_str().display(),
+                        start_pos.0,
+                        start_pos.1,
+                        e.error_message,
+                        span,
+                        if span.ends_with("\n") { "" } else { "\n" },
+                        "^".repeat(span.trim().len()),
+                    );
 
-        Path* relative = path.strip_prefix(base_src).expect("Failed to strip base src from path");
+                    process::exit(1);
+                }
 
-        if (path.extension().and_then(|var e| e.to_str()) != Some("mist")) {
-            PathBuf dest = out.join(relative);
+                error::ParseError::PreAst[e] => {
+                    eprintln!("error: parse failed in {}\n{}", path.display(), e);
 
-            Option<Path*> parent = dest.parent();
-
-            if (parent.is_some()) {
-                fs::create_dir_all(parent.unwrap()).expect("failed to create output directory");
-            }
-
-            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)) {
-            Ok[s] => s;
-            Err[e] => {
-                eprintln!("error: failed to read file {}\n  {}", path.display(), e);
-
-                process::exit(1);
-            }
-        };
-
-        var mut gc = mist_codegen::RustCodegen::new();
-
-        String output = gc.generate(match (mist_parser::parse(&source)) {
-            Ok[ast] => ast;
-            Err[e] => {
-                match (e) {
-                    error::ParseError::Ast[e] => {
-                        var start_pos = e.span.start_pos().line_col();
-
-                        var span = e.span.as_str();
-
-                        eprintln!(
-                            "\n{}:{}:{}\n \x1b[31mError\x1b[0m: {}\n\t{}{}\t{}",
-                            path.as_os_str().display(),
-                            start_pos.0,
-                            start_pos.1,
-                            e.error_message,
-                            span,
-                            if span.ends_with("\n") { "" } else { "\n" },
-                            "^".repeat(span.trim().len()),
-                        );
-
-                        process::exit(1);
-                    }
-
-                    error::ParseError::PreAst[e] => {
-                        eprintln!("error: parse failed in {}\n{}", path.display(), e);
-
-                        process::exit(1);
-                    }
+                    process::exit(1);
                 }
             }
-        });
-
-        var res = fs::write(&output_file, output);
-
-        if (res.is_err()) {
-            eprintln!(
-                "error: failed to write output {}\n  {}",
-                output_file.display(),
-                res.unwrap_err(),
-            );
-
-            process::exit(1);
         }
+    });
+
+    var res = fs::write(&output_file, format!("{mod_decl}{output}"));
+
+    if (res.is_err()) {
+        eprintln!(
+            "error: failed to write output {}\n  {}",
+            output_file.display(),
+            res.unwrap_err(),
+        );
+
+        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()
-}

crates/parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mist-parser"
-version = "0.1.7-alpha.0"
+version = "0.1.7-alpha.2"
 edition = "2024"
 description = "The Mist programming language parser"
 license = "Apache-2.0"

crates/parser/src/grammar.pest

@@ -139,7 +139,7 @@ multi_pat_template = _{
 }
 
 tuple_pattern = {
-    "[" ~ multi_pat_template ~ "]"
+    "[" ~ pattern ~ "," ~ multi_pat_template ~ "]"
 }
 
 named_tuple_pattern = {

mist-test/src/main.mist

@@ -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");
 

src/main.mist

@@ -102,4 +102,4 @@ void inject_mist_target(bool is_lib) {
     };
 
     fs::write("Cargo.toml", toml_content+inject).expect("Failed to inject to Cargo.toml");
-}
+}