From 55c895b58826374d83c52b092bcd974fb33b3ec9 Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <nikolay.igotti@huawei.com>
Date: Wed, 27 Aug 2025 14:03:13 +0300
Subject: [PATCH 1/2] Move ui-plugins to ui-plugins-ng Signed-off-by: Nikolay
 Igotti <nikolay.igotti@huawei.com>

---
 .gitignore                                                  | 2 +-
 arkoala-arkts/.gitlab-ci.yml                                | 2 +-
 arkoala-arkts/cats/user/package.json                        | 2 +-
 arkoala-arkts/doc/ui2abc.md                                 | 2 +-
 arkoala-arkts/package.json                                  | 2 +-
 arkoala-arkts/shopping/user/package.json                    | 2 +-
 arkoala-arkts/trivial/user/package.json                     | 2 +-
 ui2abc/.gitlab-ci.yml                                       | 6 +++---
 ui2abc/ets-tests/hap/user/package.json                      | 2 +-
 ui2abc/ets-tests/package.json                               | 2 +-
 ui2abc/libarkts/.gitlab-ci.yml                              | 2 +-
 ui2abc/package.json                                         | 5 +++--
 ui2abc/{ui-plugins => ui-plugins-ng}/BUILD.gn               | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/package.json           | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/rollup.config.mjs      | 0
 .../src/annotation-translator.ts                            | 0
 .../src/builder-lambda-transformer.ts                       | 0
 .../{ui-plugins => ui-plugins-ng}/src/call-transformer.ts   | 0
 .../src/checked-state-plugin.ts                             | 0
 .../{ui-plugins => ui-plugins-ng}/src/class-transformer.ts  | 0
 .../{ui-plugins => ui-plugins-ng}/src/common/arkts-utils.ts | 0
 .../src/common/gensym-generator.ts                          | 0
 .../src/component-transformer.ts                            | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/src/entry.ts           | 0
 .../src/ets-first-arg-transformer.ts                        | 0
 .../src/imports-transformer.ts                              | 0
 .../src/instantiate-factory-helper.ts                       | 0
 .../src/parsed-state-plugin.ts                              | 0
 .../src/property-transformers.ts                            | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/src/resources-utils.ts | 0
 .../src/struct-call-rewriter.ts                             | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/src/struct-recorder.ts | 0
 .../{ui-plugins => ui-plugins-ng}/src/style-transformer.ts  | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/src/ui-factory.ts      | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/src/utils.ts           | 0
 ui2abc/{ui-plugins => ui-plugins-ng}/tsconfig.json          | 0
 36 files changed, 16 insertions(+), 15 deletions(-)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/BUILD.gn (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/package.json (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/rollup.config.mjs (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/annotation-translator.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/builder-lambda-transformer.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/call-transformer.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/checked-state-plugin.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/class-transformer.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/common/arkts-utils.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/common/gensym-generator.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/component-transformer.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/entry.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/ets-first-arg-transformer.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/imports-transformer.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/instantiate-factory-helper.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/parsed-state-plugin.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/property-transformers.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/resources-utils.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/struct-call-rewriter.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/struct-recorder.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/style-transformer.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/ui-factory.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/src/utils.ts (100%)
 rename ui2abc/{ui-plugins => ui-plugins-ng}/tsconfig.json (100%)

diff --git a/.gitignore b/.gitignore
index f941d5ac8..5bbb0cd00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ perf.data*
 *.tsbuildinfo
 ui2abc/libarkts/lib
 ui2abc/memo-plugin/lib
-ui2abc/ui-plugins/lib
+ui2abc/ui-plugins-ng/lib
 incremetal-cj/runtime/callsitekey
 .rollup.cache
 tsconfig.tsbuildinfo
diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml
index 27e496f88..ac0c381e9 100644
--- a/arkoala-arkts/.gitlab-ci.yml
+++ b/arkoala-arkts/.gitlab-ci.yml
@@ -81,7 +81,7 @@ install node modules (arkoala-arkts):
   before_script:
     - !reference [.setup, script]
     - !reference [.setup, regenerate-plugin-api]
-    - npm run compile --prefix ui2abc/ui-plugins
+    - npm run compile --prefix ui2abc/ui-plugins-ng
     - npm run compile --prefix ui2abc/memo-plugin
     - npm run compile --prefix ui2abc/fast-arktsc
     - npm run runtime:prepare --prefix ui2abc/memo-plugin
diff --git a/arkoala-arkts/cats/user/package.json b/arkoala-arkts/cats/user/package.json
index f0dd310e3..ddd4844f2 100644
--- a/arkoala-arkts/cats/user/package.json
+++ b/arkoala-arkts/cats/user/package.json
@@ -10,7 +10,7 @@
     },
     "scripts": {
         "clean": "rimraf build generated unmemoized js_output abc lib app/user/build app/user/libs",
-        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins && npm run build",
+        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins-ng && npm run build",
         "build": "npm run prepare:sdk --prefix ../../arkui && node ../../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../../../incremental/tools/panda/arkts/ui2abc --link-name ./build/user.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja",
         "run:node": "npm run build:user && mkdir -p ../../build/userPandaFiles && cp ./build/user.abc ../../build/userPandaFiles/user.abc && npm run build:loader:node -C ../.. && ACE_LIBRARY_PATH=../../build PANDA_HOME=../../../incremental/tools/panda/node_modules/@panda/sdk node ../../build/index.js panda-ani:class=@ohos.example.cats.src.ets.entry.Entry 10",
         "copy": "mkdir -p ../build && cp -r build/user.abc ../build/",
diff --git a/arkoala-arkts/doc/ui2abc.md b/arkoala-arkts/doc/ui2abc.md
index 03ae6dcd6..67c01623f 100644
--- a/arkoala-arkts/doc/ui2abc.md
+++ b/arkoala-arkts/doc/ui2abc.md
@@ -72,6 +72,6 @@ The project needs help from the different teams
     https://gitee.com/rri_opensource/koala_projects/tree/master/ui2abc/memo-plugin
 
   * ui-plugins prototype
-    https://gitee.com/rri_opensource/koala_projects/tree/master/ui2abc/ui-plugins
+    https://gitee.com/rri_opensource/koala_projects/tree/master/ui2abc/ui-plugins-ng
 
 
diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json
index 7404fa184..49a89ab27 100644
--- a/arkoala-arkts/package.json
+++ b/arkoala-arkts/package.json
@@ -5,7 +5,7 @@
         "./arkui",
         "./framework",
         "./memo-plugin",
-        "../ui2abc/ui-plugins",
+        "../ui2abc/ui-plugins-ng",
         "../ui2abc/fast-arktsc",
         "../ui2abc/ets-tests",
         "./loader",
diff --git a/arkoala-arkts/shopping/user/package.json b/arkoala-arkts/shopping/user/package.json
index 9918b73c3..c9a80a935 100644
--- a/arkoala-arkts/shopping/user/package.json
+++ b/arkoala-arkts/shopping/user/package.json
@@ -10,7 +10,7 @@
     },
     "scripts": {
         "clean": "rimraf build js_output abc lib app/user/build app/user/libs",
-        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins && npm run build",
+        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins-ng && npm run build",
         "build": "npm run prepare:sdk --prefix ../../arkui && node ../../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../../../incremental/tools/panda/arkts/ui2abc --link-name ./build/user.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja",
         "run:node": "npm run build:user && mkdir -p ../../build/userPandaFiles && cp ./build/user.abc ../../build/userPandaFiles/user.abc && npm run build:loader:node -C ../.. && ACE_LIBRARY_PATH=../../build PANDA_HOME=../../../incremental/tools/panda/node_modules/@panda/sdk node ../../build/index.js panda-ani:class=@ohos.example.src.ets.entry.Entry 10",
         "copy": "mkdir -p ../build && cp -r build/user.abc ../build/user.abc",
diff --git a/arkoala-arkts/trivial/user/package.json b/arkoala-arkts/trivial/user/package.json
index 5d887397c..572b9d626 100644
--- a/arkoala-arkts/trivial/user/package.json
+++ b/arkoala-arkts/trivial/user/package.json
@@ -10,7 +10,7 @@
     },
     "scripts": {
         "clean": "rimraf build generated unmemoized js_output abc lib app/user/build app/user/libs",
-        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins && npm run build",
+        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins-ng && npm run build",
         "build:dump": "node ../../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --simultaneous --compiler-flags '--dump-plugin-ast' --compiler ../../../incremental/tools/panda/arkts/ui2abc --link-name ./build/user.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja",
         "build": "npm run prepare:sdk --prefix ../../arkui && node ../../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../../../incremental/tools/panda/arkts/ui2abc --link-name ./build/user.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja",
         "run": "npm run build:user && mkdir -p ../../build/userPandaFiles && cp ./build/user.abc ../../build/userPandaFiles/hello.abc && npm run build:loader:node -C ../.. && ACE_LIBRARY_PATH=../../build PANDA_HOME=../../../incremental/tools/panda/node_modules/@panda/sdk node ../../build/index.js panda-ani:class=@ohos.example.src.ets.entry.Entry 10",
diff --git a/ui2abc/.gitlab-ci.yml b/ui2abc/.gitlab-ci.yml
index 367541cb5..e71d7fa76 100644
--- a/ui2abc/.gitlab-ci.yml
+++ b/ui2abc/.gitlab-ci.yml
@@ -47,7 +47,7 @@ install node modules (ui2abc):
     - npm run compile --prefix ui2abc/fast-arktsc
     - npm run compile --prefix ui2abc/libarkts
     - npm run compile --prefix ui2abc/memo-plugin
-    - npm run compile --prefix ui2abc/ui-plugins
+    - npm run compile --prefix ui2abc/ui-plugins-ng
   artifacts:
     paths:
       - incremental/tools/panda/node_modules/@panda/sdk/ets
@@ -58,8 +58,8 @@ install node modules (ui2abc):
       - ui2abc/libarkts/lib
       - ui2abc/libarkts/build/native/
       - ui2abc/memo-plugin/lib
-      - ui2abc/ui-plugins/lib
+      - ui2abc/ui-plugins-ng/lib
       # need these symlinks for require in es2panda.js to work
       - ui2abc/node_modules/@koalaui/memo-plugin
-      - ui2abc/node_modules/@koalaui/ui-plugins
+      - ui2abc/node_modules/@koalaui/ui-plugins-ng
     expire_in: 1 day
diff --git a/ui2abc/ets-tests/hap/user/package.json b/ui2abc/ets-tests/hap/user/package.json
index c5a07e745..44f8c1fb9 100644
--- a/ui2abc/ets-tests/hap/user/package.json
+++ b/ui2abc/ets-tests/hap/user/package.json
@@ -10,7 +10,7 @@
     },
     "scripts": {
         "clean": "rimraf build generated unmemoized js_output abc lib app/user/build app/user/libs",
-        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins && npm run build",
+        "build:user": "npm run compile -C ../../../ui2abc/ui-plugins-ng && npm run build",
         "build:dump": "node ../../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --simultaneous --compiler-flags '--dump-plugin-ast' --compiler ../../../incremental/tools/panda/arkts/ui2abc --link-name ./build/user.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja",
         "build": "node ../../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../../../incremental/tools/panda/arkts/ui2abc --link-name ./build/user.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja",
         "run": "npm run build:user && mkdir -p ../../build/userPandaFiles && cp ./build/user.abc ../../build/userPandaFiles/hello.abc && npm run build:loader:node -C ../.. && ACE_LIBRARY_PATH=../../build PANDA_HOME=../../../incremental/tools/panda/node_modules/@panda/sdk node ../../build/index.js panda-ani:class=@ohos.example.src.ets.entry.Entry 10",
diff --git a/ui2abc/ets-tests/package.json b/ui2abc/ets-tests/package.json
index 0d774a4d8..b2321706b 100644
--- a/ui2abc/ets-tests/package.json
+++ b/ui2abc/ets-tests/package.json
@@ -23,7 +23,7 @@
         "all:ets": "npm run build:deps && npm run run:ets",
         "all:golden": "npm run build:deps && npm run run:golden",
         "all": "npm run all:ets",
-        "check": "npm run compile --prefix ../ui-plugins && npm run run",
+        "check": "npm run compile --prefix ../ui-plugins-ng && npm run run",
         "build:ets": "npm run prepare:arkui && node ../fast-arktsc --config ./ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/ets-tests.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja",
         "build:golden": "npm run prepare:arkui && node ../fast-arktsc --config ./golden-test-ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/ets-tests.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/ets/abc/build.ninja && mkdir -p build/golden",
         "build": "npm run build:ets",
diff --git a/ui2abc/libarkts/.gitlab-ci.yml b/ui2abc/libarkts/.gitlab-ci.yml
index f001ba76a..88a6fe68d 100644
--- a/ui2abc/libarkts/.gitlab-ci.yml
+++ b/ui2abc/libarkts/.gitlab-ci.yml
@@ -84,7 +84,7 @@ test example arkts-plugin:
     before_script:
         - !reference [ .setup, script ]
         - !reference [ .setup, regenerate-plugin-api ]
-        - npm run compile --prefix ui2abc/ui-plugins
+        - npm run compile --prefix ui2abc/ui-plugins-ng
         - npm run compile --prefix ui2abc/memo-plugin
         - npm run compile --prefix ui2abc/fast-arktsc
         - npm run runtime:prepare --prefix ui2abc/memo-plugin
diff --git a/ui2abc/package.json b/ui2abc/package.json
index 7385a2245..a31697058 100644
--- a/ui2abc/package.json
+++ b/ui2abc/package.json
@@ -6,7 +6,8 @@
         "./libarkts",
         "./fast-arktsc",
         "./memo-plugin",
-        "./ui-plugins",
+        "./ui-plugins-ng",
+	"./ets-tests",
         "./tests-memo",
         "../incremental/build-common",
         "../interop",
@@ -41,7 +42,7 @@
         "clean:all": "npm run clean --prefix libarkts && npm run clean:plugins --prefix libarkts && npm run clean --prefix memo-plugin && npm run runtime:clean --prefix memo-plugin && npm run clean --prefix memo-plugin/demo && npm run clean --prefix ../arkoala-arkts/trivial/user && npm run clean --prefix ../incremental/harness && npm run clean --prefix tests-memo",
         "build:all": "npm run compile --prefix libarkts && npm run compile --prefix annotate && npm run build:fast-arktsc && npm run build:plugins && npm run compile:plugins --prefix libarkts && npm run runtime:prepare --prefix memo-plugin",
         "build:fast-arktsc": "npm run compile --prefix fast-arktsc",
-        "build:plugins": "npm run compile --prefix memo-plugin && npm run compile --prefix ui-plugins",
+        "build:plugins": "npm run compile --prefix memo-plugin && npm run compile --prefix ui-plugins-ng",
         "test:all": "npm run build:all --prefix ../incremental/harness && npm run test:light --prefix libarkts && npm run demo:run:light --prefix memo-plugin && npm run test:all --prefix memo-plugin",
         "all": "npm run clean:all && npm run build:all && npm run test:all"
     }
diff --git a/ui2abc/ui-plugins/BUILD.gn b/ui2abc/ui-plugins-ng/BUILD.gn
similarity index 100%
rename from ui2abc/ui-plugins/BUILD.gn
rename to ui2abc/ui-plugins-ng/BUILD.gn
diff --git a/ui2abc/ui-plugins/package.json b/ui2abc/ui-plugins-ng/package.json
similarity index 100%
rename from ui2abc/ui-plugins/package.json
rename to ui2abc/ui-plugins-ng/package.json
diff --git a/ui2abc/ui-plugins/rollup.config.mjs b/ui2abc/ui-plugins-ng/rollup.config.mjs
similarity index 100%
rename from ui2abc/ui-plugins/rollup.config.mjs
rename to ui2abc/ui-plugins-ng/rollup.config.mjs
diff --git a/ui2abc/ui-plugins/src/annotation-translator.ts b/ui2abc/ui-plugins-ng/src/annotation-translator.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/annotation-translator.ts
rename to ui2abc/ui-plugins-ng/src/annotation-translator.ts
diff --git a/ui2abc/ui-plugins/src/builder-lambda-transformer.ts b/ui2abc/ui-plugins-ng/src/builder-lambda-transformer.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/builder-lambda-transformer.ts
rename to ui2abc/ui-plugins-ng/src/builder-lambda-transformer.ts
diff --git a/ui2abc/ui-plugins/src/call-transformer.ts b/ui2abc/ui-plugins-ng/src/call-transformer.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/call-transformer.ts
rename to ui2abc/ui-plugins-ng/src/call-transformer.ts
diff --git a/ui2abc/ui-plugins/src/checked-state-plugin.ts b/ui2abc/ui-plugins-ng/src/checked-state-plugin.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/checked-state-plugin.ts
rename to ui2abc/ui-plugins-ng/src/checked-state-plugin.ts
diff --git a/ui2abc/ui-plugins/src/class-transformer.ts b/ui2abc/ui-plugins-ng/src/class-transformer.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/class-transformer.ts
rename to ui2abc/ui-plugins-ng/src/class-transformer.ts
diff --git a/ui2abc/ui-plugins/src/common/arkts-utils.ts b/ui2abc/ui-plugins-ng/src/common/arkts-utils.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/common/arkts-utils.ts
rename to ui2abc/ui-plugins-ng/src/common/arkts-utils.ts
diff --git a/ui2abc/ui-plugins/src/common/gensym-generator.ts b/ui2abc/ui-plugins-ng/src/common/gensym-generator.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/common/gensym-generator.ts
rename to ui2abc/ui-plugins-ng/src/common/gensym-generator.ts
diff --git a/ui2abc/ui-plugins/src/component-transformer.ts b/ui2abc/ui-plugins-ng/src/component-transformer.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/component-transformer.ts
rename to ui2abc/ui-plugins-ng/src/component-transformer.ts
diff --git a/ui2abc/ui-plugins/src/entry.ts b/ui2abc/ui-plugins-ng/src/entry.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/entry.ts
rename to ui2abc/ui-plugins-ng/src/entry.ts
diff --git a/ui2abc/ui-plugins/src/ets-first-arg-transformer.ts b/ui2abc/ui-plugins-ng/src/ets-first-arg-transformer.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/ets-first-arg-transformer.ts
rename to ui2abc/ui-plugins-ng/src/ets-first-arg-transformer.ts
diff --git a/ui2abc/ui-plugins/src/imports-transformer.ts b/ui2abc/ui-plugins-ng/src/imports-transformer.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/imports-transformer.ts
rename to ui2abc/ui-plugins-ng/src/imports-transformer.ts
diff --git a/ui2abc/ui-plugins/src/instantiate-factory-helper.ts b/ui2abc/ui-plugins-ng/src/instantiate-factory-helper.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/instantiate-factory-helper.ts
rename to ui2abc/ui-plugins-ng/src/instantiate-factory-helper.ts
diff --git a/ui2abc/ui-plugins/src/parsed-state-plugin.ts b/ui2abc/ui-plugins-ng/src/parsed-state-plugin.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/parsed-state-plugin.ts
rename to ui2abc/ui-plugins-ng/src/parsed-state-plugin.ts
diff --git a/ui2abc/ui-plugins/src/property-transformers.ts b/ui2abc/ui-plugins-ng/src/property-transformers.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/property-transformers.ts
rename to ui2abc/ui-plugins-ng/src/property-transformers.ts
diff --git a/ui2abc/ui-plugins/src/resources-utils.ts b/ui2abc/ui-plugins-ng/src/resources-utils.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/resources-utils.ts
rename to ui2abc/ui-plugins-ng/src/resources-utils.ts
diff --git a/ui2abc/ui-plugins/src/struct-call-rewriter.ts b/ui2abc/ui-plugins-ng/src/struct-call-rewriter.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/struct-call-rewriter.ts
rename to ui2abc/ui-plugins-ng/src/struct-call-rewriter.ts
diff --git a/ui2abc/ui-plugins/src/struct-recorder.ts b/ui2abc/ui-plugins-ng/src/struct-recorder.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/struct-recorder.ts
rename to ui2abc/ui-plugins-ng/src/struct-recorder.ts
diff --git a/ui2abc/ui-plugins/src/style-transformer.ts b/ui2abc/ui-plugins-ng/src/style-transformer.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/style-transformer.ts
rename to ui2abc/ui-plugins-ng/src/style-transformer.ts
diff --git a/ui2abc/ui-plugins/src/ui-factory.ts b/ui2abc/ui-plugins-ng/src/ui-factory.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/ui-factory.ts
rename to ui2abc/ui-plugins-ng/src/ui-factory.ts
diff --git a/ui2abc/ui-plugins/src/utils.ts b/ui2abc/ui-plugins-ng/src/utils.ts
similarity index 100%
rename from ui2abc/ui-plugins/src/utils.ts
rename to ui2abc/ui-plugins-ng/src/utils.ts
diff --git a/ui2abc/ui-plugins/tsconfig.json b/ui2abc/ui-plugins-ng/tsconfig.json
similarity index 100%
rename from ui2abc/ui-plugins/tsconfig.json
rename to ui2abc/ui-plugins-ng/tsconfig.json
-- 
Gitee


From 81919b6d5839e2e430a55258564f492f8757c334 Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <nikolay.igotti@huawei.com>
Date: Wed, 27 Aug 2025 18:05:11 +0300
Subject: [PATCH 2/2] Update Signed-off-by: Nikolay Igotti
 <nikolay.igotti@huawei.com>

---
 arkoala-arkts/cats/user/ui2abcconfig.json      | 4 ++--
 arkoala-arkts/shopping/user/ui2abcconfig.json  | 4 ++--
 arkoala-arkts/trivial/user/ui2abcconfig.json   | 4 ++--
 tools/release.mjs                              | 1 +
 ui2abc/ets-tests/golden-test-ui2abcconfig.json | 4 ++--
 ui2abc/ets-tests/hap/user/ui2abcconfig.json    | 4 ++--
 ui2abc/ets-tests/ui2abcconfig.json             | 4 ++--
 ui2abc/perf-tests/ui2abcconfig.json            | 4 ++--
 ui2abc/ui-plugins-ng/package.json              | 2 +-
 9 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json
index faa3c5a72..f514cf8f0 100644
--- a/arkoala-arkts/cats/user/ui2abcconfig.json
+++ b/arkoala-arkts/cats/user/ui2abcconfig.json
@@ -29,7 +29,7 @@
         },
         "plugins": [
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "parsed",
                 "name": "ui"
             },
@@ -39,7 +39,7 @@
                 "name": "memo"
             },
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "checked",
                 "name": "ui"
             },
diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json
index e93ac3e42..9af8c714d 100644
--- a/arkoala-arkts/shopping/user/ui2abcconfig.json
+++ b/arkoala-arkts/shopping/user/ui2abcconfig.json
@@ -29,7 +29,7 @@
         },
         "plugins": [
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "parsed",
                 "name": "ui"
             },
@@ -39,7 +39,7 @@
                 "name": "memo"
             },
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "checked",
                 "name": "ui"
             },
diff --git a/arkoala-arkts/trivial/user/ui2abcconfig.json b/arkoala-arkts/trivial/user/ui2abcconfig.json
index 5a2cf0bfb..4875b8eef 100644
--- a/arkoala-arkts/trivial/user/ui2abcconfig.json
+++ b/arkoala-arkts/trivial/user/ui2abcconfig.json
@@ -30,7 +30,7 @@
         },
         "plugins": [
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "parsed",
                 "name": "ui"
             },
@@ -40,7 +40,7 @@
                 "name": "memo"
             },
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "checked",
                 "name": "ui"
             },
diff --git a/tools/release.mjs b/tools/release.mjs
index 91ef28871..261c89836 100644
--- a/tools/release.mjs
+++ b/tools/release.mjs
@@ -74,6 +74,7 @@ const all_packages = [
     new Package(path.join(EXTERNAL_HOME, "ui2abc/fast-arktsc")),
     new Package(path.join(EXTERNAL_HOME, "ui2abc/libarkts")),
     new Package(path.join(EXTERNAL_HOME, "ui2abc/memo-plugin")),
+    new Package(path.join(EXTERNAL_HOME, "ui2abc/ui-plugins-ng")),
     new Package(path.join(EXTERNAL_HOME, "ui2abc/tests-memo")),
     new Package(path.join(EXTERNAL_HOME, "ui2abc/ets-tests")),
     new Package(path.join(EXTERNAL_HOME, "arkoala-arkts/ets-plugin")),
diff --git a/ui2abc/ets-tests/golden-test-ui2abcconfig.json b/ui2abc/ets-tests/golden-test-ui2abcconfig.json
index 79725c99f..3c3a4a3f3 100644
--- a/ui2abc/ets-tests/golden-test-ui2abcconfig.json
+++ b/ui2abc/ets-tests/golden-test-ui2abcconfig.json
@@ -31,7 +31,7 @@
         },
         "plugins": [
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "parsed",
                 "name": "ui"
             },
@@ -41,7 +41,7 @@
                 "name": "memo"
             },
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "checked",
                 "name": "ui"
             },
diff --git a/ui2abc/ets-tests/hap/user/ui2abcconfig.json b/ui2abc/ets-tests/hap/user/ui2abcconfig.json
index 8393a9a0c..da5725a37 100644
--- a/ui2abc/ets-tests/hap/user/ui2abcconfig.json
+++ b/ui2abc/ets-tests/hap/user/ui2abcconfig.json
@@ -19,7 +19,7 @@
         },
         "plugins": [
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "parsed",
                 "name": "ui"
             },
@@ -29,7 +29,7 @@
                 "name": "memo"
             },
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "checked",
                 "name": "ui"
             },
diff --git a/ui2abc/ets-tests/ui2abcconfig.json b/ui2abc/ets-tests/ui2abcconfig.json
index cbace643e..7c620b62f 100644
--- a/ui2abc/ets-tests/ui2abcconfig.json
+++ b/ui2abc/ets-tests/ui2abcconfig.json
@@ -31,7 +31,7 @@
         },
         "plugins": [
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "parsed",
                 "name": "ui"
             },
@@ -41,7 +41,7 @@
                 "name": "memo"
             },
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "checked",
                 "name": "ui"
             },
diff --git a/ui2abc/perf-tests/ui2abcconfig.json b/ui2abc/perf-tests/ui2abcconfig.json
index 2579759c9..64c4e3c37 100644
--- a/ui2abc/perf-tests/ui2abcconfig.json
+++ b/ui2abc/perf-tests/ui2abcconfig.json
@@ -17,7 +17,7 @@
         },
         "plugins": [
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "parsed",
                 "name": "ui"
             },
@@ -27,7 +27,7 @@
                 "name": "memo"
             },
             {
-                "transform": "@koalaui/ui-plugins",
+                "transform": "@koalaui/ui-plugins-ng",
                 "state": "checked",
                 "name": "ui"
             },
diff --git a/ui2abc/ui-plugins-ng/package.json b/ui2abc/ui-plugins-ng/package.json
index e4f0609d3..1146a1a78 100644
--- a/ui2abc/ui-plugins-ng/package.json
+++ b/ui2abc/ui-plugins-ng/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@koalaui/ui-plugins",
+  "name": "@koalaui/ui-plugins-ng",
   "main": "./lib/entry.js",
   "dependencies": {},
   "scripts": {
-- 
Gitee