diff --git a/arkui-plugins/ui-plugins/component-transformer.ts b/arkui-plugins/ui-plugins/component-transformer.ts index 44a6765879d350f2a006908726b32e602d9811d2..fa3067b003d83270dc29bd4442253e4e85b096c6 100644 --- a/arkui-plugins/ui-plugins/component-transformer.ts +++ b/arkui-plugins/ui-plugins/component-transformer.ts @@ -255,7 +255,7 @@ export class ComponentTransformer extends AbstractVisitor { entryFactory.callRegisterNamedRouter( this.entryRouteName, this.projectConfig, - this.program?.globalAbsName + this.program?.absName ) ); this.createImportDeclaration(ENTRY_POINT_IMPORT_SOURCE_NAME, NavigationNames.NAVINTERFACE); diff --git a/koala-wrapper/native/src/bridges.cc b/koala-wrapper/native/src/bridges.cc index 0936041a44fd2ea4d3d620d653a638e6339413a5..73466e93dc7efa2c0595624634b653b7cdf1e40f 100644 --- a/koala-wrapper/native/src/bridges.cc +++ b/koala-wrapper/native/src/bridges.cc @@ -446,6 +446,15 @@ KNativePointer impl_ETSParserGetGlobalProgramAbsName(KNativePointer contextPtr) } KOALA_INTEROP_1(ETSParserGetGlobalProgramAbsName, KNativePointer, KNativePointer) +KNativePointer impl_ProgramAbsoluteNameConst(KNativePointer contextPtr, KNativePointer instancePtr) +{ + auto context = reinterpret_cast(contextPtr); + auto &&instance = reinterpret_cast(instancePtr); + auto result = GetImpl()->ProgramAbsoluteNameConst(context, instance); + return new std::string(result); +} +KOALA_INTEROP_2(ProgramAbsoluteNameConst, KNativePointer, KNativePointer, KNativePointer); + KNativePointer impl_ClassVariableDeclaration(KNativePointer context, KNativePointer classInstance) { const auto _context = reinterpret_cast(context); diff --git a/koala-wrapper/src/Es2pandaNativeModule.ts b/koala-wrapper/src/Es2pandaNativeModule.ts index 9435c1a3fe8b31ca67d1991dac987692ca8e554b..1d323dc4c50c2477066bd9424cf3b48df79b1ef3 100644 --- a/koala-wrapper/src/Es2pandaNativeModule.ts +++ b/koala-wrapper/src/Es2pandaNativeModule.ts @@ -820,6 +820,10 @@ export class Es2pandaNativeModule { throw new Error('Not implemented'); } + _ProgramAbsoluteNameConst(context: KNativePointer, instance: KNativePointer): KNativePointer { + throw new Error('Not implemented'); + } + _ImportSpecifierIsRemovableConst(context: KNativePointer, instance: KNativePointer): KBoolean { throw new Error('Not implemented'); } diff --git a/koala-wrapper/src/arkts-api/peers/Program.ts b/koala-wrapper/src/arkts-api/peers/Program.ts index 5a1099473210b4ccbb95a313cbf58b69208dfdea..5733592bc642d34d895e9c38f494e0b7d1dcb13e 100644 --- a/koala-wrapper/src/arkts-api/peers/Program.ts +++ b/koala-wrapper/src/arkts-api/peers/Program.ts @@ -59,10 +59,17 @@ export class Program extends ArktsObject { return unpackString(global.es2panda._ProgramFileNameWithExtensionConst(global.context, this.peer)); } + /** + * @deprecated + */ get globalAbsName(): string { return unpackString(global.es2panda._ETSParserGetGlobalProgramAbsName(global.context)); } + get absName(): string { + return unpackString(global.es2panda._ProgramAbsoluteNameConst(global.context, this.peer)); + } + get moduleName(): string { return unpackString(global.es2panda._ProgramModuleNameConst(global.context, this.peer)); }