chore: update list varibale API arguments and return values

Signed-off-by: peefy <[email protected]>

Author: Peefy

nodejs/__test__/list_variables.spec.mjs

@@ -3,6 +3,6 @@ import test from 'ava'
 import { listVariables, ListVariablesArgs } from '../index.js'
 
 test('listVariables', (t) => {
-  const result = listVariables(ListVariablesArgs('__test__/test_data/schema.k', []))
-  t.is(result.variables['app'].value, 'AppConfig {replicas: 2}')
+  const result = listVariables(ListVariablesArgs(['__test__/test_data/schema.k'], []))
+  t.is(result.variables['app'][0].value, 'AppConfig {replicas: 2}')
 })

nodejs/index.d.ts

@@ -152,13 +152,20 @@ export interface LintPathResult {
 export interface OverrideFileResult {
   result: boolean
 }
+export interface ListVariablesOptions {
+  mergeProgram: boolean
+}
 export interface ListVariablesResult {
-  variables: Record<string, Variable>
+  variables: Record<string, Array<Variable>>
   unsupportedCodes: Array<string>
   parseErrors: Array<Error>
 }
 export interface Variable {
   value: string
+  typeName: string
+  opSym: string
+  listItems: Array<Variable>
+  dictEntires: Record<string, Variable>
 }
 export interface GetSchemaTypeResult {
   schemaTypeList: Array<KclType>
@@ -320,7 +327,7 @@ export class ExecProgramArgs {
   constructor(paths: Array<string>, workDir?: string | undefined | null)
 }
 export class ListVariablesArgs {
-  constructor(file: string, specs: Array<string>)
+  constructor(files: Array<string>, specs: Array<string>, opts?: ListVariablesOptions | undefined | null)
 }
 export class OverrideFileArgs {
   constructor(file: string, specs: Array<string>, importPaths: Array<string>)

nodejs/src/lib.rs

@@ -83,8 +83,18 @@ pub struct ListVariablesArgs(kclvm_api::ListVariablesArgs);
 #[napi]
 impl ListVariablesArgs {
     #[napi(constructor)]
-    pub fn new(files: Vec<String>, specs: Vec<String>) -> Result<Self> {
-        Ok(Self(kclvm_api::ListVariablesArgs { files, specs }))
+    pub fn new(
+        files: Vec<String>,
+        specs: Vec<String>,
+        opts: Option<ListVariablesOptions>,
+    ) -> Result<Self> {
+        Ok(Self(kclvm_api::ListVariablesArgs {
+            files,
+            specs,
+            options: opts.map(|o| kclvm_api::ListVariablesOptions {
+                merge_program: o.merge_program,
+            }),
+        }))
     }
 }
 

nodejs/src/spec.rs

@@ -337,16 +337,47 @@ impl OverrideFileResult {
     }
 }
 
+#[napi(object)]
+pub struct ListVariablesOptions {
+    pub merge_program: bool,
+}
+
 #[napi(object)]
 pub struct ListVariablesResult {
-    pub variables: HashMap<String, Variable>,
+    pub variables: HashMap<String, Vec<Variable>>,
     pub unsupported_codes: Vec<String>,
     pub parse_errors: Vec<Error>,
 }
 
 #[napi(object)]
+#[derive(Default, Debug)]
 pub struct Variable {
     pub value: String,
+    pub type_name: String,
+    pub op_sym: String,
+    pub list_items: Vec<Variable>,
+    pub dict_entires: HashMap<String, Variable>,
+}
+
+impl Variable {
+    pub fn new(v: &kclvm_api::Variable) -> Self {
+        Self {
+            value: v.value.to_string(),
+            type_name: v.type_name.to_string(),
+            op_sym: v.op_sym.to_string(),
+            list_items: v.list_items.iter().map(|v| Variable::new(v)).collect(),
+            dict_entires: v
+                .dict_entries
+                .iter()
+                .map(|e| {
+                    (
+                        e.key.to_string(),
+                        Variable::new(&e.value.clone().unwrap_or_default()),
+                    )
+                })
+                .collect(),
+        }
+    }
 }
 
 impl ListVariablesResult {
@@ -358,9 +389,7 @@ impl ListVariablesResult {
                 .map(|(k, v)| {
                     (
                         k.to_string(),
-                        Variable {
-                            value: v.value.to_string(),
-                        },
+                        v.variables.iter().map(|v| Variable::new(v)).collect(),
                     )
                 })
                 .collect(),