diff --git a/arkoala/ets-plugin/src/Importer.ts b/arkoala/ets-plugin/src/Importer.ts index 8d4cd6384d7b4c4467c9d63c0d45237acaef1899..1995462520ffaaddd1c5e6904adef81f03052923 100644 --- a/arkoala/ets-plugin/src/Importer.ts +++ b/arkoala/ets-plugin/src/Importer.ts @@ -260,6 +260,16 @@ export class Importer { this.addImport(this.subproject.koalaRuntime, undefined, name) } addAdaptorImport(name: string) { + /* + temporary workaround for arkts reexport bug + */ + if (this.isArkts()) { + if (name === "ArkPageTransitionEnterComponent") return this.addArkuiCommonImport(name) + if (name === "ArkPageTransitionExitComponent") return this.addArkuiCommonImport(name) + if (name === "LocalStorage") return this.addArkuiCommonImport(name) + if (name === "observableProxy") return this.addArkuiCommonImport(name) + } + this.addImport(this.subproject.koalaAdaptor, undefined, name) } addArkuiCommonImport(name: string) { diff --git a/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts b/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts index 4b12cf9d64dbd945e817eae065bdca40ccfe8943..17330e3d9384255b3a21a5f4a5bd62aebfca03a7 100644 --- a/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts +++ b/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts @@ -1,6 +1,7 @@ -import { AppStorageLinkState, ArkButton, ArkButtonComponent, ArkColumn, ArkColumnComponent, ArkCommonMethodInterface, ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, ArkStructBase, ArkText, ArkTextComponent, LocalStorage, SyncedProperty, bindCustomDialog, contextLocalStateOf, objectLinkState, observableProxy, propState, stateOf } from "@koalaui/arkts-arkui"; +import { AppStorageLinkState, ArkButton, ArkButtonComponent, ArkColumn, ArkColumnComponent, ArkCommonMethodInterface, ArkStructBase, ArkText, ArkTextComponent, SyncedProperty, bindCustomDialog, contextLocalStateOf, objectLinkState, propState } from "@koalaui/arkts-arkui"; +import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, LocalStorage, observableProxy } from "@koalaui/arkui-common"; import { registerArkuiEntry } from "@koalaui/arkts-arkui/ohos.router"; -import { MutableState, OnChange, contextLocal } from "@koalaui/runtime"; +import { MutableState, OnChange, contextLocal, stateOf } from "@koalaui/runtime"; export class ArkEntryExampleComponent extends ArkStructBase { private _entry_local_storage_ = new LocalStorage(); __initializeStruct(/**/ diff --git a/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts b/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts index bd7eef3e2d586ae5aa3ba9379e6d39820304bb68..f24942d6e63a51b2e226895b86103c128d0cabeb 100644 --- a/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts +++ b/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts @@ -1,4 +1,5 @@ -import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, ArkStructBase, ArkText, StorageLinkState, observableProxy } from "@koalaui/arkts-arkui"; +import { ArkStructBase, ArkText, StorageLinkState } from "@koalaui/arkts-arkui"; +import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, observableProxy } from "@koalaui/arkui-common"; import { registerArkuiEntry } from "@koalaui/arkts-arkui/ohos.router"; import { MutableState } from "@koalaui/runtime"; /* diff --git a/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts b/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts index 3633efd1cd9524b35c68e4878db0e195c353231c..0751d7d5aff7fe0e8f080008089044fd47234ba0 100644 --- a/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts +++ b/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts @@ -1,4 +1,5 @@ -import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, ArkStructBase, StorageLinkState, SyncedProperty, observableProxy, propState } from "@koalaui/arkts-arkui"; +import { ArkStructBase, StorageLinkState, SyncedProperty, propState } from "@koalaui/arkts-arkui"; +import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, observableProxy } from "@koalaui/arkui-common"; import { registerArkuiEntry } from "@koalaui/arkts-arkui/ohos.router"; /* * Copyright (c) 2022-2023 Huawei Device Co., Ltd.