From b0a528f64c50a3ed0377dfd4e863988c3e8fc87f Mon Sep 17 00:00:00 2001
From: Korobeinikov Evgeny <korobeinikov.evgeny@huawei.com>
Date: Sat, 13 Sep 2025 16:17:41 +0300
Subject: [PATCH 1/2] Ace build json check when resource transform

Signed-off-by: Korobeinikov Evgeny <korobeinikov.evgeny@huawei.com>
---
 ui2abc/libarkts/src-host/es2panda.ts         | 48 ++++++++++----------
 ui2abc/ui-plugins-ng/src/call-transformer.ts |  2 +-
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/ui2abc/libarkts/src-host/es2panda.ts b/ui2abc/libarkts/src-host/es2panda.ts
index 600e8aa92..67906ac1d 100644
--- a/ui2abc/libarkts/src-host/es2panda.ts
+++ b/ui2abc/libarkts/src-host/es2panda.ts
@@ -101,31 +101,29 @@ function insertPlugin(pluginEntry: PluginEntry, state: Es2pandaContextState, dum
     const hooks = new DumpingHooks(state, pluginName, dumpAst);
     const pluginContext = new PluginContextImpl();
 
-    if (true) {
-        pluginContext.setProjectConfig({
-            bundleName: 'bundle',
-            moduleName: 'module',
-            cachePath: './dist',
-            dependentModuleList: [],
-            appResource: '',
-            rawFileResource: '',
-            buildLoaderJson: '',
-            hspResourcesMap: false,
-            compileHar: false,
-            byteCodeHar: false,
-            uiTransformOptimization: false,
-            resetBundleName: true,
-            allowEmptyBundleName: true,
-            moduleType: 'module',
-            moduleRootPath: '.',
-            aceModuleJsonPath: './module.json',
-            ignoreError: false,
-            projectPath: '.',
-            projectRootPath: '.',
-            integratedHsp: false,
-            frameworkMode: 'yes',
-        });
-    }
+    pluginContext.setProjectConfig({
+        bundleName: 'bundle',
+        moduleName: 'module',
+        cachePath: './dist',
+        dependentModuleList: [],
+        appResource: '',
+        rawFileResource: '',
+        buildLoaderJson: '',
+        hspResourcesMap: false,
+        compileHar: false,
+        byteCodeHar: false,
+        uiTransformOptimization: false,
+        resetBundleName: true,
+        allowEmptyBundleName: true,
+        moduleType: 'module',
+        moduleRootPath: '.',
+        aceModuleJsonPath: './module.json',
+        ignoreError: false,
+        projectPath: '.',
+        projectRootPath: '.',
+        integratedHsp: false,
+        frameworkMode: 'yes',
+    });
 
     if (state == Es2pandaContextState.ES2PANDA_STATE_PARSED) {
         pluginEntry.parsed?.call(pluginContext, hooks);
diff --git a/ui2abc/ui-plugins-ng/src/call-transformer.ts b/ui2abc/ui-plugins-ng/src/call-transformer.ts
index 6654b43f7..0dc6fa695 100644
--- a/ui2abc/ui-plugins-ng/src/call-transformer.ts
+++ b/ui2abc/ui-plugins-ng/src/call-transformer.ts
@@ -62,7 +62,7 @@ export class CallTransformer extends arkts.AbstractVisitor {
 
     transformDollarCallExpression(node: arkts.CallExpression): arkts.CallExpression {
 
-        if (!arkts.isIdentifier(node.callee) || !this.projectConfig) {
+        if (!arkts.isIdentifier(node.callee) || !this.projectConfig || JSON.stringify(this.aceBuildJson) === '{}' ) {
             return this.updateResourceCallDefault(node) // TODO: rework
         }
 
-- 
Gitee


From 4395847ea7a168ad68147fbfdd99c1e1a5144301 Mon Sep 17 00:00:00 2001
From: Korobeinikov Evgeny <korobeinikov.evgeny@huawei.com>
Date: Mon, 15 Sep 2025 15:48:42 +0300
Subject: [PATCH 2/2] isUi2abc

Signed-off-by: Korobeinikov Evgeny <korobeinikov.evgeny@huawei.com>
---
 ui2abc/libarkts/src-host/es2panda.ts         | 1 +
 ui2abc/libarkts/src/arkts-api/plugins.ts     | 1 +
 ui2abc/ui-plugins-ng/src/call-transformer.ts | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui2abc/libarkts/src-host/es2panda.ts b/ui2abc/libarkts/src-host/es2panda.ts
index 67906ac1d..cee2fb54b 100644
--- a/ui2abc/libarkts/src-host/es2panda.ts
+++ b/ui2abc/libarkts/src-host/es2panda.ts
@@ -123,6 +123,7 @@ function insertPlugin(pluginEntry: PluginEntry, state: Es2pandaContextState, dum
         projectRootPath: '.',
         integratedHsp: false,
         frameworkMode: 'yes',
+        isUi2abc: true
     });
 
     if (state == Es2pandaContextState.ES2PANDA_STATE_PARSED) {
diff --git a/ui2abc/libarkts/src/arkts-api/plugins.ts b/ui2abc/libarkts/src/arkts-api/plugins.ts
index 3afcc8c6f..583d49de8 100644
--- a/ui2abc/libarkts/src/arkts-api/plugins.ts
+++ b/ui2abc/libarkts/src/arkts-api/plugins.ts
@@ -59,6 +59,7 @@ export interface ProjectConfig {
     projectRootPath: string;
     integratedHsp: boolean;
     frameworkMode?: string;
+    isUi2abc?: boolean;
 }
 
 export interface PluginContext {
diff --git a/ui2abc/ui-plugins-ng/src/call-transformer.ts b/ui2abc/ui-plugins-ng/src/call-transformer.ts
index 0dc6fa695..5f09712c8 100644
--- a/ui2abc/ui-plugins-ng/src/call-transformer.ts
+++ b/ui2abc/ui-plugins-ng/src/call-transformer.ts
@@ -62,7 +62,7 @@ export class CallTransformer extends arkts.AbstractVisitor {
 
     transformDollarCallExpression(node: arkts.CallExpression): arkts.CallExpression {
 
-        if (!arkts.isIdentifier(node.callee) || !this.projectConfig || JSON.stringify(this.aceBuildJson) === '{}' ) {
+        if (!arkts.isIdentifier(node.callee) || !this.projectConfig || this.projectConfig.isUi2abc ) {
             return this.updateResourceCallDefault(node) // TODO: rework
         }
 
-- 
Gitee