Move citeproc into a separate crate

.build-steps.yml

@@ -10,11 +10,6 @@ steps:
     inputs:
       versionSpec: ">=10.x"
     displayName: "Install Node.js"
-  - bash: |
-      cd citeproc
-      npm ci
-      npm run dist
-    displayName: "Bundle citeproc"
   - ${{ if eq(parameters.coverage, 'false') }}:
       - bash: |
           export RUST_BACKTRACE=1

Cargo.toml

@@ -8,7 +8,11 @@ authors = [
 edition = "2018"
 
 [workspace]
-members = ["./jsonrpc", "./jsonrpc_derive", "crates/texlab_syntax"]
+members = [
+    "jsonrpc", 
+    "jsonrpc_derive", 
+    "crates/texlab_citeproc",
+    "crates/texlab_syntax"]
 
 [dependencies]
 base64 = "0.10.1"
@@ -36,6 +40,7 @@ serde_json = "1.0.40"
 serde_repr = "0.1"
 stderrlog = "0.4.1"
 tempfile = "3"
+texlab-citeproc = { path = "crates/texlab_citeproc" }
 texlab-syntax = { path = "crates/texlab_syntax" }
 tokio = "0.1"
 tokio-codec = "0.1"

README.md

@@ -21,13 +21,9 @@ You will need to install the following dependencies to compile the server:
 - [Rust](https://rustup.rs/)
 - [Node.js](https://nodejs.org/)
 
-Then run the following commands in the project folder:
+Then run the following command in the project folder:
 
 ```shell
-cd citeproc
-npm install
-npm run dist
-cd ..
 cargo build --release
 ```
 

crates/texlab_citeproc/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "texlab-citeproc"
+version = "0.1.0"
+authors = [
+    "Eric Förster <[email protected]>",
+    "Patrick Förster <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+futures-preview = { version = "0.3.0-alpha.15", features = ["compat"] }
+html2md = "0.2.9"
+lsp-types = { git = "https://github.com/latex-lsp/lsp-types", rev = "9fcc5d9b9d3013ce84e20ef566267754d594b268", features = ["proposed"] }
+runtime = "0.3.0-alpha.4"
+runtime-tokio = "0.3.0-alpha.4"
+serde = { version = "1.0.97", features = ["derive", "rc"] }
+tempfile = "3"
+texlab-syntax = { path = "../texlab_syntax" }
+tokio = "0.1"
+tokio-process = "0.2.4"
+

crates/texlab_citeproc/build.rs

@@ -0,0 +1,20 @@
+use std::process::Command;
+
+fn sh(command: &'static str) {
+    let (executable, args) = if cfg!(windows) {
+        ("cmd", vec!["/C", command])
+    } else {
+        ("sh", vec!["-c", command])
+    };
+
+    Command::new(executable)
+        .args(args)
+        .current_dir("script")
+        .output()
+        .expect(&format!("Failed to execute \"{}\"", command));
+}
+
+fn main() {
+    sh("npm ci");
+    sh("npm run dist");
+}

src/data/citation.rs → crates/texlab_citeproc/src/lib.rs

@@ -1,10 +1,13 @@
+#![feature(async_await)]
+
 use texlab_syntax::*;
 use futures::compat::*;
 use lsp_types::*;
 use std::process::{Command, Stdio};
 use tempfile::tempdir;
 use tokio_process::CommandExt;
 
+
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum RenderCitationError {
     InitializationFailed,
@@ -59,7 +62,7 @@ pub async fn render_citation(entry_code: &str) -> Result<MarkupContent, RenderCi
     }
 }
 
-const SCRIPT: &str = include_str!("../../citeproc/dist/citeproc.js");
+const SCRIPT: &str = include_str!("../script/dist/citeproc.js");
 
 #[cfg(test)]
 mod tests {

src/data/mod.rs

@@ -1,4 +1,3 @@
-pub mod citation;
 pub mod completion;
 pub mod kernel_primitives;
 pub mod label;

src/hover/latex_citation.rs

@@ -1,4 +1,4 @@
-use crate::data::citation::{render_citation, RenderCitationError};
+use texlab_citeproc::{render_citation, RenderCitationError};
 use crate::feature::{FeatureProvider, FeatureRequest};
 use crate::formatting::bibtex;
 use crate::formatting::bibtex::BibtexFormattingParams;

src/server.rs

@@ -2,7 +2,7 @@ use crate::action::{Action, ActionMananger, LintReason};
 use crate::build::*;
 use crate::client::LspClient;
 use crate::completion::{CompletionItemData, CompletionProvider};
-use crate::data::citation::render_citation;
+use texlab_citeproc::render_citation;
 use crate::data::completion::DATABASE;
 use crate::definition::DefinitionProvider;
 use crate::diagnostics::{DiagnosticsManager, LatexLintOptions};