get_schema_type function will now return SchemaType instances wit…

…h base schema information included (#1272)

* `get_schema_type` and `get_full_schema_type` will now return `SchemaType` instance

Signed-off-by: utnim2 <mintugogoi567@gmail.com>

* added  the recursive function

Signed-off-by: utnim2 <mintugogoi567@gmail.com>

* fixed the types

Signed-off-by: utnim2 <mintugogoi567@gmail.com>

---------

Signed-off-by: utnim2 <mintugogoi567@gmail.com>

kclvm/api/src/service/ty.rs

@@ -51,6 +51,10 @@ pub(crate) fn kcl_schema_ty_to_pb_ty(schema_ty: &SchemaType) -> KclType {
         filename: schema_ty.filename.clone(),
         pkg_path: schema_ty.pkgpath.clone(),
         description: schema_ty.doc.clone(),
+        base_schema: schema_ty
+            .base
+            .as_ref()
+            .map(|base| Box::new(kcl_schema_ty_to_pb_ty(&**base))),
         ..Default::default()
     }
 }

kclvm/query/src/query.rs

@@ -164,7 +164,10 @@ pub fn get_full_schema_type(
     let scope = resolve_file(&opts)?;
     for (name, o) in &scope.borrow().elems {
         if o.borrow().ty.is_schema() {
-            let schema_ty = o.borrow().ty.into_schema_type();
+            let mut schema_ty = o.borrow().ty.into_schema_type();
+            if let Some(base) = &schema_ty.base {
+                schema_ty.base = Some(Box::new(get_full_schema_type_recursive(*base.clone())?));
+            }
             if opts.get_schema_opts == GetSchemaOption::All
                 || (opts.get_schema_opts == GetSchemaOption::Definitions && !schema_ty.is_instance)
                 || (opts.get_schema_opts == GetSchemaOption::Instances && schema_ty.is_instance)
@@ -186,6 +189,14 @@ pub fn get_full_schema_type(
     Ok(result)
 }
 
+fn get_full_schema_type_recursive(schema_ty: SchemaType) -> Result<SchemaType> {
+    let mut result = schema_ty;
+    if let Some(base) = result.base {
+        result.base = Some(Box::new(get_full_schema_type_recursive(*base)?));
+    }
+    Ok(result)
+}
+
 fn resolve_file(opts: &CompilationOptions) -> Result<Rc<RefCell<Scope>>> {
     let sess = Arc::new(ParseSession::default());
     let mut program = match load_program(

kclvm/spec/gpyrpc/gpyrpc.proto

@@ -477,6 +477,7 @@ message KclType {
 	string pkg_path = 13;                // `pkg_path` represents the path name of the package where the attribute is located.
 	string description = 14;             // `description` represents the document of the attribute.
 	map<string, Example> examples = 15;  // A map object to hold examples, the key is the example name.
+	KclType base_schema = 16;
 }
 
 message Decorator {