From 681f245a73cce0904eec67de1bb52b8b6087610f Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Tue, 16 Dec 2025 18:16:49 +0300 Subject: [PATCH 1/8] Rename states to impl Signed-off-by: Nikolay Igotti --- incremental/runtime/src/animation/AnimatedState.ts | 4 ++-- incremental/runtime/src/animation/GlobalTimer.ts | 2 +- incremental/runtime/src/animation/TimeAnimation.ts | 2 +- incremental/runtime/src/{states => impl}/Dependency.ts | 0 incremental/runtime/src/{states => impl}/Disposable.ts | 0 .../runtime/src/{states => impl}/GlobalStateManager.ts | 0 incremental/runtime/src/{states => impl}/Journal.ts | 0 incremental/runtime/src/{states => impl}/State.ts | 0 incremental/runtime/src/index.ts | 8 ++++---- incremental/runtime/src/memo/changeListener.ts | 2 +- incremental/runtime/src/memo/entry.ts | 2 +- incremental/runtime/src/memo/remember.ts | 2 +- incremental/runtime/src/memo/testing.ts | 4 ++-- incremental/runtime/src/state.ts | 2 +- incremental/runtime/src/tree/IncrementalNode.ts | 2 +- incremental/runtime/src/tree/TreeNode.ts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) rename incremental/runtime/src/{states => impl}/Dependency.ts (100%) rename incremental/runtime/src/{states => impl}/Disposable.ts (100%) rename incremental/runtime/src/{states => impl}/GlobalStateManager.ts (100%) rename incremental/runtime/src/{states => impl}/Journal.ts (100%) rename incremental/runtime/src/{states => impl}/State.ts (100%) diff --git a/incremental/runtime/src/animation/AnimatedState.ts b/incremental/runtime/src/animation/AnimatedState.ts index 09a64ff49..7ab4676ca 100644 --- a/incremental/runtime/src/animation/AnimatedState.ts +++ b/incremental/runtime/src/animation/AnimatedState.ts @@ -16,8 +16,8 @@ import { int64 } from '@koalaui/common' import { getAnimationTimer } from './GlobalTimer' import { TimeAnimation, constAnimation } from './TimeAnimation' -import { Disposable } from '../states/Disposable' -import { GlobalStateManager } from '../states/GlobalStateManager' +import { Disposable } from '../impl/Disposable' +import { GlobalStateManager } from '../impl/GlobalStateManager' import { ComputableState, MutableState, ReadableState, StateContext } from '../state' diff --git a/incremental/runtime/src/animation/GlobalTimer.ts b/incremental/runtime/src/animation/GlobalTimer.ts index d978b84cf..87a8ee097 100644 --- a/incremental/runtime/src/animation/GlobalTimer.ts +++ b/incremental/runtime/src/animation/GlobalTimer.ts @@ -14,7 +14,7 @@ */ import { int64 } from '@koalaui/common' -import { GlobalStateManager } from '../states/GlobalStateManager' +import { GlobalStateManager } from '../impl/GlobalStateManager' import { MutableState, StateContext } from '../state' const GLOBAL_ANIMATION_TIMER = 'ohos.koala.runtime.global.animation.timer' diff --git a/incremental/runtime/src/animation/TimeAnimation.ts b/incremental/runtime/src/animation/TimeAnimation.ts index 84730f10d..5a89c6f53 100644 --- a/incremental/runtime/src/animation/TimeAnimation.ts +++ b/incremental/runtime/src/animation/TimeAnimation.ts @@ -16,7 +16,7 @@ import { float64, float64toInt64, int32, int64, isFiniteNumber, uint32 } from '@koalaui/common' import { AnimationRange, NumberAnimationRange } from './AnimationRange' import { Easing, EasingCurve } from './Easing' -import { scheduleCallback } from '../states/GlobalStateManager' +import { scheduleCallback } from '../impl/GlobalStateManager' export const DEFAULT_ANIMATION_DURATION: uint32 = 300 diff --git a/incremental/runtime/src/states/Dependency.ts b/incremental/runtime/src/impl/Dependency.ts similarity index 100% rename from incremental/runtime/src/states/Dependency.ts rename to incremental/runtime/src/impl/Dependency.ts diff --git a/incremental/runtime/src/states/Disposable.ts b/incremental/runtime/src/impl/Disposable.ts similarity index 100% rename from incremental/runtime/src/states/Disposable.ts rename to incremental/runtime/src/impl/Disposable.ts diff --git a/incremental/runtime/src/states/GlobalStateManager.ts b/incremental/runtime/src/impl/GlobalStateManager.ts similarity index 100% rename from incremental/runtime/src/states/GlobalStateManager.ts rename to incremental/runtime/src/impl/GlobalStateManager.ts diff --git a/incremental/runtime/src/states/Journal.ts b/incremental/runtime/src/impl/Journal.ts similarity index 100% rename from incremental/runtime/src/states/Journal.ts rename to incremental/runtime/src/impl/Journal.ts diff --git a/incremental/runtime/src/states/State.ts b/incremental/runtime/src/impl/State.ts similarity index 100% rename from incremental/runtime/src/states/State.ts rename to incremental/runtime/src/impl/State.ts diff --git a/incremental/runtime/src/index.ts b/incremental/runtime/src/index.ts index abee8b12d..6b912b502 100644 --- a/incremental/runtime/src/index.ts +++ b/incremental/runtime/src/index.ts @@ -130,13 +130,13 @@ export { export { Dependent, -} from './states/Dependency' +} from './impl/Dependency' export { Disposable, disposeContent, disposeContentBackward, disposeContentForward, -} from './states/Disposable' +} from './impl/Disposable' export { GlobalStateManager, arrayState, @@ -145,11 +145,11 @@ export { mutableState, scheduleCallback, updateStateManager, -} from './states/GlobalStateManager' +} from './impl/GlobalStateManager' export { createStateManager, StateManagerImpl, /* Improve:HQ private as public*/ -} from './states/State' +} from './impl/State' export { __context, diff --git a/incremental/runtime/src/memo/changeListener.ts b/incremental/runtime/src/memo/changeListener.ts index 337279529..7f58601af 100644 --- a/incremental/runtime/src/memo/changeListener.ts +++ b/incremental/runtime/src/memo/changeListener.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { scheduleCallback } from '../states/GlobalStateManager' +import { scheduleCallback } from '../impl/GlobalStateManager' import { __memo_context_type, __memo_id_type } from '../state' import { __context, __id } from '../internals' diff --git a/incremental/runtime/src/memo/entry.ts b/incremental/runtime/src/memo/entry.ts index 3d45fd444..d42abc0b3 100644 --- a/incremental/runtime/src/memo/entry.ts +++ b/incremental/runtime/src/memo/entry.ts @@ -14,7 +14,7 @@ */ import { RuntimeProfiler } from '../common/RuntimeProfiler' -import { GlobalStateManager } from '../states/GlobalStateManager' +import { GlobalStateManager } from '../impl/GlobalStateManager' import { __memo_context_type, __memo_id_type, ComputableState, StateContext, StateManager } from '../state' import { IncrementalNode } from '../tree/IncrementalNode' diff --git a/incremental/runtime/src/memo/remember.ts b/incremental/runtime/src/memo/remember.ts index 9ea0e8ae9..5353e895d 100644 --- a/incremental/runtime/src/memo/remember.ts +++ b/incremental/runtime/src/memo/remember.ts @@ -15,7 +15,7 @@ import { functionOverValue } from '@koalaui/common' import { __context, __id } from '../internals' -import { scheduleCallback } from '../states/GlobalStateManager' +import { scheduleCallback } from '../impl/GlobalStateManager' import { ArrayState, ControlledScope, MutableState, ReadableState } from '../state' /** diff --git a/incremental/runtime/src/memo/testing.ts b/incremental/runtime/src/memo/testing.ts index 0a32e7a2d..a2db7abcd 100644 --- a/incremental/runtime/src/memo/testing.ts +++ b/incremental/runtime/src/memo/testing.ts @@ -14,11 +14,11 @@ */ import { KoalaCallsiteKey, uint32, unsafeCast } from '@koalaui/common' -import { GlobalStateManager } from '../states/GlobalStateManager' +import { GlobalStateManager } from '../impl/GlobalStateManager' import { ComputableState, ReadableState, StateManager } from '../state' import { IncrementalNode } from '../tree/IncrementalNode' import { ReadonlyTreeNode, toNodeHierarchy } from '../tree/ReadonlyTreeNode' -import { Disposable } from '../states/Disposable' +import { Disposable } from '../impl/Disposable' import { memoRoot } from './entry' import { NodeAttach } from './node' diff --git a/incremental/runtime/src/state.ts b/incremental/runtime/src/state.ts index 97506bf75..07fe678c4 100644 --- a/incremental/runtime/src/state.ts +++ b/incremental/runtime/src/state.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import { int32, KoalaCallsiteKey } from "@koalaui/common" -import { Disposable } from "./states/Disposable" +import { Disposable } from "./impl/Disposable" import { IncrementalNode } from "./tree/IncrementalNode" /** diff --git a/incremental/runtime/src/tree/IncrementalNode.ts b/incremental/runtime/src/tree/IncrementalNode.ts index fc0681584..0ea787d54 100644 --- a/incremental/runtime/src/tree/IncrementalNode.ts +++ b/incremental/runtime/src/tree/IncrementalNode.ts @@ -14,7 +14,7 @@ */ import { className, KoalaCallsiteKey, uint32 } from '@koalaui/common' -import { Disposable } from '../states/Disposable' +import { Disposable } from '../impl/Disposable' import { ReadonlyTreeNode, toNodeHierarchy } from './ReadonlyTreeNode' /** diff --git a/incremental/runtime/src/tree/TreeNode.ts b/incremental/runtime/src/tree/TreeNode.ts index a6463d3ab..07b8088fd 100644 --- a/incremental/runtime/src/tree/TreeNode.ts +++ b/incremental/runtime/src/tree/TreeNode.ts @@ -15,7 +15,7 @@ import { className, int32, uint32 } from '@koalaui/common' import { RuntimeProfiler } from '../common/RuntimeProfiler' -import { Disposable } from '../states/Disposable' +import { Disposable } from '../impl/Disposable' import { ReadonlyTreeNode, toNodeHierarchy } from './ReadonlyTreeNode' /** -- Gitee From 035a135fc945a8054b0e57362fc1344d8c9ff1e5 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 16 Dec 2025 19:17:03 +0300 Subject: [PATCH 2/8] rename 'states' to 'impl' in imports and configs --- arkoala-arkts/arkui/src/PeerNode.ets | 4 ++-- arkoala-arkts/arkui/src/component/gesture.ets | 2 +- .../src/incrementalAndStateManagementReexport.ets | 4 ++-- .../src/stateManagement/tools/arkts/stateMgmtTool.ts | 2 +- arkoala-arkts/arkui/ui2abcconfig.json | 12 ++++++------ arkoala-arkts/cats/user/ui2abcconfig.json | 12 ++++++------ arkoala-arkts/modules/ohos/arktsconfig.json | 12 ++++++------ arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets | 2 +- arkoala-arkts/shopping/user/path.json | 12 ++++++------ arkoala-arkts/shopping/user/ui2abcconfig.json | 12 ++++++------ arkoala-arkts/shopping/user/ui2abcconfig_light.json | 12 ++++++------ arkoala-arkts/trivial/user/build_config.json | 12 ++++++------ arkoala-arkts/trivial/user/ui2abcconfig.json | 12 ++++++------ .../benchmarks/memo-benchmark/src/compat/arkts.ts | 2 +- .../benchmarks/memo-benchmark/ui2abcconfig.json | 12 ++++++------ incremental/incremental_components.gni | 10 +++++----- incremental/runtime/docs/api-examples.md | 10 +++++----- .../runtime/test-arkts/states/Journal.test.ts | 2 +- incremental/runtime/test/states/Journal.test.ts | 2 +- ui2abc/arkui-plugins/test/arktsconfig_template.json | 8 ++++---- ui2abc/ets-tests/golden-test-ui2abcconfig.json | 12 ++++++------ ui2abc/ets-tests/ui2abcconfig-incrementality.json | 12 ++++++------ ui2abc/ets-tests/ui2abcconfig-minimal.json | 12 ++++++------ ui2abc/ets-tests/ui2abcconfig.json | 12 ++++++------ ui2abc/memo-plugin-ng/demo/demo/demo.ets | 2 +- ui2abc/memo-plugin-ng/demo/ui2abcconfig.json | 12 ++++++------ ui2abc/memo-plugin-ng/doc/memo-introduction.md | 4 ++-- .../memo-plugin-ng/test/arktsconfig-diagnostics.json | 12 ++++++------ .../memo-plugin-ng/test/arktsconfig-executable.json | 12 ++++++------ ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json | 12 ++++++------ ui2abc/perf-tests/ui2abcconfig.json | 12 ++++++------ ui2abc/tests-memo/test/arktsconfig-memo-plugin.json | 12 ++++++------ ui2abc/tests-memo/test/compat/arkts/compat.ts | 2 +- ui2abc/tests-memo/test/ui2abc/main.test.ts | 2 +- ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json | 12 ++++++------ .../perf/ui2abcconfig-ui-parsed-checked.json | 12 ++++++------ .../perf/ui2abcconfig-ui-parsed-only.json | 12 ++++++------ ui2abc/ui-plugins-ng/src/utils.ts | 2 +- 38 files changed, 162 insertions(+), 162 deletions(-) diff --git a/arkoala-arkts/arkui/src/PeerNode.ets b/arkoala-arkts/arkui/src/PeerNode.ets index 93a3179dc..8c7a19190 100644 --- a/arkoala-arkts/arkui/src/PeerNode.ets +++ b/arkoala-arkts/arkui/src/PeerNode.ets @@ -22,8 +22,8 @@ import { ReusablePool } from "./ReusablePool" // import { MutableState } from "#incrementalAndStateManagementReexport" // import { IncrementalNode } from "@koalaui.runtime.tree.IncrementalNode" -// import { Disposable } from "@koalaui.runtime.states.Disposable" -// import { scheduleCallback, GlobalStateManager } from "@koalaui.runtime.states.GlobalStateManager" +// import { Disposable } from "@koalaui.runtime.impl.Disposable" +// import { scheduleCallback, GlobalStateManager } from "@koalaui.runtime.impl.GlobalStateManager" export const PeerNodeType = 11 export const RootPeerType = 33 diff --git a/arkoala-arkts/arkui/src/component/gesture.ets b/arkoala-arkts/arkui/src/component/gesture.ets index 8e56a9532..ee4b847f6 100644 --- a/arkoala-arkts/arkui/src/component/gesture.ets +++ b/arkoala-arkts/arkui/src/component/gesture.ets @@ -3,7 +3,7 @@ import { Callback } from "./common" import { GestureOps } from "./idlize" import { PeerNode } from "../PeerNode" import { MutableState } from 'arkui.incremental.runtime.state' -import { GlobalStateManager } from "arkui.incremental.runtime.states.GlobalStateManager" +import { GlobalStateManager } from "arkui.incremental.runtime.impl.GlobalStateManager" import { KeyEventInternal, TouchTestInfo } from "#generated" //import { TypeChecker } from "#components" import { SourceTool, GestureType } from "#generated" diff --git a/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets b/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets index 1ff4265a0..b437ddd3c 100644 --- a/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets +++ b/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -export * from "arkui.incremental.runtime.states.State" -export * from "arkui.incremental.runtime.states.GlobalStateManager" +export * from "arkui.incremental.runtime.impl.State" +export * from "arkui.incremental.runtime.impl.GlobalStateManager" export * from "arkui.incremental.runtime.memo.remember" export * from "arkui.incremental.runtime.memo.changeListener" export * from "arkui.incremental.runtime.memo.node" diff --git a/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts b/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts index a031e278e..619a56da9 100644 --- a/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts +++ b/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts @@ -28,7 +28,7 @@ import { NullableObject } from '../../base/types'; import { InterfaceProxyHandler } from './observeInterfaceProxy'; import { ISubscribedWatches } from '../../decorator'; import { DecoratedV1VariableBase } from '../../decoratorImpl/decoratorBase'; -import { GlobalStateManager } from 'arkui.incremental.runtime.states.GlobalStateManager'; +import { GlobalStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager'; import { StateManager } from 'arkui.incremental.runtime.state' import { StateMgmtConsole } from '../stateMgmtDFX'; export class StateMgmtTool { diff --git a/arkoala-arkts/arkui/ui2abcconfig.json b/arkoala-arkts/arkui/ui2abcconfig.json index a28a3d99e..0236b65d1 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.json +++ b/arkoala-arkts/arkui/ui2abcconfig.json @@ -1855,14 +1855,14 @@ "arkui.incremental.runtime.state": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.incremental.runtime.tree.IncrementalNode": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json index 03073a3a1..d830aec87 100644 --- a/arkoala-arkts/cats/user/ui2abcconfig.json +++ b/arkoala-arkts/cats/user/ui2abcconfig.json @@ -1695,14 +1695,14 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/modules/ohos/arktsconfig.json b/arkoala-arkts/modules/ohos/arktsconfig.json index b9b9684f3..acb50059e 100644 --- a/arkoala-arkts/modules/ohos/arktsconfig.json +++ b/arkoala-arkts/modules/ohos/arktsconfig.json @@ -1692,14 +1692,14 @@ "arkui.stateManagement.remember": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets b/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets index 9a1084adc..733f7f4c6 100644 --- a/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets +++ b/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets @@ -17,7 +17,7 @@ import { int32 } from "@koalaui/compat" import { MutableState } from 'arkui.incremental.runtime.state' import { contextLocal, contextLocalScope } from 'arkui.incremental.runtime.memo.contextLocal' -import { scheduleCallback, arrayState, mutableState } from 'arkui.incremental.runtime.states.GlobalStateManager' +import { scheduleCallback, arrayState, mutableState } from 'arkui.incremental.runtime.impl.GlobalStateManager' import { RunEffect } from 'arkui.incremental.runtime.memo.changeListener' import { RepeatByArray } from 'arkui.incremental.runtime.memo.repeat' import { NodeAttach } from 'arkui.incremental.runtime.memo.node' diff --git a/arkoala-arkts/shopping/user/path.json b/arkoala-arkts/shopping/user/path.json index 87431b4e2..8db28d012 100644 --- a/arkoala-arkts/shopping/user/path.json +++ b/arkoala-arkts/shopping/user/path.json @@ -1673,14 +1673,14 @@ "@koalaui.runtime.memo.testing": [ "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.memo.testing" ], - "@koalaui.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.states.Disposable" + "@koalaui.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.impl.Disposable" ], - "@koalaui.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.states.GlobalStateManager" + "@koalaui.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.impl.GlobalStateManager" ], - "@koalaui.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.states.State" + "@koalaui.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.impl.State" ], "@koalaui.runtime.tree.IncrementalNode": [ "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.tree.IncrementalNode" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json index 978c2d259..68e46d786 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig.json @@ -1696,14 +1696,14 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig_light.json b/arkoala-arkts/shopping/user/ui2abcconfig_light.json index 49744c431..4cd598109 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig_light.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig_light.json @@ -1689,14 +1689,14 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/trivial/user/build_config.json b/arkoala-arkts/trivial/user/build_config.json index 8bde6a18b..cda575ab4 100644 --- a/arkoala-arkts/trivial/user/build_config.json +++ b/arkoala-arkts/trivial/user/build_config.json @@ -1718,14 +1718,14 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/trivial/user/ui2abcconfig.json b/arkoala-arkts/trivial/user/ui2abcconfig.json index df521f1f6..dcc0f5356 100644 --- a/arkoala-arkts/trivial/user/ui2abcconfig.json +++ b/arkoala-arkts/trivial/user/ui2abcconfig.json @@ -1690,14 +1690,14 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts b/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts index 0666c0c03..af0f2e96c 100644 --- a/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts +++ b/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts @@ -18,4 +18,4 @@ export { MutableState } from 'arkui.incremental.runtime.state' export { NodeAttach } from 'arkui.incremental.runtime.memo.node' export { memoRoot } from 'arkui.incremental.runtime.memo.entry' export { toRootHierarchy, testTick } from 'arkui.incremental.runtime.memo.testing' -export { mutableState, updateStateManager } from 'arkui.incremental.runtime.states.GlobalStateManager' +export { mutableState, updateStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' diff --git a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json index 4365c4ec3..178e88f31 100644 --- a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json +++ b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json @@ -1702,14 +1702,14 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/incremental/incremental_components.gni b/incremental/incremental_components.gni index 5c61c5789..c9961f5c1 100644 --- a/incremental/incremental_components.gni +++ b/incremental/incremental_components.gni @@ -35,11 +35,11 @@ incremental_files = [ "runtime/src/memo/repeat.ts", "runtime/src/memo/testing.ts", "runtime/src/runtime.ts", - "runtime/src/states/Dependency.ts", - "runtime/src/states/Disposable.ts", - "runtime/src/states/GlobalStateManager.ts", - "runtime/src/states/Journal.ts", - "runtime/src/states/State.ts", + "runtime/src/impl/Dependency.ts", + "runtime/src/impl/Disposable.ts", + "runtime/src/impl/GlobalStateManager.ts", + "runtime/src/impl/Journal.ts", + "runtime/src/impl/State.ts", "runtime/src/tree/IncrementalNode.ts", "runtime/src/tree/PrimeNumbers.ts", "runtime/src/tree/ReadonlyTreeNode.ts", diff --git a/incremental/runtime/docs/api-examples.md b/incremental/runtime/docs/api-examples.md index 0aa2cb053..bb1759c8d 100644 --- a/incremental/runtime/docs/api-examples.md +++ b/incremental/runtime/docs/api-examples.md @@ -89,7 +89,7 @@ And incapsulate the creation of the state in `MyComponent`. import {Entry, Component, Column, Builder, Button, Text} from "@ohos.arkui.component" import { rememberMutableState } from "arkui.stateManagement.memo.remember" -import { MutableState } from "arkui.stateManagement.states.State" +import { MutableState } from "arkui.stateManagement.impl.State" @Builder @@ -427,7 +427,7 @@ The following program demonstrates the difference. 'use static' import {Entry, Component, Column, Builder, Button, ForEach, Text} from "@ohos.arkui.component" -import { arrayState, mutableState } from "arkui.stateManagement.states.GlobalStateManager" +import { arrayState, mutableState } from "arkui.stateManagement.impl.GlobalStateManager" const array = arrayState([0, 0]) const states = [mutableState(0), mutableState(0)] @@ -653,11 +653,11 @@ See the difference of `scheduleCallback`, `OnChange` and `RunEffect` in the foll 'use static' import {Entry, Component, Column, Builder, Button, ForEach, Text} from "@ohos.arkui.component" -import { arrayState, mutableState } from "arkui.stateManagement.states.GlobalStateManager" +import { arrayState, mutableState } from "arkui.stateManagement.impl.GlobalStateManager" import { rememberMutableState } from "arkui.stateManagement.memo.remember" import { OnChange, RunEffect } from "arkui.stateManagement.memo.changeListener" -import { scheduleCallback } from "arkui.stateManagement.states.GlobalStateManager" -import { MutableState } from "arkui.stateManagement.states.State" +import { scheduleCallback } from "arkui.stateManagement.impl.GlobalStateManager" +import { MutableState } from "arkui.stateManagement.impl.State" @memo function TextWithCallbacks(label: string, state: MutableState) { diff --git a/incremental/runtime/test-arkts/states/Journal.test.ts b/incremental/runtime/test-arkts/states/Journal.test.ts index 9088039cf..68f098e5f 100644 --- a/incremental/runtime/test-arkts/states/Journal.test.ts +++ b/incremental/runtime/test-arkts/states/Journal.test.ts @@ -14,7 +14,7 @@ */ import { assert, suite, test } from "@koalaui/harness" -import { Changes, Journal } from "../../ets/states/Journal" +import { Changes, Journal } from "../../ets/impl/Journal" function assertChange(changes: Changes | undefined, state: Object, expected: Value) { const change = changes?.getChange(state) diff --git a/incremental/runtime/test/states/Journal.test.ts b/incremental/runtime/test/states/Journal.test.ts index 52a0a0db9..e1d2a6883 100644 --- a/incremental/runtime/test/states/Journal.test.ts +++ b/incremental/runtime/test/states/Journal.test.ts @@ -14,7 +14,7 @@ */ import { assert, suite, test } from "@koalaui/harness" -import { Changes, Journal } from "../../src/states/Journal" +import { Changes, Journal } from "../../src/impl/Journal" function assertChange(changes: Changes | undefined, state: Object, expected: Value) { const change = changes?.getChange(state) diff --git a/ui2abc/arkui-plugins/test/arktsconfig_template.json b/ui2abc/arkui-plugins/test/arktsconfig_template.json index 99a3dae1f..0ee080449 100644 --- a/ui2abc/arkui-plugins/test/arktsconfig_template.json +++ b/ui2abc/arkui-plugins/test/arktsconfig_template.json @@ -2382,11 +2382,11 @@ "@koalaui.runtime.memo.testing": [ "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.memo.testing" ], - "@koalaui.runtime.states.Disposable": [ - "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.states.Disposable" + "@koalaui.runtime.impl.Disposable": [ + "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.impl.Disposable" ], - "@koalaui.runtime.states.GlobalStateManager": [ - "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.states.GlobalStateManager" + "@koalaui.runtime.impl.GlobalStateManager": [ + "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.impl.GlobalStateManager" ], "@koalaui.runtime.tree.PrimeNumbers": [ "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.tree.PrimeNumbers" diff --git a/ui2abc/ets-tests/golden-test-ui2abcconfig.json b/ui2abc/ets-tests/golden-test-ui2abcconfig.json index 774f3be59..5be59d8a9 100644 --- a/ui2abc/ets-tests/golden-test-ui2abcconfig.json +++ b/ui2abc/ets-tests/golden-test-ui2abcconfig.json @@ -1711,14 +1711,14 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/staimpltes/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ets-tests/ui2abcconfig-incrementality.json b/ui2abc/ets-tests/ui2abcconfig-incrementality.json index e4d78a74a..d09fc2ca0 100644 --- a/ui2abc/ets-tests/ui2abcconfig-incrementality.json +++ b/ui2abc/ets-tests/ui2abcconfig-incrementality.json @@ -1705,14 +1705,14 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ets-tests/ui2abcconfig-minimal.json b/ui2abc/ets-tests/ui2abcconfig-minimal.json index 29ad1ace0..5f7331edd 100644 --- a/ui2abc/ets-tests/ui2abcconfig-minimal.json +++ b/ui2abc/ets-tests/ui2abcconfig-minimal.json @@ -1711,14 +1711,14 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ets-tests/ui2abcconfig.json b/ui2abc/ets-tests/ui2abcconfig.json index 1e37e3dfd..7cffcd971 100644 --- a/ui2abc/ets-tests/ui2abcconfig.json +++ b/ui2abc/ets-tests/ui2abcconfig.json @@ -1711,14 +1711,14 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/demo/demo/demo.ets b/ui2abc/memo-plugin-ng/demo/demo/demo.ets index 1ac0ca9ff..a93478430 100644 --- a/ui2abc/memo-plugin-ng/demo/demo/demo.ets +++ b/ui2abc/memo-plugin-ng/demo/demo/demo.ets @@ -17,7 +17,7 @@ import { IncrementalNode } from 'arkui.incremental.runtime.tree.IncrementalNode' import { NodeAttach } from 'arkui.incremental.runtime.memo.node' import { memoRoot } from 'arkui.incremental.runtime.memo.entry' import { toRootHierarchy } from 'arkui.incremental.runtime.memo.testing' -import { mutableState, updateStateManager } from 'arkui.incremental.runtime.states.GlobalStateManager' +import { mutableState, updateStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' import { memo } from "arkui.incremental.annotation" // This example demostrates creation of incremental trees of string nodes diff --git a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json index 8c0b0911e..546099a85 100644 --- a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json +++ b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json @@ -1705,14 +1705,14 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/doc/memo-introduction.md b/ui2abc/memo-plugin-ng/doc/memo-introduction.md index fb3255773..a85db6654 100644 --- a/ui2abc/memo-plugin-ng/doc/memo-introduction.md +++ b/ui2abc/memo-plugin-ng/doc/memo-introduction.md @@ -187,7 +187,7 @@ To have something triggering the tree rebuild, let's have some state we can tweak between frames. ``` -import { mutableState } from 'arkui.incremental.runtime.states.GlobalStateManager' +import { mutableState } from 'arkui.incremental.runtime.impl.GlobalStateManager' // We create a state for the memo functions to subsceibe const state = mutableState(17) @@ -318,7 +318,7 @@ import { NodeAttach } from 'arkui.incremental.runtime.memo.node' import { memoRoot } from 'arkui.incremental.runtime.memo.entry' import { toRootHierarchy } from 'arkui.incremental.runtime.memo.testing' import { MutableState } from 'arkui.incremental.runtime.state' -import { mutableState, updateStateManager } from 'arkui.incremental.runtime.states.GlobalStateManager' +import { mutableState, updateStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' import { memo } from "arkui.incremental.annotation" // This example demostrates creation of incremental trees of string nodes diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json index 6bbc3656a..757e7674d 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json @@ -1702,14 +1702,14 @@ "arkui.stateManagement.runtime": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json index 60a8fa2da..bbd307efe 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json @@ -1705,14 +1705,14 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json index 082ab37d2..62884f099 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json @@ -1702,14 +1702,14 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/perf-tests/ui2abcconfig.json b/ui2abc/perf-tests/ui2abcconfig.json index a3a5a663b..04e6b07d8 100644 --- a/ui2abc/perf-tests/ui2abcconfig.json +++ b/ui2abc/perf-tests/ui2abcconfig.json @@ -1693,14 +1693,14 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json index 0f28641ff..a6da5090c 100644 --- a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json +++ b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json @@ -1708,14 +1708,14 @@ "arkui.stateManagement.runtime": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/tests-memo/test/compat/arkts/compat.ts b/ui2abc/tests-memo/test/compat/arkts/compat.ts index b5a4cf9f8..993b71367 100644 --- a/ui2abc/tests-memo/test/compat/arkts/compat.ts +++ b/ui2abc/tests-memo/test/compat/arkts/compat.ts @@ -14,6 +14,6 @@ */ export { TestNode, testRoot, testTick } from 'arkui.incremental.runtime.memo.testing' -export { mutableState, GlobalStateManager } from 'arkui.incremental.runtime.states.GlobalStateManager' +export { mutableState, GlobalStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' export { StateContext, MutableState } from 'arkui.incremental.runtime.state' export { __id, __key, __context } from "arkui.incremental.annotation" diff --git a/ui2abc/tests-memo/test/ui2abc/main.test.ts b/ui2abc/tests-memo/test/ui2abc/main.test.ts index 908b69413..bf2356874 100644 --- a/ui2abc/tests-memo/test/ui2abc/main.test.ts +++ b/ui2abc/tests-memo/test/ui2abc/main.test.ts @@ -15,7 +15,7 @@ import { suite, test } from "@koalaui/harness" import { __id, __key, __context } from "arkui.incremental.annotation" -import { GlobalStateManager } from 'arkui.incremental.runtime.states.GlobalStateManager' +import { GlobalStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' import { TestNode, testRoot, testTick } from 'arkui.incremental.runtime.memo.testing' import { assertResultArray, GlobalStateHolder } from "../utils" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json index ef4d595da..77a037679 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json @@ -1711,14 +1711,14 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json index 5d043883f..6a846f035 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json @@ -1711,14 +1711,14 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json index 0899af3e5..e83ccd96f 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json @@ -1711,14 +1711,14 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.states.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/Disposable" + "arkui.incremental.runtime.impl.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" ], - "arkui.incremental.runtime.states.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/GlobalStateManager" + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" ], - "arkui.incremental.runtime.states.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/states/State" + "arkui.incremental.runtime.impl.State": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ui-plugins-ng/src/utils.ts b/ui2abc/ui-plugins-ng/src/utils.ts index 022e87473..d53c8aed1 100644 --- a/ui2abc/ui-plugins-ng/src/utils.ts +++ b/ui2abc/ui-plugins-ng/src/utils.ts @@ -82,7 +82,7 @@ export function getGlobalStatePackage(): string { if (isKoalaWorkspace()) { return '@koalaui/runtime' } else { - return 'arkui.incremental.runtime.states.GlobalStateManager' + return 'arkui.incremental.runtime.impl.GlobalStateManager' } } -- Gitee From a47c6be80333996eac2f591b5eacf62369695929 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Fri, 19 Dec 2025 14:25:36 +0300 Subject: [PATCH 3/8] move come files to the 'common' folder --- incremental/runtime/src/animation/AnimatedState.ts | 2 +- incremental/runtime/src/{impl => common}/Dependency.ts | 2 +- incremental/runtime/src/{impl => common}/Disposable.ts | 0 incremental/runtime/src/{impl => common}/Journal.ts | 0 incremental/runtime/src/impl/State.ts | 6 +++--- incremental/runtime/src/index.ts | 4 ++-- incremental/runtime/src/memo/testing.ts | 2 +- incremental/runtime/src/state.ts | 6 +++--- incremental/runtime/src/tree/IncrementalNode.ts | 2 +- incremental/runtime/src/tree/TreeNode.ts | 2 +- .../runtime/test-arkts/{states => common}/Journal.test.ts | 4 ++-- incremental/runtime/test-arkts/tests.ts | 4 ++-- incremental/runtime/test/{states => common}/Journal.test.ts | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) rename incremental/runtime/src/{impl => common}/Dependency.ts (98%) rename incremental/runtime/src/{impl => common}/Disposable.ts (100%) rename incremental/runtime/src/{impl => common}/Journal.ts (100%) rename incremental/runtime/test-arkts/{states => common}/Journal.test.ts (96%) rename incremental/runtime/test/{states => common}/Journal.test.ts (98%) diff --git a/incremental/runtime/src/animation/AnimatedState.ts b/incremental/runtime/src/animation/AnimatedState.ts index 7ab4676ca..adfe6741a 100644 --- a/incremental/runtime/src/animation/AnimatedState.ts +++ b/incremental/runtime/src/animation/AnimatedState.ts @@ -16,7 +16,7 @@ import { int64 } from '@koalaui/common' import { getAnimationTimer } from './GlobalTimer' import { TimeAnimation, constAnimation } from './TimeAnimation' -import { Disposable } from '../impl/Disposable' +import { Disposable } from '../common/Disposable' import { GlobalStateManager } from '../impl/GlobalStateManager' import { ComputableState, MutableState, ReadableState, StateContext } from '../state' diff --git a/incremental/runtime/src/impl/Dependency.ts b/incremental/runtime/src/common/Dependency.ts similarity index 98% rename from incremental/runtime/src/impl/Dependency.ts rename to incremental/runtime/src/common/Dependency.ts index 1462bb9fb..8c701588a 100644 --- a/incremental/runtime/src/impl/Dependency.ts +++ b/incremental/runtime/src/common/Dependency.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { UID, Unique, UniqueMap, UniqueSet } from '../common/Unique' +import { UID, Unique, UniqueMap, UniqueSet } from './Unique' let uidCounter: UID = 0 diff --git a/incremental/runtime/src/impl/Disposable.ts b/incremental/runtime/src/common/Disposable.ts similarity index 100% rename from incremental/runtime/src/impl/Disposable.ts rename to incremental/runtime/src/common/Disposable.ts diff --git a/incremental/runtime/src/impl/Journal.ts b/incremental/runtime/src/common/Journal.ts similarity index 100% rename from incremental/runtime/src/impl/Journal.ts rename to incremental/runtime/src/common/Journal.ts diff --git a/incremental/runtime/src/impl/State.ts b/incremental/runtime/src/impl/State.ts index 5367caaeb..6878c89ce 100644 --- a/incremental/runtime/src/impl/State.ts +++ b/incremental/runtime/src/impl/State.ts @@ -22,9 +22,9 @@ import { ObservableHandler, uint32, } from '@koalaui/common' -import { Dependency, Dependent, ScopeToStates, StateToScopes } from './Dependency' -import { Disposable, disposeContent, disposeContentBackward } from './Disposable' -import { Changes, Journal } from './Journal' +import { Dependency, Dependent, ScopeToStates, StateToScopes } from '../common/Dependency' +import { Disposable, disposeContent, disposeContentBackward } from '../common/Disposable' +import { Changes, Journal } from '../common/Journal' import { markableQueue } from '../common/MarkableQueue' import { RuntimeProfiler } from '../common/RuntimeProfiler' import { IncrementalNode } from '../tree/IncrementalNode' diff --git a/incremental/runtime/src/index.ts b/incremental/runtime/src/index.ts index 6b912b502..dc5401a76 100644 --- a/incremental/runtime/src/index.ts +++ b/incremental/runtime/src/index.ts @@ -130,13 +130,13 @@ export { export { Dependent, -} from './impl/Dependency' +} from './common/Dependency' export { Disposable, disposeContent, disposeContentBackward, disposeContentForward, -} from './impl/Disposable' +} from './common/Disposable' export { GlobalStateManager, arrayState, diff --git a/incremental/runtime/src/memo/testing.ts b/incremental/runtime/src/memo/testing.ts index a2db7abcd..558776b72 100644 --- a/incremental/runtime/src/memo/testing.ts +++ b/incremental/runtime/src/memo/testing.ts @@ -18,7 +18,7 @@ import { GlobalStateManager } from '../impl/GlobalStateManager' import { ComputableState, ReadableState, StateManager } from '../state' import { IncrementalNode } from '../tree/IncrementalNode' import { ReadonlyTreeNode, toNodeHierarchy } from '../tree/ReadonlyTreeNode' -import { Disposable } from '../impl/Disposable' +import { Disposable } from '../common/Disposable' import { memoRoot } from './entry' import { NodeAttach } from './node' diff --git a/incremental/runtime/src/state.ts b/incremental/runtime/src/state.ts index 07fe678c4..a4f24c44e 100644 --- a/incremental/runtime/src/state.ts +++ b/incremental/runtime/src/state.ts @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { int32, KoalaCallsiteKey } from "@koalaui/common" -import { Disposable } from "./impl/Disposable" -import { IncrementalNode } from "./tree/IncrementalNode" +import { int32, KoalaCallsiteKey } from '@koalaui/common' +import { Disposable } from './common/Disposable' +import { IncrementalNode } from './tree/IncrementalNode' /** * Individual state, wrapping a value of type `Value`. diff --git a/incremental/runtime/src/tree/IncrementalNode.ts b/incremental/runtime/src/tree/IncrementalNode.ts index 0ea787d54..a595cd003 100644 --- a/incremental/runtime/src/tree/IncrementalNode.ts +++ b/incremental/runtime/src/tree/IncrementalNode.ts @@ -14,7 +14,7 @@ */ import { className, KoalaCallsiteKey, uint32 } from '@koalaui/common' -import { Disposable } from '../impl/Disposable' +import { Disposable } from '../common/Disposable' import { ReadonlyTreeNode, toNodeHierarchy } from './ReadonlyTreeNode' /** diff --git a/incremental/runtime/src/tree/TreeNode.ts b/incremental/runtime/src/tree/TreeNode.ts index 07b8088fd..40f003a23 100644 --- a/incremental/runtime/src/tree/TreeNode.ts +++ b/incremental/runtime/src/tree/TreeNode.ts @@ -15,7 +15,7 @@ import { className, int32, uint32 } from '@koalaui/common' import { RuntimeProfiler } from '../common/RuntimeProfiler' -import { Disposable } from '../impl/Disposable' +import { Disposable } from '../common/Disposable' import { ReadonlyTreeNode, toNodeHierarchy } from './ReadonlyTreeNode' /** diff --git a/incremental/runtime/test-arkts/states/Journal.test.ts b/incremental/runtime/test-arkts/common/Journal.test.ts similarity index 96% rename from incremental/runtime/test-arkts/states/Journal.test.ts rename to incremental/runtime/test-arkts/common/Journal.test.ts index 68f098e5f..5bf56bd00 100644 --- a/incremental/runtime/test-arkts/states/Journal.test.ts +++ b/incremental/runtime/test-arkts/common/Journal.test.ts @@ -14,7 +14,7 @@ */ import { assert, suite, test } from "@koalaui/harness" -import { Changes, Journal } from "../../ets/impl/Journal" +import { Changes, Journal } from "../../ets/common/Journal" function assertChange(changes: Changes | undefined, state: Object, expected: Value) { const change = changes?.getChange(state) @@ -97,4 +97,4 @@ suite("Journal tests", () => { assertNoChanges(journal) }) }) -export const __ARKTEST__ = "states/Journal.test" +export const __ARKTEST__ = "common/Journal.test" diff --git a/incremental/runtime/test-arkts/tests.ts b/incremental/runtime/test-arkts/tests.ts index 8be8232a8..86d3a5c66 100644 --- a/incremental/runtime/test-arkts/tests.ts +++ b/incremental/runtime/test-arkts/tests.ts @@ -15,6 +15,7 @@ import { suite } from "@koalaui/harness" import { __ARKTEST__ as Easing } from "./animation/Easing.test" +import { __ARKTEST__ as Journal } from "./common/Journal.test" import { __ARKTEST__ as MarkableQueue } from "./common/MarkableQueue.test" import { __ARKTEST__ as bind } from "./memo/bind.test" import { __ARKTEST__ as changeListener } from "./memo/changeListener.test" @@ -22,11 +23,10 @@ import { __ARKTEST__ as contextLocal } from "./memo/contextLocal.test" import { __ARKTEST__ as node } from "./memo/node.test" import { __ARKTEST__ as remember } from "./memo/remember.test" import { __ARKTEST__ as repeat } from "./memo/repeat.test" -import { __ARKTEST__ as Journal } from "./states/Journal.test" import { __ARKTEST__ as State } from "./states/State.test" import { __ARKTEST__ as TreeNode } from "./tree/TreeNode.test" import { __ARKTEST__ as TreePath } from "./tree/TreePath.test" suite("runtime", () => { - Array.of(Easing, MarkableQueue, bind, changeListener, contextLocal, node, remember, repeat, Journal, /* state_basics, */State, TreeNode, TreePath) + Array.of(Easing, Journal, MarkableQueue, bind, changeListener, contextLocal, node, remember, repeat, /* state_basics, */State, TreeNode, TreePath) }) diff --git a/incremental/runtime/test/states/Journal.test.ts b/incremental/runtime/test/common/Journal.test.ts similarity index 98% rename from incremental/runtime/test/states/Journal.test.ts rename to incremental/runtime/test/common/Journal.test.ts index e1d2a6883..cc72863af 100644 --- a/incremental/runtime/test/states/Journal.test.ts +++ b/incremental/runtime/test/common/Journal.test.ts @@ -14,7 +14,7 @@ */ import { assert, suite, test } from "@koalaui/harness" -import { Changes, Journal } from "../../src/impl/Journal" +import { Changes, Journal } from "../../src/common/Journal" function assertChange(changes: Changes | undefined, state: Object, expected: Value) { const change = changes?.getChange(state) -- Gitee From 984e94ae5c8f3d3bb13f740ed820eb3e5dc28e7b Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Fri, 19 Dec 2025 17:26:20 +0300 Subject: [PATCH 4/8] fix configs --- arkoala-arkts/arkui/ui2abcconfig.json | 4 ++-- arkoala-arkts/cats/user/ui2abcconfig.json | 4 ++-- arkoala-arkts/modules/ohos/arktsconfig.json | 4 ++-- arkoala-arkts/shopping/user/path.json | 4 ++-- arkoala-arkts/shopping/user/ui2abcconfig.json | 4 ++-- arkoala-arkts/shopping/user/ui2abcconfig_light.json | 4 ++-- arkoala-arkts/trivial/user/build_config.json | 4 ++-- arkoala-arkts/trivial/user/ui2abcconfig.json | 4 ++-- incremental/benchmarks/memo-benchmark/ui2abcconfig.json | 4 ++-- incremental/incremental_components.gni | 6 +++--- ui2abc/arkui-plugins/test/arktsconfig_template.json | 4 ++-- ui2abc/ets-tests/golden-test-ui2abcconfig.json | 4 ++-- ui2abc/ets-tests/ui2abcconfig-incrementality.json | 4 ++-- ui2abc/ets-tests/ui2abcconfig-minimal.json | 4 ++-- ui2abc/ets-tests/ui2abcconfig.json | 4 ++-- ui2abc/memo-plugin-ng/demo/ui2abcconfig.json | 4 ++-- ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json | 4 ++-- ui2abc/memo-plugin-ng/test/arktsconfig-executable.json | 4 ++-- ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json | 4 ++-- ui2abc/perf-tests/ui2abcconfig.json | 4 ++-- ui2abc/tests-memo/test/arktsconfig-memo-plugin.json | 4 ++-- ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json | 4 ++-- .../ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json | 4 ++-- ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json | 4 ++-- 24 files changed, 49 insertions(+), 49 deletions(-) diff --git a/arkoala-arkts/arkui/ui2abcconfig.json b/arkoala-arkts/arkui/ui2abcconfig.json index 0236b65d1..a431fc5a3 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.json +++ b/arkoala-arkts/arkui/ui2abcconfig.json @@ -1855,8 +1855,8 @@ "arkui.incremental.runtime.state": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json index d830aec87..70c39dab2 100644 --- a/arkoala-arkts/cats/user/ui2abcconfig.json +++ b/arkoala-arkts/cats/user/ui2abcconfig.json @@ -1695,8 +1695,8 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/arkoala-arkts/modules/ohos/arktsconfig.json b/arkoala-arkts/modules/ohos/arktsconfig.json index acb50059e..aece52a51 100644 --- a/arkoala-arkts/modules/ohos/arktsconfig.json +++ b/arkoala-arkts/modules/ohos/arktsconfig.json @@ -1692,8 +1692,8 @@ "arkui.stateManagement.remember": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/arkoala-arkts/shopping/user/path.json b/arkoala-arkts/shopping/user/path.json index 8db28d012..84255eb98 100644 --- a/arkoala-arkts/shopping/user/path.json +++ b/arkoala-arkts/shopping/user/path.json @@ -1673,8 +1673,8 @@ "@koalaui.runtime.memo.testing": [ "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.memo.testing" ], - "@koalaui.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.impl.Disposable" + "@koalaui.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.common.Disposable" ], "@koalaui.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.impl.GlobalStateManager" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json index 68e46d786..8c7197cd4 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig.json @@ -1696,8 +1696,8 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig_light.json b/arkoala-arkts/shopping/user/ui2abcconfig_light.json index 4cd598109..9133f62b5 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig_light.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig_light.json @@ -1689,8 +1689,8 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/arkoala-arkts/trivial/user/build_config.json b/arkoala-arkts/trivial/user/build_config.json index cda575ab4..2fbff1826 100644 --- a/arkoala-arkts/trivial/user/build_config.json +++ b/arkoala-arkts/trivial/user/build_config.json @@ -1718,8 +1718,8 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/arkoala-arkts/trivial/user/ui2abcconfig.json b/arkoala-arkts/trivial/user/ui2abcconfig.json index dcc0f5356..29bfad081 100644 --- a/arkoala-arkts/trivial/user/ui2abcconfig.json +++ b/arkoala-arkts/trivial/user/ui2abcconfig.json @@ -1690,8 +1690,8 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json index 178e88f31..5fc97f8b4 100644 --- a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json +++ b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json @@ -1702,8 +1702,8 @@ "arkui.stateManagement.remember": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/incremental/incremental_components.gni b/incremental/incremental_components.gni index c9961f5c1..71f91dbc7 100644 --- a/incremental/incremental_components.gni +++ b/incremental/incremental_components.gni @@ -22,6 +22,9 @@ incremental_files = [ "runtime/src/animation/GlobalTimer.ts", "runtime/src/animation/TimeAnimation.ts", "runtime/src/animation/memo.ts", + "runtime/src/common/Dependency.ts", + "runtime/src/common/Disposable.ts", + "runtime/src/common/Journal.ts", "runtime/src/common/MarkableQueue.ts", "runtime/src/common/RuntimeProfiler.ts", "runtime/src/common/Unique.ts", @@ -35,10 +38,7 @@ incremental_files = [ "runtime/src/memo/repeat.ts", "runtime/src/memo/testing.ts", "runtime/src/runtime.ts", - "runtime/src/impl/Dependency.ts", - "runtime/src/impl/Disposable.ts", "runtime/src/impl/GlobalStateManager.ts", - "runtime/src/impl/Journal.ts", "runtime/src/impl/State.ts", "runtime/src/tree/IncrementalNode.ts", "runtime/src/tree/PrimeNumbers.ts", diff --git a/ui2abc/arkui-plugins/test/arktsconfig_template.json b/ui2abc/arkui-plugins/test/arktsconfig_template.json index 0ee080449..c1655e3f2 100644 --- a/ui2abc/arkui-plugins/test/arktsconfig_template.json +++ b/ui2abc/arkui-plugins/test/arktsconfig_template.json @@ -2382,8 +2382,8 @@ "@koalaui.runtime.memo.testing": [ "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.memo.testing" ], - "@koalaui.runtime.impl.Disposable": [ - "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.impl.Disposable" + "@koalaui.runtime.common.Disposable": [ + "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.common.Disposable" ], "@koalaui.runtime.impl.GlobalStateManager": [ "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.impl.GlobalStateManager" diff --git a/ui2abc/ets-tests/golden-test-ui2abcconfig.json b/ui2abc/ets-tests/golden-test-ui2abcconfig.json index 5be59d8a9..4fb2930c7 100644 --- a/ui2abc/ets-tests/golden-test-ui2abcconfig.json +++ b/ui2abc/ets-tests/golden-test-ui2abcconfig.json @@ -1711,8 +1711,8 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/staimpltes/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/ets-tests/ui2abcconfig-incrementality.json b/ui2abc/ets-tests/ui2abcconfig-incrementality.json index d09fc2ca0..c1d85fb31 100644 --- a/ui2abc/ets-tests/ui2abcconfig-incrementality.json +++ b/ui2abc/ets-tests/ui2abcconfig-incrementality.json @@ -1705,8 +1705,8 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/ets-tests/ui2abcconfig-minimal.json b/ui2abc/ets-tests/ui2abcconfig-minimal.json index 5f7331edd..da342a163 100644 --- a/ui2abc/ets-tests/ui2abcconfig-minimal.json +++ b/ui2abc/ets-tests/ui2abcconfig-minimal.json @@ -1711,8 +1711,8 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/ets-tests/ui2abcconfig.json b/ui2abc/ets-tests/ui2abcconfig.json index 7cffcd971..ab75728d2 100644 --- a/ui2abc/ets-tests/ui2abcconfig.json +++ b/ui2abc/ets-tests/ui2abcconfig.json @@ -1711,8 +1711,8 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json index 546099a85..9ef66cffb 100644 --- a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json +++ b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json @@ -1705,8 +1705,8 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json index 757e7674d..5869d206f 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json @@ -1702,8 +1702,8 @@ "arkui.stateManagement.runtime": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json index bbd307efe..da665b09c 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json @@ -1705,8 +1705,8 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json index 62884f099..827a0384e 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json @@ -1702,8 +1702,8 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/perf-tests/ui2abcconfig.json b/ui2abc/perf-tests/ui2abcconfig.json index 04e6b07d8..8bbb3104b 100644 --- a/ui2abc/perf-tests/ui2abcconfig.json +++ b/ui2abc/perf-tests/ui2abcconfig.json @@ -1693,8 +1693,8 @@ "arkui.stateManagement.runtime": [ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json index a6da5090c..98f449681 100644 --- a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json +++ b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json @@ -1708,8 +1708,8 @@ "arkui.stateManagement.runtime": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json index 77a037679..6f81ea561 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json @@ -1711,8 +1711,8 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json index 6a846f035..5cea5a2f7 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json @@ -1711,8 +1711,8 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json index e83ccd96f..30e34311b 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json @@ -1711,8 +1711,8 @@ "arkui.stateManagement.runtime": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], - "arkui.incremental.runtime.impl.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/Disposable" + "arkui.incremental.runtime.common.Disposable": [ + "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" -- Gitee From 1913add796d069931adc6b5abc81f7be673e53db Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Fri, 19 Dec 2025 18:32:24 +0300 Subject: [PATCH 5/8] try to specify direct local paths --- arkoala-arkts/arkui/ui2abcconfig.json | 38 +++++++++---------- arkoala-arkts/cats/user/ui2abcconfig.json | 36 +++++++++--------- arkoala-arkts/modules/ohos/arktsconfig.json | 36 +++++++++--------- arkoala-arkts/shopping/user/ui2abcconfig.json | 36 +++++++++--------- .../shopping/user/ui2abcconfig_light.json | 34 ++++++++--------- arkoala-arkts/trivial/user/build_config.json | 34 ++++++++--------- arkoala-arkts/trivial/user/ui2abcconfig.json | 36 +++++++++--------- .../memo-benchmark/ui2abcconfig.json | 36 +++++++++--------- .../ets-tests/golden-test-ui2abcconfig.json | 36 +++++++++--------- .../ui2abcconfig-incrementality.json | 34 ++++++++--------- ui2abc/ets-tests/ui2abcconfig-minimal.json | 36 +++++++++--------- ui2abc/ets-tests/ui2abcconfig.json | 36 +++++++++--------- ui2abc/memo-plugin-ng/demo/ui2abcconfig.json | 36 +++++++++--------- .../test/arktsconfig-diagnostics.json | 36 +++++++++--------- .../test/arktsconfig-executable.json | 36 +++++++++--------- .../test/arktsconfig-rewrite.json | 36 +++++++++--------- ui2abc/perf-tests/ui2abcconfig.json | 34 ++++++++--------- .../test/arktsconfig-memo-plugin.json | 36 +++++++++--------- .../perf/ui2abcconfig-ui-none.json | 34 ++++++++--------- .../perf/ui2abcconfig-ui-parsed-checked.json | 34 ++++++++--------- .../perf/ui2abcconfig-ui-parsed-only.json | 34 ++++++++--------- 21 files changed, 372 insertions(+), 372 deletions(-) diff --git a/arkoala-arkts/arkui/ui2abcconfig.json b/arkoala-arkts/arkui/ui2abcconfig.json index a431fc5a3..44dac430b 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.json +++ b/arkoala-arkts/arkui/ui2abcconfig.json @@ -1823,61 +1823,61 @@ "./component/xcomponent" ], "arkui.incremental.annotation": [ - "../../../absolute-sdk-patched/api/arkui/incremental/annotation" + "../../../incremental/annotation" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.incremental.runtime.state": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../incremental/runtime/ets/state" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json index 70c39dab2..b462f4e9f 100644 --- a/arkoala-arkts/cats/user/ui2abcconfig.json +++ b/arkoala-arkts/cats/user/ui2abcconfig.json @@ -8,7 +8,7 @@ "../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../incremental/runtime/ets/state" ], "arkui.ohos.router": [ @@ -1657,7 +1657,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1666,28 +1666,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1696,13 +1696,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1720,19 +1720,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/arkoala-arkts/modules/ohos/arktsconfig.json b/arkoala-arkts/modules/ohos/arktsconfig.json index aece52a51..1f6eda877 100644 --- a/arkoala-arkts/modules/ohos/arktsconfig.json +++ b/arkoala-arkts/modules/ohos/arktsconfig.json @@ -8,7 +8,7 @@ "../../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../../incremental/runtime/ets/state" ], "arkui.internals": ["../../../arkui/non-public-sdk"], "@koalaui/compat": ["../../../../compat/src/arkts"], @@ -1654,7 +1654,7 @@ "../../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1663,28 +1663,28 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1693,13 +1693,13 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1717,19 +1717,19 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json index 8c7197cd4..4c6578814 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig.json @@ -9,7 +9,7 @@ "../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../incremental/runtime/ets/state" ], "arkui.ohos.router": [ @@ -1658,7 +1658,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1667,28 +1667,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1697,13 +1697,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1721,19 +1721,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig_light.json b/arkoala-arkts/shopping/user/ui2abcconfig_light.json index 9133f62b5..a3f4e6c5e 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig_light.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig_light.json @@ -1651,7 +1651,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1660,28 +1660,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1690,13 +1690,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1714,19 +1714,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/arkoala-arkts/trivial/user/build_config.json b/arkoala-arkts/trivial/user/build_config.json index 2fbff1826..e70f63652 100644 --- a/arkoala-arkts/trivial/user/build_config.json +++ b/arkoala-arkts/trivial/user/build_config.json @@ -1680,7 +1680,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1689,28 +1689,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1719,13 +1719,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1743,19 +1743,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/arkoala-arkts/trivial/user/ui2abcconfig.json b/arkoala-arkts/trivial/user/ui2abcconfig.json index 29bfad081..e890f855d 100644 --- a/arkoala-arkts/trivial/user/ui2abcconfig.json +++ b/arkoala-arkts/trivial/user/ui2abcconfig.json @@ -8,7 +8,7 @@ "../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../incremental/runtime/ets/state" ], "@ohos.arkui": [ "../../../absolute-sdk-patched/api/@ohos.arkui.component" @@ -1652,7 +1652,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1661,28 +1661,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1691,13 +1691,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1715,19 +1715,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json index 5fc97f8b4..da87db651 100644 --- a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json +++ b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json @@ -20,7 +20,7 @@ "../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../incremental/runtime/ets/state" ], "@ohos.arkui": [ "../../../absolute-sdk-patched/api/@ohos.arkui.component" @@ -1664,7 +1664,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1673,28 +1673,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1703,13 +1703,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/remember" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1727,19 +1727,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/ets-tests/golden-test-ui2abcconfig.json b/ui2abc/ets-tests/golden-test-ui2abcconfig.json index 4fb2930c7..49d69c7d1 100644 --- a/ui2abc/ets-tests/golden-test-ui2abcconfig.json +++ b/ui2abc/ets-tests/golden-test-ui2abcconfig.json @@ -29,7 +29,7 @@ "../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../incremental/runtime/ets/state" ], "@ohos.InputMethodSubtype": [ "../../absolute-sdk-patched/api/@ohos.InputMethodSubtype" @@ -1670,7 +1670,7 @@ "../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1679,28 +1679,28 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1712,13 +1712,13 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1736,19 +1736,19 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/ets-tests/ui2abcconfig-incrementality.json b/ui2abc/ets-tests/ui2abcconfig-incrementality.json index c1d85fb31..5fd9b69d3 100644 --- a/ui2abc/ets-tests/ui2abcconfig-incrementality.json +++ b/ui2abc/ets-tests/ui2abcconfig-incrementality.json @@ -1664,7 +1664,7 @@ "../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1673,28 +1673,28 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1706,13 +1706,13 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1730,19 +1730,19 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/ets-tests/ui2abcconfig-minimal.json b/ui2abc/ets-tests/ui2abcconfig-minimal.json index da342a163..6786d65fc 100644 --- a/ui2abc/ets-tests/ui2abcconfig-minimal.json +++ b/ui2abc/ets-tests/ui2abcconfig-minimal.json @@ -29,7 +29,7 @@ "../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../incremental/runtime/ets/state" ], "@ohos.InputMethodSubtype": [ "../../absolute-sdk-patched/api/@ohos.InputMethodSubtype" @@ -1670,7 +1670,7 @@ "../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1679,28 +1679,28 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1712,13 +1712,13 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1736,19 +1736,19 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/ets-tests/ui2abcconfig.json b/ui2abc/ets-tests/ui2abcconfig.json index ab75728d2..81592bb8a 100644 --- a/ui2abc/ets-tests/ui2abcconfig.json +++ b/ui2abc/ets-tests/ui2abcconfig.json @@ -29,7 +29,7 @@ "../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../incremental/runtime/ets/state" ], "@ohos.InputMethodSubtype": [ "../../absolute-sdk-patched/api/@ohos.InputMethodSubtype" @@ -1670,7 +1670,7 @@ "../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1679,28 +1679,28 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1712,13 +1712,13 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1736,19 +1736,19 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json index 9ef66cffb..f920e1f36 100644 --- a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json +++ b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json @@ -26,7 +26,7 @@ "../../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../../incremental/runtime/ets/state" ], "@ohos.UiTest": [ "../../../../absolute-sdk-patched/api/@ohos.UiTest" @@ -1664,7 +1664,7 @@ "../../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1673,28 +1673,28 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1706,13 +1706,13 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1730,19 +1730,19 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json index 5869d206f..b6883de08 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json @@ -17,7 +17,7 @@ "../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../incremental/runtime/ets/state" ], "@ohos.arkui": [ "../../../absolute-sdk-patched/api/@ohos.arkui.component" @@ -1661,7 +1661,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1670,28 +1670,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1703,13 +1703,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1727,19 +1727,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json index da665b09c..06b43123a 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json @@ -23,7 +23,7 @@ "../../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../../incremental/runtime/ets/state" ], "@ohos.InputMethodSubtype": [ "../../../../absolute-sdk-patched/api/@ohos.InputMethodSubtype" @@ -1664,7 +1664,7 @@ "../../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1673,28 +1673,28 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1706,13 +1706,13 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1730,19 +1730,19 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json index 827a0384e..556aa6fa6 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json @@ -17,7 +17,7 @@ "../../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../../incremental/runtime/ets/state" ], "@ohos.arkui": [ "../../../../absolute-sdk-patched/api/@ohos.arkui.component" @@ -1661,7 +1661,7 @@ "../../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1670,28 +1670,28 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1703,13 +1703,13 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1727,19 +1727,19 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/perf-tests/ui2abcconfig.json b/ui2abc/perf-tests/ui2abcconfig.json index 8bbb3104b..020b14fe1 100644 --- a/ui2abc/perf-tests/ui2abcconfig.json +++ b/ui2abc/perf-tests/ui2abcconfig.json @@ -8,7 +8,7 @@ "../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../incremental/runtime/ets/state" ], "@ohos.arkui": [ "../../absolute-sdk-patched/api/@ohos.arkui.component" @@ -1661,28 +1661,28 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1694,13 +1694,13 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1718,19 +1718,19 @@ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json index 98f449681..5b3c1ed6d 100644 --- a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json +++ b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json @@ -26,7 +26,7 @@ "../../../absolute-sdk-patched/api/arkui/incremental/annotation" ], "arkui.incremental.runtime.state": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/state" + "../../../incremental/runtime/ets/state" ], "@ohos.InputMethodSubtype": [ "../../../absolute-sdk-patched/api/@ohos.InputMethodSubtype" @@ -1667,7 +1667,7 @@ "../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1676,28 +1676,28 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1709,13 +1709,13 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1733,19 +1733,19 @@ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json index 6f81ea561..121ae0407 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json @@ -1670,7 +1670,7 @@ "../../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1679,28 +1679,28 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1712,13 +1712,13 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1736,19 +1736,19 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json index 5cea5a2f7..6c3c7705e 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json @@ -1670,7 +1670,7 @@ "../../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1679,28 +1679,28 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1712,13 +1712,13 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1736,19 +1736,19 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/utils" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json index 30e34311b..48040b7a7 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json @@ -1670,7 +1670,7 @@ "../../../../absolute-sdk-patched/api/arkui/external/resource" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/animation/GlobalTimer" + "../../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.stateManagement.common": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/common" @@ -1679,28 +1679,28 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/decorator" ], "arkui.incremental.runtime.memo.bind": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/bind" + "../../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/changeListener" + "../../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/contextLocal" + "../../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/entry" + "../../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/node" + "../../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/remember" + "../../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/repeat" + "../../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/memo/testing" + "../../../../incremental/runtime/ets/memo/testing" ], "arkui.stateManagement.memorize.state": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/memorize/state" @@ -1712,13 +1712,13 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/runtime" ], "arkui.incremental.runtime.common.Disposable": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/common/Disposable" + "../../../../incremental/runtime/ets/common/Disposable" ], "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/GlobalStateManager" + "../../../../incremental/runtime/ets/impl/GlobalStateManager" ], "arkui.incremental.runtime.impl.State": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/impl/State" + "../../../../incremental/runtime/ets/impl/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" @@ -1736,19 +1736,19 @@ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/storageProperty" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/IncrementalNode" + "../../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/PrimeNumbers" + "../../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/ReadonlyTreeNode" + "../../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreeNode" + "../../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/runtime/tree/TreePath" + "../../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.utils": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/utils" -- Gitee From 25c3251a17424ee03d348bc02fd9695d749b24ae Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Fri, 19 Dec 2025 18:48:36 +0300 Subject: [PATCH 6/8] fix CI task --- incremental/.gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/incremental/.gitlab-ci.yml b/incremental/.gitlab-ci.yml index bc849c400..d9b42d564 100644 --- a/incremental/.gitlab-ci.yml +++ b/incremental/.gitlab-ci.yml @@ -32,4 +32,5 @@ build incremental.abc: artifacts: paths: - incremental/runtime/build/incremental.abc + - incremental/runtime/ets expire_in: 1 day -- Gitee From 9abdad207c16fefce3d45093d3e19f92fa2e74e3 Mon Sep 17 00:00:00 2001 From: Kolegov Ilya Date: Mon, 22 Dec 2025 12:02:57 +0300 Subject: [PATCH 7/8] Fixed arkui build --- .../incrementalAndStateManagementReexport.ets | 1 + arkoala-arkts/arkui/ui2abcconfig.json | 74 +++++++++++++------ .../arkui/ui2abcconfig.template.json | 30 ++++++++ arkoala-arkts/modules/ohos/arktsconfig.json | 49 ++++++++++-- .../tools/peer-generator/config-ui2abc.json | 23 ++++-- incremental/runtime/annotations/index.ts | 4 + 6 files changed, 146 insertions(+), 35 deletions(-) diff --git a/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets b/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets index b437ddd3c..4e081fbee 100644 --- a/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets +++ b/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets @@ -19,6 +19,7 @@ export * from "arkui.incremental.runtime.memo.remember" export * from "arkui.incremental.runtime.memo.changeListener" export * from "arkui.incremental.runtime.memo.node" export * from "arkui.incremental.runtime.memo.entry" +export * from "arkui.incremental.runtime.internals" export * from "arkui.incremental.runtime.animation.GlobalTimer" export * from "arkui.incremental.annotation" export * from "arkui.incremental.runtime.state" diff --git a/arkoala-arkts/arkui/ui2abcconfig.json b/arkoala-arkts/arkui/ui2abcconfig.json index 44dac430b..ff28335fe 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.json +++ b/arkoala-arkts/arkui/ui2abcconfig.json @@ -19,6 +19,9 @@ "arkui.ani": [ "./ani/arkts/ArkUIAniModule" ], + "@koalaui/runtime/annotations": [ + "../../../incremental/runtime/annotations" + ], "@koalaui/interop": [ "../../../interop/src/arkts" ], @@ -43,6 +46,33 @@ "#incrementalAndStateManagementReexport": [ "./incrementalAndStateManagementReexport" ], + "arkui.incremental.runtime.impl.State": [ + "../../../incremental/runtime/ets/impl/State" + ], + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../incremental/runtime/ets/impl/GlobalStateManager" + ], + "arkui.incremental.runtime.internals": [ + "../../../incremental/runtime/ets/internals" + ], + "arkui.incremental.runtime.common.Unique": [ + "../../../incremental/runtime/ets/common/Unique" + ], + "arkui.incremental.runtime.common.RuntimeProfiler": [ + "../../../incremental/runtime/ets/common/RuntimeProfiler" + ], + "arkui.incremental.runtime.common.MarkableQueue": [ + "../../../incremental/runtime/ets/common/MarkableQueue" + ], + "arkui.incremental.runtime.common.Journal": [ + "../../../incremental/runtime/ets/common/Journal" + ], + "arkui.incremental.runtime.common.Disposable": [ + "../../../incremental/runtime/ets/common/Disposable" + ], + "arkui.incremental.runtime.common.Dependency": [ + "../../../incremental/runtime/ets/common/Dependency" + ], "@ohos.InputMethodSubtype": [ "../../../absolute-sdk-patched/api/@ohos.InputMethodSubtype" ], @@ -1823,61 +1853,61 @@ "./component/xcomponent" ], "arkui.incremental.annotation": [ - "../../../incremental/annotation" + "../../../incremental/runtime/annotations" ], "arkui.incremental.runtime.animation.GlobalTimer": [ - "../../../incremental/runtime/ets/animation/GlobalTimer" + "./../../../incremental/runtime/ets/animation/GlobalTimer" ], "arkui.incremental.runtime.memo.bind": [ - "../../../incremental/runtime/ets/memo/bind" + "./../../../incremental/runtime/ets/memo/bind" ], "arkui.incremental.runtime.memo.changeListener": [ - "../../../incremental/runtime/ets/memo/changeListener" + "./../../../incremental/runtime/ets/memo/changeListener" ], "arkui.incremental.runtime.memo.contextLocal": [ - "../../../incremental/runtime/ets/memo/contextLocal" + "./../../../incremental/runtime/ets/memo/contextLocal" ], "arkui.incremental.runtime.memo.entry": [ - "../../../incremental/runtime/ets/memo/entry" + "./../../../incremental/runtime/ets/memo/entry" ], "arkui.incremental.runtime.memo.node": [ - "../../../incremental/runtime/ets/memo/node" + "./../../../incremental/runtime/ets/memo/node" ], "arkui.incremental.runtime.memo.remember": [ - "../../../incremental/runtime/ets/memo/remember" + "./../../../incremental/runtime/ets/memo/remember" ], "arkui.incremental.runtime.memo.repeat": [ - "../../../incremental/runtime/ets/memo/repeat" + "./../../../incremental/runtime/ets/memo/repeat" ], "arkui.incremental.runtime.memo.testing": [ - "../../../incremental/runtime/ets/memo/testing" + "./../../../incremental/runtime/ets/memo/testing" ], "arkui.incremental.runtime.state": [ - "../../../incremental/runtime/ets/state" + "./../../../incremental/runtime/ets/state" ], - "arkui.incremental.runtime.common.Disposable": [ - "../../../incremental/runtime/ets/common/Disposable" + "arkui.incremental.runtime.states.Disposable": [ + "./../../../incremental/runtime/ets/states/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.states.GlobalStateManager": [ + "./../../../incremental/runtime/ets/states/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.states.State": [ + "./../../../incremental/runtime/ets/states/State" ], "arkui.incremental.runtime.tree.IncrementalNode": [ - "../../../incremental/runtime/ets/tree/IncrementalNode" + "./../../../incremental/runtime/ets/tree/IncrementalNode" ], "arkui.incremental.runtime.tree.PrimeNumbers": [ - "../../../incremental/runtime/ets/tree/PrimeNumbers" + "./../../../incremental/runtime/ets/tree/PrimeNumbers" ], "arkui.incremental.runtime.tree.ReadonlyTreeNode": [ - "../../../incremental/runtime/ets/tree/ReadonlyTreeNode" + "./../../../incremental/runtime/ets/tree/ReadonlyTreeNode" ], "arkui.incremental.runtime.tree.TreeNode": [ - "../../../incremental/runtime/ets/tree/TreeNode" + "./../../../incremental/runtime/ets/tree/TreeNode" ], "arkui.incremental.runtime.tree.TreePath": [ - "../../../incremental/runtime/ets/tree/TreePath" + "./../../../incremental/runtime/ets/tree/TreePath" ], "arkui.stateManagement.common": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/common" diff --git a/arkoala-arkts/arkui/ui2abcconfig.template.json b/arkoala-arkts/arkui/ui2abcconfig.template.json index 3431cf6df..4ff6fa37d 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.template.json +++ b/arkoala-arkts/arkui/ui2abcconfig.template.json @@ -19,6 +19,9 @@ "arkui.ani": [ "./ani/arkts/ArkUIAniModule" ], + "@koalaui/runtime/annotations": [ + "../../../incremental/runtime/annotations" + ], "@koalaui/interop": [ "../../../interop/src/arkts" ], @@ -40,6 +43,33 @@ ], "#incrementalAndStateManagementReexport": [ "./incrementalAndStateManagementReexport" + ], + "arkui.incremental.runtime.impl.State": [ + "../../../incremental/runtime/ets/impl/State" + ], + "arkui.incremental.runtime.impl.GlobalStateManager": [ + "../../../incremental/runtime/ets/impl/GlobalStateManager" + ], + "arkui.incremental.runtime.internals": [ + "../../../incremental/runtime/ets/internals" + ], + "arkui.incremental.runtime.common.Unique": [ + "../../../incremental/runtime/ets/common/Unique" + ], + "arkui.incremental.runtime.common.RuntimeProfiler": [ + "../../../incremental/runtime/ets/common/RuntimeProfiler" + ], + "arkui.incremental.runtime.common.MarkableQueue": [ + "../../../incremental/runtime/ets/common/MarkableQueue" + ], + "arkui.incremental.runtime.common.Journal": [ + "../../../incremental/runtime/ets/common/Journal" + ], + "arkui.incremental.runtime.common.Disposable": [ + "../../../incremental/runtime/ets/common/Disposable" + ], + "arkui.incremental.runtime.common.Dependency": [ + "../../../incremental/runtime/ets/common/Dependency" ] } }, diff --git a/arkoala-arkts/modules/ohos/arktsconfig.json b/arkoala-arkts/modules/ohos/arktsconfig.json index 1f6eda877..685582780 100644 --- a/arkoala-arkts/modules/ohos/arktsconfig.json +++ b/arkoala-arkts/modules/ohos/arktsconfig.json @@ -5,16 +5,47 @@ "outDir": "build", "paths": { "arkui.incremental.annotation": [ - "../../../../absolute-sdk-patched/api/arkui/incremental/annotation" + "../../../../incremental/runtime/annotations" ], "arkui.incremental.runtime.state": [ "../../../../incremental/runtime/ets/state" ], - "arkui.internals": ["../../../arkui/non-public-sdk"], - "@koalaui/compat": ["../../../../compat/src/arkts"], - "@koalaui/common": ["../../../../common/src"], - "@koalaui/interop": [ "../../../../interop/src/arkts" ], - "global.resource": ["../../global.resource/src/resource"], + "arkui.internals": [ + "../../../arkui/non-public-sdk" + ], + "@koalaui/runtime/annotations": [ + "../../../../incremental/runtime/annotations" + ], + "arkui.incremental.runtime.internals": [ + "../../../../incremental/runtime/ets/internals" + ], + "arkui.incremental.runtime.common.Unique": [ + "../../../../incremental/runtime/ets/common/Unique" + ], + "arkui.incremental.runtime.common.RuntimeProfiler": [ + "../../../../incremental/runtime/ets/common/RuntimeProfiler" + ], + "arkui.incremental.runtime.common.MarkableQueue": [ + "../../../../incremental/runtime/ets/common/MarkableQueue" + ], + "arkui.incremental.runtime.common.Journal": [ + "../../../../incremental/runtime/ets/common/Journal" + ], + "arkui.incremental.runtime.common.Dependency": [ + "../../../../incremental/runtime/ets/common/Dependency" + ], + "@koalaui/compat": [ + "../../../../compat/src/arkts" + ], + "@koalaui/common": [ + "../../../../common/src" + ], + "@koalaui/interop": [ + "../../../../interop/src/arkts" + ], + "global.resource": [ + "../../global.resource/src/resource" + ], "@ohos.InputMethodSubtype": [ "../../../../absolute-sdk-patched/api/@ohos.InputMethodSubtype" ], @@ -1910,11 +1941,13 @@ ] } }, - "include": ["./src/**/*.ets"], + "include": [ + "./src/**/*.ets" + ], "plugins": { "memo": "@koalaui/memo-plugin-ng" }, "memoPluginOptions": { "skipDiagnostics": true } -} +} \ No newline at end of file diff --git a/arkoala-arkts/tools/peer-generator/config-ui2abc.json b/arkoala-arkts/tools/peer-generator/config-ui2abc.json index b2d431d45..cc5b50b3c 100644 --- a/arkoala-arkts/tools/peer-generator/config-ui2abc.json +++ b/arkoala-arkts/tools/peer-generator/config-ui2abc.json @@ -11,13 +11,26 @@ "arkui.Content": "@arkui.Content" }, "rewriteArkConfigPath": { - "arkui.SymbolGlyphModifier": ["./SymbolGlyphModifier"], - "arkui.ImageModifier": ["./ImageModifier"], - "arkui.TextModifier": ["./TextModifier"], - "arkui": ["./"] + "arkui.SymbolGlyphModifier": [ + "./SymbolGlyphModifier" + ], + "arkui.ImageModifier": [ + "./ImageModifier" + ], + "arkui.TextModifier": [ + "./TextModifier" + ], + "arkui": [ + "./" + ], + "arkui.incremental.runtime": [ + "../../../incremental/runtime/ets" + ], + "arkui.incremental.annotation": [ + "../../../incremental/runtime/annotations" + ] }, "rewriteArkConfigPathIgnore": [ - "arkui.incremental", "arkui.component.animation", "arkui.component.repeat", "arkui.component.resources", diff --git a/incremental/runtime/annotations/index.ts b/incremental/runtime/annotations/index.ts index 541ce76f4..caba0e3d2 100644 --- a/incremental/runtime/annotations/index.ts +++ b/incremental/runtime/annotations/index.ts @@ -17,6 +17,10 @@ @Retention({policy: "SOURCE"}) export @interface memo {} +// To be compatibale with SDK +@Retention({policy: "SOURCE"}) +export @interface Memo {} + @Retention({policy: "SOURCE"}) export @interface memo_intrinsic {} -- Gitee From d28d9aa7b7ea5404375ea6c79aa5f6cbae682718 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 23 Dec 2025 13:44:06 +0300 Subject: [PATCH 8/8] rename impl to core --- arkoala-arkts/arkui/src/PeerNode.ets | 5 ----- arkoala-arkts/arkui/src/component/gesture.ets | 2 +- .../src/incrementalAndStateManagementReexport.ets | 4 ++-- .../src/stateManagement/tools/arkts/stateMgmtTool.ts | 2 +- arkoala-arkts/arkui/ui2abcconfig.json | 8 ++++---- arkoala-arkts/arkui/ui2abcconfig.template.json | 8 ++++---- arkoala-arkts/cats/user/ui2abcconfig.json | 8 ++++---- arkoala-arkts/modules/ohos/arktsconfig.json | 8 ++++---- arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets | 2 +- arkoala-arkts/shopping/user/path.json | 8 ++++---- arkoala-arkts/shopping/user/ui2abcconfig.json | 8 ++++---- arkoala-arkts/shopping/user/ui2abcconfig_light.json | 8 ++++---- arkoala-arkts/trivial/user/build_config.json | 8 ++++---- arkoala-arkts/trivial/user/ui2abcconfig.json | 8 ++++---- .../benchmarks/memo-benchmark/src/compat/arkts.ts | 2 +- .../benchmarks/memo-benchmark/ui2abcconfig.json | 8 ++++---- incremental/incremental_components.gni | 4 ++-- incremental/runtime/docs/api-examples.md | 10 +++++----- incremental/runtime/src/animation/AnimatedState.ts | 2 +- incremental/runtime/src/animation/GlobalTimer.ts | 2 +- incremental/runtime/src/animation/TimeAnimation.ts | 2 +- .../runtime/src/{impl => core}/GlobalStateManager.ts | 0 incremental/runtime/src/{impl => core}/State.ts | 0 incremental/runtime/src/index.ts | 6 +++--- incremental/runtime/src/memo/changeListener.ts | 2 +- incremental/runtime/src/memo/entry.ts | 2 +- incremental/runtime/src/memo/remember.ts | 2 +- incremental/runtime/src/memo/testing.ts | 2 +- ui2abc/arkui-plugins/test/arktsconfig_template.json | 4 ++-- ui2abc/ets-tests/golden-test-ui2abcconfig.json | 8 ++++---- ui2abc/ets-tests/ui2abcconfig-incrementality.json | 8 ++++---- ui2abc/ets-tests/ui2abcconfig-minimal.json | 8 ++++---- ui2abc/ets-tests/ui2abcconfig.json | 8 ++++---- ui2abc/memo-plugin-ng/demo/demo/demo.ets | 2 +- ui2abc/memo-plugin-ng/demo/ui2abcconfig.json | 8 ++++---- ui2abc/memo-plugin-ng/doc/memo-introduction.md | 4 ++-- .../memo-plugin-ng/test/arktsconfig-diagnostics.json | 8 ++++---- ui2abc/memo-plugin-ng/test/arktsconfig-executable.json | 8 ++++---- ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json | 8 ++++---- ui2abc/perf-tests/ui2abcconfig.json | 8 ++++---- ui2abc/tests-memo/test/arktsconfig-memo-plugin.json | 8 ++++---- ui2abc/tests-memo/test/compat/arkts/compat.ts | 2 +- ui2abc/tests-memo/test/ui2abc/main.test.ts | 2 +- ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json | 8 ++++---- .../perf/ui2abcconfig-ui-parsed-checked.json | 8 ++++---- .../perf/ui2abcconfig-ui-parsed-only.json | 8 ++++---- ui2abc/ui-plugins-ng/src/utils.ts | 2 +- 47 files changed, 123 insertions(+), 128 deletions(-) rename incremental/runtime/src/{impl => core}/GlobalStateManager.ts (100%) rename incremental/runtime/src/{impl => core}/State.ts (100%) diff --git a/arkoala-arkts/arkui/src/PeerNode.ets b/arkoala-arkts/arkui/src/PeerNode.ets index 8c7a19190..b8b7767f2 100644 --- a/arkoala-arkts/arkui/src/PeerNode.ets +++ b/arkoala-arkts/arkui/src/PeerNode.ets @@ -20,11 +20,6 @@ import { nullptr, pointer } from "@koalaui/interop" import { ArkRootPeer, StateStylesOps } from "#generated" import { ReusablePool } from "./ReusablePool" -// import { MutableState } from "#incrementalAndStateManagementReexport" -// import { IncrementalNode } from "@koalaui.runtime.tree.IncrementalNode" -// import { Disposable } from "@koalaui.runtime.impl.Disposable" -// import { scheduleCallback, GlobalStateManager } from "@koalaui.runtime.impl.GlobalStateManager" - export const PeerNodeType = 11 export const RootPeerType = 33 export const LazyForEachType = 13 diff --git a/arkoala-arkts/arkui/src/component/gesture.ets b/arkoala-arkts/arkui/src/component/gesture.ets index ee4b847f6..b7ccf3316 100644 --- a/arkoala-arkts/arkui/src/component/gesture.ets +++ b/arkoala-arkts/arkui/src/component/gesture.ets @@ -3,7 +3,7 @@ import { Callback } from "./common" import { GestureOps } from "./idlize" import { PeerNode } from "../PeerNode" import { MutableState } from 'arkui.incremental.runtime.state' -import { GlobalStateManager } from "arkui.incremental.runtime.impl.GlobalStateManager" +import { GlobalStateManager } from "arkui.incremental.runtime.core.GlobalStateManager" import { KeyEventInternal, TouchTestInfo } from "#generated" //import { TypeChecker } from "#components" import { SourceTool, GestureType } from "#generated" diff --git a/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets b/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets index 4e081fbee..f259b8e55 100644 --- a/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets +++ b/arkoala-arkts/arkui/src/incrementalAndStateManagementReexport.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -export * from "arkui.incremental.runtime.impl.State" -export * from "arkui.incremental.runtime.impl.GlobalStateManager" +export * from "arkui.incremental.runtime.core.State" +export * from "arkui.incremental.runtime.core.GlobalStateManager" export * from "arkui.incremental.runtime.memo.remember" export * from "arkui.incremental.runtime.memo.changeListener" export * from "arkui.incremental.runtime.memo.node" diff --git a/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts b/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts index 619a56da9..f40411fe9 100644 --- a/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts +++ b/arkoala-arkts/arkui/src/stateManagement/tools/arkts/stateMgmtTool.ts @@ -28,7 +28,7 @@ import { NullableObject } from '../../base/types'; import { InterfaceProxyHandler } from './observeInterfaceProxy'; import { ISubscribedWatches } from '../../decorator'; import { DecoratedV1VariableBase } from '../../decoratorImpl/decoratorBase'; -import { GlobalStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager'; +import { GlobalStateManager } from 'arkui.incremental.runtime.core.GlobalStateManager'; import { StateManager } from 'arkui.incremental.runtime.state' import { StateMgmtConsole } from '../stateMgmtDFX'; export class StateMgmtTool { diff --git a/arkoala-arkts/arkui/ui2abcconfig.json b/arkoala-arkts/arkui/ui2abcconfig.json index ff28335fe..be5f7dc95 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.json +++ b/arkoala-arkts/arkui/ui2abcconfig.json @@ -46,11 +46,11 @@ "#incrementalAndStateManagementReexport": [ "./incrementalAndStateManagementReexport" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], "arkui.incremental.runtime.internals": [ "../../../incremental/runtime/ets/internals" diff --git a/arkoala-arkts/arkui/ui2abcconfig.template.json b/arkoala-arkts/arkui/ui2abcconfig.template.json index 4ff6fa37d..94f339037 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.template.json +++ b/arkoala-arkts/arkui/ui2abcconfig.template.json @@ -44,11 +44,11 @@ "#incrementalAndStateManagementReexport": [ "./incrementalAndStateManagementReexport" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], "arkui.incremental.runtime.internals": [ "../../../incremental/runtime/ets/internals" diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json index b462f4e9f..2c340cacf 100644 --- a/arkoala-arkts/cats/user/ui2abcconfig.json +++ b/arkoala-arkts/cats/user/ui2abcconfig.json @@ -1698,11 +1698,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/modules/ohos/arktsconfig.json b/arkoala-arkts/modules/ohos/arktsconfig.json index 685582780..40e76cf8d 100644 --- a/arkoala-arkts/modules/ohos/arktsconfig.json +++ b/arkoala-arkts/modules/ohos/arktsconfig.json @@ -1726,11 +1726,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets b/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets index 733f7f4c6..76f719a57 100644 --- a/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets +++ b/arkoala-arkts/modules/ohos/src/arkui/RouterImpl.ets @@ -17,7 +17,7 @@ import { int32 } from "@koalaui/compat" import { MutableState } from 'arkui.incremental.runtime.state' import { contextLocal, contextLocalScope } from 'arkui.incremental.runtime.memo.contextLocal' -import { scheduleCallback, arrayState, mutableState } from 'arkui.incremental.runtime.impl.GlobalStateManager' +import { scheduleCallback, arrayState, mutableState } from 'arkui.incremental.runtime.core.GlobalStateManager' import { RunEffect } from 'arkui.incremental.runtime.memo.changeListener' import { RepeatByArray } from 'arkui.incremental.runtime.memo.repeat' import { NodeAttach } from 'arkui.incremental.runtime.memo.node' diff --git a/arkoala-arkts/shopping/user/path.json b/arkoala-arkts/shopping/user/path.json index 84255eb98..f832cd761 100644 --- a/arkoala-arkts/shopping/user/path.json +++ b/arkoala-arkts/shopping/user/path.json @@ -1676,11 +1676,11 @@ "@koalaui.runtime.common.Disposable": [ "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.common.Disposable" ], - "@koalaui.runtime.impl.GlobalStateManager": [ - "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.impl.GlobalStateManager" + "@koalaui.runtime.core.GlobalStateManager": [ + "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.core.GlobalStateManager" ], - "@koalaui.runtime.impl.State": [ - "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.impl.State" + "@koalaui.runtime.core.State": [ + "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.core.State" ], "@koalaui.runtime.tree.IncrementalNode": [ "../../../absolute-sdk-patched/api/arkui/runtime-api/@koalaui.runtime.tree.IncrementalNode" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json index 4c6578814..72ede8b7d 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig.json @@ -1699,11 +1699,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/shopping/user/ui2abcconfig_light.json b/arkoala-arkts/shopping/user/ui2abcconfig_light.json index a3f4e6c5e..2a8cfcf24 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig_light.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig_light.json @@ -1692,11 +1692,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/trivial/user/build_config.json b/arkoala-arkts/trivial/user/build_config.json index e70f63652..08d515a87 100644 --- a/arkoala-arkts/trivial/user/build_config.json +++ b/arkoala-arkts/trivial/user/build_config.json @@ -1721,11 +1721,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/arkoala-arkts/trivial/user/ui2abcconfig.json b/arkoala-arkts/trivial/user/ui2abcconfig.json index e890f855d..2f423fb8f 100644 --- a/arkoala-arkts/trivial/user/ui2abcconfig.json +++ b/arkoala-arkts/trivial/user/ui2abcconfig.json @@ -1693,11 +1693,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts b/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts index af0f2e96c..ab838a23e 100644 --- a/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts +++ b/incremental/benchmarks/memo-benchmark/src/compat/arkts.ts @@ -18,4 +18,4 @@ export { MutableState } from 'arkui.incremental.runtime.state' export { NodeAttach } from 'arkui.incremental.runtime.memo.node' export { memoRoot } from 'arkui.incremental.runtime.memo.entry' export { toRootHierarchy, testTick } from 'arkui.incremental.runtime.memo.testing' -export { mutableState, updateStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' +export { mutableState, updateStateManager } from 'arkui.incremental.runtime.core.GlobalStateManager' diff --git a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json index da87db651..0b9854a3a 100644 --- a/incremental/benchmarks/memo-benchmark/ui2abcconfig.json +++ b/incremental/benchmarks/memo-benchmark/ui2abcconfig.json @@ -1705,11 +1705,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/incremental/incremental_components.gni b/incremental/incremental_components.gni index 71f91dbc7..f38c0f195 100644 --- a/incremental/incremental_components.gni +++ b/incremental/incremental_components.gni @@ -38,8 +38,8 @@ incremental_files = [ "runtime/src/memo/repeat.ts", "runtime/src/memo/testing.ts", "runtime/src/runtime.ts", - "runtime/src/impl/GlobalStateManager.ts", - "runtime/src/impl/State.ts", + "runtime/src/core/GlobalStateManager.ts", + "runtime/src/core/State.ts", "runtime/src/tree/IncrementalNode.ts", "runtime/src/tree/PrimeNumbers.ts", "runtime/src/tree/ReadonlyTreeNode.ts", diff --git a/incremental/runtime/docs/api-examples.md b/incremental/runtime/docs/api-examples.md index bb1759c8d..6ff4791ca 100644 --- a/incremental/runtime/docs/api-examples.md +++ b/incremental/runtime/docs/api-examples.md @@ -89,7 +89,7 @@ And incapsulate the creation of the state in `MyComponent`. import {Entry, Component, Column, Builder, Button, Text} from "@ohos.arkui.component" import { rememberMutableState } from "arkui.stateManagement.memo.remember" -import { MutableState } from "arkui.stateManagement.impl.State" +import { MutableState } from "arkui.stateManagement.core.State" @Builder @@ -427,7 +427,7 @@ The following program demonstrates the difference. 'use static' import {Entry, Component, Column, Builder, Button, ForEach, Text} from "@ohos.arkui.component" -import { arrayState, mutableState } from "arkui.stateManagement.impl.GlobalStateManager" +import { arrayState, mutableState } from "arkui.stateManagement.core.GlobalStateManager" const array = arrayState([0, 0]) const states = [mutableState(0), mutableState(0)] @@ -653,11 +653,11 @@ See the difference of `scheduleCallback`, `OnChange` and `RunEffect` in the foll 'use static' import {Entry, Component, Column, Builder, Button, ForEach, Text} from "@ohos.arkui.component" -import { arrayState, mutableState } from "arkui.stateManagement.impl.GlobalStateManager" +import { arrayState, mutableState } from "arkui.stateManagement.core.GlobalStateManager" import { rememberMutableState } from "arkui.stateManagement.memo.remember" import { OnChange, RunEffect } from "arkui.stateManagement.memo.changeListener" -import { scheduleCallback } from "arkui.stateManagement.impl.GlobalStateManager" -import { MutableState } from "arkui.stateManagement.impl.State" +import { scheduleCallback } from "arkui.stateManagement.core.GlobalStateManager" +import { MutableState } from "arkui.stateManagement.core.State" @memo function TextWithCallbacks(label: string, state: MutableState) { diff --git a/incremental/runtime/src/animation/AnimatedState.ts b/incremental/runtime/src/animation/AnimatedState.ts index adfe6741a..7e4cc3fb7 100644 --- a/incremental/runtime/src/animation/AnimatedState.ts +++ b/incremental/runtime/src/animation/AnimatedState.ts @@ -17,7 +17,7 @@ import { int64 } from '@koalaui/common' import { getAnimationTimer } from './GlobalTimer' import { TimeAnimation, constAnimation } from './TimeAnimation' import { Disposable } from '../common/Disposable' -import { GlobalStateManager } from '../impl/GlobalStateManager' +import { GlobalStateManager } from '../core/GlobalStateManager' import { ComputableState, MutableState, ReadableState, StateContext } from '../state' diff --git a/incremental/runtime/src/animation/GlobalTimer.ts b/incremental/runtime/src/animation/GlobalTimer.ts index 87a8ee097..37eb5450c 100644 --- a/incremental/runtime/src/animation/GlobalTimer.ts +++ b/incremental/runtime/src/animation/GlobalTimer.ts @@ -14,7 +14,7 @@ */ import { int64 } from '@koalaui/common' -import { GlobalStateManager } from '../impl/GlobalStateManager' +import { GlobalStateManager } from '../core/GlobalStateManager' import { MutableState, StateContext } from '../state' const GLOBAL_ANIMATION_TIMER = 'ohos.koala.runtime.global.animation.timer' diff --git a/incremental/runtime/src/animation/TimeAnimation.ts b/incremental/runtime/src/animation/TimeAnimation.ts index 5a89c6f53..9faecad5a 100644 --- a/incremental/runtime/src/animation/TimeAnimation.ts +++ b/incremental/runtime/src/animation/TimeAnimation.ts @@ -16,7 +16,7 @@ import { float64, float64toInt64, int32, int64, isFiniteNumber, uint32 } from '@koalaui/common' import { AnimationRange, NumberAnimationRange } from './AnimationRange' import { Easing, EasingCurve } from './Easing' -import { scheduleCallback } from '../impl/GlobalStateManager' +import { scheduleCallback } from '../core/GlobalStateManager' export const DEFAULT_ANIMATION_DURATION: uint32 = 300 diff --git a/incremental/runtime/src/impl/GlobalStateManager.ts b/incremental/runtime/src/core/GlobalStateManager.ts similarity index 100% rename from incremental/runtime/src/impl/GlobalStateManager.ts rename to incremental/runtime/src/core/GlobalStateManager.ts diff --git a/incremental/runtime/src/impl/State.ts b/incremental/runtime/src/core/State.ts similarity index 100% rename from incremental/runtime/src/impl/State.ts rename to incremental/runtime/src/core/State.ts diff --git a/incremental/runtime/src/index.ts b/incremental/runtime/src/index.ts index dc5401a76..0a43ff0e6 100644 --- a/incremental/runtime/src/index.ts +++ b/incremental/runtime/src/index.ts @@ -145,11 +145,11 @@ export { mutableState, scheduleCallback, updateStateManager, -} from './impl/GlobalStateManager' +} from './core/GlobalStateManager' export { createStateManager, StateManagerImpl, /* Improve:HQ private as public*/ -} from './impl/State' +} from './core/State' export { __context, @@ -177,6 +177,6 @@ export { export { IncrementalNode } from './tree/IncrementalNode' export { PrimeNumbers } from './tree/PrimeNumbers' -export { ReadonlyTreeNode } from './tree/ReadonlyTreeNode' +export type { ReadonlyTreeNode } from './tree/ReadonlyTreeNode' export { TreeNode } from './tree/TreeNode' export { TreePath } from './tree/TreePath' diff --git a/incremental/runtime/src/memo/changeListener.ts b/incremental/runtime/src/memo/changeListener.ts index 7f58601af..037e4f542 100644 --- a/incremental/runtime/src/memo/changeListener.ts +++ b/incremental/runtime/src/memo/changeListener.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { scheduleCallback } from '../impl/GlobalStateManager' +import { scheduleCallback } from '../core/GlobalStateManager' import { __memo_context_type, __memo_id_type } from '../state' import { __context, __id } from '../internals' diff --git a/incremental/runtime/src/memo/entry.ts b/incremental/runtime/src/memo/entry.ts index d42abc0b3..e4c9a8dbd 100644 --- a/incremental/runtime/src/memo/entry.ts +++ b/incremental/runtime/src/memo/entry.ts @@ -14,7 +14,7 @@ */ import { RuntimeProfiler } from '../common/RuntimeProfiler' -import { GlobalStateManager } from '../impl/GlobalStateManager' +import { GlobalStateManager } from '../core/GlobalStateManager' import { __memo_context_type, __memo_id_type, ComputableState, StateContext, StateManager } from '../state' import { IncrementalNode } from '../tree/IncrementalNode' diff --git a/incremental/runtime/src/memo/remember.ts b/incremental/runtime/src/memo/remember.ts index 5353e895d..599e4c623 100644 --- a/incremental/runtime/src/memo/remember.ts +++ b/incremental/runtime/src/memo/remember.ts @@ -15,7 +15,7 @@ import { functionOverValue } from '@koalaui/common' import { __context, __id } from '../internals' -import { scheduleCallback } from '../impl/GlobalStateManager' +import { scheduleCallback } from '../core/GlobalStateManager' import { ArrayState, ControlledScope, MutableState, ReadableState } from '../state' /** diff --git a/incremental/runtime/src/memo/testing.ts b/incremental/runtime/src/memo/testing.ts index 558776b72..86b2f11c8 100644 --- a/incremental/runtime/src/memo/testing.ts +++ b/incremental/runtime/src/memo/testing.ts @@ -14,7 +14,7 @@ */ import { KoalaCallsiteKey, uint32, unsafeCast } from '@koalaui/common' -import { GlobalStateManager } from '../impl/GlobalStateManager' +import { GlobalStateManager } from '../core/GlobalStateManager' import { ComputableState, ReadableState, StateManager } from '../state' import { IncrementalNode } from '../tree/IncrementalNode' import { ReadonlyTreeNode, toNodeHierarchy } from '../tree/ReadonlyTreeNode' diff --git a/ui2abc/arkui-plugins/test/arktsconfig_template.json b/ui2abc/arkui-plugins/test/arktsconfig_template.json index c1655e3f2..36732bf9f 100644 --- a/ui2abc/arkui-plugins/test/arktsconfig_template.json +++ b/ui2abc/arkui-plugins/test/arktsconfig_template.json @@ -2385,8 +2385,8 @@ "@koalaui.runtime.common.Disposable": [ "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.common.Disposable" ], - "@koalaui.runtime.impl.GlobalStateManager": [ - "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.impl.GlobalStateManager" + "@koalaui.runtime.core.GlobalStateManager": [ + "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.core.GlobalStateManager" ], "@koalaui.runtime.tree.PrimeNumbers": [ "workspace/out/sdk/ohos-sdk/linux/ets/static/api/arkui/runtime-api/@koalaui.runtime.tree.PrimeNumbers" diff --git a/ui2abc/ets-tests/golden-test-ui2abcconfig.json b/ui2abc/ets-tests/golden-test-ui2abcconfig.json index 49d69c7d1..60fa6c88f 100644 --- a/ui2abc/ets-tests/golden-test-ui2abcconfig.json +++ b/ui2abc/ets-tests/golden-test-ui2abcconfig.json @@ -1714,11 +1714,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ets-tests/ui2abcconfig-incrementality.json b/ui2abc/ets-tests/ui2abcconfig-incrementality.json index 5fd9b69d3..2b17306bc 100644 --- a/ui2abc/ets-tests/ui2abcconfig-incrementality.json +++ b/ui2abc/ets-tests/ui2abcconfig-incrementality.json @@ -1708,11 +1708,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ets-tests/ui2abcconfig-minimal.json b/ui2abc/ets-tests/ui2abcconfig-minimal.json index 6786d65fc..5577eb8b9 100644 --- a/ui2abc/ets-tests/ui2abcconfig-minimal.json +++ b/ui2abc/ets-tests/ui2abcconfig-minimal.json @@ -1714,11 +1714,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ets-tests/ui2abcconfig.json b/ui2abc/ets-tests/ui2abcconfig.json index 81592bb8a..2c424502e 100644 --- a/ui2abc/ets-tests/ui2abcconfig.json +++ b/ui2abc/ets-tests/ui2abcconfig.json @@ -1714,11 +1714,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/demo/demo/demo.ets b/ui2abc/memo-plugin-ng/demo/demo/demo.ets index a93478430..24db66b1d 100644 --- a/ui2abc/memo-plugin-ng/demo/demo/demo.ets +++ b/ui2abc/memo-plugin-ng/demo/demo/demo.ets @@ -17,7 +17,7 @@ import { IncrementalNode } from 'arkui.incremental.runtime.tree.IncrementalNode' import { NodeAttach } from 'arkui.incremental.runtime.memo.node' import { memoRoot } from 'arkui.incremental.runtime.memo.entry' import { toRootHierarchy } from 'arkui.incremental.runtime.memo.testing' -import { mutableState, updateStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' +import { mutableState, updateStateManager } from 'arkui.incremental.runtime.core.GlobalStateManager' import { memo } from "arkui.incremental.annotation" // This example demostrates creation of incremental trees of string nodes diff --git a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json index f920e1f36..f1b258e28 100644 --- a/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json +++ b/ui2abc/memo-plugin-ng/demo/ui2abcconfig.json @@ -1708,11 +1708,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/doc/memo-introduction.md b/ui2abc/memo-plugin-ng/doc/memo-introduction.md index a85db6654..637373832 100644 --- a/ui2abc/memo-plugin-ng/doc/memo-introduction.md +++ b/ui2abc/memo-plugin-ng/doc/memo-introduction.md @@ -187,7 +187,7 @@ To have something triggering the tree rebuild, let's have some state we can tweak between frames. ``` -import { mutableState } from 'arkui.incremental.runtime.impl.GlobalStateManager' +import { mutableState } from 'arkui.incremental.runtime.core.GlobalStateManager' // We create a state for the memo functions to subsceibe const state = mutableState(17) @@ -318,7 +318,7 @@ import { NodeAttach } from 'arkui.incremental.runtime.memo.node' import { memoRoot } from 'arkui.incremental.runtime.memo.entry' import { toRootHierarchy } from 'arkui.incremental.runtime.memo.testing' import { MutableState } from 'arkui.incremental.runtime.state' -import { mutableState, updateStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' +import { mutableState, updateStateManager } from 'arkui.incremental.runtime.core.GlobalStateManager' import { memo } from "arkui.incremental.annotation" // This example demostrates creation of incremental trees of string nodes diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json index b6883de08..b49527fdb 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-diagnostics.json @@ -1705,11 +1705,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json index 06b43123a..3ef0cb7e5 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-executable.json @@ -1708,11 +1708,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../../incremental/runtime/ets/imcorepl/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json index 556aa6fa6..c8fb73bf1 100644 --- a/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json +++ b/ui2abc/memo-plugin-ng/test/arktsconfig-rewrite.json @@ -1705,11 +1705,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/perf-tests/ui2abcconfig.json b/ui2abc/perf-tests/ui2abcconfig.json index 020b14fe1..6971fe801 100644 --- a/ui2abc/perf-tests/ui2abcconfig.json +++ b/ui2abc/perf-tests/ui2abcconfig.json @@ -1696,11 +1696,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json index 5b3c1ed6d..20bcca8aa 100644 --- a/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json +++ b/ui2abc/tests-memo/test/arktsconfig-memo-plugin.json @@ -1711,11 +1711,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/tests-memo/test/compat/arkts/compat.ts b/ui2abc/tests-memo/test/compat/arkts/compat.ts index 993b71367..772359055 100644 --- a/ui2abc/tests-memo/test/compat/arkts/compat.ts +++ b/ui2abc/tests-memo/test/compat/arkts/compat.ts @@ -14,6 +14,6 @@ */ export { TestNode, testRoot, testTick } from 'arkui.incremental.runtime.memo.testing' -export { mutableState, GlobalStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' +export { mutableState, GlobalStateManager } from 'arkui.incremental.runtime.core.GlobalStateManager' export { StateContext, MutableState } from 'arkui.incremental.runtime.state' export { __id, __key, __context } from "arkui.incremental.annotation" diff --git a/ui2abc/tests-memo/test/ui2abc/main.test.ts b/ui2abc/tests-memo/test/ui2abc/main.test.ts index bf2356874..8b207cf7a 100644 --- a/ui2abc/tests-memo/test/ui2abc/main.test.ts +++ b/ui2abc/tests-memo/test/ui2abc/main.test.ts @@ -15,7 +15,7 @@ import { suite, test } from "@koalaui/harness" import { __id, __key, __context } from "arkui.incremental.annotation" -import { GlobalStateManager } from 'arkui.incremental.runtime.impl.GlobalStateManager' +import { GlobalStateManager } from 'arkui.incremental.runtime.core.GlobalStateManager' import { TestNode, testRoot, testTick } from 'arkui.incremental.runtime.memo.testing' import { assertResultArray, GlobalStateHolder } from "../utils" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json index 121ae0407..5b61371fe 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-none.json @@ -1714,11 +1714,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json index 6c3c7705e..226416549 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-checked.json @@ -1714,11 +1714,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json index 48040b7a7..ce82f915f 100644 --- a/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json +++ b/ui2abc/ui-plugins-ng/perf/ui2abcconfig-ui-parsed-only.json @@ -1714,11 +1714,11 @@ "arkui.incremental.runtime.common.Disposable": [ "../../../../incremental/runtime/ets/common/Disposable" ], - "arkui.incremental.runtime.impl.GlobalStateManager": [ - "../../../../incremental/runtime/ets/impl/GlobalStateManager" + "arkui.incremental.runtime.core.GlobalStateManager": [ + "../../../../incremental/runtime/ets/core/GlobalStateManager" ], - "arkui.incremental.runtime.impl.State": [ - "../../../../incremental/runtime/ets/impl/State" + "arkui.incremental.runtime.core.State": [ + "../../../../incremental/runtime/ets/core/State" ], "arkui.stateManagement.storage.appStorage": [ "../../../../absolute-sdk-patched/api/arkui/stateManagement/storage/appStorage" diff --git a/ui2abc/ui-plugins-ng/src/utils.ts b/ui2abc/ui-plugins-ng/src/utils.ts index d53c8aed1..59c60b597 100644 --- a/ui2abc/ui-plugins-ng/src/utils.ts +++ b/ui2abc/ui-plugins-ng/src/utils.ts @@ -82,7 +82,7 @@ export function getGlobalStatePackage(): string { if (isKoalaWorkspace()) { return '@koalaui/runtime' } else { - return 'arkui.incremental.runtime.impl.GlobalStateManager' + return 'arkui.incremental.runtime.core.GlobalStateManager' } } -- Gitee