From da34909b33fe6e3e8bf1a76b3c28c73f73ac198d Mon Sep 17 00:00:00 2001 From: xuhangqi Date: Sat, 21 Jun 2025 11:25:41 +0800 Subject: [PATCH] Fix code check Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICGGFP Signed-off-by: xuhangqi Change-Id: I894e673cd0f0c9ed5a044168286a1316aa6adb48 --- .../driver/build_system/src/build/base_mode.ts | 4 +++- .../src/build/compile_thread_worker.ts | 3 ++- .../build_system/src/build/compile_worker.ts | 5 +++-- .../src/plugins/KitImportTransformer.ts | 17 +++++++++-------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ets2panda/driver/build_system/src/build/base_mode.ts b/ets2panda/driver/build_system/src/build/base_mode.ts index 02e6e6c209..d2c27c7ca3 100644 --- a/ets2panda/driver/build_system/src/build/base_mode.ts +++ b/ets2panda/driver/build_system/src/build/base_mode.ts @@ -71,6 +71,7 @@ import { import { ArkTSConfigGenerator } from './generate_arktsconfig'; import { SetupClusterOptions } from '../types'; import { KitImportTransformer } from '../plugins/KitImportTransformer'; + export abstract class BaseMode { public buildConfig: BuildConfig; public entryFiles: Set; @@ -247,7 +248,8 @@ export abstract class BaseMode { if (this.buildConfig.aliasConfig?.size > 0) { // if aliasConfig is set, transform aliasName@kit.xxx to default@ohos.xxx through the plugin this.logger.printInfo('Transforming import statements with alias config'); - let transformAst = new KitImportTransformer(arkts, arktsGlobal.compilerContext.program, this.buildConfig.buildSdkPath,this.buildConfig.aliasConfig).transform(ast); + let transformAst = new KitImportTransformer(arkts, arktsGlobal.compilerContext.program, + this.buildConfig.buildSdkPath,this.buildConfig.aliasConfig).transform(ast); PluginDriver.getInstance().getPluginContext().setArkTSAst(transformAst); } else { PluginDriver.getInstance().getPluginContext().setArkTSAst(ast); diff --git a/ets2panda/driver/build_system/src/build/compile_thread_worker.ts b/ets2panda/driver/build_system/src/build/compile_thread_worker.ts index 987221aaf9..49644a1a6d 100644 --- a/ets2panda/driver/build_system/src/build/compile_thread_worker.ts +++ b/ets2panda/driver/build_system/src/build/compile_thread_worker.ts @@ -76,7 +76,8 @@ function compileAbc(jobInfo: JobInfo): void { if (config.aliasConfig?.size > 0) { // if aliasConfig is set, transform aliasName@kit.xxx to default@ohos.xxx through the plugin let ast = arkts.EtsScript.fromContext(); - let transformAst = new KitImportTransformer(arkts, arktsGlobal.compilerContext.program, config.buildSdkPath, config.aliasConfig).transform(ast); + let transformAst = new KitImportTransformer(arkts, arktsGlobal.compilerContext.program, + config.buildSdkPath, config.aliasConfig).transform(ast); PluginDriver.getInstance().getPluginContext().setArkTSAst(transformAst); } PluginDriver.getInstance().runPluginHook(PluginHook.PARSED); diff --git a/ets2panda/driver/build_system/src/build/compile_worker.ts b/ets2panda/driver/build_system/src/build/compile_worker.ts index d6eb4dcad3..9e4218cbd8 100644 --- a/ets2panda/driver/build_system/src/build/compile_worker.ts +++ b/ets2panda/driver/build_system/src/build/compile_worker.ts @@ -52,7 +52,7 @@ process.on('message', (message: { PluginDriver.getInstance().initPlugins(buildConfig); const koalaWrapperPath = process.env.KOALA_WRAPPER_PATH ?? path.resolve(buildConfig.buildSdkPath, KOALA_WRAPPER_PATH_FROM_SDK); let { arkts, arktsGlobal } = require(koalaWrapperPath); - const { KitImportTransformer } = require("../plugins/KitImportTransformer"); + const { KitImportTransformer } = require('../plugins/KitImportTransformer'); for (const fileInfo of taskList) { let errorStatus = false; @@ -80,7 +80,8 @@ process.on('message', (message: { if (buildConfig.aliasConfig?.size > 0) { // if aliasConfig is set, transform aliasName@kit.xxx to default@ohos.xxx through the plugin let ast = arkts.EtsScript.fromContext(); - let transformAst = new KitImportTransformer(arkts, arktsGlobal.compilerContext.program, buildConfig.buildSdkPath, buildConfig.aliasConfig).transform(ast); + let transformAst = new KitImportTransformer(arkts, arktsGlobal.compilerContext.program, + buildConfig.buildSdkPath, buildConfig.aliasConfig).transform(ast); PluginDriver.getInstance().getPluginContext().setArkTSAst(transformAst); } PluginDriver.getInstance().runPluginHook(PluginHook.PARSED); diff --git a/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts b/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts index 0f0f1ad077..6d6f19b6af 100644 --- a/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts +++ b/ets2panda/driver/build_system/src/plugins/KitImportTransformer.ts @@ -27,7 +27,7 @@ import { KIT_CONFIGS_PATH_FROM_SDK } from '../pre_define'; export class KitImportTransformer { private arkts: ArkTS; - private extraImports: ArkTS["ETSImportDeclaration"][] = []; + private extraImports: ArkTS['ETSImportDeclaration'][] = []; private sdkAliasConfig: Map>; private buildSdkPath: string; private program: object; @@ -41,12 +41,12 @@ export class KitImportTransformer { this.logger = Logger.getInstance(); } - public transform(astNode: ArkTS["AstNode"]): ArkTS["AstNode"] { + public transform(astNode: ArkTS['AstNode']): ArkTS['AstNode'] { if (!this.arkts.isEtsScript(astNode)) { return astNode; } - const newStatements: ArkTS["AstNode"][] = []; + const newStatements: ArkTS['AstNode'][] = []; const dynamicAliasNames = new Set(this.getDynamicAliasNames()); if (astNode.statements.length === 0) { return astNode; @@ -64,7 +64,7 @@ export class KitImportTransformer { return this.arkts.factory.updateEtsScript(astNode, finalStatements); } - private splitKitImport(importNode: ArkTS["ETSImportDeclaration"]): void { + private splitKitImport(importNode: ArkTS['ETSImportDeclaration']): void { const kitName = importNode.source.str; const symbolsJson = this.loadKitSymbolsJson(kitName); if (!symbolsJson) { @@ -75,7 +75,7 @@ export class KitImportTransformer { this.generateSplitImportDeclarations(groupedSymbols); } - private loadKitSymbolsJson(kitName: string): any | null { + private loadKitSymbolsJson(kitName: string): unknown | null { let jsonFileName: string = this.getOriginalNameByAlias(kitName); if (jsonFileName === '') { this.logger.printError(LogDataFactory.newInstance( @@ -107,7 +107,7 @@ export class KitImportTransformer { } } - private groupImportSpecifiersBySource(importNode: ArkTS["ETSImportDeclaration"], symbolsJson: any, kitName: string): Map { + private groupImportSpecifiersBySource(importNode: ArkTS['ETSImportDeclaration'], symbolsJson: unknown, kitName: string): Map { const grouped = new Map(); for (const specifier of importNode.specifiers) { @@ -120,13 +120,14 @@ export class KitImportTransformer { continue; } - const symbolEntry = symbolsJson.symbols?.[symbolName]; + const typedSymbols = (symbolsJson as { symbols: Record }); + const symbolEntry = typedSymbols.symbols?.[symbolName]; if (!symbolEntry?.source) { this.logger.printWarn(`Symbol '${symbolName}' not found in ${kitName}.json`); continue; } - const sourcePath = "default" + symbolEntry.source.replace(/\.d\.ts$/, ''); + const sourcePath = 'default' + symbolEntry.source.replace(/\.d\.ts$/, ''); if (!grouped.has(sourcePath)) { grouped.set(sourcePath, []); } -- Gitee