From e4950c60399c4ab7bb786212c97ed85bd6279adf Mon Sep 17 00:00:00 2001 From: tension <1113989231@qq.com> Date: Mon, 4 Aug 2025 19:37:38 +0800 Subject: [PATCH] Fix dependencykey loss information Issue: ICQMK2 Signed-off-by: zhangli <1113989231@qq.com> Change-id: af8cc9f75a812c05d7e81e849b3aca32cza4e66cd --- .../build_system/src/build/generate_arktsconfig.ts | 9 ++++----- .../build_system/src/plugins/KitImportTransformer.ts | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts b/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts index 03852d906f..2017fa8863 100644 --- a/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts +++ b/ets2panda/driver/build_system/src/build/generate_arktsconfig.ts @@ -248,10 +248,9 @@ export class ArkTSConfigGenerator { } - private getOhmurl(file: string, moduleInfo: ModuleInfo): string { + private getDependencyKey(file: string, moduleInfo: ModuleInfo): string { let unixFilePath: string = file.replace(/\\/g, '/'); - let ohmurl: string = moduleInfo.packageName + '/' + unixFilePath; - return changeFileExtension(ohmurl, ''); + return moduleInfo.packageName + '/' + unixFilePath; } private getDependenciesSection(moduleInfo: ModuleInfo, arktsconfig: ArkTSConfig): void { @@ -268,7 +267,7 @@ export class ArkTSConfigGenerator { const files = declFilesObject.files; Object.keys(files).forEach((file: string) => { - const ohmurl: string = this.getOhmurl(file, depModuleInfo); + const dependencyKey: string = this.getDependencyKey(file, depModuleInfo); const depItem: DependencyItem = { language: 'js', path: files[file].declPath, @@ -276,7 +275,7 @@ export class ArkTSConfigGenerator { }; arktsconfig.addDependency({ - name: ohmurl, + name: dependencyKey, item: depItem }); diff --git a/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts b/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts index 87034ff4ee..a7262ac5ba 100644 --- a/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts +++ b/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts @@ -131,7 +131,6 @@ export class KitImportTransformer { } const sourcePath = DYNAMIC_PREFIX + symbolEntry.source.replace(/\.d\.ts$/, ''); - console.log('sourcePath',sourcePath); if (!grouped.has(sourcePath)) { grouped.set(sourcePath, []); } -- Gitee