From 0dde1b413742426a21f94dcf45a965e7b9711417 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 27 Aug 2025 12:54:27 +0300 Subject: [PATCH 1/5] Move ets-tests to ui2abc where it belongs Signed-off-by: Nikolay Igotti --- .gitlab-ci.yml | 2 +- .../base/observeWrappedArray.ts | 2 +- incremental/compat/src/arkts/observable.ts | 2 +- .../ets-tests}/.gitlab-ci.yml | 18 +- {ets-tests => ui2abc/ets-tests}/README.md | 0 .../ets-tests}/ets/TestHarness.ets | 0 .../ets/environment-tests/Pages.ets | 0 .../pages/AttributeUpdaterTest.ets | 0 .../pages/DrawModifierTest.ets | 0 .../pages/RenderServiceNodePage.ets | 0 .../pages/ScreenshotServiceTest.ets | 0 .../ets/environment-tests/pages/StartPage.ets | 0 .../pages/builder/BuilderGlobalFunction.ets | 0 .../pages/builder/BuilderMultipleNesting.ets | 0 .../pages/builder/BuilderParamDecorator.ets | 0 .../builder/BuilderParamWithLocalBuilder.ets | 0 .../pages/builder/BuilderParamWithThis.ets | 0 .../builder/BuilderParamWithThisChanging.ets | 0 .../pages/builder/BuilderPrivateFunction.ets | 0 .../pages/builder/BuilderSeveralParams.ets | 0 .../pages/builder/BuilderSomeTypes.ets | 0 .../pages/builder/LocalBuilderDecorator.ets | 0 .../componentv2/ComponentV2Decorator.ets | 0 .../pages/componentv2/ComponentV2Page1.ets | 0 .../pages/componentv2/ComponentV2Page2.ets | 0 .../pages/lifecycle/AboutToAppear.ets | 0 .../pages/lifecycle/ComponentArray.ets | 0 .../pages/lifecycle/OnDidBuildSupport.ets | 0 .../pages/lifecycle/PageCallbacks.ets | 0 .../pages/lifecycle/PageSwitch.ets | 0 .../pages/lifecycle/Reusable.ets | 0 .../pages/links/DateSyncTest.ets | 0 .../pages/links/DeepLinkPropagationTest.ets | 0 .../pages/links/LinkArrayBindingTest.ets | 0 .../pages/links/LinkBooleanTest.ets | 0 .../pages/links/LinkCollectionBindingTest.ets | 0 .../pages/links/LinkDecorator.ets | 0 .../pages/links/LinkEnumTest.ets | 0 .../pages/links/LinkMapTest.ets | 0 .../pages/links/LinkObjectTest.ets | 0 .../pages/links/LinkSetTest.ets | 0 .../pages/links/LinkSimpleNumberBinding.ets | 0 .../pages/links/LinkUnionStringNullTest.ets | 0 .../links/ObjectPropertyMutationTest.ets | 0 .../pages/local/LocalObjectTest.ets | 0 .../observed/ObjectLinkInitialization.ets | 0 .../pages/observed/ObjectLinkInitializer.ets | 0 .../pages/observed/ObservedArray.ets | 0 .../pages/observed/ObservedExtended.ets | 0 .../pages/observed/ObservedObject.ets | 0 .../pages/observed/ObservedObjectLink.ets | 0 .../pages/observed/ObservedProp.ets | 0 .../pages/observed/ObservedUnion.ets | 0 .../pages/observedv2/StaticTraceDecorator.ets | 0 .../pages/observedv2/TraceDecorator.ets | 0 .../pages/observedv2/TypeDecorator.ets | 0 .../pages/props/PropArrayChildElement.ets | 0 .../pages/props/PropArrayMutationTest.ets | 0 .../pages/props/PropBoolTest.ets | 0 .../pages/props/PropDateParentChildTest.ets | 0 .../pages/props/PropDateTest.ets | 0 .../pages/props/PropIndependentChildTest.ets | 0 .../pages/props/PropLocalInitTest.ets | 0 .../pages/props/PropMapTest.ets | 0 .../pages/props/PropMutateTest.ets | 0 .../pages/props/PropParentChildBasicTest.ets | 0 .../pages/props/PropSetTest.ets | 0 .../pages/props/PropStringTest.ets | 0 .../pages/props/PropTest.ets | 0 .../pages/provide/ProvideConsumeBaseTest.ets | 0 .../pages/provide/ProvideConsumeChildTest.ets | 0 .../pages/provide/ProvideConsumeMapTest.ets | 0 .../provide/ProvideConsumeNoOverride.ets | 0 .../pages/provide/ProvideConsumeObject.ets | 0 .../pages/provide/ProvideConsumeOverride.ets | 0 .../pages/provide/ProvideConsumeSetTest.ets | 0 .../provider/ProviderConsumerBaseTest.ets | 0 .../pages/states/InitializationFromParent.ets | 0 .../pages/states/ObservableArray.ets | 0 .../pages/states/ObservableDate.ets | 0 .../pages/states/ObservableDateArray.ets | 0 .../pages/states/ObservableMap.ets | 0 .../pages/states/ObservableObject.ets | 0 .../pages/states/ObservableSet.ets | 0 .../pages/states/StateDecrement.ets | 0 .../pages/states/StateIncrement.ets | 0 .../pages/states/UndefinedStateVariable.ets | 0 .../pages/storage/AppStorageLinkTest.ets | 0 .../pages/storage/AppStoragePropTest.ets | 0 .../pages/storage/EnvironmentTest.ets | 0 .../pages/storage/LocalStorageLinkTest.ets | 0 .../pages/storage/LocalStoragePropTest.ets | 0 .../pages/storage/StorageLinkUpdateTest.ets | 0 .../ets/environment-tests/pages/styles.ets | 0 .../pages/track/TrackObject.ets | 0 .../pages/watch/WatchAppStorage.ets | 0 .../pages/watch/WatchLink.ets | 0 .../pages/watch/WatchLocalStorage.ets | 0 .../pages/watch/WatchObjectLink.ets | 0 .../pages/watch/WatchProp.ets | 0 .../pages/watch/WatchProvideConsume.ets | 0 .../pages/watch/WatchState.ets | 0 .../suites/AttributeModifier.ets | 0 .../suites/BuilderDecoratorTest.ets | 0 .../suites/BuilderParamDecoratorTest.ets | 0 .../suites/ComponentLifeCycle.ets | 0 .../suites/ComponentV2DecoratorTests.ets | 0 .../environment-tests/suites/DrawModifier.ets | 0 .../suites/LinkDecorator.ets | 0 .../suites/LocalDecoratorTests.ets | 0 .../environment-tests/suites/ObservedTest.ets | 0 .../suites/PropDecorator.ets | 0 .../suites/ProvideConsume.ets | 0 .../suites/RenderServiceNodeTest.ets | 0 .../suites/ScreenshotService.ets | 0 .../suites/StateManagement.ets | 0 .../environment-tests/suites/StorageTests.ets | 0 .../suites/TraceDecoratorTests.ets | 0 .../suites/TrackDecoratorTests.ets | 0 .../suites/WatchDecoratorTest.ets | 0 .../ets-tests}/ets/golden-tests/Pages.ets | 0 .../ets/golden-tests/golden/golden-base.tga | Bin .../golden-tests/pages/StateChangePage.ets | 0 .../ets/golden-tests/suites/StateChange.ets | 0 {ets-tests => ui2abc/ets-tests}/ets/utils.ets | 0 .../ets-tests}/golden-test-ui2abcconfig.json | 46 ++-- .../ets-tests}/hap/.gitignore | 0 .../hap/application/AppScope/app.json5 | 0 .../resources/base/element/string.json | 0 .../resources/base/media/app_icon.png | Bin .../hap/application/build-profile.json5 | 0 .../hap/application/code-linter.json5 | 0 .../hap/application/entry/.gitignore | 0 .../hap/application/entry/build-profile.json5 | 0 .../hap/application/entry/hvigorfile.ts | 0 .../application/entry/obfuscation-rules.txt | 0 .../hap/application/entry/oh-package.json5 | 0 .../main/ets/entryability/EntryAbility.ets | 0 .../entrybackupability/EntryBackupAbility.ets | 0 .../entry/src/main/ets/pages/Index.ets | 0 .../application/entry/src/main/module.json5 | 0 .../main/resources/base/element/color.json | 0 .../main/resources/base/element/string.json | 0 .../main/resources/base/media/background.png | Bin .../main/resources/base/media/foreground.png | Bin .../resources/base/media/layered_image.json | 0 .../main/resources/base/media/startIcon.png | Bin .../resources/base/profile/backup_config.json | 0 .../resources/base/profile/main_pages.json | 0 .../main/resources/en_US/element/string.json | 0 .../src/main/resources/rawfile/koala.png | Bin .../main/resources/zh_CN/element/string.json | 0 .../entry/src/mock/mock-config.json5 | 0 .../src/ohosTest/ets/test/Ability.test.ets | 0 .../entry/src/ohosTest/ets/test/List.test.ets | 0 .../entry/src/ohosTest/module.json5 | 0 .../application/entry/src/test/List.test.ets | 0 .../entry/src/test/LocalUnit.test.ets | 0 .../application/hvigor/hvigor-config.json5 | 0 .../ets-tests}/hap/application/hvigorfile.ts | 0 .../hap/application/local.properties | 0 .../hap/application/oh-package-lock.json5 | 0 .../hap/application/oh-package.json5 | 0 .../ets-tests}/hap/package.json | 42 ++-- .../hap/user/app/AppScope/app.json5 | 0 .../hap/user/app/build-profile.json5 | 0 .../hap/user/app/hvigor/hvigor-config.json5 | 0 .../ets-tests}/hap/user/app/hvigorfile.ts | 0 .../hap/user/app/oh-package-lock.json5 | 0 .../ets-tests}/hap/user/app/oh-package.json5 | 0 .../hap/user/app/user/BuildProfile.ets | 0 .../hap/user/app/user/build-profile.json5 | 0 .../hap/user/app/user/hvigorfile.ts | 0 .../hap/user/app/user/obfuscation-rules.txt | 0 .../hap/user/app/user/oh-package.json5 | 0 .../hap/user/app/user/src/main/module.json5 | 0 .../ets-tests}/hap/user/package.json | 0 .../hap/user/scripts/build-har-universal.mjs | 0 .../ets-tests}/hap/user/scripts/build-har.mjs | 0 .../ets-tests}/hap/user/src/ets/entry.ets | 0 .../hap/user/src/ets/etsconfig.json | 0 .../ets-tests}/hap/user/ui2abcconfig.json | 0 {ets-tests => ui2abc/ets-tests}/package.json | 18 +- .../ets-tests}/src/AppControl.ts | 0 {ets-tests => ui2abc/ets-tests}/src/Page.ts | 0 {ets-tests => ui2abc/ets-tests}/src/entry.ts | 0 {ets-tests => ui2abc/ets-tests}/src/index.ts | 0 .../src/suites/AttributeModifier.ts | 0 .../src/suites/BuilderDecoratorTest.ts | 0 .../src/suites/BuilderParamDecoratorTest.ts | 0 .../src/suites/ComponentLifeCycle.ts | 0 .../ets-tests}/src/suites/LinkDecorator.ts | 0 .../ets-tests}/src/suites/PropDecorator.ts | 0 .../ets-tests}/src/suites/ProvideConsume.ts | 0 .../ets-tests}/src/suites/StateManagement.ts | 0 .../ets-tests}/src/suites/StorageTests.ts | 0 .../ets-tests}/src/suites/Styles.ts | 0 .../src/suites/WatchDecoratorTest.ts | 0 {ets-tests => ui2abc/ets-tests}/tsconfig.json | 0 .../ets-tests}/ui2abcconfig.json | 46 ++-- .../libarkts/native/src/generated/bridges.cc | 65 +++--- .../libarkts/src/generated/Es2pandaEnums.ts | 212 +++++++++--------- .../src/generated/Es2pandaNativeModule.ts | 17 +- ui2abc/libarkts/src/generated/factory.ts | 11 +- .../src/generated/peers/ETSIntrinsicNode.ts | 24 +- 205 files changed, 264 insertions(+), 241 deletions(-) rename {ets-tests => ui2abc/ets-tests}/.gitlab-ci.yml (83%) rename {ets-tests => ui2abc/ets-tests}/README.md (100%) rename {ets-tests => ui2abc/ets-tests}/ets/TestHarness.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/Pages.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/AttributeUpdaterTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/DrawModifierTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/RenderServiceNodePage.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/ScreenshotServiceTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/StartPage.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderParamDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderParamWithThis.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderSeveralParams.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/BuilderSomeTypes.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/lifecycle/AboutToAppear.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/lifecycle/ComponentArray.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/lifecycle/PageCallbacks.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/lifecycle/PageSwitch.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/lifecycle/Reusable.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/DateSyncTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkArrayBindingTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkBooleanTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkEnumTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkMapTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkObjectTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkSetTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/local/LocalObjectTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObservedArray.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObservedExtended.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObservedObject.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObservedObjectLink.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObservedProp.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observed/ObservedUnion.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observedv2/TraceDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/observedv2/TypeDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropArrayChildElement.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropArrayMutationTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropBoolTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropDateParentChildTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropDateTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropIndependentChildTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropLocalInitTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropMapTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropMutateTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropParentChildBasicTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropSetTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropStringTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/props/PropTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provide/ProvideConsumeObject.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/InitializationFromParent.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/ObservableArray.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/ObservableDate.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/ObservableDateArray.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/ObservableMap.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/ObservableObject.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/ObservableSet.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/StateDecrement.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/StateIncrement.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/states/UndefinedStateVariable.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/storage/AppStorageLinkTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/storage/AppStoragePropTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/storage/EnvironmentTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/storage/LocalStoragePropTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/styles.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/track/TrackObject.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/watch/WatchAppStorage.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/watch/WatchLink.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/watch/WatchLocalStorage.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/watch/WatchObjectLink.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/watch/WatchProp.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/watch/WatchProvideConsume.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/pages/watch/WatchState.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/AttributeModifier.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/BuilderDecoratorTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/BuilderParamDecoratorTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/ComponentLifeCycle.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/ComponentV2DecoratorTests.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/DrawModifier.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/LinkDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/LocalDecoratorTests.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/ObservedTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/PropDecorator.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/ProvideConsume.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/RenderServiceNodeTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/ScreenshotService.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/StateManagement.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/StorageTests.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/TraceDecoratorTests.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/TrackDecoratorTests.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/environment-tests/suites/WatchDecoratorTest.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/golden-tests/Pages.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/golden-tests/golden/golden-base.tga (100%) rename {ets-tests => ui2abc/ets-tests}/ets/golden-tests/pages/StateChangePage.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/golden-tests/suites/StateChange.ets (100%) rename {ets-tests => ui2abc/ets-tests}/ets/utils.ets (100%) rename {ets-tests => ui2abc/ets-tests}/golden-test-ui2abcconfig.json (36%) rename {ets-tests => ui2abc/ets-tests}/hap/.gitignore (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/AppScope/app.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/AppScope/resources/base/element/string.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/AppScope/resources/base/media/app_icon.png (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/build-profile.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/code-linter.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/.gitignore (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/build-profile.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/hvigorfile.ts (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/obfuscation-rules.txt (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/oh-package.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/ets/entryability/EntryAbility.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/ets/pages/Index.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/module.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/element/color.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/element/string.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/media/background.png (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/media/foreground.png (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/media/layered_image.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/media/startIcon.png (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/profile/backup_config.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/base/profile/main_pages.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/en_US/element/string.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/rawfile/koala.png (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/main/resources/zh_CN/element/string.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/mock/mock-config.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/ohosTest/ets/test/List.test.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/ohosTest/module.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/test/List.test.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/entry/src/test/LocalUnit.test.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/hvigor/hvigor-config.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/hvigorfile.ts (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/local.properties (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/oh-package-lock.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/application/oh-package.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/package.json (64%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/AppScope/app.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/build-profile.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/hvigor/hvigor-config.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/hvigorfile.ts (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/oh-package-lock.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/oh-package.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/user/BuildProfile.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/user/build-profile.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/user/hvigorfile.ts (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/user/obfuscation-rules.txt (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/user/oh-package.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/app/user/src/main/module.json5 (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/package.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/scripts/build-har-universal.mjs (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/scripts/build-har.mjs (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/src/ets/entry.ets (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/src/ets/etsconfig.json (100%) rename {ets-tests => ui2abc/ets-tests}/hap/user/ui2abcconfig.json (100%) rename {ets-tests => ui2abc/ets-tests}/package.json (53%) rename {ets-tests => ui2abc/ets-tests}/src/AppControl.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/Page.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/entry.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/index.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/AttributeModifier.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/BuilderDecoratorTest.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/BuilderParamDecoratorTest.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/ComponentLifeCycle.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/LinkDecorator.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/PropDecorator.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/ProvideConsume.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/StateManagement.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/StorageTests.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/Styles.ts (100%) rename {ets-tests => ui2abc/ets-tests}/src/suites/WatchDecoratorTest.ts (100%) rename {ets-tests => ui2abc/ets-tests}/tsconfig.json (100%) rename {ets-tests => ui2abc/ets-tests}/ui2abcconfig.json (48%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a55842637f..cb15773894 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,6 +53,6 @@ include: - ui2abc/libarkts/.gitlab-ci.yml - ui2abc/memo-plugin/.gitlab-ci.yml - ui2abc/tests-memo/.gitlab-ci.yml + - ui2abc/ets-tests/.gitlab-ci.yml - interop/.gitlab-ci.yml - - ets-tests/.gitlab-ci.yml - tools/.gitlab-ci.yml diff --git a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts index c6d69460a9..d223f45c39 100644 --- a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts +++ b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts @@ -828,7 +828,7 @@ export class WrappedArray extends Array implements IObservedObject, Observ * If `fromIndex` is ommited then `fromIndex = length()-1`. * @returns The last index of the element in the array; -1 if not found. */ - public override lastIndexOf(searchElement: T, fromIndex?: int): int { + public override lastIndexOf(searchElement: T, fromIndex: int): int { if (this.shouldAddRef()) { this.meta_.addRef(CONSTANT.OB_ARRAY_ANY_KEY); } diff --git a/incremental/compat/src/arkts/observable.ts b/incremental/compat/src/arkts/observable.ts index 3f1e3be465..7304ea5762 100644 --- a/incremental/compat/src/arkts/observable.ts +++ b/incremental/compat/src/arkts/observable.ts @@ -519,7 +519,7 @@ class ObservableArray extends Array { return super.slice(start, end) } - override lastIndexOf(searchElement: T, fromIndex?: int): int { + override lastIndexOf(searchElement: T, fromIndex: int): int { this.handler?.onAccess() return super.lastIndexOf(searchElement, fromIndex) } diff --git a/ets-tests/.gitlab-ci.yml b/ui2abc/ets-tests/.gitlab-ci.yml similarity index 83% rename from ets-tests/.gitlab-ci.yml rename to ui2abc/ets-tests/.gitlab-ci.yml index 1ac2bce0cb..f1ca087fb0 100644 --- a/ets-tests/.gitlab-ci.yml +++ b/ui2abc/ets-tests/.gitlab-ci.yml @@ -9,7 +9,7 @@ install node modules (ets-tests): - npm i --no-audit --no-fund --prefix ets-tests artifacts: paths: - - ets-tests/node_modules + - ui2abc/ets-tests/node_modules expire_in: 1 day build ets-tests.abc: @@ -22,10 +22,10 @@ build ets-tests.abc: - annotate all script: - npm run build --prefix ets-tests - - ls -l ets-tests/build/ets-tests.abc + - ls -l ui2abc/ets-tests/build/ets-tests.abc artifacts: paths: - - ets-tests/build/ets-tests.abc + - ui2abc/ets-tests/build/ets-tests.abc expire_in: 1 day build ets-tests.abc (golden): @@ -38,10 +38,10 @@ build ets-tests.abc (golden): - annotate all script: - npm run build:golden --prefix ets-tests - - ls -l ets-tests/build/ets-tests.abc + - ls -l ui2abc/ets-tests/build/ets-tests.abc artifacts: paths: - - ets-tests/build/ets-tests.abc + - ui2abc/ets-tests/build/ets-tests.abc expire_in: 1 day run ets-tests M3 (linux, node): @@ -53,7 +53,7 @@ build ets-tests.abc (golden): script: - mkdir -p arkoala-arkts/build/userPandaFiles - cp incremental/harness/build/harness.abc arkoala-arkts/build/bootPandaFiles/ - - cp ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ + - cp ui2abc/ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ - cp arkoala-arkts/framework/native/build-node-host-vmloader/libvmloader.so arkoala-arkts/build/userPandaFiles/ - cd arkoala-arkts - npm run build:loader:node @@ -73,10 +73,10 @@ build ets-tests.abc (golden): before_script: - !reference [.setup, script] script: - - mkdir -p ets-tests/build/golden + - mkdir -p ui2abc/ets-tests/build/golden - mkdir -p arkoala-arkts/build/userPandaFiles - cp incremental/harness/build/harness.abc arkoala-arkts/build/bootPandaFiles/ - - cp ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ + - cp ui2abc/ets-tests/build/ets-tests.abc arkoala-arkts/build/userPandaFiles/ - cp arkoala-arkts/framework/native/build-node-host-vmloader/libvmloader.so arkoala-arkts/build/userPandaFiles/ - cd arkoala-arkts - npm run build:loader:node @@ -90,5 +90,5 @@ build ets-tests.abc (golden): - build ArkoalaNative (linux, linux, node+panda) artifacts: paths: - - ets-tests/build/golden + - ui2abc/ets-tests/build/golden expire_in: 1 day diff --git a/ets-tests/README.md b/ui2abc/ets-tests/README.md similarity index 100% rename from ets-tests/README.md rename to ui2abc/ets-tests/README.md diff --git a/ets-tests/ets/TestHarness.ets b/ui2abc/ets-tests/ets/TestHarness.ets similarity index 100% rename from ets-tests/ets/TestHarness.ets rename to ui2abc/ets-tests/ets/TestHarness.ets diff --git a/ets-tests/ets/environment-tests/Pages.ets b/ui2abc/ets-tests/ets/environment-tests/Pages.ets similarity index 100% rename from ets-tests/ets/environment-tests/Pages.ets rename to ui2abc/ets-tests/ets/environment-tests/Pages.ets diff --git a/ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/AttributeUpdaterTest.ets diff --git a/ets-tests/ets/environment-tests/pages/DrawModifierTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/DrawModifierTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/DrawModifierTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/DrawModifierTest.ets diff --git a/ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/RenderServiceNodePage.ets diff --git a/ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/ScreenshotServiceTest.ets diff --git a/ets-tests/ets/environment-tests/pages/StartPage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/StartPage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/StartPage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/StartPage.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderGlobalFunction.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderMultipleNesting.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithLocalBuilder.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThis.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderParamWithThisChanging.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderPrivateFunction.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSeveralParams.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/BuilderSomeTypes.ets diff --git a/ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/builder/LocalBuilderDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Decorator.ets diff --git a/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets b/ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page1.ets diff --git a/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets b/ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/componentv2/ComponentV2Page2.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/AboutToAppear.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/ComponentArray.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/OnDidBuildSupport.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageCallbacks.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/PageSwitch.ets diff --git a/ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets b/ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/lifecycle/Reusable.ets diff --git a/ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/DateSyncTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/DeepLinkPropagationTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkArrayBindingTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkBooleanTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkCollectionBindingTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkEnumTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkMapTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkObjectTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSetTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkSimpleNumberBinding.ets diff --git a/ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/LinkUnionStringNullTest.ets diff --git a/ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/links/ObjectPropertyMutationTest.ets diff --git a/ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/local/LocalObjectTest.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitialization.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObjectLinkInitializer.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedArray.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedExtended.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObject.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedObjectLink.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedProp.ets diff --git a/ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observed/ObservedUnion.ets diff --git a/ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observedv2/StaticTraceDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TraceDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/observedv2/TypeDecorator.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayChildElement.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropArrayMutationTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropBoolTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateParentChildTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropDateTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropDateTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropDateTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropIndependentChildTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropLocalInitTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropMapTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropMapTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropMapTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropMapTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropMutateTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropParentChildBasicTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropSetTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropSetTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropSetTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropSetTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropStringTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropStringTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropStringTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropStringTest.ets diff --git a/ets-tests/ets/environment-tests/pages/props/PropTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/props/PropTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/props/PropTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/props/PropTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeBaseTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeChildTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeMapTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeNoOverride.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeObject.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeOverride.ets diff --git a/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provide/ProvideConsumeSetTest.ets diff --git a/ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/provider/ProviderConsumerBaseTest.ets diff --git a/ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/InitializationFromParent.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableArray.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableDate.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDate.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableDate.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDate.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableDateArray.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableMap.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableMap.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableMap.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableMap.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableObject.ets diff --git a/ets-tests/ets/environment-tests/pages/states/ObservableSet.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableSet.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/ObservableSet.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/ObservableSet.ets diff --git a/ets-tests/ets/environment-tests/pages/states/StateDecrement.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/StateDecrement.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/StateDecrement.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/StateDecrement.ets diff --git a/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/StateIncrement.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets diff --git a/ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets b/ui2abc/ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/states/UndefinedStateVariable.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStorageLinkTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/AppStoragePropTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/EnvironmentTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStorageLinkTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/LocalStoragePropTest.ets diff --git a/ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets b/ui2abc/ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/storage/StorageLinkUpdateTest.ets diff --git a/ets-tests/ets/environment-tests/pages/styles.ets b/ui2abc/ets-tests/ets/environment-tests/pages/styles.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/styles.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/styles.ets diff --git a/ets-tests/ets/environment-tests/pages/track/TrackObject.ets b/ui2abc/ets-tests/ets/environment-tests/pages/track/TrackObject.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/track/TrackObject.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/track/TrackObject.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchAppStorage.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchLink.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLink.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchLink.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLink.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchLocalStorage.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchObjectLink.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchProp.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProp.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchProp.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProp.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchProvideConsume.ets diff --git a/ets-tests/ets/environment-tests/pages/watch/WatchState.ets b/ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchState.ets similarity index 100% rename from ets-tests/ets/environment-tests/pages/watch/WatchState.ets rename to ui2abc/ets-tests/ets/environment-tests/pages/watch/WatchState.ets diff --git a/ets-tests/ets/environment-tests/suites/AttributeModifier.ets b/ui2abc/ets-tests/ets/environment-tests/suites/AttributeModifier.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/AttributeModifier.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/AttributeModifier.ets diff --git a/ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/BuilderDecoratorTest.ets diff --git a/ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/BuilderParamDecoratorTest.ets diff --git a/ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ComponentLifeCycle.ets diff --git a/ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ComponentV2DecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/DrawModifier.ets b/ui2abc/ets-tests/ets/environment-tests/suites/DrawModifier.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/DrawModifier.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/DrawModifier.ets diff --git a/ets-tests/ets/environment-tests/suites/LinkDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/suites/LinkDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/LinkDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/LinkDecorator.ets diff --git a/ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/LocalDecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/ObservedTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ObservedTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ObservedTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ObservedTest.ets diff --git a/ets-tests/ets/environment-tests/suites/PropDecorator.ets b/ui2abc/ets-tests/ets/environment-tests/suites/PropDecorator.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/PropDecorator.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/PropDecorator.ets diff --git a/ets-tests/ets/environment-tests/suites/ProvideConsume.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ProvideConsume.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ProvideConsume.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ProvideConsume.ets diff --git a/ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/RenderServiceNodeTest.ets diff --git a/ets-tests/ets/environment-tests/suites/ScreenshotService.ets b/ui2abc/ets-tests/ets/environment-tests/suites/ScreenshotService.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/ScreenshotService.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/ScreenshotService.ets diff --git a/ets-tests/ets/environment-tests/suites/StateManagement.ets b/ui2abc/ets-tests/ets/environment-tests/suites/StateManagement.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/StateManagement.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/StateManagement.ets diff --git a/ets-tests/ets/environment-tests/suites/StorageTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/StorageTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/StorageTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/StorageTests.ets diff --git a/ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/TraceDecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets b/ui2abc/ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/TrackDecoratorTests.ets diff --git a/ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets b/ui2abc/ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets similarity index 100% rename from ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets rename to ui2abc/ets-tests/ets/environment-tests/suites/WatchDecoratorTest.ets diff --git a/ets-tests/ets/golden-tests/Pages.ets b/ui2abc/ets-tests/ets/golden-tests/Pages.ets similarity index 100% rename from ets-tests/ets/golden-tests/Pages.ets rename to ui2abc/ets-tests/ets/golden-tests/Pages.ets diff --git a/ets-tests/ets/golden-tests/golden/golden-base.tga b/ui2abc/ets-tests/ets/golden-tests/golden/golden-base.tga similarity index 100% rename from ets-tests/ets/golden-tests/golden/golden-base.tga rename to ui2abc/ets-tests/ets/golden-tests/golden/golden-base.tga diff --git a/ets-tests/ets/golden-tests/pages/StateChangePage.ets b/ui2abc/ets-tests/ets/golden-tests/pages/StateChangePage.ets similarity index 100% rename from ets-tests/ets/golden-tests/pages/StateChangePage.ets rename to ui2abc/ets-tests/ets/golden-tests/pages/StateChangePage.ets diff --git a/ets-tests/ets/golden-tests/suites/StateChange.ets b/ui2abc/ets-tests/ets/golden-tests/suites/StateChange.ets similarity index 100% rename from ets-tests/ets/golden-tests/suites/StateChange.ets rename to ui2abc/ets-tests/ets/golden-tests/suites/StateChange.ets diff --git a/ets-tests/ets/utils.ets b/ui2abc/ets-tests/ets/utils.ets similarity index 100% rename from ets-tests/ets/utils.ets rename to ui2abc/ets-tests/ets/utils.ets diff --git a/ets-tests/golden-test-ui2abcconfig.json b/ui2abc/ets-tests/golden-test-ui2abcconfig.json similarity index 36% rename from ets-tests/golden-test-ui2abcconfig.json rename to ui2abc/ets-tests/golden-test-ui2abcconfig.json index 7c36dfeb3d..79725c99f5 100644 --- a/ets-tests/golden-test-ui2abcconfig.json +++ b/ui2abc/ets-tests/golden-test-ui2abcconfig.json @@ -4,29 +4,29 @@ "outDir": "build/ets/abc", "baseUrl": ".", "paths": { - "arkui": ["../arkoala-arkts/arkui/sdk/prepared"], - "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], - "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], - "@ohos.font": ["../arkoala-arkts/modules/ohos/src/font"], - "@ohos.multimedia.image": ["../arkoala-arkts/modules/ohos/src/multimedia.image"], - "@ohos.data.uniformTypeDescriptor": ["../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], - "@ohos.data.unifiedDataChannel": ["../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], - "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], - "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], - "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"], - "@ohos.arkui.node": ["../arkoala-arkts/arkui/@ohos.arkui.node"], - "@ohos.arkui.dragController": ["../arkoala-arkts/arkui/@ohos.arkui.dragController"], - "@ohos.arkui.UIContext": ["../arkoala-arkts/arkui/@ohos.arkui.UIContext"], - "@ohos.arkui": ["../arkoala-arkts/arkui/@ohos.arkui"], - "@ohos.router": ["../arkoala-arkts/arkui/@ohos.router"], - "@koalaui/builderLambda": ["../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], - "@koalaui/interop": ["../interop/src/arkts"], - "@koalaui/harness": ["../incremental/harness/src/arkts"], - "@koalaui/compat": [ "../incremental/compat/src/arkts" ], - "#platform": [ "../incremental/compat/src/arkts" ], - "@koalaui/common": [ "../incremental/common/src" ], - "@koalaui/runtime": [ "../incremental/runtime/ets" ], - "@koalaui/runtime/annotations": [ "../incremental/runtime/annotations" ], + "arkui": ["../../arkoala-arkts/arkui/sdk/prepared"], + "@ohos.arkui.component": ["../../arkoala-arkts/arkui/@ohos.arkui.component"], + "global.resource": ["../../arkoala-arkts/modules/global.resource/src/resource"], + "@ohos.font": ["../../arkoala-arkts/modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../arkoala-arkts/modules/ohos/src/multimedia.image"], + "@ohos.data.uniformTypeDescriptor": ["../../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], + "@ohos.data.unifiedDataChannel": ["../../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], + "@ohos.arkui.stateManagement": ["../../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], + "@ohos.arkui.inspector": ["../../arkoala-arkts/arkui/@ohos.arkui.inspector"], + "@ohos.arkui.theme": ["../../arkoala-arkts/arkui/@ohos.arkui.theme"], + "@ohos.arkui.node": ["../../arkoala-arkts/arkui/@ohos.arkui.node"], + "@ohos.arkui.dragController": ["../../arkoala-arkts/arkui/@ohos.arkui.dragController"], + "@ohos.arkui.UIContext": ["../../arkoala-arkts/arkui/@ohos.arkui.UIContext"], + "@ohos.arkui": ["../../arkoala-arkts/arkui/@ohos.arkui"], + "@ohos.router": ["../../arkoala-arkts/arkui/@ohos.router"], + "@koalaui/builderLambda": ["../../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], + "@koalaui/interop": ["../../interop/src/arkts"], + "@koalaui/harness": ["../../incremental/harness/src/arkts"], + "@koalaui/compat": [ "../../incremental/compat/src/arkts" ], + "#platform": [ "../../incremental/compat/src/arkts" ], + "@koalaui/common": [ "../../incremental/common/src" ], + "@koalaui/runtime": [ "../../incremental/runtime/ets" ], + "@koalaui/runtime/annotations": [ "../../incremental/runtime/annotations" ], "@test/pages": [ "./ets/golden-tests/Pages.ets" ] }, "plugins": [ diff --git a/ets-tests/hap/.gitignore b/ui2abc/ets-tests/hap/.gitignore similarity index 100% rename from ets-tests/hap/.gitignore rename to ui2abc/ets-tests/hap/.gitignore diff --git a/ets-tests/hap/application/AppScope/app.json5 b/ui2abc/ets-tests/hap/application/AppScope/app.json5 similarity index 100% rename from ets-tests/hap/application/AppScope/app.json5 rename to ui2abc/ets-tests/hap/application/AppScope/app.json5 diff --git a/ets-tests/hap/application/AppScope/resources/base/element/string.json b/ui2abc/ets-tests/hap/application/AppScope/resources/base/element/string.json similarity index 100% rename from ets-tests/hap/application/AppScope/resources/base/element/string.json rename to ui2abc/ets-tests/hap/application/AppScope/resources/base/element/string.json diff --git a/ets-tests/hap/application/AppScope/resources/base/media/app_icon.png b/ui2abc/ets-tests/hap/application/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ets-tests/hap/application/AppScope/resources/base/media/app_icon.png rename to ui2abc/ets-tests/hap/application/AppScope/resources/base/media/app_icon.png diff --git a/ets-tests/hap/application/build-profile.json5 b/ui2abc/ets-tests/hap/application/build-profile.json5 similarity index 100% rename from ets-tests/hap/application/build-profile.json5 rename to ui2abc/ets-tests/hap/application/build-profile.json5 diff --git a/ets-tests/hap/application/code-linter.json5 b/ui2abc/ets-tests/hap/application/code-linter.json5 similarity index 100% rename from ets-tests/hap/application/code-linter.json5 rename to ui2abc/ets-tests/hap/application/code-linter.json5 diff --git a/ets-tests/hap/application/entry/.gitignore b/ui2abc/ets-tests/hap/application/entry/.gitignore similarity index 100% rename from ets-tests/hap/application/entry/.gitignore rename to ui2abc/ets-tests/hap/application/entry/.gitignore diff --git a/ets-tests/hap/application/entry/build-profile.json5 b/ui2abc/ets-tests/hap/application/entry/build-profile.json5 similarity index 100% rename from ets-tests/hap/application/entry/build-profile.json5 rename to ui2abc/ets-tests/hap/application/entry/build-profile.json5 diff --git a/ets-tests/hap/application/entry/hvigorfile.ts b/ui2abc/ets-tests/hap/application/entry/hvigorfile.ts similarity index 100% rename from ets-tests/hap/application/entry/hvigorfile.ts rename to ui2abc/ets-tests/hap/application/entry/hvigorfile.ts diff --git a/ets-tests/hap/application/entry/obfuscation-rules.txt b/ui2abc/ets-tests/hap/application/entry/obfuscation-rules.txt similarity index 100% rename from ets-tests/hap/application/entry/obfuscation-rules.txt rename to ui2abc/ets-tests/hap/application/entry/obfuscation-rules.txt diff --git a/ets-tests/hap/application/entry/oh-package.json5 b/ui2abc/ets-tests/hap/application/entry/oh-package.json5 similarity index 100% rename from ets-tests/hap/application/entry/oh-package.json5 rename to ui2abc/ets-tests/hap/application/entry/oh-package.json5 diff --git a/ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets b/ui2abc/ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets similarity index 100% rename from ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets rename to ui2abc/ets-tests/hap/application/entry/src/main/ets/entryability/EntryAbility.ets diff --git a/ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/ui2abc/ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets similarity index 100% rename from ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets rename to ui2abc/ets-tests/hap/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets diff --git a/ets-tests/hap/application/entry/src/main/ets/pages/Index.ets b/ui2abc/ets-tests/hap/application/entry/src/main/ets/pages/Index.ets similarity index 100% rename from ets-tests/hap/application/entry/src/main/ets/pages/Index.ets rename to ui2abc/ets-tests/hap/application/entry/src/main/ets/pages/Index.ets diff --git a/ets-tests/hap/application/entry/src/main/module.json5 b/ui2abc/ets-tests/hap/application/entry/src/main/module.json5 similarity index 100% rename from ets-tests/hap/application/entry/src/main/module.json5 rename to ui2abc/ets-tests/hap/application/entry/src/main/module.json5 diff --git a/ets-tests/hap/application/entry/src/main/resources/base/element/color.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/color.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/element/color.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/color.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/element/string.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/string.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/element/string.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/element/string.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/background.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/background.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/background.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/background.png diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/foreground.png diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/layered_image.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/media/startIcon.png diff --git a/ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/backup_config.json diff --git a/ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/base/profile/main_pages.json diff --git a/ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/en_US/element/string.json diff --git a/ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png b/ui2abc/ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/rawfile/koala.png diff --git a/ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json b/ui2abc/ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json similarity index 100% rename from ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json rename to ui2abc/ets-tests/hap/application/entry/src/main/resources/zh_CN/element/string.json diff --git a/ets-tests/hap/application/entry/src/mock/mock-config.json5 b/ui2abc/ets-tests/hap/application/entry/src/mock/mock-config.json5 similarity index 100% rename from ets-tests/hap/application/entry/src/mock/mock-config.json5 rename to ui2abc/ets-tests/hap/application/entry/src/mock/mock-config.json5 diff --git a/ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets b/ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/Ability.test.ets diff --git a/ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets b/ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/ohosTest/ets/test/List.test.ets diff --git a/ets-tests/hap/application/entry/src/ohosTest/module.json5 b/ui2abc/ets-tests/hap/application/entry/src/ohosTest/module.json5 similarity index 100% rename from ets-tests/hap/application/entry/src/ohosTest/module.json5 rename to ui2abc/ets-tests/hap/application/entry/src/ohosTest/module.json5 diff --git a/ets-tests/hap/application/entry/src/test/List.test.ets b/ui2abc/ets-tests/hap/application/entry/src/test/List.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/test/List.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/test/List.test.ets diff --git a/ets-tests/hap/application/entry/src/test/LocalUnit.test.ets b/ui2abc/ets-tests/hap/application/entry/src/test/LocalUnit.test.ets similarity index 100% rename from ets-tests/hap/application/entry/src/test/LocalUnit.test.ets rename to ui2abc/ets-tests/hap/application/entry/src/test/LocalUnit.test.ets diff --git a/ets-tests/hap/application/hvigor/hvigor-config.json5 b/ui2abc/ets-tests/hap/application/hvigor/hvigor-config.json5 similarity index 100% rename from ets-tests/hap/application/hvigor/hvigor-config.json5 rename to ui2abc/ets-tests/hap/application/hvigor/hvigor-config.json5 diff --git a/ets-tests/hap/application/hvigorfile.ts b/ui2abc/ets-tests/hap/application/hvigorfile.ts similarity index 100% rename from ets-tests/hap/application/hvigorfile.ts rename to ui2abc/ets-tests/hap/application/hvigorfile.ts diff --git a/ets-tests/hap/application/local.properties b/ui2abc/ets-tests/hap/application/local.properties similarity index 100% rename from ets-tests/hap/application/local.properties rename to ui2abc/ets-tests/hap/application/local.properties diff --git a/ets-tests/hap/application/oh-package-lock.json5 b/ui2abc/ets-tests/hap/application/oh-package-lock.json5 similarity index 100% rename from ets-tests/hap/application/oh-package-lock.json5 rename to ui2abc/ets-tests/hap/application/oh-package-lock.json5 diff --git a/ets-tests/hap/application/oh-package.json5 b/ui2abc/ets-tests/hap/application/oh-package.json5 similarity index 100% rename from ets-tests/hap/application/oh-package.json5 rename to ui2abc/ets-tests/hap/application/oh-package.json5 diff --git a/ets-tests/hap/package.json b/ui2abc/ets-tests/hap/package.json similarity index 64% rename from ets-tests/hap/package.json rename to ui2abc/ets-tests/hap/package.json index d6befb48e3..1546ef4b80 100644 --- a/ets-tests/hap/package.json +++ b/ui2abc/ets-tests/hap/package.json @@ -10,23 +10,23 @@ "scripts": { "clean": "rimraf application/entry/build application/generated application/oh_modules application/.hvigor", "clean:user": "npm run clean --prefix ./user", - "clean:arkoala": "npm run clean --prefix ../../arkoala-arkts/har", + "clean:arkoala": "npm run clean --prefix ../../../arkoala-arkts/har", "clean:all": "npm run clean && npm run clean:arkoala && npm run clean:user", - "prerequisites:node": "npm run prerequisites:node --prefix ../../arkoala-arkts", - "prerequisites:all": "npm run prerequisites:all --prefix ../../arkoala-arkts", + "prerequisites:node": "npm run prerequisites:node --prefix ../../../arkoala-arkts", + "prerequisites:all": "npm run prerequisites:all --prefix ../../../arkoala-arkts", - "arkoala:har:arm32": "npm run arkoala:har-arm32 --prefix ../../arkoala-arkts", - "arkoala:har:arm64": "npm run arkoala:har-arm64 --prefix ../../arkoala-arkts", - "arkoala:har:universal": "npm run arkoala:har-universal --prefix ../../arkoala-arkts", + "arkoala:har:arm32": "npm run arkoala:har-arm32 --prefix ../../../arkoala-arkts", + "arkoala:har:arm64": "npm run arkoala:har-arm64 --prefix ../../../arkoala-arkts", + "arkoala:har:universal": "npm run arkoala:har-universal --prefix ../../../arkoala-arkts", - "arkoala:har:arm64:aot": "npm run arkoala:har-arm64:aot --prefix ../../arkoala-arkts", - "arkoala:har:universal:aot": "npm run arkoala:har-universal:aot --prefix ../../arkoala-arkts", + "arkoala:har:arm64:aot": "npm run arkoala:har-arm64:aot --prefix ../../../arkoala-arkts", + "arkoala:har:universal:aot": "npm run arkoala:har-universal:aot --prefix ../../../arkoala-arkts", "user:har:arm64:aot": "npm run user:aot:arm64 && npm run har-arm64 --prefix ./user", - "user:aot:arm64": "npm run build:abc && npm run arkoala:aot:arm64 --prefix ../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../arkoala-arkts/build/arkoala.abc --aot-target arm64", + "user:aot:arm64": "npm run build:abc && npm run arkoala:aot:arm64 --prefix ../../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../../arkoala-arkts/build/arkoala.abc --aot-target arm64", "user:har:universal:aot": "npm run user:aot:universal && npm run har-universal --prefix ./user", - "user:aot:universal": "npm run build:abc && npm run arkoala:aot:host --prefix ../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../arkoala-arkts/build/arkoala.abc", + "user:aot:universal": "npm run build:abc && npm run arkoala:aot:host --prefix ../../../arkoala-arkts && fast-arktsc --only-aot ./build/user.abc --aot-libs ../../../arkoala-arkts/build/arkoala.abc", "install": "cd application && DEVECO_TOOLS_HOME=../$npm_package_config_clt_path node ../$npm_package_config_ohos_app_cli_path oh-build --install-ohpm-deps-only", @@ -42,23 +42,23 @@ "relaunch": "npm run clean && npm run launch", "log": "cd application && DEVECO_TOOLS_HOME=../$npm_package_config_clt_path node ../$npm_package_config_ohos_app_cli_path oh-log", - "build:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../arkoala-arkts && npm run build --prefix ../../arkoala-arkts && npm run build:loader:node --prefix ../../arkoala-arkts/loader && npm run build:abc", - - "build:user:abc": "cd user && npm run build && mkdir -p ../../arkoala-arkts/build ../../arkoala-arkts/trivial/build && cp build/user.abc ../build/user.abc && cp build/user.abc ../../arkoala-arkts/trivial/build/user.abc", + "build:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../../arkoala-arkts && npm run build --prefix ../../../arkoala-arkts && npm run build:loader:node --prefix ../../../arkoala-arkts/loader && npm run build:abc", + + "build:user:abc": "cd user && npm run build && mkdir -p ../../../arkoala-arkts/build ../../../arkoala-arkts/trivial/build && cp build/user.abc ../build/user.abc && cp build/user.abc ../../../arkoala-arkts/trivial/build/user.abc", "run:node:ets": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda-ets:ComExampleTrivialApplication 10", "run:node:ani": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda-ani:ComExampleTrivialApplication 10", "run:node": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda:ComExampleTrivialApplication", "run:node:routing": "npm run build:node && ACE_LIBRARY_PATH=../build PANDA_HOME=$npm_package_config_panda_sdk_path node ../build/index.js panda:ComExampleRoutingApplication", - "all:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../arkoala-arkts/ && npm run build --prefix ../../arkoala-arkts && npm run build:abc && npm run build:loader:node --prefix ../../arkoala-arkts/loader && npm run run:node", - "all:node:ci": "npm run clean:all && npm run prerequisites:node --prefix ../../arkoala-arkts && npm run compile:native:node-host --prefix ../../arkoala-arkts && npm run build --prefix ../../arkoala-arkts && npm run build:user:abc && npm run build:loader:node --prefix ../../arkoala-arkts && npm run run:node:ci --prefix ../../arkoala-arkts", - "all:node:routing": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../arkoala-arkts/ && npm run build --prefix ../../arkoala-arkts/ && npm run build:abc && npm run build:loader:node --prefix ../../arkoala-arkts/loader && npm run run:node:routing", - "all:arm32": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm32 --prefix ../../arkoala-arkts && npm run har-arm32 --prefix user && npm run launch", - "all:arm64": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64 --prefix ../../arkoala-arkts && npm run har-arm64 --prefix user && npm run launch", - "all:universal": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal --prefix ../../arkoala-arkts && npm run har-universal --prefix user && npm run launch", + "all:node": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../../arkoala-arkts/ && npm run build --prefix ../../../arkoala-arkts && npm run build:abc && npm run build:loader:node --prefix ../../../arkoala-arkts/loader && npm run run:node", + "all:node:ci": "npm run clean:all && npm run prerequisites:node --prefix ../../../arkoala-arkts && npm run compile:native:node-host --prefix ../../../arkoala-arkts && npm run build --prefix ../../../arkoala-arkts && npm run build:user:abc && npm run build:loader:node --prefix ../../../arkoala-arkts && npm run run:node:ci --prefix ../../../arkoala-arkts", + "all:node:routing": "npm run prerequisites:node && npm run compile:native:node-host --prefix ../../../arkoala-arkts/ && npm run build --prefix ../../../arkoala-arkts/ && npm run build:abc && npm run build:loader:node --prefix ../../../arkoala-arkts/loader && npm run run:node:routing", + "all:arm32": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm32 --prefix ../../../arkoala-arkts && npm run har-arm32 --prefix user && npm run launch", + "all:arm64": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64 --prefix ../../../arkoala-arkts && npm run har-arm64 --prefix user && npm run launch", + "all:universal": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal --prefix ../../../arkoala-arkts && npm run har-universal --prefix user && npm run launch", - "all:arm64:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64:aot --prefix ../../arkoala-arkts && npm run user:har:arm64:aot && npm run launch", - "all:universal:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal:aot --prefix ../../arkoala-arkts && npm run user:har:universal:aot && npm run launch" + "all:arm64:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-arm64:aot --prefix ../../../arkoala-arkts && npm run user:har:arm64:aot && npm run launch", + "all:universal:aot": "npm run clean:all && npm run prerequisites:all && npm run arkoala:har-universal:aot --prefix ../../../arkoala-arkts && npm run user:har:universal:aot && npm run launch" } } diff --git a/ets-tests/hap/user/app/AppScope/app.json5 b/ui2abc/ets-tests/hap/user/app/AppScope/app.json5 similarity index 100% rename from ets-tests/hap/user/app/AppScope/app.json5 rename to ui2abc/ets-tests/hap/user/app/AppScope/app.json5 diff --git a/ets-tests/hap/user/app/build-profile.json5 b/ui2abc/ets-tests/hap/user/app/build-profile.json5 similarity index 100% rename from ets-tests/hap/user/app/build-profile.json5 rename to ui2abc/ets-tests/hap/user/app/build-profile.json5 diff --git a/ets-tests/hap/user/app/hvigor/hvigor-config.json5 b/ui2abc/ets-tests/hap/user/app/hvigor/hvigor-config.json5 similarity index 100% rename from ets-tests/hap/user/app/hvigor/hvigor-config.json5 rename to ui2abc/ets-tests/hap/user/app/hvigor/hvigor-config.json5 diff --git a/ets-tests/hap/user/app/hvigorfile.ts b/ui2abc/ets-tests/hap/user/app/hvigorfile.ts similarity index 100% rename from ets-tests/hap/user/app/hvigorfile.ts rename to ui2abc/ets-tests/hap/user/app/hvigorfile.ts diff --git a/ets-tests/hap/user/app/oh-package-lock.json5 b/ui2abc/ets-tests/hap/user/app/oh-package-lock.json5 similarity index 100% rename from ets-tests/hap/user/app/oh-package-lock.json5 rename to ui2abc/ets-tests/hap/user/app/oh-package-lock.json5 diff --git a/ets-tests/hap/user/app/oh-package.json5 b/ui2abc/ets-tests/hap/user/app/oh-package.json5 similarity index 100% rename from ets-tests/hap/user/app/oh-package.json5 rename to ui2abc/ets-tests/hap/user/app/oh-package.json5 diff --git a/ets-tests/hap/user/app/user/BuildProfile.ets b/ui2abc/ets-tests/hap/user/app/user/BuildProfile.ets similarity index 100% rename from ets-tests/hap/user/app/user/BuildProfile.ets rename to ui2abc/ets-tests/hap/user/app/user/BuildProfile.ets diff --git a/ets-tests/hap/user/app/user/build-profile.json5 b/ui2abc/ets-tests/hap/user/app/user/build-profile.json5 similarity index 100% rename from ets-tests/hap/user/app/user/build-profile.json5 rename to ui2abc/ets-tests/hap/user/app/user/build-profile.json5 diff --git a/ets-tests/hap/user/app/user/hvigorfile.ts b/ui2abc/ets-tests/hap/user/app/user/hvigorfile.ts similarity index 100% rename from ets-tests/hap/user/app/user/hvigorfile.ts rename to ui2abc/ets-tests/hap/user/app/user/hvigorfile.ts diff --git a/ets-tests/hap/user/app/user/obfuscation-rules.txt b/ui2abc/ets-tests/hap/user/app/user/obfuscation-rules.txt similarity index 100% rename from ets-tests/hap/user/app/user/obfuscation-rules.txt rename to ui2abc/ets-tests/hap/user/app/user/obfuscation-rules.txt diff --git a/ets-tests/hap/user/app/user/oh-package.json5 b/ui2abc/ets-tests/hap/user/app/user/oh-package.json5 similarity index 100% rename from ets-tests/hap/user/app/user/oh-package.json5 rename to ui2abc/ets-tests/hap/user/app/user/oh-package.json5 diff --git a/ets-tests/hap/user/app/user/src/main/module.json5 b/ui2abc/ets-tests/hap/user/app/user/src/main/module.json5 similarity index 100% rename from ets-tests/hap/user/app/user/src/main/module.json5 rename to ui2abc/ets-tests/hap/user/app/user/src/main/module.json5 diff --git a/ets-tests/hap/user/package.json b/ui2abc/ets-tests/hap/user/package.json similarity index 100% rename from ets-tests/hap/user/package.json rename to ui2abc/ets-tests/hap/user/package.json diff --git a/ets-tests/hap/user/scripts/build-har-universal.mjs b/ui2abc/ets-tests/hap/user/scripts/build-har-universal.mjs similarity index 100% rename from ets-tests/hap/user/scripts/build-har-universal.mjs rename to ui2abc/ets-tests/hap/user/scripts/build-har-universal.mjs diff --git a/ets-tests/hap/user/scripts/build-har.mjs b/ui2abc/ets-tests/hap/user/scripts/build-har.mjs similarity index 100% rename from ets-tests/hap/user/scripts/build-har.mjs rename to ui2abc/ets-tests/hap/user/scripts/build-har.mjs diff --git a/ets-tests/hap/user/src/ets/entry.ets b/ui2abc/ets-tests/hap/user/src/ets/entry.ets similarity index 100% rename from ets-tests/hap/user/src/ets/entry.ets rename to ui2abc/ets-tests/hap/user/src/ets/entry.ets diff --git a/ets-tests/hap/user/src/ets/etsconfig.json b/ui2abc/ets-tests/hap/user/src/ets/etsconfig.json similarity index 100% rename from ets-tests/hap/user/src/ets/etsconfig.json rename to ui2abc/ets-tests/hap/user/src/ets/etsconfig.json diff --git a/ets-tests/hap/user/ui2abcconfig.json b/ui2abc/ets-tests/hap/user/ui2abcconfig.json similarity index 100% rename from ets-tests/hap/user/ui2abcconfig.json rename to ui2abc/ets-tests/hap/user/ui2abcconfig.json diff --git a/ets-tests/package.json b/ui2abc/ets-tests/package.json similarity index 53% rename from ets-tests/package.json rename to ui2abc/ets-tests/package.json index e90f9edb98..10d15ab9d1 100644 --- a/ets-tests/package.json +++ b/ui2abc/ets-tests/package.json @@ -14,22 +14,22 @@ ], "scripts": { "clean": "rimraf build", - "clean:all": "npm run clean && npm run clean:all --prefix ../arkoala-arkts", - "copy:deps": "mkdir -p ../arkoala-arkts/build/bootPandaFiles && cp ../incremental/harness/build/harness.abc ../arkoala-arkts/build/bootPandaFiles/", - "build:deps": "npm run compile:native:node-host -C ../arkoala-arkts && npm run build -C ../arkoala-arkts && npm run build -C ../incremental/harness && npm run build -C ../arkoala-arkts/arkui && npm run build:loader:node -C ../arkoala-arkts && npm run copy:deps", + "clean:all": "npm run clean && npm run clean:all --prefix ../../arkoala-arkts", + "copy:deps": "mkdir -p ../../arkoala-arkts/build/bootPandaFiles && cp ../../incremental/harness/build/harness.abc ../../arkoala-arkts/build/bootPandaFiles/", + "build:deps": "npm run compile:native:node-host -C ../../arkoala-arkts && npm run build -C ../../arkoala-arkts && npm run build -C ../../incremental/harness && npm run build -C ../../arkoala-arkts/arkui && npm run build:loader:node -C ../../arkoala-arkts && npm run copy:deps", "run:ets": "npm run build:ets && mkdir -p ../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../arkoala-arkts/build/userPandaFiles/ && cd ../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", - "run:golden": "npm run build:golden && mkdir -p ../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../arkoala-arkts/build/userPandaFiles/ && cd ../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", + "run:golden": "npm run build:golden && mkdir -p ../../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../../arkoala-arkts/build/userPandaFiles/ && cd ../../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", "run": "npm run run:ets", "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 ../ui2abc/ui-plugins && npm run run", - "build:ets": "npm run prepare:arkui && node ../ui2abc/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 ../ui2abc/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", + "check": "npm run compile --prefix ../ui-plugins && 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", "hap:golden": "npm run all:universal -C ./hap", "hap": "cp ./ets/{TestHarness.ets,utils.ets} ./hap/user/src/ets/ && cp -a ./ets/golden-tests ./hap/user/src/ets/ && npm run hap:golden", - "prepare:arkui": "npm run prepare:sdk --prefix ../arkoala-arkts/arkui" + "prepare:arkui": "npm run prepare:sdk --prefix ../../arkoala-arkts/arkui" }, "keywords": [], "dependencies": { @@ -48,4 +48,4 @@ "minimist": "1.2.8", "source-map-support": "^0.5.21" } -} \ No newline at end of file +} diff --git a/ets-tests/src/AppControl.ts b/ui2abc/ets-tests/src/AppControl.ts similarity index 100% rename from ets-tests/src/AppControl.ts rename to ui2abc/ets-tests/src/AppControl.ts diff --git a/ets-tests/src/Page.ts b/ui2abc/ets-tests/src/Page.ts similarity index 100% rename from ets-tests/src/Page.ts rename to ui2abc/ets-tests/src/Page.ts diff --git a/ets-tests/src/entry.ts b/ui2abc/ets-tests/src/entry.ts similarity index 100% rename from ets-tests/src/entry.ts rename to ui2abc/ets-tests/src/entry.ts diff --git a/ets-tests/src/index.ts b/ui2abc/ets-tests/src/index.ts similarity index 100% rename from ets-tests/src/index.ts rename to ui2abc/ets-tests/src/index.ts diff --git a/ets-tests/src/suites/AttributeModifier.ts b/ui2abc/ets-tests/src/suites/AttributeModifier.ts similarity index 100% rename from ets-tests/src/suites/AttributeModifier.ts rename to ui2abc/ets-tests/src/suites/AttributeModifier.ts diff --git a/ets-tests/src/suites/BuilderDecoratorTest.ts b/ui2abc/ets-tests/src/suites/BuilderDecoratorTest.ts similarity index 100% rename from ets-tests/src/suites/BuilderDecoratorTest.ts rename to ui2abc/ets-tests/src/suites/BuilderDecoratorTest.ts diff --git a/ets-tests/src/suites/BuilderParamDecoratorTest.ts b/ui2abc/ets-tests/src/suites/BuilderParamDecoratorTest.ts similarity index 100% rename from ets-tests/src/suites/BuilderParamDecoratorTest.ts rename to ui2abc/ets-tests/src/suites/BuilderParamDecoratorTest.ts diff --git a/ets-tests/src/suites/ComponentLifeCycle.ts b/ui2abc/ets-tests/src/suites/ComponentLifeCycle.ts similarity index 100% rename from ets-tests/src/suites/ComponentLifeCycle.ts rename to ui2abc/ets-tests/src/suites/ComponentLifeCycle.ts diff --git a/ets-tests/src/suites/LinkDecorator.ts b/ui2abc/ets-tests/src/suites/LinkDecorator.ts similarity index 100% rename from ets-tests/src/suites/LinkDecorator.ts rename to ui2abc/ets-tests/src/suites/LinkDecorator.ts diff --git a/ets-tests/src/suites/PropDecorator.ts b/ui2abc/ets-tests/src/suites/PropDecorator.ts similarity index 100% rename from ets-tests/src/suites/PropDecorator.ts rename to ui2abc/ets-tests/src/suites/PropDecorator.ts diff --git a/ets-tests/src/suites/ProvideConsume.ts b/ui2abc/ets-tests/src/suites/ProvideConsume.ts similarity index 100% rename from ets-tests/src/suites/ProvideConsume.ts rename to ui2abc/ets-tests/src/suites/ProvideConsume.ts diff --git a/ets-tests/src/suites/StateManagement.ts b/ui2abc/ets-tests/src/suites/StateManagement.ts similarity index 100% rename from ets-tests/src/suites/StateManagement.ts rename to ui2abc/ets-tests/src/suites/StateManagement.ts diff --git a/ets-tests/src/suites/StorageTests.ts b/ui2abc/ets-tests/src/suites/StorageTests.ts similarity index 100% rename from ets-tests/src/suites/StorageTests.ts rename to ui2abc/ets-tests/src/suites/StorageTests.ts diff --git a/ets-tests/src/suites/Styles.ts b/ui2abc/ets-tests/src/suites/Styles.ts similarity index 100% rename from ets-tests/src/suites/Styles.ts rename to ui2abc/ets-tests/src/suites/Styles.ts diff --git a/ets-tests/src/suites/WatchDecoratorTest.ts b/ui2abc/ets-tests/src/suites/WatchDecoratorTest.ts similarity index 100% rename from ets-tests/src/suites/WatchDecoratorTest.ts rename to ui2abc/ets-tests/src/suites/WatchDecoratorTest.ts diff --git a/ets-tests/tsconfig.json b/ui2abc/ets-tests/tsconfig.json similarity index 100% rename from ets-tests/tsconfig.json rename to ui2abc/ets-tests/tsconfig.json diff --git a/ets-tests/ui2abcconfig.json b/ui2abc/ets-tests/ui2abcconfig.json similarity index 48% rename from ets-tests/ui2abcconfig.json rename to ui2abc/ets-tests/ui2abcconfig.json index 8a0f2c6a30..cbace643e1 100644 --- a/ets-tests/ui2abcconfig.json +++ b/ui2abc/ets-tests/ui2abcconfig.json @@ -4,29 +4,29 @@ "outDir": "build/ets/abc", "baseUrl": ".", "paths": { - "arkui": ["../arkoala-arkts/arkui/sdk/prepared"], - "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], - "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], - "@ohos.font": ["../arkoala-arkts/modules/ohos/src/font"], - "@ohos.multimedia.image": ["../arkoala-arkts/modules/ohos/src/multimedia.image"], - "@ohos.data.uniformTypeDescriptor": ["../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], - "@ohos.data.unifiedDataChannel": ["../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], - "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], - "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], - "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"], - "@ohos.arkui.node": ["../arkoala-arkts/arkui/@ohos.arkui.node"], - "@ohos.arkui.dragController": ["../arkoala-arkts/arkui/@ohos.arkui.dragController"], - "@ohos.arkui.UIContext": ["../arkoala-arkts/arkui/@ohos.arkui.UIContext"], - "@ohos.arkui": ["../arkoala-arkts/arkui/@ohos.arkui"], - "@ohos.router": ["../arkoala-arkts/arkui/@ohos.router"], - "@koalaui/builderLambda": ["../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], - "@koalaui/interop": ["../interop/src/arkts"], - "@koalaui/harness": ["../incremental/harness/src/arkts"], - "@koalaui/compat": [ "../incremental/compat/src/arkts" ], - "#platform": [ "../incremental/compat/src/arkts" ], - "@koalaui/common": [ "../incremental/common/src" ], - "@koalaui/runtime": [ "../incremental/runtime/ets" ], - "@koalaui/runtime/annotations": [ "../incremental/runtime/annotations" ], + "arkui": ["../../arkoala-arkts/arkui/sdk/prepared"], + "@ohos.arkui.component": ["../../arkoala-arkts/arkui/@ohos.arkui.component"], + "global.resource": ["../../arkoala-arkts/modules/global.resource/src/resource"], + "@ohos.font": ["../../arkoala-arkts/modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../arkoala-arkts/modules/ohos/src/multimedia.image"], + "@ohos.data.uniformTypeDescriptor": ["../../arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor"], + "@ohos.data.unifiedDataChannel": ["../../arkoala-arkts/modules/ohos/src/data.unifiedDataChannel"], + "@ohos.arkui.stateManagement": ["../../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], + "@ohos.arkui.inspector": ["../../arkoala-arkts/arkui/@ohos.arkui.inspector"], + "@ohos.arkui.theme": ["../../arkoala-arkts/arkui/@ohos.arkui.theme"], + "@ohos.arkui.node": ["../../arkoala-arkts/arkui/@ohos.arkui.node"], + "@ohos.arkui.dragController": ["../../arkoala-arkts/arkui/@ohos.arkui.dragController"], + "@ohos.arkui.UIContext": ["../../arkoala-arkts/arkui/@ohos.arkui.UIContext"], + "@ohos.arkui": ["../../arkoala-arkts/arkui/@ohos.arkui"], + "@ohos.router": ["../../arkoala-arkts/arkui/@ohos.router"], + "@koalaui/builderLambda": ["../../arkoala-arkts/arkui/sdk/prepared/stateAnnotations"], + "@koalaui/interop": ["../../interop/src/arkts"], + "@koalaui/harness": ["../../incremental/harness/src/arkts"], + "@koalaui/compat": [ "../../incremental/compat/src/arkts" ], + "#platform": [ "../../incremental/compat/src/arkts" ], + "@koalaui/common": [ "../../incremental/common/src" ], + "@koalaui/runtime": [ "../../incremental/runtime/ets" ], + "@koalaui/runtime/annotations": [ "../../incremental/runtime/annotations" ], "@test/pages": [ "./ets/environment-tests/Pages.ets" ] }, "plugins": [ diff --git a/ui2abc/libarkts/native/src/generated/bridges.cc b/ui2abc/libarkts/native/src/generated/bridges.cc index ca80361325..d4ef04f92e 100644 --- a/ui2abc/libarkts/native/src/generated/bridges.cc +++ b/ui2abc/libarkts/native/src/generated/bridges.cc @@ -17,7 +17,7 @@ /* * THIS FILE IS AUTOGENERATED BY arktscgen v2.1.10-arktscgen-3a. DO NOT EDIT MANUALLY! - * es2panda b1eea1e8c27124f2f9195f99735c91bcbfb5523a(2025-08-26) sdk v1.5.0-dev.43047 + * es2panda b90198c15c97a5627fa1a69ab5f061ef4e54921e(2025-08-25) sdk v1.5.0-dev.42899 */ KNativePointer impl_GetAllErrorMessages(KNativePointer context) @@ -9945,56 +9945,73 @@ KNativePointer impl_UpdateCharLiteral(KNativePointer context, KNativePointer ori } KOALA_INTEROP_2(UpdateCharLiteral, KNativePointer, KNativePointer, KNativePointer); -KNativePointer impl_CreateETSIntrinsicNode(KNativePointer context, KNativePointer other) +KNativePointer impl_CreateETSIntrinsicNode(KNativePointer context) +{ + const auto _context = reinterpret_cast(context); + auto result = GetImpl()->CreateETSIntrinsicNode(_context); + return result; +} +KOALA_INTEROP_1(CreateETSIntrinsicNode, KNativePointer, KNativePointer); + +KNativePointer impl_UpdateETSIntrinsicNode(KNativePointer context, KNativePointer original) +{ + const auto _context = reinterpret_cast(context); + const auto _original = reinterpret_cast(original); + auto result = GetImpl()->UpdateETSIntrinsicNode(_context, _original); + return result; +} +KOALA_INTEROP_2(UpdateETSIntrinsicNode, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_CreateETSIntrinsicNode1(KNativePointer context, KNativePointer other) { const auto _context = reinterpret_cast(context); const auto _other = reinterpret_cast(other); - auto result = GetImpl()->CreateETSIntrinsicNode(_context, _other); + auto result = GetImpl()->CreateETSIntrinsicNode1(_context, _other); return result; } -KOALA_INTEROP_2(CreateETSIntrinsicNode, KNativePointer, KNativePointer, KNativePointer); +KOALA_INTEROP_2(CreateETSIntrinsicNode1, KNativePointer, KNativePointer, KNativePointer); -KNativePointer impl_UpdateETSIntrinsicNode(KNativePointer context, KNativePointer original, KNativePointer other) +KNativePointer impl_UpdateETSIntrinsicNode1(KNativePointer context, KNativePointer original, KNativePointer other) { const auto _context = reinterpret_cast(context); const auto _original = reinterpret_cast(original); const auto _other = reinterpret_cast(other); - auto result = GetImpl()->UpdateETSIntrinsicNode(_context, _original, _other); + auto result = GetImpl()->UpdateETSIntrinsicNode1(_context, _original, _other); return result; } -KOALA_INTEROP_3(UpdateETSIntrinsicNode, KNativePointer, KNativePointer, KNativePointer, KNativePointer); +KOALA_INTEROP_3(UpdateETSIntrinsicNode1, KNativePointer, KNativePointer, KNativePointer, KNativePointer); -KNativePointer impl_CreateETSIntrinsicNode1(KNativePointer context, KStringPtr& id, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) +KNativePointer impl_CreateETSIntrinsicNode2(KNativePointer context, KInt type, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) { const auto _context = reinterpret_cast(context); - const auto _id = getStringCopy(id); + const auto _type = static_cast(type); const auto __arguments = reinterpret_cast(_arguments); const auto __argumentsSequenceLength = static_cast(_argumentsSequenceLength); - auto result = GetImpl()->CreateETSIntrinsicNode1(_context, _id, __arguments, __argumentsSequenceLength); + auto result = GetImpl()->CreateETSIntrinsicNode2(_context, _type, __arguments, __argumentsSequenceLength); return result; } -KOALA_INTEROP_4(CreateETSIntrinsicNode1, KNativePointer, KNativePointer, KStringPtr, KNativePointerArray, KUInt); +KOALA_INTEROP_4(CreateETSIntrinsicNode2, KNativePointer, KNativePointer, KInt, KNativePointerArray, KUInt); -KNativePointer impl_UpdateETSIntrinsicNode1(KNativePointer context, KNativePointer original, KStringPtr& id, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) +KNativePointer impl_UpdateETSIntrinsicNode2(KNativePointer context, KNativePointer original, KInt type, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) { const auto _context = reinterpret_cast(context); const auto _original = reinterpret_cast(original); - const auto _id = getStringCopy(id); + const auto _type = static_cast(type); const auto __arguments = reinterpret_cast(_arguments); const auto __argumentsSequenceLength = static_cast(_argumentsSequenceLength); - auto result = GetImpl()->UpdateETSIntrinsicNode1(_context, _original, _id, __arguments, __argumentsSequenceLength); + auto result = GetImpl()->UpdateETSIntrinsicNode2(_context, _original, _type, __arguments, __argumentsSequenceLength); return result; } -KOALA_INTEROP_5(UpdateETSIntrinsicNode1, KNativePointer, KNativePointer, KNativePointer, KStringPtr, KNativePointerArray, KUInt); +KOALA_INTEROP_5(UpdateETSIntrinsicNode2, KNativePointer, KNativePointer, KNativePointer, KInt, KNativePointerArray, KUInt); -KNativePointer impl_ETSIntrinsicNodeIdConst(KNativePointer context, KNativePointer receiver) +KInt impl_ETSIntrinsicNodeTypeConst(KNativePointer context, KNativePointer receiver) { const auto _context = reinterpret_cast(context); const auto _receiver = reinterpret_cast(receiver); - auto result = GetImpl()->ETSIntrinsicNodeIdConst(_context, _receiver); - return StageArena::strdup(result); + auto result = GetImpl()->ETSIntrinsicNodeTypeConst(_context, _receiver); + return result; } -KOALA_INTEROP_2(ETSIntrinsicNodeIdConst, KNativePointer, KNativePointer, KNativePointer); +KOALA_INTEROP_2(ETSIntrinsicNodeTypeConst, KInt, KNativePointer, KNativePointer); KNativePointer impl_ETSIntrinsicNodeArgumentsConst(KNativePointer context, KNativePointer receiver) { @@ -10006,16 +10023,6 @@ KNativePointer impl_ETSIntrinsicNodeArgumentsConst(KNativePointer context, KNati } KOALA_INTEROP_2(ETSIntrinsicNodeArgumentsConst, KNativePointer, KNativePointer, KNativePointer); -KNativePointer impl_ETSIntrinsicNodeArguments(KNativePointer context, KNativePointer receiver) -{ - const auto _context = reinterpret_cast(context); - const auto _receiver = reinterpret_cast(receiver); - std::size_t length; - auto result = GetImpl()->ETSIntrinsicNodeArguments(_context, _receiver, &length); - return length ? StageArena::cloneVector(result, length) : nullptr; -} -KOALA_INTEROP_2(ETSIntrinsicNodeArguments, KNativePointer, KNativePointer, KNativePointer); - KNativePointer impl_CreateETSPackageDeclaration(KNativePointer context, KNativePointer name) { const auto _context = reinterpret_cast(context); diff --git a/ui2abc/libarkts/src/generated/Es2pandaEnums.ts b/ui2abc/libarkts/src/generated/Es2pandaEnums.ts index de998fc624..421883a7e3 100644 --- a/ui2abc/libarkts/src/generated/Es2pandaEnums.ts +++ b/ui2abc/libarkts/src/generated/Es2pandaEnums.ts @@ -849,6 +849,10 @@ export enum Es2pandaPrimitiveType { PRIMITIVE_TYPE_CHAR = 7, PRIMITIVE_TYPE_VOID = 8 } +export enum Es2pandaIntrinsicNodeType { + INTRINSIC_NODE_TYPE_NONE = 0, + INTRINSIC_NODE_TYPE_TYPE_REFERENCE = 1 +} export enum Es2pandaObjectFlags { OBJECT_FLAGS_NO_OPTS = 0, OBJECT_FLAGS_CHECK_EXCESS_PROPS = 1, @@ -1012,109 +1016,111 @@ export enum Es2pandaGlobalTypeId { GLOBAL_TYPE_ID_ETS_FUNCTION_BUILTIN = 78, GLOBAL_TYPE_ID_ETS_REGEXP_BUILTIN = 79, GLOBAL_TYPE_ID_ETS_ARRAY_BUILTIN = 80, - GLOBAL_TYPE_ID_ETS_BOX_BUILTIN = 81, - GLOBAL_TYPE_ID_ETS_BOOLEAN_BOX_BUILTIN = 82, - GLOBAL_TYPE_ID_ETS_BYTE_BOX_BUILTIN = 83, - GLOBAL_TYPE_ID_ETS_CHAR_BOX_BUILTIN = 84, - GLOBAL_TYPE_ID_ETS_SHORT_BOX_BUILTIN = 85, - GLOBAL_TYPE_ID_ETS_INT_BOX_BUILTIN = 86, - GLOBAL_TYPE_ID_ETS_LONG_BOX_BUILTIN = 87, - GLOBAL_TYPE_ID_ETS_FLOAT_BOX_BUILTIN = 88, - GLOBAL_TYPE_ID_ETS_DOUBLE_BOX_BUILTIN = 89, - GLOBAL_TYPE_ID_ETS_BIG_INT_BUILTIN = 90, - GLOBAL_TYPE_ID_ETS_BIG_INT = 91, - GLOBAL_TYPE_ID_ETS_ARRAY = 92, - GLOBAL_TYPE_ID_ETS_READONLY_ARRAY = 93, - GLOBAL_TYPE_ID_ETS_FUNCTION0_CLASS = 94, - GLOBAL_TYPE_ID_ETS_FUNCTION1_CLASS = 95, - GLOBAL_TYPE_ID_ETS_FUNCTION2_CLASS = 96, - GLOBAL_TYPE_ID_ETS_FUNCTION3_CLASS = 97, - GLOBAL_TYPE_ID_ETS_FUNCTION4_CLASS = 98, - GLOBAL_TYPE_ID_ETS_FUNCTION5_CLASS = 99, - GLOBAL_TYPE_ID_ETS_FUNCTION6_CLASS = 100, - GLOBAL_TYPE_ID_ETS_FUNCTION7_CLASS = 101, - GLOBAL_TYPE_ID_ETS_FUNCTION8_CLASS = 102, - GLOBAL_TYPE_ID_ETS_FUNCTION9_CLASS = 103, - GLOBAL_TYPE_ID_ETS_FUNCTION10_CLASS = 104, - GLOBAL_TYPE_ID_ETS_FUNCTION11_CLASS = 105, - GLOBAL_TYPE_ID_ETS_FUNCTION12_CLASS = 106, - GLOBAL_TYPE_ID_ETS_FUNCTION13_CLASS = 107, - GLOBAL_TYPE_ID_ETS_FUNCTION14_CLASS = 108, - GLOBAL_TYPE_ID_ETS_FUNCTION15_CLASS = 109, - GLOBAL_TYPE_ID_ETS_FUNCTION16_CLASS = 110, - GLOBAL_TYPE_ID_ETS_FUNCTIONN_CLASS = 111, - GLOBAL_TYPE_ID_ETS_LAMBDA0_CLASS = 112, - GLOBAL_TYPE_ID_ETS_LAMBDA1_CLASS = 113, - GLOBAL_TYPE_ID_ETS_LAMBDA2_CLASS = 114, - GLOBAL_TYPE_ID_ETS_LAMBDA3_CLASS = 115, - GLOBAL_TYPE_ID_ETS_LAMBDA4_CLASS = 116, - GLOBAL_TYPE_ID_ETS_LAMBDA5_CLASS = 117, - GLOBAL_TYPE_ID_ETS_LAMBDA6_CLASS = 118, - GLOBAL_TYPE_ID_ETS_LAMBDA7_CLASS = 119, - GLOBAL_TYPE_ID_ETS_LAMBDA8_CLASS = 120, - GLOBAL_TYPE_ID_ETS_LAMBDA9_CLASS = 121, - GLOBAL_TYPE_ID_ETS_LAMBDA10_CLASS = 122, - GLOBAL_TYPE_ID_ETS_LAMBDA11_CLASS = 123, - GLOBAL_TYPE_ID_ETS_LAMBDA12_CLASS = 124, - GLOBAL_TYPE_ID_ETS_LAMBDA13_CLASS = 125, - GLOBAL_TYPE_ID_ETS_LAMBDA14_CLASS = 126, - GLOBAL_TYPE_ID_ETS_LAMBDA15_CLASS = 127, - GLOBAL_TYPE_ID_ETS_LAMBDA16_CLASS = 128, - GLOBAL_TYPE_ID_ETS_LAMBDAN_CLASS = 129, - GLOBAL_TYPE_ID_ETS_FUNCTIONR0_CLASS = 130, - GLOBAL_TYPE_ID_ETS_FUNCTIONR1_CLASS = 131, - GLOBAL_TYPE_ID_ETS_FUNCTIONR2_CLASS = 132, - GLOBAL_TYPE_ID_ETS_FUNCTIONR3_CLASS = 133, - GLOBAL_TYPE_ID_ETS_FUNCTIONR4_CLASS = 134, - GLOBAL_TYPE_ID_ETS_FUNCTIONR5_CLASS = 135, - GLOBAL_TYPE_ID_ETS_FUNCTIONR6_CLASS = 136, - GLOBAL_TYPE_ID_ETS_FUNCTIONR7_CLASS = 137, - GLOBAL_TYPE_ID_ETS_FUNCTIONR8_CLASS = 138, - GLOBAL_TYPE_ID_ETS_FUNCTIONR9_CLASS = 139, - GLOBAL_TYPE_ID_ETS_FUNCTIONR10_CLASS = 140, - GLOBAL_TYPE_ID_ETS_FUNCTIONR11_CLASS = 141, - GLOBAL_TYPE_ID_ETS_FUNCTIONR12_CLASS = 142, - GLOBAL_TYPE_ID_ETS_FUNCTIONR13_CLASS = 143, - GLOBAL_TYPE_ID_ETS_FUNCTIONR14_CLASS = 144, - GLOBAL_TYPE_ID_ETS_FUNCTIONR15_CLASS = 145, - GLOBAL_TYPE_ID_ETS_FUNCTIONR16_CLASS = 146, - GLOBAL_TYPE_ID_ETS_LAMBDAR0_CLASS = 147, - GLOBAL_TYPE_ID_ETS_LAMBDAR1_CLASS = 148, - GLOBAL_TYPE_ID_ETS_LAMBDAR2_CLASS = 149, - GLOBAL_TYPE_ID_ETS_LAMBDAR3_CLASS = 150, - GLOBAL_TYPE_ID_ETS_LAMBDAR4_CLASS = 151, - GLOBAL_TYPE_ID_ETS_LAMBDAR5_CLASS = 152, - GLOBAL_TYPE_ID_ETS_LAMBDAR6_CLASS = 153, - GLOBAL_TYPE_ID_ETS_LAMBDAR7_CLASS = 154, - GLOBAL_TYPE_ID_ETS_LAMBDAR8_CLASS = 155, - GLOBAL_TYPE_ID_ETS_LAMBDAR9_CLASS = 156, - GLOBAL_TYPE_ID_ETS_LAMBDAR10_CLASS = 157, - GLOBAL_TYPE_ID_ETS_LAMBDAR11_CLASS = 158, - GLOBAL_TYPE_ID_ETS_LAMBDAR12_CLASS = 159, - GLOBAL_TYPE_ID_ETS_LAMBDAR13_CLASS = 160, - GLOBAL_TYPE_ID_ETS_LAMBDAR14_CLASS = 161, - GLOBAL_TYPE_ID_ETS_LAMBDAR15_CLASS = 162, - GLOBAL_TYPE_ID_ETS_LAMBDAR16_CLASS = 163, - GLOBAL_TYPE_ID_ETS_TUPLE0_CLASS = 164, - GLOBAL_TYPE_ID_ETS_TUPLE1_CLASS = 165, - GLOBAL_TYPE_ID_ETS_TUPLE2_CLASS = 166, - GLOBAL_TYPE_ID_ETS_TUPLE3_CLASS = 167, - GLOBAL_TYPE_ID_ETS_TUPLE4_CLASS = 168, - GLOBAL_TYPE_ID_ETS_TUPLE5_CLASS = 169, - GLOBAL_TYPE_ID_ETS_TUPLE6_CLASS = 170, - GLOBAL_TYPE_ID_ETS_TUPLE7_CLASS = 171, - GLOBAL_TYPE_ID_ETS_TUPLE8_CLASS = 172, - GLOBAL_TYPE_ID_ETS_TUPLE9_CLASS = 173, - GLOBAL_TYPE_ID_ETS_TUPLE10_CLASS = 174, - GLOBAL_TYPE_ID_ETS_TUPLE11_CLASS = 175, - GLOBAL_TYPE_ID_ETS_TUPLE12_CLASS = 176, - GLOBAL_TYPE_ID_ETS_TUPLE13_CLASS = 177, - GLOBAL_TYPE_ID_ETS_TUPLE14_CLASS = 178, - GLOBAL_TYPE_ID_ETS_TUPLE15_CLASS = 179, - GLOBAL_TYPE_ID_ETS_TUPLE16_CLASS = 180, - GLOBAL_TYPE_ID_ETS_TUPLEN_CLASS = 181, - GLOBAL_TYPE_ID_TYPE_ERROR = 182, - GLOBAL_TYPE_ID_COUNT = 183 + GLOBAL_TYPE_ID_ETS_INTEROP_JSRUNTIME_BUILTIN = 81, + GLOBAL_TYPE_ID_ETS_INTEROP_JSVALUE_BUILTIN = 82, + GLOBAL_TYPE_ID_ETS_BOX_BUILTIN = 83, + GLOBAL_TYPE_ID_ETS_BOOLEAN_BOX_BUILTIN = 84, + GLOBAL_TYPE_ID_ETS_BYTE_BOX_BUILTIN = 85, + GLOBAL_TYPE_ID_ETS_CHAR_BOX_BUILTIN = 86, + GLOBAL_TYPE_ID_ETS_SHORT_BOX_BUILTIN = 87, + GLOBAL_TYPE_ID_ETS_INT_BOX_BUILTIN = 88, + GLOBAL_TYPE_ID_ETS_LONG_BOX_BUILTIN = 89, + GLOBAL_TYPE_ID_ETS_FLOAT_BOX_BUILTIN = 90, + GLOBAL_TYPE_ID_ETS_DOUBLE_BOX_BUILTIN = 91, + GLOBAL_TYPE_ID_ETS_BIG_INT_BUILTIN = 92, + GLOBAL_TYPE_ID_ETS_BIG_INT = 93, + GLOBAL_TYPE_ID_ETS_ARRAY = 94, + GLOBAL_TYPE_ID_ETS_READONLY_ARRAY = 95, + GLOBAL_TYPE_ID_ETS_FUNCTION0_CLASS = 96, + GLOBAL_TYPE_ID_ETS_FUNCTION1_CLASS = 97, + GLOBAL_TYPE_ID_ETS_FUNCTION2_CLASS = 98, + GLOBAL_TYPE_ID_ETS_FUNCTION3_CLASS = 99, + GLOBAL_TYPE_ID_ETS_FUNCTION4_CLASS = 100, + GLOBAL_TYPE_ID_ETS_FUNCTION5_CLASS = 101, + GLOBAL_TYPE_ID_ETS_FUNCTION6_CLASS = 102, + GLOBAL_TYPE_ID_ETS_FUNCTION7_CLASS = 103, + GLOBAL_TYPE_ID_ETS_FUNCTION8_CLASS = 104, + GLOBAL_TYPE_ID_ETS_FUNCTION9_CLASS = 105, + GLOBAL_TYPE_ID_ETS_FUNCTION10_CLASS = 106, + GLOBAL_TYPE_ID_ETS_FUNCTION11_CLASS = 107, + GLOBAL_TYPE_ID_ETS_FUNCTION12_CLASS = 108, + GLOBAL_TYPE_ID_ETS_FUNCTION13_CLASS = 109, + GLOBAL_TYPE_ID_ETS_FUNCTION14_CLASS = 110, + GLOBAL_TYPE_ID_ETS_FUNCTION15_CLASS = 111, + GLOBAL_TYPE_ID_ETS_FUNCTION16_CLASS = 112, + GLOBAL_TYPE_ID_ETS_FUNCTIONN_CLASS = 113, + GLOBAL_TYPE_ID_ETS_LAMBDA0_CLASS = 114, + GLOBAL_TYPE_ID_ETS_LAMBDA1_CLASS = 115, + GLOBAL_TYPE_ID_ETS_LAMBDA2_CLASS = 116, + GLOBAL_TYPE_ID_ETS_LAMBDA3_CLASS = 117, + GLOBAL_TYPE_ID_ETS_LAMBDA4_CLASS = 118, + GLOBAL_TYPE_ID_ETS_LAMBDA5_CLASS = 119, + GLOBAL_TYPE_ID_ETS_LAMBDA6_CLASS = 120, + GLOBAL_TYPE_ID_ETS_LAMBDA7_CLASS = 121, + GLOBAL_TYPE_ID_ETS_LAMBDA8_CLASS = 122, + GLOBAL_TYPE_ID_ETS_LAMBDA9_CLASS = 123, + GLOBAL_TYPE_ID_ETS_LAMBDA10_CLASS = 124, + GLOBAL_TYPE_ID_ETS_LAMBDA11_CLASS = 125, + GLOBAL_TYPE_ID_ETS_LAMBDA12_CLASS = 126, + GLOBAL_TYPE_ID_ETS_LAMBDA13_CLASS = 127, + GLOBAL_TYPE_ID_ETS_LAMBDA14_CLASS = 128, + GLOBAL_TYPE_ID_ETS_LAMBDA15_CLASS = 129, + GLOBAL_TYPE_ID_ETS_LAMBDA16_CLASS = 130, + GLOBAL_TYPE_ID_ETS_LAMBDAN_CLASS = 131, + GLOBAL_TYPE_ID_ETS_FUNCTIONR0_CLASS = 132, + GLOBAL_TYPE_ID_ETS_FUNCTIONR1_CLASS = 133, + GLOBAL_TYPE_ID_ETS_FUNCTIONR2_CLASS = 134, + GLOBAL_TYPE_ID_ETS_FUNCTIONR3_CLASS = 135, + GLOBAL_TYPE_ID_ETS_FUNCTIONR4_CLASS = 136, + GLOBAL_TYPE_ID_ETS_FUNCTIONR5_CLASS = 137, + GLOBAL_TYPE_ID_ETS_FUNCTIONR6_CLASS = 138, + GLOBAL_TYPE_ID_ETS_FUNCTIONR7_CLASS = 139, + GLOBAL_TYPE_ID_ETS_FUNCTIONR8_CLASS = 140, + GLOBAL_TYPE_ID_ETS_FUNCTIONR9_CLASS = 141, + GLOBAL_TYPE_ID_ETS_FUNCTIONR10_CLASS = 142, + GLOBAL_TYPE_ID_ETS_FUNCTIONR11_CLASS = 143, + GLOBAL_TYPE_ID_ETS_FUNCTIONR12_CLASS = 144, + GLOBAL_TYPE_ID_ETS_FUNCTIONR13_CLASS = 145, + GLOBAL_TYPE_ID_ETS_FUNCTIONR14_CLASS = 146, + GLOBAL_TYPE_ID_ETS_FUNCTIONR15_CLASS = 147, + GLOBAL_TYPE_ID_ETS_FUNCTIONR16_CLASS = 148, + GLOBAL_TYPE_ID_ETS_LAMBDAR0_CLASS = 149, + GLOBAL_TYPE_ID_ETS_LAMBDAR1_CLASS = 150, + GLOBAL_TYPE_ID_ETS_LAMBDAR2_CLASS = 151, + GLOBAL_TYPE_ID_ETS_LAMBDAR3_CLASS = 152, + GLOBAL_TYPE_ID_ETS_LAMBDAR4_CLASS = 153, + GLOBAL_TYPE_ID_ETS_LAMBDAR5_CLASS = 154, + GLOBAL_TYPE_ID_ETS_LAMBDAR6_CLASS = 155, + GLOBAL_TYPE_ID_ETS_LAMBDAR7_CLASS = 156, + GLOBAL_TYPE_ID_ETS_LAMBDAR8_CLASS = 157, + GLOBAL_TYPE_ID_ETS_LAMBDAR9_CLASS = 158, + GLOBAL_TYPE_ID_ETS_LAMBDAR10_CLASS = 159, + GLOBAL_TYPE_ID_ETS_LAMBDAR11_CLASS = 160, + GLOBAL_TYPE_ID_ETS_LAMBDAR12_CLASS = 161, + GLOBAL_TYPE_ID_ETS_LAMBDAR13_CLASS = 162, + GLOBAL_TYPE_ID_ETS_LAMBDAR14_CLASS = 163, + GLOBAL_TYPE_ID_ETS_LAMBDAR15_CLASS = 164, + GLOBAL_TYPE_ID_ETS_LAMBDAR16_CLASS = 165, + GLOBAL_TYPE_ID_ETS_TUPLE0_CLASS = 166, + GLOBAL_TYPE_ID_ETS_TUPLE1_CLASS = 167, + GLOBAL_TYPE_ID_ETS_TUPLE2_CLASS = 168, + GLOBAL_TYPE_ID_ETS_TUPLE3_CLASS = 169, + GLOBAL_TYPE_ID_ETS_TUPLE4_CLASS = 170, + GLOBAL_TYPE_ID_ETS_TUPLE5_CLASS = 171, + GLOBAL_TYPE_ID_ETS_TUPLE6_CLASS = 172, + GLOBAL_TYPE_ID_ETS_TUPLE7_CLASS = 173, + GLOBAL_TYPE_ID_ETS_TUPLE8_CLASS = 174, + GLOBAL_TYPE_ID_ETS_TUPLE9_CLASS = 175, + GLOBAL_TYPE_ID_ETS_TUPLE10_CLASS = 176, + GLOBAL_TYPE_ID_ETS_TUPLE11_CLASS = 177, + GLOBAL_TYPE_ID_ETS_TUPLE12_CLASS = 178, + GLOBAL_TYPE_ID_ETS_TUPLE13_CLASS = 179, + GLOBAL_TYPE_ID_ETS_TUPLE14_CLASS = 180, + GLOBAL_TYPE_ID_ETS_TUPLE15_CLASS = 181, + GLOBAL_TYPE_ID_ETS_TUPLE16_CLASS = 182, + GLOBAL_TYPE_ID_ETS_TUPLEN_CLASS = 183, + GLOBAL_TYPE_ID_TYPE_ERROR = 184, + GLOBAL_TYPE_ID_COUNT = 185 } export enum Es2pandaMethodDefinitionKind { METHOD_DEFINITION_KIND_NONE = 0, diff --git a/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts b/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts index d9c2ec92e7..141cfa758f 100644 --- a/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts +++ b/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts @@ -3197,25 +3197,28 @@ export class Es2pandaNativeModule { _UpdateCharLiteral(context: KNativePointer, original: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _CreateETSIntrinsicNode(context: KNativePointer, other: KNativePointer): KNativePointer { + _CreateETSIntrinsicNode(context: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _UpdateETSIntrinsicNode(context: KNativePointer, original: KNativePointer, other: KNativePointer): KNativePointer { + _UpdateETSIntrinsicNode(context: KNativePointer, original: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _CreateETSIntrinsicNode1(context: KNativePointer, id: KStringPtr, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { + _CreateETSIntrinsicNode1(context: KNativePointer, other: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _UpdateETSIntrinsicNode1(context: KNativePointer, original: KNativePointer, id: KStringPtr, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { + _UpdateETSIntrinsicNode1(context: KNativePointer, original: KNativePointer, other: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _ETSIntrinsicNodeIdConst(context: KNativePointer, receiver: KNativePointer): KStringPtr { + _CreateETSIntrinsicNode2(context: KNativePointer, type: KInt, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _ETSIntrinsicNodeArgumentsConst(context: KNativePointer, receiver: KNativePointer): KNativePointer { + _UpdateETSIntrinsicNode2(context: KNativePointer, original: KNativePointer, type: KInt, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { + throw new Error("This methods was not overloaded by native module initialization") + } + _ETSIntrinsicNodeTypeConst(context: KNativePointer, receiver: KNativePointer): KInt { throw new Error("This methods was not overloaded by native module initialization") } - _ETSIntrinsicNodeArguments(context: KNativePointer, receiver: KNativePointer): KNativePointer { + _ETSIntrinsicNodeArgumentsConst(context: KNativePointer, receiver: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } _CreateETSPackageDeclaration(context: KNativePointer, name: KNativePointer): KNativePointer { diff --git a/ui2abc/libarkts/src/generated/factory.ts b/ui2abc/libarkts/src/generated/factory.ts index 525c84662e..e48f35cd8b 100644 --- a/ui2abc/libarkts/src/generated/factory.ts +++ b/ui2abc/libarkts/src/generated/factory.ts @@ -68,6 +68,7 @@ import { ETSTypeReferencePart } from "./peers/ETSTypeReferencePart" import { ETSUndefinedType } from "./peers/ETSUndefinedType" import { ETSUnionType } from "./peers/ETSUnionType" import { EmptyStatement } from "./peers/EmptyStatement" +import { Es2pandaIntrinsicNodeType } from "./Es2pandaEnums" import { Es2pandaMetaPropertyKind } from "./Es2pandaEnums" import { Es2pandaModifierFlags } from "./Es2pandaEnums" import { Es2pandaPrimitiveType } from "./Es2pandaEnums" @@ -674,14 +675,14 @@ export const factory = { return updateNodeByNode(CharLiteral.createCharLiteral(), original) } , - createETSIntrinsicNode(id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { - return ETSIntrinsicNode.create1ETSIntrinsicNode(id, _arguments) + createETSIntrinsicNode(type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { + return ETSIntrinsicNode.create2ETSIntrinsicNode(type, _arguments) } , - updateETSIntrinsicNode(original: ETSIntrinsicNode, id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { - if (isSameNativeObject(id, original.id) && isSameNativeObject(_arguments, original.arguments)) + updateETSIntrinsicNode(original: ETSIntrinsicNode, type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { + if (isSameNativeObject(type, original.type) && isSameNativeObject(_arguments, original.arguments)) return original - return updateNodeByNode(ETSIntrinsicNode.create1ETSIntrinsicNode(id, _arguments), original) + return updateNodeByNode(ETSIntrinsicNode.create2ETSIntrinsicNode(type, _arguments), original) } , createTSModuleBlock(statements: readonly Statement[]): TSModuleBlock { diff --git a/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts b/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts index d93e82e026..e37180cbb7 100644 --- a/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts +++ b/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts @@ -32,32 +32,38 @@ import { } from "../../reexport-for-generated" import { Es2pandaAstNodeType } from "./../Es2pandaEnums" +import { Es2pandaIntrinsicNodeType } from "./../Es2pandaEnums" import { Expression } from "./Expression" export class ETSIntrinsicNode extends Expression { constructor(pointer: KNativePointer, astNodeType: Es2pandaAstNodeType) { super(pointer, astNodeType) } - static create1ETSIntrinsicNode(id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { - const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._CreateETSIntrinsicNode1(global.context, id, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) + static create2ETSIntrinsicNode(type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { + const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._CreateETSIntrinsicNode2(global.context, type, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) result.setChildrenParentPtr() return result } - static updateETSIntrinsicNode(original?: ETSIntrinsicNode, other?: ETSIntrinsicNode): ETSIntrinsicNode { - const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode(global.context, passNode(original), passNode(other)), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) + static updateETSIntrinsicNode(original?: ETSIntrinsicNode): ETSIntrinsicNode { + const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode(global.context, passNode(original)), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) result.setChildrenParentPtr() return result } - static update1ETSIntrinsicNode(original: ETSIntrinsicNode | undefined, id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { - const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode1(global.context, passNode(original), id, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) + static update1ETSIntrinsicNode(original?: ETSIntrinsicNode, other?: ETSIntrinsicNode): ETSIntrinsicNode { + const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode1(global.context, passNode(original), passNode(other)), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) result.setChildrenParentPtr() return result } - get id(): string { - return unpackString(global.generatedEs2panda._ETSIntrinsicNodeIdConst(global.context, this.peer)) + static update2ETSIntrinsicNode(original: ETSIntrinsicNode | undefined, type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { + const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode2(global.context, passNode(original), type, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) + result.setChildrenParentPtr() + return result + } + get type(): Es2pandaIntrinsicNodeType { + return global.generatedEs2panda._ETSIntrinsicNodeTypeConst(global.context, this.peer) } get arguments(): readonly Expression[] { - return unpackNodeArray(global.generatedEs2panda._ETSIntrinsicNodeArguments(global.context, this.peer)) + return unpackNodeArray(global.generatedEs2panda._ETSIntrinsicNodeArgumentsConst(global.context, this.peer)) } protected readonly brandETSIntrinsicNode: undefined } -- Gitee From e01f7d9015dccf0a6b0a0c8899bff28546337e8a Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 27 Aug 2025 12:57:17 +0300 Subject: [PATCH 2/5] Update Signed-off-by: Nikolay Igotti --- ui2abc/ets-tests/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui2abc/ets-tests/package.json b/ui2abc/ets-tests/package.json index 10d15ab9d1..0d774a4d8f 100644 --- a/ui2abc/ets-tests/package.json +++ b/ui2abc/ets-tests/package.json @@ -17,7 +17,7 @@ "clean:all": "npm run clean && npm run clean:all --prefix ../../arkoala-arkts", "copy:deps": "mkdir -p ../../arkoala-arkts/build/bootPandaFiles && cp ../../incremental/harness/build/harness.abc ../../arkoala-arkts/build/bootPandaFiles/", "build:deps": "npm run compile:native:node-host -C ../../arkoala-arkts && npm run build -C ../../arkoala-arkts && npm run build -C ../../incremental/harness && npm run build -C ../../arkoala-arkts/arkui && npm run build:loader:node -C ../../arkoala-arkts && npm run copy:deps", - "run:ets": "npm run build:ets && mkdir -p ../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../arkoala-arkts/build/userPandaFiles/ && cd ../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", + "run:ets": "npm run build:ets && mkdir -p ../../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../../arkoala-arkts/build/userPandaFiles/ && cd ../../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", "run:golden": "npm run build:golden && mkdir -p ../../arkoala-arkts/build/userPandaFiles && cp ./build/ets-tests.abc ../../arkoala-arkts/build/userPandaFiles/ && cd ../../arkoala-arkts && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:tests", "run": "npm run run:ets", "all:ets": "npm run build:deps && npm run run:ets", -- Gitee From b6bd9ebd7250f42dc16e33010559a9b5fabfbb2b Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 27 Aug 2025 13:13:31 +0300 Subject: [PATCH 3/5] More fixes Signed-off-by: Nikolay Igotti --- arkoala-arkts/framework/native/src/tree.h | 4 ++-- arkoala-arkts/package.json | 2 +- tools/release.mjs | 4 ++-- ui2abc/ets-tests/.gitlab-ci.yml | 6 +++--- ui2abc/ets-tests/README.md | 22 +++++++++++----------- ui2abc/perf-tests/package.json | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arkoala-arkts/framework/native/src/tree.h b/arkoala-arkts/framework/native/src/tree.h index ca339bf096..917686ab1c 100644 --- a/arkoala-arkts/framework/native/src/tree.h +++ b/arkoala-arkts/framework/native/src/tree.h @@ -325,8 +325,8 @@ struct TGAInfo { std::vector pixels; }; -const std::string baseGoldenPath = "../ets-tests/ets/golden-tests/golden/"; -const std::string baseBuildPath = "../ets-tests/build/golden/"; +const std::string baseGoldenPath = "../ui2abc/ets-tests/ets/golden-tests/golden/"; +const std::string baseBuildPath = "../ui2abc/ets-tests/build/golden/"; bool WriteImageTGA(std::string name, TGAInfo &info) { fprintf(stderr, "image: %s %s\n", std::filesystem::current_path().c_str(), name.c_str()); diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index ed6b923040..7404fa184a 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -7,11 +7,11 @@ "./memo-plugin", "../ui2abc/ui-plugins", "../ui2abc/fast-arktsc", + "../ui2abc/ets-tests", "./loader", "./har", "./ets-harness", "./ets-plugin", - "../ets-tests", "../incremental/build-common", "../incremental/compiler-plugin", "../incremental/harness", diff --git a/tools/release.mjs b/tools/release.mjs index 6d8b6fc336..91ef28871d 100644 --- a/tools/release.mjs +++ b/tools/release.mjs @@ -75,12 +75,12 @@ const all_packages = [ new Package(path.join(EXTERNAL_HOME, "ui2abc/libarkts")), new Package(path.join(EXTERNAL_HOME, "ui2abc/memo-plugin")), 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")), new Package(path.join(EXTERNAL_HOME, "arkoala/arkui")), new Package(path.join(EXTERNAL_HOME, "interop")), new Package(path.join(EXTERNAL_HOME, "arkoala-arkts/ets-harness")), - new Package(path.join(EXTERNAL_HOME, "arkoala/ets-harness")), - new Package(path.join(EXTERNAL_HOME, "ets-tests")) + new Package(path.join(EXTERNAL_HOME, "arkoala/ets-harness")) ] const exclude_packages = [ diff --git a/ui2abc/ets-tests/.gitlab-ci.yml b/ui2abc/ets-tests/.gitlab-ci.yml index f1ca087fb0..d122c8f978 100644 --- a/ui2abc/ets-tests/.gitlab-ci.yml +++ b/ui2abc/ets-tests/.gitlab-ci.yml @@ -6,7 +6,7 @@ install node modules (ets-tests): before_script: - !reference [.setup, script] script: - - npm i --no-audit --no-fund --prefix ets-tests + - npm i --no-audit --no-fund --prefix ui2abc/ets-tests artifacts: paths: - ui2abc/ets-tests/node_modules @@ -21,7 +21,7 @@ build ets-tests.abc: - build ui2abc-all M3 - annotate all script: - - npm run build --prefix ets-tests + - npm run build --prefix ui2abc/ets-tests - ls -l ui2abc/ets-tests/build/ets-tests.abc artifacts: paths: @@ -37,7 +37,7 @@ build ets-tests.abc (golden): - build ui2abc-all M3 - annotate all script: - - npm run build:golden --prefix ets-tests + - npm run build:golden --prefix ui2abc/ets-tests - ls -l ui2abc/ets-tests/build/ets-tests.abc artifacts: paths: diff --git a/ui2abc/ets-tests/README.md b/ui2abc/ets-tests/README.md index 55d86dcb2d..fe0bf973e0 100644 --- a/ui2abc/ets-tests/README.md +++ b/ui2abc/ets-tests/README.md @@ -16,16 +16,16 @@ npm i -C ui2abc/libarkts/ npm run reinstall:regenerate -C ui2abc/libarkts/ npm run compile -C ui2abc/libarkts/ npm run build:all -C ui2abc/ -npm run build:deps -C ets-tests/ +npm run build:deps -C ui2abc/ets-tests/ ``` ### Running tests ``` // Build deps and run tests: -npm run run -C ets-tests/ +npm run run -C ui2abc/ets-tests // Run tests: -npm run run -C ets-tests/ +npm run run -C ui2abc/ets-tests ``` ### How to write tests @@ -49,7 +49,7 @@ uiLog(message: string) // memo function, invokes only if message was changed nLog(message: string) // non memo function to save log records on native side ``` -Example of the test case page (could be found `ets-tests/ets/environment-tests/pages/states/StateIncrement.ets`): +Example of the test case page (could be found `ui2abc/ets-tests/ets/environment-tests/pages/states/StateIncrement.ets`): ``` import { TestComponent, uiLog } from '@ohos.arkui' @@ -65,7 +65,7 @@ struct StateIncrement { } ``` Here we set `id` for `TestComponent`, increment state (in `onChange` callback) `this.x` and record log after each state changes. -Let's look at the test (can be found `ets-tests/ets/environment-tests/suites/StateManagement.ets`): +Let's look at the test (can be found `ui2abc/ets-tests/ets/environment-tests/suites/StateManagement.ets`): ``` import { testPageOnChange } from "../entry" suite("State Management", () => { @@ -79,7 +79,7 @@ suite("State Management", () => { ... -// testPageOnChange body (could be found ets-tests/ets/utils.ets): +// testPageOnChange body (could be found ui2abc/ets-tests/ets/utils.ets): export function testPageOnChange(control: AppControl, page: string, targetId: int32 | int32[], expected: string, message: string | undefined = undefined) { // apply changes for child components of all nested levels control.loadPage(page).nextFrame().nextFrame().nextFrame() @@ -107,7 +107,7 @@ Here we can send following commands to test environment via `control`: ### Register case pages Every case we add to the import and to the `cases` switcher: ``` -ets-tests/ets/ets-tests/Pages.ets +ui2abc/ets-tests/ets/ets-tests/Pages.ets ``` Example: ``` @@ -126,7 +126,7 @@ function pageByName(name: string): void { ### Register suites Every suite we add to the import and into the common suite named "ETS_TESTS": ``` -ets-tests/ets/ets-tests/Pages.ets +ui2abc/ets-tests/ets/ets-tests/Pages.ets ``` Example: ``` @@ -147,11 +147,11 @@ Running specified suite or tests: //EXAMPLES: // runs [State Management] suite and one test [StateChange:Increment] inside that suite -npm run run "State Management|StateChange:Increment" -C ets-tests/ +npm run run "State Management|StateChange:Increment" -C ui2abc/ets-tests/ // runs [State Management] suite and two tests [StateChange:Increment, StateChange:Decrement] inside that suite -npm run run "State Management|StateChange:Increment|StateChange:Decrement" -C ets-tests/ +npm run run "State Management|StateChange:Increment|StateChange:Decrement" -C ui2abc/ets-tests/ // runs tests independently from any suites (leave first reserved for suite place empty) -npm run run "|StateChange:Increment|StateChange:Decrement|attributeModifier" -C ets-tests/ +npm run run "|StateChange:Increment|StateChange:Decrement|attributeModifier" -C ui2abc/ets-tests/ ``` diff --git a/ui2abc/perf-tests/package.json b/ui2abc/perf-tests/package.json index f6969528b1..a8db5caef9 100644 --- a/ui2abc/perf-tests/package.json +++ b/ui2abc/perf-tests/package.json @@ -4,8 +4,8 @@ "description": "ui2abc performance tests", "scripts": { "clean": "rimraf build", - "prepare": "npm run -C ../../ets-tests build:deps", - "recheck:inc": "node ../../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/out-recheck.abc && time ninja ${NINJA_OPTIONS} -f build/build.ninja", + "prepare": "npm run -C ../ets-tests build:deps", + "recheck:inc": "node ../fast-arktsc --config ./ui2abcconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/out-recheck.abc && time ninja ${NINJA_OPTIONS} -f build/build.ninja", "recheck": "npm run clean && npm run recheck:inc" } } \ No newline at end of file -- Gitee From 98b99b08199cd88ff2dbdfe6183f075565117ff4 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 27 Aug 2025 13:15:00 +0300 Subject: [PATCH 4/5] More Signed-off-by: Nikolay Igotti --- arkoala/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala/package.json b/arkoala/package.json index 3258e429d6..8cb43885a2 100644 --- a/arkoala/package.json +++ b/arkoala/package.json @@ -14,7 +14,7 @@ "extension-component", "loader", "ets-harness", - "../ets-tests", + "../ui2abc/ets-tests", "../incremental/build-common", "../incremental/compat", "../incremental/common", -- Gitee From 8aa20acc8bf6f9c9d14dc6d3ad285fa714b3cc4d Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 27 Aug 2025 13:38:57 +0300 Subject: [PATCH 5/5] Regenerate Signed-off-by: Nikolay Igotti --- .../base/observeWrappedArray.ts | 2 +- incremental/compat/src/arkts/observable.ts | 2 +- incremental/tools/panda/arkts/ui2abc | 2 +- tools/mirror.mjs | 2 +- .../libarkts/native/src/generated/bridges.cc | 65 +++--- .../libarkts/src/generated/Es2pandaEnums.ts | 212 +++++++++--------- .../src/generated/Es2pandaNativeModule.ts | 17 +- ui2abc/libarkts/src/generated/factory.ts | 11 +- .../src/generated/peers/ETSIntrinsicNode.ts | 24 +- 9 files changed, 157 insertions(+), 180 deletions(-) diff --git a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts index d223f45c39..c6d69460a9 100644 --- a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts +++ b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedArray.ts @@ -828,7 +828,7 @@ export class WrappedArray extends Array implements IObservedObject, Observ * If `fromIndex` is ommited then `fromIndex = length()-1`. * @returns The last index of the element in the array; -1 if not found. */ - public override lastIndexOf(searchElement: T, fromIndex: int): int { + public override lastIndexOf(searchElement: T, fromIndex?: int): int { if (this.shouldAddRef()) { this.meta_.addRef(CONSTANT.OB_ARRAY_ANY_KEY); } diff --git a/incremental/compat/src/arkts/observable.ts b/incremental/compat/src/arkts/observable.ts index 7304ea5762..3f1e3be465 100644 --- a/incremental/compat/src/arkts/observable.ts +++ b/incremental/compat/src/arkts/observable.ts @@ -519,7 +519,7 @@ class ObservableArray extends Array { return super.slice(start, end) } - override lastIndexOf(searchElement: T, fromIndex: int): int { + override lastIndexOf(searchElement: T, fromIndex?: int): int { this.handler?.onAccess() return super.lastIndexOf(searchElement, fromIndex) } diff --git a/incremental/tools/panda/arkts/ui2abc b/incremental/tools/panda/arkts/ui2abc index d8db6488cb..960c3cb33a 100755 --- a/incremental/tools/panda/arkts/ui2abc +++ b/incremental/tools/panda/arkts/ui2abc @@ -14,5 +14,5 @@ # limitations under the License. SCRIPT_DIR=`dirname "${BASH_SOURCE[0]}"` -KOALA_WORKSPACE=${KOALA_WORKSPACE:=1} PANDA_SDK_PATH=${PANDA_SDK_PATH:=$SCRIPT_DIR/../node_modules/@panda/sdk} node $SCRIPT_DIR/../../../../ui2abc/libarkts/lib/es2panda.js "$@" +KOALA_WORKSPACE=${KOALA_WORKSPACE:=1} PANDA_SDK_PATH=${PANDA_SDK_PATH:=$SCRIPT_DIR/../node_modules/@panda/sdk} node -- $SCRIPT_DIR/../../../../ui2abc/libarkts/lib/es2panda.js "$@" diff --git a/tools/mirror.mjs b/tools/mirror.mjs index 27346d8ad2..5586b43950 100644 --- a/tools/mirror.mjs +++ b/tools/mirror.mjs @@ -6,7 +6,7 @@ import { execSync } from 'child_process' const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) const KOALA_HOME = path.resolve(path.join(__dirname, "..")) -const USE_MIRROR_BUNDLE = process.env.USE_MIRROR_BUNDLE ? true : false +const USE_MIRROR_BUNDLE = !!process.env.USE_MIRROR_BUNDLE const args = process.argv.slice(2) const outPath = args[0] ?? path.join(KOALA_HOME, USE_MIRROR_BUNDLE ? "koala_tools" : "koala_mirror") diff --git a/ui2abc/libarkts/native/src/generated/bridges.cc b/ui2abc/libarkts/native/src/generated/bridges.cc index d4ef04f92e..ca80361325 100644 --- a/ui2abc/libarkts/native/src/generated/bridges.cc +++ b/ui2abc/libarkts/native/src/generated/bridges.cc @@ -17,7 +17,7 @@ /* * THIS FILE IS AUTOGENERATED BY arktscgen v2.1.10-arktscgen-3a. DO NOT EDIT MANUALLY! - * es2panda b90198c15c97a5627fa1a69ab5f061ef4e54921e(2025-08-25) sdk v1.5.0-dev.42899 + * es2panda b1eea1e8c27124f2f9195f99735c91bcbfb5523a(2025-08-26) sdk v1.5.0-dev.43047 */ KNativePointer impl_GetAllErrorMessages(KNativePointer context) @@ -9945,73 +9945,56 @@ KNativePointer impl_UpdateCharLiteral(KNativePointer context, KNativePointer ori } KOALA_INTEROP_2(UpdateCharLiteral, KNativePointer, KNativePointer, KNativePointer); -KNativePointer impl_CreateETSIntrinsicNode(KNativePointer context) -{ - const auto _context = reinterpret_cast(context); - auto result = GetImpl()->CreateETSIntrinsicNode(_context); - return result; -} -KOALA_INTEROP_1(CreateETSIntrinsicNode, KNativePointer, KNativePointer); - -KNativePointer impl_UpdateETSIntrinsicNode(KNativePointer context, KNativePointer original) -{ - const auto _context = reinterpret_cast(context); - const auto _original = reinterpret_cast(original); - auto result = GetImpl()->UpdateETSIntrinsicNode(_context, _original); - return result; -} -KOALA_INTEROP_2(UpdateETSIntrinsicNode, KNativePointer, KNativePointer, KNativePointer); - -KNativePointer impl_CreateETSIntrinsicNode1(KNativePointer context, KNativePointer other) +KNativePointer impl_CreateETSIntrinsicNode(KNativePointer context, KNativePointer other) { const auto _context = reinterpret_cast(context); const auto _other = reinterpret_cast(other); - auto result = GetImpl()->CreateETSIntrinsicNode1(_context, _other); + auto result = GetImpl()->CreateETSIntrinsicNode(_context, _other); return result; } -KOALA_INTEROP_2(CreateETSIntrinsicNode1, KNativePointer, KNativePointer, KNativePointer); +KOALA_INTEROP_2(CreateETSIntrinsicNode, KNativePointer, KNativePointer, KNativePointer); -KNativePointer impl_UpdateETSIntrinsicNode1(KNativePointer context, KNativePointer original, KNativePointer other) +KNativePointer impl_UpdateETSIntrinsicNode(KNativePointer context, KNativePointer original, KNativePointer other) { const auto _context = reinterpret_cast(context); const auto _original = reinterpret_cast(original); const auto _other = reinterpret_cast(other); - auto result = GetImpl()->UpdateETSIntrinsicNode1(_context, _original, _other); + auto result = GetImpl()->UpdateETSIntrinsicNode(_context, _original, _other); return result; } -KOALA_INTEROP_3(UpdateETSIntrinsicNode1, KNativePointer, KNativePointer, KNativePointer, KNativePointer); +KOALA_INTEROP_3(UpdateETSIntrinsicNode, KNativePointer, KNativePointer, KNativePointer, KNativePointer); -KNativePointer impl_CreateETSIntrinsicNode2(KNativePointer context, KInt type, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) +KNativePointer impl_CreateETSIntrinsicNode1(KNativePointer context, KStringPtr& id, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) { const auto _context = reinterpret_cast(context); - const auto _type = static_cast(type); + const auto _id = getStringCopy(id); const auto __arguments = reinterpret_cast(_arguments); const auto __argumentsSequenceLength = static_cast(_argumentsSequenceLength); - auto result = GetImpl()->CreateETSIntrinsicNode2(_context, _type, __arguments, __argumentsSequenceLength); + auto result = GetImpl()->CreateETSIntrinsicNode1(_context, _id, __arguments, __argumentsSequenceLength); return result; } -KOALA_INTEROP_4(CreateETSIntrinsicNode2, KNativePointer, KNativePointer, KInt, KNativePointerArray, KUInt); +KOALA_INTEROP_4(CreateETSIntrinsicNode1, KNativePointer, KNativePointer, KStringPtr, KNativePointerArray, KUInt); -KNativePointer impl_UpdateETSIntrinsicNode2(KNativePointer context, KNativePointer original, KInt type, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) +KNativePointer impl_UpdateETSIntrinsicNode1(KNativePointer context, KNativePointer original, KStringPtr& id, KNativePointerArray _arguments, KUInt _argumentsSequenceLength) { const auto _context = reinterpret_cast(context); const auto _original = reinterpret_cast(original); - const auto _type = static_cast(type); + const auto _id = getStringCopy(id); const auto __arguments = reinterpret_cast(_arguments); const auto __argumentsSequenceLength = static_cast(_argumentsSequenceLength); - auto result = GetImpl()->UpdateETSIntrinsicNode2(_context, _original, _type, __arguments, __argumentsSequenceLength); + auto result = GetImpl()->UpdateETSIntrinsicNode1(_context, _original, _id, __arguments, __argumentsSequenceLength); return result; } -KOALA_INTEROP_5(UpdateETSIntrinsicNode2, KNativePointer, KNativePointer, KNativePointer, KInt, KNativePointerArray, KUInt); +KOALA_INTEROP_5(UpdateETSIntrinsicNode1, KNativePointer, KNativePointer, KNativePointer, KStringPtr, KNativePointerArray, KUInt); -KInt impl_ETSIntrinsicNodeTypeConst(KNativePointer context, KNativePointer receiver) +KNativePointer impl_ETSIntrinsicNodeIdConst(KNativePointer context, KNativePointer receiver) { const auto _context = reinterpret_cast(context); const auto _receiver = reinterpret_cast(receiver); - auto result = GetImpl()->ETSIntrinsicNodeTypeConst(_context, _receiver); - return result; + auto result = GetImpl()->ETSIntrinsicNodeIdConst(_context, _receiver); + return StageArena::strdup(result); } -KOALA_INTEROP_2(ETSIntrinsicNodeTypeConst, KInt, KNativePointer, KNativePointer); +KOALA_INTEROP_2(ETSIntrinsicNodeIdConst, KNativePointer, KNativePointer, KNativePointer); KNativePointer impl_ETSIntrinsicNodeArgumentsConst(KNativePointer context, KNativePointer receiver) { @@ -10023,6 +10006,16 @@ KNativePointer impl_ETSIntrinsicNodeArgumentsConst(KNativePointer context, KNati } KOALA_INTEROP_2(ETSIntrinsicNodeArgumentsConst, KNativePointer, KNativePointer, KNativePointer); +KNativePointer impl_ETSIntrinsicNodeArguments(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + std::size_t length; + auto result = GetImpl()->ETSIntrinsicNodeArguments(_context, _receiver, &length); + return length ? StageArena::cloneVector(result, length) : nullptr; +} +KOALA_INTEROP_2(ETSIntrinsicNodeArguments, KNativePointer, KNativePointer, KNativePointer); + KNativePointer impl_CreateETSPackageDeclaration(KNativePointer context, KNativePointer name) { const auto _context = reinterpret_cast(context); diff --git a/ui2abc/libarkts/src/generated/Es2pandaEnums.ts b/ui2abc/libarkts/src/generated/Es2pandaEnums.ts index 421883a7e3..de998fc624 100644 --- a/ui2abc/libarkts/src/generated/Es2pandaEnums.ts +++ b/ui2abc/libarkts/src/generated/Es2pandaEnums.ts @@ -849,10 +849,6 @@ export enum Es2pandaPrimitiveType { PRIMITIVE_TYPE_CHAR = 7, PRIMITIVE_TYPE_VOID = 8 } -export enum Es2pandaIntrinsicNodeType { - INTRINSIC_NODE_TYPE_NONE = 0, - INTRINSIC_NODE_TYPE_TYPE_REFERENCE = 1 -} export enum Es2pandaObjectFlags { OBJECT_FLAGS_NO_OPTS = 0, OBJECT_FLAGS_CHECK_EXCESS_PROPS = 1, @@ -1016,111 +1012,109 @@ export enum Es2pandaGlobalTypeId { GLOBAL_TYPE_ID_ETS_FUNCTION_BUILTIN = 78, GLOBAL_TYPE_ID_ETS_REGEXP_BUILTIN = 79, GLOBAL_TYPE_ID_ETS_ARRAY_BUILTIN = 80, - GLOBAL_TYPE_ID_ETS_INTEROP_JSRUNTIME_BUILTIN = 81, - GLOBAL_TYPE_ID_ETS_INTEROP_JSVALUE_BUILTIN = 82, - GLOBAL_TYPE_ID_ETS_BOX_BUILTIN = 83, - GLOBAL_TYPE_ID_ETS_BOOLEAN_BOX_BUILTIN = 84, - GLOBAL_TYPE_ID_ETS_BYTE_BOX_BUILTIN = 85, - GLOBAL_TYPE_ID_ETS_CHAR_BOX_BUILTIN = 86, - GLOBAL_TYPE_ID_ETS_SHORT_BOX_BUILTIN = 87, - GLOBAL_TYPE_ID_ETS_INT_BOX_BUILTIN = 88, - GLOBAL_TYPE_ID_ETS_LONG_BOX_BUILTIN = 89, - GLOBAL_TYPE_ID_ETS_FLOAT_BOX_BUILTIN = 90, - GLOBAL_TYPE_ID_ETS_DOUBLE_BOX_BUILTIN = 91, - GLOBAL_TYPE_ID_ETS_BIG_INT_BUILTIN = 92, - GLOBAL_TYPE_ID_ETS_BIG_INT = 93, - GLOBAL_TYPE_ID_ETS_ARRAY = 94, - GLOBAL_TYPE_ID_ETS_READONLY_ARRAY = 95, - GLOBAL_TYPE_ID_ETS_FUNCTION0_CLASS = 96, - GLOBAL_TYPE_ID_ETS_FUNCTION1_CLASS = 97, - GLOBAL_TYPE_ID_ETS_FUNCTION2_CLASS = 98, - GLOBAL_TYPE_ID_ETS_FUNCTION3_CLASS = 99, - GLOBAL_TYPE_ID_ETS_FUNCTION4_CLASS = 100, - GLOBAL_TYPE_ID_ETS_FUNCTION5_CLASS = 101, - GLOBAL_TYPE_ID_ETS_FUNCTION6_CLASS = 102, - GLOBAL_TYPE_ID_ETS_FUNCTION7_CLASS = 103, - GLOBAL_TYPE_ID_ETS_FUNCTION8_CLASS = 104, - GLOBAL_TYPE_ID_ETS_FUNCTION9_CLASS = 105, - GLOBAL_TYPE_ID_ETS_FUNCTION10_CLASS = 106, - GLOBAL_TYPE_ID_ETS_FUNCTION11_CLASS = 107, - GLOBAL_TYPE_ID_ETS_FUNCTION12_CLASS = 108, - GLOBAL_TYPE_ID_ETS_FUNCTION13_CLASS = 109, - GLOBAL_TYPE_ID_ETS_FUNCTION14_CLASS = 110, - GLOBAL_TYPE_ID_ETS_FUNCTION15_CLASS = 111, - GLOBAL_TYPE_ID_ETS_FUNCTION16_CLASS = 112, - GLOBAL_TYPE_ID_ETS_FUNCTIONN_CLASS = 113, - GLOBAL_TYPE_ID_ETS_LAMBDA0_CLASS = 114, - GLOBAL_TYPE_ID_ETS_LAMBDA1_CLASS = 115, - GLOBAL_TYPE_ID_ETS_LAMBDA2_CLASS = 116, - GLOBAL_TYPE_ID_ETS_LAMBDA3_CLASS = 117, - GLOBAL_TYPE_ID_ETS_LAMBDA4_CLASS = 118, - GLOBAL_TYPE_ID_ETS_LAMBDA5_CLASS = 119, - GLOBAL_TYPE_ID_ETS_LAMBDA6_CLASS = 120, - GLOBAL_TYPE_ID_ETS_LAMBDA7_CLASS = 121, - GLOBAL_TYPE_ID_ETS_LAMBDA8_CLASS = 122, - GLOBAL_TYPE_ID_ETS_LAMBDA9_CLASS = 123, - GLOBAL_TYPE_ID_ETS_LAMBDA10_CLASS = 124, - GLOBAL_TYPE_ID_ETS_LAMBDA11_CLASS = 125, - GLOBAL_TYPE_ID_ETS_LAMBDA12_CLASS = 126, - GLOBAL_TYPE_ID_ETS_LAMBDA13_CLASS = 127, - GLOBAL_TYPE_ID_ETS_LAMBDA14_CLASS = 128, - GLOBAL_TYPE_ID_ETS_LAMBDA15_CLASS = 129, - GLOBAL_TYPE_ID_ETS_LAMBDA16_CLASS = 130, - GLOBAL_TYPE_ID_ETS_LAMBDAN_CLASS = 131, - GLOBAL_TYPE_ID_ETS_FUNCTIONR0_CLASS = 132, - GLOBAL_TYPE_ID_ETS_FUNCTIONR1_CLASS = 133, - GLOBAL_TYPE_ID_ETS_FUNCTIONR2_CLASS = 134, - GLOBAL_TYPE_ID_ETS_FUNCTIONR3_CLASS = 135, - GLOBAL_TYPE_ID_ETS_FUNCTIONR4_CLASS = 136, - GLOBAL_TYPE_ID_ETS_FUNCTIONR5_CLASS = 137, - GLOBAL_TYPE_ID_ETS_FUNCTIONR6_CLASS = 138, - GLOBAL_TYPE_ID_ETS_FUNCTIONR7_CLASS = 139, - GLOBAL_TYPE_ID_ETS_FUNCTIONR8_CLASS = 140, - GLOBAL_TYPE_ID_ETS_FUNCTIONR9_CLASS = 141, - GLOBAL_TYPE_ID_ETS_FUNCTIONR10_CLASS = 142, - GLOBAL_TYPE_ID_ETS_FUNCTIONR11_CLASS = 143, - GLOBAL_TYPE_ID_ETS_FUNCTIONR12_CLASS = 144, - GLOBAL_TYPE_ID_ETS_FUNCTIONR13_CLASS = 145, - GLOBAL_TYPE_ID_ETS_FUNCTIONR14_CLASS = 146, - GLOBAL_TYPE_ID_ETS_FUNCTIONR15_CLASS = 147, - GLOBAL_TYPE_ID_ETS_FUNCTIONR16_CLASS = 148, - GLOBAL_TYPE_ID_ETS_LAMBDAR0_CLASS = 149, - GLOBAL_TYPE_ID_ETS_LAMBDAR1_CLASS = 150, - GLOBAL_TYPE_ID_ETS_LAMBDAR2_CLASS = 151, - GLOBAL_TYPE_ID_ETS_LAMBDAR3_CLASS = 152, - GLOBAL_TYPE_ID_ETS_LAMBDAR4_CLASS = 153, - GLOBAL_TYPE_ID_ETS_LAMBDAR5_CLASS = 154, - GLOBAL_TYPE_ID_ETS_LAMBDAR6_CLASS = 155, - GLOBAL_TYPE_ID_ETS_LAMBDAR7_CLASS = 156, - GLOBAL_TYPE_ID_ETS_LAMBDAR8_CLASS = 157, - GLOBAL_TYPE_ID_ETS_LAMBDAR9_CLASS = 158, - GLOBAL_TYPE_ID_ETS_LAMBDAR10_CLASS = 159, - GLOBAL_TYPE_ID_ETS_LAMBDAR11_CLASS = 160, - GLOBAL_TYPE_ID_ETS_LAMBDAR12_CLASS = 161, - GLOBAL_TYPE_ID_ETS_LAMBDAR13_CLASS = 162, - GLOBAL_TYPE_ID_ETS_LAMBDAR14_CLASS = 163, - GLOBAL_TYPE_ID_ETS_LAMBDAR15_CLASS = 164, - GLOBAL_TYPE_ID_ETS_LAMBDAR16_CLASS = 165, - GLOBAL_TYPE_ID_ETS_TUPLE0_CLASS = 166, - GLOBAL_TYPE_ID_ETS_TUPLE1_CLASS = 167, - GLOBAL_TYPE_ID_ETS_TUPLE2_CLASS = 168, - GLOBAL_TYPE_ID_ETS_TUPLE3_CLASS = 169, - GLOBAL_TYPE_ID_ETS_TUPLE4_CLASS = 170, - GLOBAL_TYPE_ID_ETS_TUPLE5_CLASS = 171, - GLOBAL_TYPE_ID_ETS_TUPLE6_CLASS = 172, - GLOBAL_TYPE_ID_ETS_TUPLE7_CLASS = 173, - GLOBAL_TYPE_ID_ETS_TUPLE8_CLASS = 174, - GLOBAL_TYPE_ID_ETS_TUPLE9_CLASS = 175, - GLOBAL_TYPE_ID_ETS_TUPLE10_CLASS = 176, - GLOBAL_TYPE_ID_ETS_TUPLE11_CLASS = 177, - GLOBAL_TYPE_ID_ETS_TUPLE12_CLASS = 178, - GLOBAL_TYPE_ID_ETS_TUPLE13_CLASS = 179, - GLOBAL_TYPE_ID_ETS_TUPLE14_CLASS = 180, - GLOBAL_TYPE_ID_ETS_TUPLE15_CLASS = 181, - GLOBAL_TYPE_ID_ETS_TUPLE16_CLASS = 182, - GLOBAL_TYPE_ID_ETS_TUPLEN_CLASS = 183, - GLOBAL_TYPE_ID_TYPE_ERROR = 184, - GLOBAL_TYPE_ID_COUNT = 185 + GLOBAL_TYPE_ID_ETS_BOX_BUILTIN = 81, + GLOBAL_TYPE_ID_ETS_BOOLEAN_BOX_BUILTIN = 82, + GLOBAL_TYPE_ID_ETS_BYTE_BOX_BUILTIN = 83, + GLOBAL_TYPE_ID_ETS_CHAR_BOX_BUILTIN = 84, + GLOBAL_TYPE_ID_ETS_SHORT_BOX_BUILTIN = 85, + GLOBAL_TYPE_ID_ETS_INT_BOX_BUILTIN = 86, + GLOBAL_TYPE_ID_ETS_LONG_BOX_BUILTIN = 87, + GLOBAL_TYPE_ID_ETS_FLOAT_BOX_BUILTIN = 88, + GLOBAL_TYPE_ID_ETS_DOUBLE_BOX_BUILTIN = 89, + GLOBAL_TYPE_ID_ETS_BIG_INT_BUILTIN = 90, + GLOBAL_TYPE_ID_ETS_BIG_INT = 91, + GLOBAL_TYPE_ID_ETS_ARRAY = 92, + GLOBAL_TYPE_ID_ETS_READONLY_ARRAY = 93, + GLOBAL_TYPE_ID_ETS_FUNCTION0_CLASS = 94, + GLOBAL_TYPE_ID_ETS_FUNCTION1_CLASS = 95, + GLOBAL_TYPE_ID_ETS_FUNCTION2_CLASS = 96, + GLOBAL_TYPE_ID_ETS_FUNCTION3_CLASS = 97, + GLOBAL_TYPE_ID_ETS_FUNCTION4_CLASS = 98, + GLOBAL_TYPE_ID_ETS_FUNCTION5_CLASS = 99, + GLOBAL_TYPE_ID_ETS_FUNCTION6_CLASS = 100, + GLOBAL_TYPE_ID_ETS_FUNCTION7_CLASS = 101, + GLOBAL_TYPE_ID_ETS_FUNCTION8_CLASS = 102, + GLOBAL_TYPE_ID_ETS_FUNCTION9_CLASS = 103, + GLOBAL_TYPE_ID_ETS_FUNCTION10_CLASS = 104, + GLOBAL_TYPE_ID_ETS_FUNCTION11_CLASS = 105, + GLOBAL_TYPE_ID_ETS_FUNCTION12_CLASS = 106, + GLOBAL_TYPE_ID_ETS_FUNCTION13_CLASS = 107, + GLOBAL_TYPE_ID_ETS_FUNCTION14_CLASS = 108, + GLOBAL_TYPE_ID_ETS_FUNCTION15_CLASS = 109, + GLOBAL_TYPE_ID_ETS_FUNCTION16_CLASS = 110, + GLOBAL_TYPE_ID_ETS_FUNCTIONN_CLASS = 111, + GLOBAL_TYPE_ID_ETS_LAMBDA0_CLASS = 112, + GLOBAL_TYPE_ID_ETS_LAMBDA1_CLASS = 113, + GLOBAL_TYPE_ID_ETS_LAMBDA2_CLASS = 114, + GLOBAL_TYPE_ID_ETS_LAMBDA3_CLASS = 115, + GLOBAL_TYPE_ID_ETS_LAMBDA4_CLASS = 116, + GLOBAL_TYPE_ID_ETS_LAMBDA5_CLASS = 117, + GLOBAL_TYPE_ID_ETS_LAMBDA6_CLASS = 118, + GLOBAL_TYPE_ID_ETS_LAMBDA7_CLASS = 119, + GLOBAL_TYPE_ID_ETS_LAMBDA8_CLASS = 120, + GLOBAL_TYPE_ID_ETS_LAMBDA9_CLASS = 121, + GLOBAL_TYPE_ID_ETS_LAMBDA10_CLASS = 122, + GLOBAL_TYPE_ID_ETS_LAMBDA11_CLASS = 123, + GLOBAL_TYPE_ID_ETS_LAMBDA12_CLASS = 124, + GLOBAL_TYPE_ID_ETS_LAMBDA13_CLASS = 125, + GLOBAL_TYPE_ID_ETS_LAMBDA14_CLASS = 126, + GLOBAL_TYPE_ID_ETS_LAMBDA15_CLASS = 127, + GLOBAL_TYPE_ID_ETS_LAMBDA16_CLASS = 128, + GLOBAL_TYPE_ID_ETS_LAMBDAN_CLASS = 129, + GLOBAL_TYPE_ID_ETS_FUNCTIONR0_CLASS = 130, + GLOBAL_TYPE_ID_ETS_FUNCTIONR1_CLASS = 131, + GLOBAL_TYPE_ID_ETS_FUNCTIONR2_CLASS = 132, + GLOBAL_TYPE_ID_ETS_FUNCTIONR3_CLASS = 133, + GLOBAL_TYPE_ID_ETS_FUNCTIONR4_CLASS = 134, + GLOBAL_TYPE_ID_ETS_FUNCTIONR5_CLASS = 135, + GLOBAL_TYPE_ID_ETS_FUNCTIONR6_CLASS = 136, + GLOBAL_TYPE_ID_ETS_FUNCTIONR7_CLASS = 137, + GLOBAL_TYPE_ID_ETS_FUNCTIONR8_CLASS = 138, + GLOBAL_TYPE_ID_ETS_FUNCTIONR9_CLASS = 139, + GLOBAL_TYPE_ID_ETS_FUNCTIONR10_CLASS = 140, + GLOBAL_TYPE_ID_ETS_FUNCTIONR11_CLASS = 141, + GLOBAL_TYPE_ID_ETS_FUNCTIONR12_CLASS = 142, + GLOBAL_TYPE_ID_ETS_FUNCTIONR13_CLASS = 143, + GLOBAL_TYPE_ID_ETS_FUNCTIONR14_CLASS = 144, + GLOBAL_TYPE_ID_ETS_FUNCTIONR15_CLASS = 145, + GLOBAL_TYPE_ID_ETS_FUNCTIONR16_CLASS = 146, + GLOBAL_TYPE_ID_ETS_LAMBDAR0_CLASS = 147, + GLOBAL_TYPE_ID_ETS_LAMBDAR1_CLASS = 148, + GLOBAL_TYPE_ID_ETS_LAMBDAR2_CLASS = 149, + GLOBAL_TYPE_ID_ETS_LAMBDAR3_CLASS = 150, + GLOBAL_TYPE_ID_ETS_LAMBDAR4_CLASS = 151, + GLOBAL_TYPE_ID_ETS_LAMBDAR5_CLASS = 152, + GLOBAL_TYPE_ID_ETS_LAMBDAR6_CLASS = 153, + GLOBAL_TYPE_ID_ETS_LAMBDAR7_CLASS = 154, + GLOBAL_TYPE_ID_ETS_LAMBDAR8_CLASS = 155, + GLOBAL_TYPE_ID_ETS_LAMBDAR9_CLASS = 156, + GLOBAL_TYPE_ID_ETS_LAMBDAR10_CLASS = 157, + GLOBAL_TYPE_ID_ETS_LAMBDAR11_CLASS = 158, + GLOBAL_TYPE_ID_ETS_LAMBDAR12_CLASS = 159, + GLOBAL_TYPE_ID_ETS_LAMBDAR13_CLASS = 160, + GLOBAL_TYPE_ID_ETS_LAMBDAR14_CLASS = 161, + GLOBAL_TYPE_ID_ETS_LAMBDAR15_CLASS = 162, + GLOBAL_TYPE_ID_ETS_LAMBDAR16_CLASS = 163, + GLOBAL_TYPE_ID_ETS_TUPLE0_CLASS = 164, + GLOBAL_TYPE_ID_ETS_TUPLE1_CLASS = 165, + GLOBAL_TYPE_ID_ETS_TUPLE2_CLASS = 166, + GLOBAL_TYPE_ID_ETS_TUPLE3_CLASS = 167, + GLOBAL_TYPE_ID_ETS_TUPLE4_CLASS = 168, + GLOBAL_TYPE_ID_ETS_TUPLE5_CLASS = 169, + GLOBAL_TYPE_ID_ETS_TUPLE6_CLASS = 170, + GLOBAL_TYPE_ID_ETS_TUPLE7_CLASS = 171, + GLOBAL_TYPE_ID_ETS_TUPLE8_CLASS = 172, + GLOBAL_TYPE_ID_ETS_TUPLE9_CLASS = 173, + GLOBAL_TYPE_ID_ETS_TUPLE10_CLASS = 174, + GLOBAL_TYPE_ID_ETS_TUPLE11_CLASS = 175, + GLOBAL_TYPE_ID_ETS_TUPLE12_CLASS = 176, + GLOBAL_TYPE_ID_ETS_TUPLE13_CLASS = 177, + GLOBAL_TYPE_ID_ETS_TUPLE14_CLASS = 178, + GLOBAL_TYPE_ID_ETS_TUPLE15_CLASS = 179, + GLOBAL_TYPE_ID_ETS_TUPLE16_CLASS = 180, + GLOBAL_TYPE_ID_ETS_TUPLEN_CLASS = 181, + GLOBAL_TYPE_ID_TYPE_ERROR = 182, + GLOBAL_TYPE_ID_COUNT = 183 } export enum Es2pandaMethodDefinitionKind { METHOD_DEFINITION_KIND_NONE = 0, diff --git a/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts b/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts index 141cfa758f..d9c2ec92e7 100644 --- a/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts +++ b/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts @@ -3197,28 +3197,25 @@ export class Es2pandaNativeModule { _UpdateCharLiteral(context: KNativePointer, original: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _CreateETSIntrinsicNode(context: KNativePointer): KNativePointer { + _CreateETSIntrinsicNode(context: KNativePointer, other: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _UpdateETSIntrinsicNode(context: KNativePointer, original: KNativePointer): KNativePointer { + _UpdateETSIntrinsicNode(context: KNativePointer, original: KNativePointer, other: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _CreateETSIntrinsicNode1(context: KNativePointer, other: KNativePointer): KNativePointer { + _CreateETSIntrinsicNode1(context: KNativePointer, id: KStringPtr, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _UpdateETSIntrinsicNode1(context: KNativePointer, original: KNativePointer, other: KNativePointer): KNativePointer { + _UpdateETSIntrinsicNode1(context: KNativePointer, original: KNativePointer, id: KStringPtr, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _CreateETSIntrinsicNode2(context: KNativePointer, type: KInt, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { + _ETSIntrinsicNodeIdConst(context: KNativePointer, receiver: KNativePointer): KStringPtr { throw new Error("This methods was not overloaded by native module initialization") } - _UpdateETSIntrinsicNode2(context: KNativePointer, original: KNativePointer, type: KInt, _arguments: BigUint64Array, _argumentsSequenceLength: KUInt): KNativePointer { - throw new Error("This methods was not overloaded by native module initialization") - } - _ETSIntrinsicNodeTypeConst(context: KNativePointer, receiver: KNativePointer): KInt { + _ETSIntrinsicNodeArgumentsConst(context: KNativePointer, receiver: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } - _ETSIntrinsicNodeArgumentsConst(context: KNativePointer, receiver: KNativePointer): KNativePointer { + _ETSIntrinsicNodeArguments(context: KNativePointer, receiver: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } _CreateETSPackageDeclaration(context: KNativePointer, name: KNativePointer): KNativePointer { diff --git a/ui2abc/libarkts/src/generated/factory.ts b/ui2abc/libarkts/src/generated/factory.ts index e48f35cd8b..525c84662e 100644 --- a/ui2abc/libarkts/src/generated/factory.ts +++ b/ui2abc/libarkts/src/generated/factory.ts @@ -68,7 +68,6 @@ import { ETSTypeReferencePart } from "./peers/ETSTypeReferencePart" import { ETSUndefinedType } from "./peers/ETSUndefinedType" import { ETSUnionType } from "./peers/ETSUnionType" import { EmptyStatement } from "./peers/EmptyStatement" -import { Es2pandaIntrinsicNodeType } from "./Es2pandaEnums" import { Es2pandaMetaPropertyKind } from "./Es2pandaEnums" import { Es2pandaModifierFlags } from "./Es2pandaEnums" import { Es2pandaPrimitiveType } from "./Es2pandaEnums" @@ -675,14 +674,14 @@ export const factory = { return updateNodeByNode(CharLiteral.createCharLiteral(), original) } , - createETSIntrinsicNode(type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { - return ETSIntrinsicNode.create2ETSIntrinsicNode(type, _arguments) + createETSIntrinsicNode(id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { + return ETSIntrinsicNode.create1ETSIntrinsicNode(id, _arguments) } , - updateETSIntrinsicNode(original: ETSIntrinsicNode, type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { - if (isSameNativeObject(type, original.type) && isSameNativeObject(_arguments, original.arguments)) + updateETSIntrinsicNode(original: ETSIntrinsicNode, id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { + if (isSameNativeObject(id, original.id) && isSameNativeObject(_arguments, original.arguments)) return original - return updateNodeByNode(ETSIntrinsicNode.create2ETSIntrinsicNode(type, _arguments), original) + return updateNodeByNode(ETSIntrinsicNode.create1ETSIntrinsicNode(id, _arguments), original) } , createTSModuleBlock(statements: readonly Statement[]): TSModuleBlock { diff --git a/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts b/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts index e37180cbb7..d93e82e026 100644 --- a/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts +++ b/ui2abc/libarkts/src/generated/peers/ETSIntrinsicNode.ts @@ -32,38 +32,32 @@ import { } from "../../reexport-for-generated" import { Es2pandaAstNodeType } from "./../Es2pandaEnums" -import { Es2pandaIntrinsicNodeType } from "./../Es2pandaEnums" import { Expression } from "./Expression" export class ETSIntrinsicNode extends Expression { constructor(pointer: KNativePointer, astNodeType: Es2pandaAstNodeType) { super(pointer, astNodeType) } - static create2ETSIntrinsicNode(type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { - const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._CreateETSIntrinsicNode2(global.context, type, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) + static create1ETSIntrinsicNode(id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { + const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._CreateETSIntrinsicNode1(global.context, id, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) result.setChildrenParentPtr() return result } - static updateETSIntrinsicNode(original?: ETSIntrinsicNode): ETSIntrinsicNode { - const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode(global.context, passNode(original)), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) + static updateETSIntrinsicNode(original?: ETSIntrinsicNode, other?: ETSIntrinsicNode): ETSIntrinsicNode { + const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode(global.context, passNode(original), passNode(other)), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) result.setChildrenParentPtr() return result } - static update1ETSIntrinsicNode(original?: ETSIntrinsicNode, other?: ETSIntrinsicNode): ETSIntrinsicNode { - const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode1(global.context, passNode(original), passNode(other)), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) + static update1ETSIntrinsicNode(original: ETSIntrinsicNode | undefined, id: string, _arguments: readonly Expression[]): ETSIntrinsicNode { + const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode1(global.context, passNode(original), id, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) result.setChildrenParentPtr() return result } - static update2ETSIntrinsicNode(original: ETSIntrinsicNode | undefined, type: Es2pandaIntrinsicNodeType, _arguments: readonly Expression[]): ETSIntrinsicNode { - const result: ETSIntrinsicNode = new ETSIntrinsicNode(global.generatedEs2panda._UpdateETSIntrinsicNode2(global.context, passNode(original), type, passNodeArray(_arguments), _arguments.length), Es2pandaAstNodeType.AST_NODE_TYPE_ETS_INTRINSIC_NODE_TYPE) - result.setChildrenParentPtr() - return result - } - get type(): Es2pandaIntrinsicNodeType { - return global.generatedEs2panda._ETSIntrinsicNodeTypeConst(global.context, this.peer) + get id(): string { + return unpackString(global.generatedEs2panda._ETSIntrinsicNodeIdConst(global.context, this.peer)) } get arguments(): readonly Expression[] { - return unpackNodeArray(global.generatedEs2panda._ETSIntrinsicNodeArgumentsConst(global.context, this.peer)) + return unpackNodeArray(global.generatedEs2panda._ETSIntrinsicNodeArguments(global.context, this.peer)) } protected readonly brandETSIntrinsicNode: undefined } -- Gitee