feat: support return list and dict structure from api ListVariable (#…

…1349) * feat: support return list and dict structure from api ListVariable Signed-off-by: zongz <[email protected]> * fix: rm un-used import Signed-off-by: zongz <[email protected]> --------- Signed-off-by: zongz <[email protected]>
kcl-lang · May 22, 2024 · f90939f · f90939f
1 parent 017610b
commit f90939f
Show file tree

Hide file tree

Showing 63 changed files with 11,125 additions and 70 deletions.
diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock
diff --git a/kclvm/api/src/service/service_impl.rs b/kclvm/api/src/service/service_impl.rs
@@ -45,6 +45,25 @@ pub struct KclvmServiceImpl {
     pub plugin_agent: u64,
 }
 
+impl From<&kclvm_query::selector::Variable> for Variable {
+    fn from(var: &kclvm_query::selector::Variable) -> Self {
+        Variable {
+            value: var.value.to_string(),
+            type_name: var.type_name.to_string(),
+            op_sym: var.op_sym.to_string(),
+            list_items: var.list_items.iter().map(|item| item.into()).collect(),
+            dict_entries: var
+                .dict_entries
+                .iter()
+                .map(|entry| MapEntry {
+                    key: entry.key.to_string(),
+                    value: Some((&entry.value).into()),
+                })
+                .collect(),
+        }
+    }
+}
+
 impl KclvmServiceImpl {
     /// Ping KclvmService, return the same value as the parameter
     ///
@@ -349,16 +368,7 @@ impl KclvmServiceImpl {
         let variables: HashMap<String, Variable> = select_res
             .variables
             .iter()
-            .map(|(key, var)| {
-                (
-                    key.clone(),
-                    Variable {
-                        value: var.value.to_string(),
-                        type_name: var.type_name.to_string(),
-                        op_sym: var.op_sym.to_string(),
-                    },
-                )
-            })
+            .map(|(key, var)| (key.clone(), var.into()))
             .collect();
 
         let unsupported_codes: Vec<String> = select_res

diff --git a/kclvm/api/src/testdata/list-variables.json b/kclvm/api/src/testdata/list-variables.json
@@ -1,4 +1,4 @@
 {
 	"file": "./src/testdata/variables/main.k",
-	"specs": ["a"]
+	"specs": ["a", "b", "c"]
 }
diff --git a/kclvm/api/src/testdata/list-variables.response.json b/kclvm/api/src/testdata/list-variables.response.json
@@ -1 +1,60 @@
-{"variables":{"a":{"value":"1","type_name":"","op_sym":"="}},"unsupported_codes":[]}
+{
+    "variables": {
+        "a": {
+            "value": "1",
+            "type_name": "",
+            "op_sym": "=",
+            "list_items": [],
+            "dict_entries": []
+        },
+        "c": {
+            "value": "{\"a\": \"b\"}",
+            "type_name": "",
+            "op_sym": "=",
+            "list_items": [],
+            "dict_entries": [
+                {
+                    "key": "a",
+                    "value": {
+                        "value": "\"b\"",
+                        "type_name": "",
+                        "op_sym": ":",
+                        "list_items": [],
+                        "dict_entries": []
+                    }
+                }
+            ]
+        },
+        "b": {
+            "value": "[1, 2, 3]",
+            "type_name": "",
+            "op_sym": "=",
+            "list_items": [
+                {
+                    "value": "1",
+                    "type_name": "",
+                    "op_sym": "",
+                    "list_items": [],
+                    "dict_entries": []
+                },
+                {
+                    "value": "2",
+                    "type_name": "",
+                    "op_sym": "",
+                    "list_items": [],
+                    "dict_entries": []
+                },
+                {
+                    "value": "3",
+                    "type_name": "",
+                    "op_sym": "",
+                    "list_items": [],
+                    "dict_entries": []
+                }
+            ],
+            "dict_entries": []
+        }
+    },
+    "unsupported_codes": [],
+    "parse_errors": []
+}
diff --git a/kclvm/api/src/testdata/variables/main.k b/kclvm/api/src/testdata/variables/main.k
@@ -1 +1,3 @@
-a = 1
+a = 1
+b = [1, 2, 3]
+c = {"a": "b"}
diff --git a/kclvm/error/Cargo.toml b/kclvm/error/Cargo.toml
@@ -18,6 +18,7 @@ anyhow = "1.0"
 tracing = "0.1"
 atty = "0.2"
 annotate-snippets = { version = "0.9.2", default-features = false, features = ["color"] }
+serde = { version = "1.0", features = ["derive"] }
 termize = "0.1.1"
 indexmap = "1.0"
 serde_json = "1.0"
diff --git a/kclvm/query/Cargo.toml b/kclvm/query/Cargo.toml
@@ -16,6 +16,8 @@ kclvm-ast-pretty = {path = "../ast_pretty"}
 kclvm-parser = {path = "../parser"}
 kclvm-sema = {path = "../sema"}
 kclvm-error = {path = "../error"}
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 maplit = "1.0.2"
 
 [dev-dependencies]

diff --git a/kclvm/query/src/main.k b/kclvm/query/src/main.k
@@ -0,0 +1,18 @@
+a = [1, 2, 3, 4]
+b = {
+    "c": "d",
+}
+
+_part1 = {
+    a = "b"
+}
+
+_part2 = {
+    c = "d"
+}
+
+_list0 = [1, 2, 3]
+_list1 = [4, 5, 6]
+union_list = [*_list0, *_list1] 
+
+a_dict = {**_part1, **_part2}  # {"a: "b", "c": "d"}