feat: logger

Author: ahabhgk

src/api.rs

@@ -24,8 +24,8 @@ pub struct Options {
   pub importers: Option<Vec<SassImporter>>,
   /// https://sass-lang.com/documentation/js-api/interfaces/Options#loadPaths
   pub load_paths: Option<Vec<String>>,
-  // /// https://sass-lang.com/documentation/js-api/interfaces/Options#logger
-  // pub logger
+  /// https://sass-lang.com/documentation/js-api/interfaces/Options#logger
+  pub logger: Option<SassLogger>,
   /// https://sass-lang.com/documentation/js-api/interfaces/Options#quietDeps
   pub quiet_deps: bool,
   /// https://sass-lang.com/documentation/js-api/interfaces/Options#sourceMap
@@ -182,3 +182,24 @@ pub struct CompileResult {
   /// https://sass-lang.com/documentation/js-api/interfaces/CompileResult#sourceMap
   pub source_map: Option<String>,
 }
+
+pub type SassLogger = Box<dyn Logger>;
+
+/// https://sass-lang.com/documentation/js-api/interfaces/Logger
+pub trait Logger: Debug {
+  /// https://sass-lang.com/documentation/js-api/interfaces/Logger#warn
+  fn warn(&self, message: &str, options: &LoggerWarnOptions);
+
+  /// https://sass-lang.com/documentation/js-api/interfaces/Logger#debug
+  fn debug(&self, message: &str, options: &LoggerDebugOptions);
+}
+
+pub struct LoggerWarnOptions {
+  pub deprecation: bool,
+  pub span: Option<SourceSpan>,
+  pub stack: Option<String>,
+}
+
+pub struct LoggerDebugOptions {
+  pub span: Option<SourceSpan>,
+}

src/compile.rs

@@ -1,41 +1,10 @@
-use std::{
-  process::Stdio,
-  sync::{Arc, Mutex},
-  thread,
-};
-
-use futures::{
-  future::{self, BoxFuture},
-  stream, Stream, StreamExt,
-};
-use prost::Message as _;
-use tokio::{
-  io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
-  process::Command,
-};
-// use tokio_stream::StreamExt as _;
-use tokio_util::io::ReaderStream;
-
 use crate::{
-  api::{
-    CompileResult, Exception, Result, StringOptions,
-    StringOptionsWithoutImporter,
-  },
+  api::{CompileResult, Exception, Result, StringOptions},
   compiler::Embedded,
   compiler_path,
   importer_registry::ImporterRegistry,
-  packet_transformer::PacketTransformer,
-  pb::{
-    inbound_message::{
-      compile_request::{Input, StringInput},
-      CompileRequest, Message,
-    },
-    outbound_message::{
-      compile_response::{self, CompileSuccess},
-      CompileResponse,
-    },
-    InboundMessage, OutboundMessage, OutputStyle, Syntax,
-  },
+  logger_registry::LoggerRegistry,
+  pb::{inbound_message::CompileRequest, outbound_message::compile_response},
 };
 
 pub async fn compile_string(
@@ -45,9 +14,13 @@ pub async fn compile_string(
   let base = options.get_options_mut();
   let mut importers =
     ImporterRegistry::new(base.importers.take(), base.load_paths.take());
+  let logger = LoggerRegistry::new(base.logger.take());
+
   let request = CompileRequest::with_string(source, &mut importers, options);
   let mut embedded = Embedded::new(compiler_path::compiler_path().unwrap());
-  let response = embedded.send_compile_request(request, importers).await?;
+  let response = embedded
+    .send_compile_request(request, importers, logger)
+    .await?;
   match response.result.unwrap() {
     compile_response::Result::Success(success) => {
       let css = success.css;
@@ -65,63 +38,20 @@ pub async fn compile_string(
   }
 }
 
-#[tokio::test]
-async fn test_compile_string() {
-  let res = compile_string(
-    ".foo {a: b}".to_string(),
-    StringOptions::WithoutImporter(StringOptionsWithoutImporter::default()),
-  )
-  .await
-  .unwrap();
-  dbg!(res);
-}
+#[cfg(test)]
+mod tests {
+  use crate::api::StringOptionsWithoutImporter;
 
-#[tokio::test]
-async fn t_compile_string() {
-  let source = ".a { color: red; }".to_string();
-  let mut string = StringInput::default();
-  string.source = source;
-  string.set_syntax(Syntax::Scss);
-  let mut request = CompileRequest::default();
-  request.set_style(OutputStyle::Expanded);
-  request.input = Some(Input::String(string));
-  // request.id = 0;
-  let mut inbound_message = InboundMessage::default();
-  inbound_message.message = Some(Message::CompileRequest(request));
-  let buf = inbound_message.encode_length_delimited_to_vec();
-  // let buf = PacketTransformer::encode(buf);
+  use super::*;
 
-  let path = compiler_path::compiler_path().unwrap();
-  let mut child = Command::new(path)
-    .stdin(Stdio::piped())
-    .stdout(Stdio::piped())
-    .stderr(Stdio::piped())
-    .spawn()
-    .unwrap();
-  dbg!(&buf);
-  child
-    .stdin
-    .as_mut()
-    .unwrap()
-    .write_all(buf.as_ref())
+  #[tokio::test]
+  async fn test_compile_string() {
+    let res = compile_string(
+      ".foo {a: b}".to_string(),
+      StringOptions::WithoutImporter(StringOptionsWithoutImporter::default()),
+    )
     .await
     .unwrap();
-  let stdout = child.stdout.take().unwrap();
-  let reader = BufReader::new(stdout);
-  let stream = ReaderStream::new(reader);
-  stream
-    // .flat_map(|buf| {
-    //   let ps = pt.decode(buf.unwrap().to_vec());
-    //   stream::iter(ps)
-    // })
-    .map(|buf| {
-      let buf = buf.unwrap().to_vec();
-      let m = OutboundMessage::decode_length_delimited(buf.as_ref()).unwrap();
-      m
-    })
-    .for_each(|m| {
-      dbg!(m);
-      future::ready(())
-    })
-    .await;
+    dbg!(res);
+  }
 }