Merge pull request #277 from Pivot-Studio/feat/npm_pkg

Chronostasys · web-flow · commit aa71d44eb388 · 2023-04-21T09:48:46.000+08:00
feat: add npm pkg &amp;&amp; support std lib in wasm lsp
diff --git a/.github/workflows/npmpkg.yml b/.github/workflows/npmpkg.yml
@@ -0,0 +1,28 @@
+name: Publish Package to npmjs
+on:
+  push:
+    tags:
+      - 'wasm/*'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        name: Install Rust (stable)
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+      - name: install rust
+        run: cargo install wasm-pack
+      - name: build wasm
+        run: wasm-pack build --target bundler --no-default-features --scope pivot-lang --release
+      # Setup .npmrc file to publish to npm
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+      - run: cd pkg && npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -22,5 +22,11 @@
         "tuple": "cpp",
         "test1.c": "cpp"
     },
-    "C_Cpp.errorSquiggles": "enabled"
+    "C_Cpp.errorSquiggles": "enabled",
+    // "rust-analyzer.check.targets": [
+    //     "wasm32-unknown-unknown",
+    // ],
+    // "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+    // "rust-analyzer.cargo.noDefaultFeatures": true,
+    // "rust-analyzer.check.noDefaultFeatures": true
 }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,14 +8,14 @@ authors = ["The pivot-lang Authors"]
 
 [dependencies]
 inkwell = { version = "0.1", optional = true, features = ["llvm14-0", "no-libffi-linking"] }
+llvm-sys = { version = "140", optional = true }
+pl_linker = { path = "./pl_linker", optional = true }
+immix = { path = "./immix", optional = true, features = ["llvm_gc_plugin", "llvm_stackmap"] }
+vm = { path = "./vm", optional = true, features = ["jit"] }
 indexmap = "1.9"
 lazy_static = "1.4"
 paste = "1.0"
-llvm-sys = { version = "140", optional = true }
 internal_macro = { path = "./internal_macro", default-features = false }
-pl_linker = { path = "./pl_linker", optional = true }
-vm = { path = "./vm", optional = true, features = ["jit"] }
-immix = { path = "./immix", optional = true, features = ["llvm_gc_plugin", "llvm_stackmap"] }
 nom_locate = "4.0"
 rowan = "0.15"
 dissimilar = "1.0"
@@ -45,8 +45,9 @@ console = "0.15"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "0.2"
-console_error_panic_hook = "0.1.7"
-wasm-logger = "0.2.0"
+console_error_panic_hook = "0.1"
+wasm-logger = "0.2"
+include_dir = "0.7"
 
 
 [dependencies.nom]
diff --git a/Makefile b/Makefile
@@ -41,4 +41,4 @@ cmake-clean:
 	@find . -name CMakeCache.txt -type f -delete
 
 lsp-wasm:
-	@wasm-pack build --target bundler --no-default-features
+	@wasm-pack build --target bundler --no-default-features --scope pivot-lang
diff --git a/src/ast/node/pkg.rs b/src/ast/node/pkg.rs
@@ -55,6 +55,9 @@ impl Node for UseNode {
         ctx: &'b mut Ctx<'a>,
         _builder: &'b BuilderEnum<'a, 'ctx>,
     ) -> NodeResult {
+        #[cfg(target_arch = "wasm32")]
+        let mut path = PathBuf::from("");
+        #[cfg(not(target_arch = "wasm32"))]
         let mut path = PathBuf::from(&ctx.config.root);
         let head = self.ids[0].get_name(ctx);
         if !self.ids.is_empty() {
@@ -73,6 +76,13 @@ impl Node for UseNode {
         for v in self.ids.iter() {
             ctx.push_semantic_token(v.range, SemanticTokenType::NAMESPACE, 0);
         }
+        #[cfg(target_arch = "wasm32")]
+        if crate::lsp::wasm::PLLIB_DIR
+            .get_file(path.with_extension("pi"))
+            .is_some()
+        {
+            return Ok(Default::default());
+        }
         if !path.with_extension("pi").exists() {
             let mut path = path.with_extension("");
             if !path.exists() {
diff --git a/src/ast/node/program.rs b/src/ast/node/program.rs
@@ -170,7 +170,7 @@ impl Program {
         let binding = PathBuf::from(self.params(db).file(db)).with_extension("");
         let pkgname = binding.file_name().unwrap().to_str().unwrap();
         // 默认加入gc和builtin module
-        #[cfg(not(target_arch = "wasm32"))] // TODO support std on wasm
+        // #[cfg(not(target_arch = "wasm32"))] // TODO support std on wasm
         if pkgname != "gc" && pkgname != "builtin" {
             prog.uses.extend_from_slice(&DEFAULT_USE_NODES);
         }
@@ -421,7 +421,7 @@ pub fn emit_file(db: &dyn Db, params: ProgramEmitParam) -> ModWrapper {
     );
     ctx.plmod.submods = params.submods(db);
     // imports all builtin symbols
-    #[cfg(not(target_arch = "wasm32"))] // TODO support std on wasm
+    // #[cfg(not(target_arch = "wasm32"))] // TODO support std on wasm
     if ctx.plmod.name != "builtin" && ctx.plmod.name != "gc" {
         let builtin_mod = ctx.plmod.submods.get("builtin").unwrap().clone();
         ctx.plmod.import_all_public_symbols_from(&builtin_mod);
diff --git a/src/lsp/lspserver.rs b/src/lsp/lspserver.rs
@@ -317,14 +317,14 @@ fn main_loop(
                 });
             }
         })
-        .on::<DocumentSymbolRequest, _>(|id, params| {
-            let uri = url_to_path(params.text_document.uri);
-            docin.set_file(&mut db).to(uri);
-            docin.set_action(&mut db).to(ActionType::DocSymbol);
-            docin
-                .set_params(&mut db)
-                .to(Some((Default::default(), None)));
-            compile_dry(&db, docin);
+        .on::<DocumentSymbolRequest, _>(|id, _| {
+            // let uri = url_to_path(params.text_document.uri);
+            // docin.set_file(&mut db).to(uri);
+            // docin.set_action(&mut db).to(ActionType::DocSymbol);
+            // docin
+            //     .set_params(&mut db)
+            //     .to(Some((Default::default(), None)));
+            // compile_dry(&db, docin);
             let doc_symbols = compile_dry::accumulated::<DocSymbols>(&db, docin);
             let sender = connection.sender.clone();
             if !doc_symbols.is_empty() {
diff --git a/src/lsp/mem_docs.rs b/src/lsp/mem_docs.rs
@@ -200,10 +200,10 @@ impl MemDocs {
     pub fn get_file_content(&mut self, db: &dyn Db, key: &str) -> Option<SourceProgram> {
         // let sanitized = crate::utils::canonicalize(key).unwrap();
         // let key = sanitized.to_str().unwrap();
-        debug!("mdmdoc get_file_content {}", key);
+        debug!("memdoc get_file_content {}", key);
         let mem = self.get(key);
         if let Some(mem) = mem {
-            debug!("mdmdoc get_file_content result \n{}", mem.text(db));
+            debug!("memdoc get_file_content result \n{}", mem.text(db));
             return Some(*mem);
         }
         let re = read_to_string(key);
diff --git a/src/lsp/mod.rs b/src/lsp/mod.rs
@@ -9,4 +9,4 @@ pub mod text;
 #[cfg(not(target_arch = "wasm32"))]
 pub use lspserver::*;
 #[cfg(target_arch = "wasm32")]
-mod wasm;
+pub mod wasm;
diff --git a/src/lsp/wasm.rs b/src/lsp/wasm.rs
@@ -1,9 +1,11 @@
 use std::{
     borrow::Borrow,
     cell::RefCell,
+    fmt::format,
     sync::{Arc, Mutex},
 };
 
+use include_dir::{include_dir, Dir};
 use lazy_static::lazy_static;
 use lsp_types::{
     notification::DidChangeTextDocument, CompletionParams, Diagnostic, DidChangeTextDocumentParams,
@@ -14,7 +16,7 @@ use wasm_bindgen::prelude::wasm_bindgen;
 
 use crate::{
     ast::{
-        accumulators::{Completions, Diagnostics, Hints, PLSemanticTokens},
+        accumulators::{Completions, Diagnostics, DocSymbols, Hints, PLSemanticTokens},
         compiler::{compile_dry, ActionType},
         range::Pos,
     },
@@ -72,18 +74,9 @@ const LSP_DEMO_URI: &str = "http://www.test.com/main.pi";
 
 const LSP_DEMO_CONF_URI: &str = "http://www.test.com/Kagari.toml";
 
-// #[wasm_bindgen]
-// pub unsafe fn highlight(req:&str) {
-//     let mut db = & mut DB;
-//     let docs = Arc::new(Mutex::new(RefCell::new(MemDocs::default())));
-//     let mut tokens = FxHashMap::default();
-//     let mut completions: Vec<Vec<lsp_types::CompletionItem>> = vec![];
-// }
-
 #[wasm_bindgen]
 pub unsafe fn on_change_doc(req: &str) -> String {
-    console_error_panic_hook::set_once();
-    log::error!("req: {}", req);
+    log::info!("req: {}", req);
     let params: DidChangeTextDocumentParams = serde_json::from_str(req).unwrap();
     let docin = *DOCIN;
     let binding = &DB.inner;
@@ -106,8 +99,8 @@ pub unsafe fn on_change_doc(req: &str) -> String {
     docin.set_file(db).to(f);
 
     docin.set_action(db).to(ActionType::Diagnostic);
-    let re = compile_dry(db, docin).unwrap();
-    log::trace!("mod {:#?}", re.plmod(db));
+    let re = compile_dry(db, docin);
+    // log::trace!("mod {:#?}", re.plmod(db));
     // completions = compile_dry::accumulated::<Completions>(db, docin);
     let diags = compile_dry::accumulated::<Diagnostics>(db, docin);
     let mut m = FxHashMap::<String, Vec<Diagnostic>>::default();
@@ -142,9 +135,44 @@ pub unsafe fn on_change_doc(req: &str) -> String {
     .to_string();
 }
 
+pub static PLLIB_DIR: Dir = include_dir!("./planglib");
+
+fn add_file(db: &mut Database, docs: Arc<Mutex<RefCell<MemDocs>>>, fpath: &str, content: &str) {
+    // include!(real_path);
+    // log::error!("add file: {}", fpath);
+    docs.lock()
+        .unwrap()
+        .borrow_mut()
+        .insert(db, fpath.into(), content.into(), fpath.into());
+}
+
+fn add_fill_rec(db: &mut Database, docs: Arc<Mutex<RefCell<MemDocs>>>, dir: &Dir) {
+    dir.files().for_each(|f| {
+        let path = f.path();
+        f.contents_utf8().map(|x| {
+            add_file(db, docs.clone(), path.to_str().unwrap(), x);
+        });
+    });
+    dir.dirs().for_each(|d| {
+        add_fill_rec(db, docs.clone(), d);
+    });
+}
+
+fn add_pl_libs(db: &mut Database, docs: Arc<Mutex<RefCell<MemDocs>>>) {
+    for entry in PLLIB_DIR.dirs() {
+        let path = entry.path();
+        if path.starts_with("thirdparty") {
+            continue;
+        }
+        add_fill_rec(db, docs.clone(), entry);
+
+        // add_file(db, docs.clone(), path.to_str().unwrap(), content);
+    }
+}
 #[wasm_bindgen]
 pub fn set_init_content(content: &str) -> String {
-    wasm_logger::init(wasm_logger::Config::new(log::Level::Info));
+    console_error_panic_hook::set_once();
+    wasm_logger::init(wasm_logger::Config::new(log::Level::Error));
     let docin = *DOCIN;
     let binding = &DB.inner;
     let db = &mut *binding.borrow_mut();
@@ -163,12 +191,13 @@ pub fn set_init_content(content: &str) -> String {
             .to_string(),
         LSP_DEMO_CONF_URI.to_string(),
     );
+    add_pl_libs(db, docs.clone());
 
     docin.set_file(db).to(LSP_DEMO_URI.to_string());
 
     docin.set_action(db).to(ActionType::Diagnostic);
-    let re = compile_dry(db, docin).unwrap();
-    log::trace!("mod {:#?}", re.plmod(db));
+    let re = compile_dry(db, docin);
+    // log::trace!("mod {:#?}", re.plmod(db));
     // completions = compile_dry::accumulated::<Completions>(db, docin);
     let diags = compile_dry::accumulated::<Diagnostics>(db, docin);
     let mut m = FxHashMap::<String, Vec<Diagnostic>>::default();
@@ -204,7 +233,7 @@ pub fn get_semantic_tokens() -> String {
     let db = &mut *binding.borrow_mut();
     docin.set_action(db).to(ActionType::SemanticTokensFull);
     docin.set_params(db).to(Some((Default::default(), None)));
-    compile_dry(db, docin).unwrap();
+    compile_dry(db, docin);
     // let docs = DOCIN.docs(db);
     let mut newtokens = compile_dry::accumulated::<PLSemanticTokens>(db, docin);
     if newtokens.is_empty() {
@@ -228,7 +257,7 @@ pub fn get_semantic_tokens_full() -> String {
     let db = &mut *binding.borrow_mut();
     docin.set_action(db).to(ActionType::SemanticTokensFull);
     docin.set_params(db).to(Some((Default::default(), None)));
-    compile_dry(db, docin).unwrap();
+    compile_dry(db, docin);
     // let docs = DOCIN.docs(db);
     let mut newtokens = compile_dry::accumulated::<PLSemanticTokens>(db, docin);
     if newtokens.is_empty() {
@@ -249,6 +278,7 @@ pub fn get_legend() -> String {
 
 #[wasm_bindgen]
 pub fn get_completions() -> String {
+    log::error!("get_completions {:#?}", &*COMPLETIONS.inner.borrow());
     return serde_json::to_value(COMPLETIONS.inner.borrow().clone())
         .unwrap()
         .to_string();
@@ -265,3 +295,13 @@ pub fn get_inlay_hints() -> String {
     }
     return serde_json::to_value(hints[0].clone()).unwrap().to_string();
 }
+
+#[wasm_bindgen]
+pub fn get_doc_symbol() -> String {
+    let docin = *DOCIN;
+    let binding = &DB.inner;
+    let db = &mut *binding.borrow_mut();
+    let doc_symbols = compile_dry::accumulated::<DocSymbols>(db, docin);
+    let symbol = &doc_symbols[0];
+    return serde_json::to_value(symbol).unwrap().to_string();
+}
diff --git a/src/main.rs b/src/main.rs
@@ -21,10 +21,10 @@ use std::{
 use ast::compiler::{self, ActionType, HashOptimizationLevel};
 use clap::{CommandFactory, Parser, Subcommand};
 use db::Database;
-use lsp::{
-    mem_docs::{self, MemDocsInput},
-    start_lsp,
-};
+use lsp::mem_docs::{self, MemDocsInput};
+
+#[cfg(not(target_arch = "wasm32"))]
+use lsp::start_lsp;
 
 /// Pivot Lang compiler program
 #[derive(Parser)]
@@ -118,6 +118,8 @@ enum RunCommand {
 }
 
 fn main() {
+    #[cfg(target_arch = "wasm32")]
+    unimplemented!("compiler on wasm32 is not supported yet");
     let cli = Cli::parse();
     let opt = match cli.optimization {
         0 => HashOptimizationLevel::None,
@@ -183,6 +185,7 @@ fn main() {
                     .timestamp(stderrlog::Timestamp::Microsecond)
                     .init()
                     .unwrap();
+                #[cfg(not(target_arch = "wasm32"))]
                 start_lsp().unwrap();
             }
             RunCommand::Fmt {} => {
diff --git a/src/nomparser/program.rs b/src/nomparser/program.rs
diff --git a/src/nomparser/statement.rs b/src/nomparser/statement.rs
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
diff --git a/src/utils/read_config.rs b/src/utils/read_config.rs
