From 234f94ef1e5e97595ab58bab131cf8882b597006 Mon Sep 17 00:00:00 2001
From: wangcaoyu <wangcaoyu@huawei.com>
Date: Sat, 14 Jun 2025 19:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=81=E5=89=AA=E5=B7=A5=E5=85=B7=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99ets1.1=E6=A0=BC=E5=BC=8F=E5=8C=96=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangcaoyu <wangcaoyu@huawei.com>
---
 build-tools/delete_systemapi_plugin.js | 46 +++++++++++++++-----------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js
index 9b52240365..0bf70e4040 100644
--- a/build-tools/delete_systemapi_plugin.js
+++ b/build-tools/delete_systemapi_plugin.js
@@ -303,28 +303,36 @@ function tsTransform(utFiles, callback) {
       }
       return;
     }
-    if (/\.json/.test(url) || apiBaseName === 'index-full.d.ts' || !/\@systemapi/.test(content) && apiBaseName !== '@ohos.arkui.component.d.ets') {
-      // 特殊类型文件处理
+    let isTransformer = /\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName);
+    if (/\.json/.test(url) || apiBaseName === 'index-full.d.ts') {
+      isTransformer = false;
+    }
+    if (etsType === 'ets2') {
+      if (!/\@systemapi/.test(content) && apiBaseName !== '@ohos.arkui.component.d.ets') {
+        isTransformer = false;
+      }
+    }
+    if (!isTransformer) {
       writeFile(url, content);
-    } else if (/\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName)) {
-      // dts文件处理
-      const fileName = processFileName(url);
-      let references = content.match(PATT.GET_REFERENCE);
-      if (references) {
-        referencesMap.set(url, { references: references });
-        for (let index = 0; index < references.length; index++) {
-          const item = references[index];
-          content = content.replace(item, '');
-        }
+      return;
+    }
+    // dts文件处理
+    const fileName = processFileName(url);
+    let references = content.match(PATT.GET_REFERENCE);
+    if (references) {
+      referencesMap.set(url, { references: references });
+      for (let index = 0; index < references.length; index++) {
+        const item = references[index];
+        content = content.replace(item, '');
       }
-      ts.transpileModule(content, {
-        compilerOptions: {
-          target: ts.ScriptTarget.ES2017,
-        },
-        fileName: fileName,
-        transformers: { before: [callback(url)] },
-      });
     }
+    ts.transpileModule(content, {
+      compilerOptions: {
+        target: ts.ScriptTarget.ES2017,
+      },
+      fileName: fileName,
+      transformers: { before: [callback(url)] },
+    });
   });
 }
 /**
-- 
Gitee