feat: support print functions for normal logger writer and not only f…

…or stdout Signed-off-by: peefy <[email protected]>
Peefy · Nov 20, 2023 · 1a4477c · 1a4477c
1 parent 269632b
commit 1a4477c
Show file tree

Hide file tree

Showing 22 changed files with 298 additions and 198 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.0-alpha.2
+0.7.0-beta.1
diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock
diff --git a/kclvm/api/src/capi_test.rs b/kclvm/api/src/capi_test.rs
@@ -17,7 +17,7 @@ fn test_c_api_call_exec_program() {
         "KclvmService.ExecProgram",
         "exec-program.json",
         "exec-program.response.json",
-        |res| res.escaped_time = "0".to_owned(),
+        |_| {},
     );
 }
 
@@ -27,7 +27,7 @@ fn test_c_api_call_exec_program_with_external_pkg() {
         "KclvmService.ExecProgram",
         "exec-program-with-external-pkg.json",
         "exec-program-with-external-pkg.response.json",
-        |res| res.escaped_time = "0".to_owned(),
+        |_| {},
     );
 }
 
@@ -37,7 +37,7 @@ fn test_c_api_call_exec_program_with_include_schema_type_path() {
         "KclvmService.ExecProgram",
         "exec-program-with-include-schema-type-path.json",
         "exec-program-with-include-schema-type-path.response.json",
-        |res| res.escaped_time = "0".to_owned(),
+        |_| {},
     );
 }
 
@@ -47,7 +47,17 @@ fn test_c_api_call_exec_program_with_path_selector() {
         "KclvmService.ExecProgram",
         "exec-program-with-path-selector.json",
         "exec-program-with-path-selector.response.json",
-        |res| res.escaped_time = "0".to_owned(),
+        |_| {},
+    );
+}
+
+#[test]
+fn test_c_api_call_exec_program_with_print() {
+    test_c_api::<ExecProgramArgs, ExecProgramResult, _>(
+        "KclvmService.ExecProgram",
+        "exec-program-with-print.json",
+        "exec-program-with-print.response.json",
+        |_| {},
     );
 }
 
@@ -111,7 +121,7 @@ fn test_c_api_call_exec_program_with_recursive() {
         "KclvmService.ExecProgram",
         "exec-program-with-recursive.json",
         "exec-program-with-recursive.response.json",
-        |res| res.escaped_time = "0".to_owned(),
+        |_| {},
     );
 }
 

diff --git a/kclvm/api/src/service/service_impl.rs b/kclvm/api/src/service/service_impl.rs
@@ -102,12 +102,14 @@ impl KclvmServiceImpl {
         let result = exec_program(
             sess,
             &kclvm_runner::ExecProgramArgs::from_str(args_json.as_str()),
-        )?;
+        )
+        .map_err(|err| err.to_string())?;
 
         Ok(ExecProgramResult {
             json_result: result.json_result,
             yaml_result: result.yaml_result,
-            escaped_time: result.escaped_time,
+            log_message: result.log_message,
+            err_message: result.err_message,
         })
     }
 
@@ -415,7 +417,7 @@ impl KclvmServiceImpl {
             transform_str_para(&args.code),
         )) {
             Ok(success) => (success, "".to_string()),
-            Err(err) => (false, err),
+            Err(err) => (false, err.to_string()),
         };
         Ok(ValidateCodeResult {
             success,

diff --git a/kclvm/api/src/testdata/exec-program-with-print.json b/kclvm/api/src/testdata/exec-program-with-print.json
@@ -0,0 +1,6 @@
+{
+	"work_dir" : "./src/testdata",
+	"k_filename_list":[
+		"hello_with_print.k"
+	]
+}
diff --git a/kclvm/api/src/testdata/exec-program-with-print.response.json b/kclvm/api/src/testdata/exec-program-with-print.response.json
@@ -0,0 +1,6 @@
+{
+        "json_result": "[{\"a\": 1}]",
+        "yaml_result": "a: 1",
+        "log_message": "Hello world\n",
+        "err_message": ""
+}
diff --git a/kclvm/api/src/testdata/hello_with_print.k b/kclvm/api/src/testdata/hello_with_print.k
@@ -0,0 +1,2 @@
+print("Hello world")
+a = 1
diff --git a/kclvm/cmd/src/run.rs b/kclvm/cmd/src/run.rs
@@ -15,17 +15,31 @@ pub fn run_command<W: Write>(matches: &ArgMatches, writer: &mut W) -> Result<()>
     let output = settings.output();
     let sess = Arc::new(ParseSession::default());
     match exec_program(sess.clone(), &settings.try_into()?) {
-        Ok(result) => match output {
-            Some(o) => {
-                std::fs::write(o, result.yaml_result)?;
+        Ok(result) => {
+            // Output log message
+            if !result.log_message.is_empty() {
+                write!(writer, "{}", result.log_message)?;
             }
-            // [`println!`] is not a good way to output content to stdout,
-            // using [`writeln`] can be better to redirect the output.
-            None => writeln!(writer, "{}", result.yaml_result)?,
-        },
+            // Output execute error message
+            if !result.err_message.is_empty() {
+                if !sess.0.diag_handler.has_errors()? {
+                    sess.0.add_err(StringError(result.err_message))?;
+                }
+                sess.0.emit_stashed_diagnostics_and_abort()?;
+            }
+            if !result.yaml_result.is_empty() {
+                match output {
+                    Some(o) => std::fs::write(o, result.yaml_result)?,
+                    // [`println!`] is not a good way to output content to stdout,
+                    // using [`writeln`] can be better to redirect the output.
+                    None => writeln!(writer, "{}", result.yaml_result)?,
+                }
+            }
+        }
+        // Other error message
         Err(msg) => {
             if !sess.0.diag_handler.has_errors()? {
-                sess.0.add_err(StringError(msg))?;
+                sess.0.add_err(StringError(msg.to_string()))?;
             }
             sess.0.emit_stashed_diagnostics_and_abort()?;
         }

diff --git a/kclvm/cmd/src/tests.rs b/kclvm/cmd/src/tests.rs
@@ -7,7 +7,7 @@ use std::{
 
 use kclvm_config::modfile::KCL_PKG_PATH;
 use kclvm_parser::ParseSession;
-use kclvm_runner::exec_program;
+use kclvm_runner::{exec_program, MapErrorResult};
 
 use crate::{
     app,
@@ -522,7 +522,10 @@ fn test_main_pkg_not_found() {
     ]);
     let settings = must_build_settings(matches.subcommand_matches("run").unwrap());
     let sess = Arc::new(ParseSession::default());
-    match exec_program(sess.clone(), &settings.try_into().unwrap()) {
+    match exec_program(sess.clone(), &settings.try_into().unwrap())
+        .map_err_to_result()
+        .map_err(|e| e.to_string())
+    {
         Ok(_) => panic!("unreachable code."),
         Err(msg) => assert_eq!(
             msg,
@@ -563,7 +566,7 @@ fn test_plugin_not_found() {
     ]);
     let settings = must_build_settings(matches.subcommand_matches("run").unwrap());
     let sess = Arc::new(ParseSession::default());
-    match exec_program(sess.clone(), &settings.try_into().unwrap()) {
+    match exec_program(sess.clone(), &settings.try_into().unwrap()).map_err_to_result().map_err(|e|e.to_string()) {
         Ok(_) => panic!("unreachable code."),
         Err(msg) => assert!(msg.contains("the plugin package `kcl_plugin.not_exist` is not found, please confirm if plugin mode is enabled")),
     }
@@ -578,7 +581,10 @@ fn test_error_message_fuzz_matched() {
     ]);
     let settings = must_build_settings(matches.subcommand_matches("run").unwrap());
     let sess = Arc::new(ParseSession::default());
-    match exec_program(sess.clone(), &settings.try_into().unwrap()) {
+    match exec_program(sess.clone(), &settings.try_into().unwrap())
+        .map_err_to_result()
+        .map_err(|e| e.to_string())
+    {
         Ok(_) => panic!("unreachable code."),
         Err(msg) => {
             assert!(msg
@@ -596,7 +602,10 @@ fn test_error_message_fuzz_unmatched() {
     ]);
     let settings = must_build_settings(matches.subcommand_matches("run").unwrap());
     let sess = Arc::new(ParseSession::default());
-    match exec_program(sess.clone(), &settings.try_into().unwrap()) {
+    match exec_program(sess.clone(), &settings.try_into().unwrap())
+        .map_err_to_result()
+        .map_err(|e| e.to_string())
+    {
         Ok(_) => panic!("unreachable code."),
         Err(msg) => {
             assert!(msg.contains("attribute 'a' not found in schema 'Person'"))
@@ -613,7 +622,10 @@ fn test_keyword_argument_error_message() {
     ]);
     let settings = must_build_settings(matches.subcommand_matches("run").unwrap());
     let sess = Arc::new(ParseSession::default());
-    match exec_program(sess.clone(), &settings.try_into().unwrap()) {
+    match exec_program(sess.clone(), &settings.try_into().unwrap())
+        .map_err_to_result()
+        .map_err(|e| e.to_string())
+    {
         Ok(_) => panic!("unreachable code."),
         Err(msg) => {
             assert!(msg.contains("keyword argument 'ID' not found"));

diff --git a/kclvm/cmd/src/vet.rs b/kclvm/cmd/src/vet.rs
@@ -30,8 +30,7 @@ pub fn vet_command(matches: &ArgMatches) -> Result<()> {
                 Some(kcl_file.to_string()),
                 None,
             ))
-            .map_err(|err| anyhow::anyhow!(err))?;
-            Ok(())
+            .map(|_| ())
         }
         _ => Err(anyhow::anyhow!("No input data file or kcl file")),
     }

diff --git a/kclvm/runner/Cargo.toml b/kclvm/runner/Cargo.toml
@@ -16,7 +16,7 @@ walkdir = "2"
 libc = "0.2.112"
 indexmap = "1.0"
 fslock = "0.2.1"
-libloading = "0.7.3"
+libloading = "0.8"
 threadpool = "1.0"
 chrono = "0.4.19"
 tempfile = "3.5.0"