From 9cb8fb3a54f540d41767bbc7772ab4524c022e4e Mon Sep 17 00:00:00 2001
From: xietingwei <xietingwei@h-partners.com>
Date: Sat, 12 Apr 2025 16:42:18 +0800
Subject: [PATCH] =?UTF-8?q?new:=20typescript=E6=A0=B9=E6=8D=AE=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=8A=A8=E6=80=81=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xietingwei <xietingwei@h-partners.com>
---
 hb/util/component_util.py                     | 17 +++---
 .../config/download_part_whitelist.json       | 55 +++++++++++++++++++
 .../config/rust_download_part_whitelist.json  | 13 -----
 3 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 indep_configs/config/download_part_whitelist.json
 delete mode 100644 indep_configs/config/rust_download_part_whitelist.json

diff --git a/hb/util/component_util.py b/hb/util/component_util.py
index 2008a3cd33..e0bbf5d5b1 100644
--- a/hb/util/component_util.py
+++ b/hb/util/component_util.py
@@ -152,14 +152,17 @@ def gen_default_deps_json(variant, root_path, has_test=False):
     default_deps_file = os.path.join(root_path, "build", "indep_configs", "variants", "common", 'default_deps.json')
     default_deps_json = IoUtil.read_json_file(default_deps_file)
     default_deps_json.append("variants_" + variant)
-
-    part_white_list_path = os.path.join(root_path, "build", "indep_configs", "config",
-                                        "rust_download_part_whitelist.json")
-    part_white_list = IoUtil.read_json_file(part_white_list_path)
-    rust_deps = ['rust', 'rust_cxx', 'rust_libc', 'rust_syn', 'rust_proc_macro2', 'rust_quote', 'rust_unicode_ident', 'rust_bindgen']
+    # Dynamic download whitelist path
+    download_part_whitelist_path = os.path.join(root_path, 'build', 'indep_configs', 'config',
+                                         "download_part_whitelist.json")
+    download_part_whitelist = IoUtil.read_json_file(download_part_whitelist_path)
     for part_name in part_name_list:
-        if part_name in part_white_list:
-            for dep in rust_deps:
+        # Default Dependency List 
+        common_deps = []
+        if part_name in download_part_whitelist["components"]:
+            for dependencie in download_part_whitelist["components"][part_name]["dependencies"]:
+                common_deps += download_part_whitelist["dependencies"][dependencie]
+            for dep in common_deps:
                 default_deps_json.append(dep)
     if has_test:
         default_deps_json.append('developer_test')
diff --git a/indep_configs/config/download_part_whitelist.json b/indep_configs/config/download_part_whitelist.json
new file mode 100644
index 0000000000..631314ab7c
--- /dev/null
+++ b/indep_configs/config/download_part_whitelist.json
@@ -0,0 +1,55 @@
+{
+    "dependencies": {
+      "rust_common": [
+        "rust",
+        "rust_cxx",
+        "rust_libc",
+        "rust_syn",
+        "rust_proc_macro2",
+        "rust_quote",
+        "rust_unicode_ident",
+        "rust_bindgen"
+      ],
+      "typescript_common": [
+        "typescript"
+      ]
+    },
+    "components": {
+      "ets_utils": {
+        "dependencies": ["typescript_common"]
+      },
+      "ylong_runtime": {
+        "dependencies": ["rust_common"]
+      },
+      "ylong_json": {
+        "dependencies": ["rust_common"]
+      },
+      "c_utils": {
+        "dependencies": ["rust_common"]
+      },
+      "samgr": {
+        "dependencies": ["rust_common"]
+      },
+      "safwk": {
+        "dependencies": ["rust_common"]
+      },
+      "ipc": {
+        "dependencies": ["rust_common"]
+      },
+      "faultloggerd": {
+        "dependencies": ["rust_common"]
+      },
+      "graphic_2d": {
+        "dependencies": ["rust_common"]
+      },
+      "hitrace": {
+        "dependencies": ["rust_common"]
+      },
+      "code_signature": {
+        "dependencies": ["rust_common"]
+      },
+      "input": {
+        "dependencies": ["rust_common"]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/indep_configs/config/rust_download_part_whitelist.json b/indep_configs/config/rust_download_part_whitelist.json
deleted file mode 100644
index 0197e92e3f..0000000000
--- a/indep_configs/config/rust_download_part_whitelist.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  "ylong_runtime",
-  "ylong_json",
-  "c_utils",
-  "samgr",
-  "safwk",
-  "ipc",
-  "faultloggerd",
-  "graphic_2d",
-  "hitrace",
-  "code_signature",
-  "input"
-]
\ No newline at end of file
-- 
Gitee