diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern index ae4a5689f43d30a2cb1166c2f8a791dd5f1b0275..c4b09a33d71ddcf0da96cb8120b149116a266cf0 100644 --- a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern +++ b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern @@ -5,4 +5,4 @@ export declare function %COMPONENT_NAME%( %FUNCTION_PARAMETERS% @memo content_?: () => void, -): UI%COMPONENT_NAME%Attribute \ No newline at end of file +): %COMPONENT_NAME%Attribute \ No newline at end of file diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern deleted file mode 100644 index c4b09a33d71ddcf0da96cb8120b149116a266cf0..0000000000000000000000000000000000000000 --- a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern +++ /dev/null @@ -1,8 +0,0 @@ -%COMPONENT_COMMENT% -@memo -@ComponentBuilder -export declare function %COMPONENT_NAME%( - %FUNCTION_PARAMETERS% - @memo - content_?: () => void, -): %COMPONENT_NAME%Attribute \ No newline at end of file diff --git a/build-tools/arkui_transformer/src/add_import.ts b/build-tools/arkui_transformer/src/add_import.ts index daf313dd4eb52be669777639ee4d1ce330f77a3f..83a69d9b3a5a9116861d5bffdb2839095aca7051 100644 --- a/build-tools/arkui_transformer/src/add_import.ts +++ b/build-tools/arkui_transformer/src/add_import.ts @@ -68,15 +68,9 @@ function handleImportDeclaration(node: ts.ImportDeclaration): [ts.Node, boolean] if (importClause && ts.isImportClause(importClause) && importClause.namedBindings && ts.isNamedImports(importClause.namedBindings)) { const namedImports = importClause.namedBindings.elements; const existingImports = namedImports.map((element) => element.name.text); - existingImports.forEach((element) => { - if (uiconfig.isUIHeritage(element)) { - uiconfig.useMemoM3 || uiprefixImports.add(`UI${element}`) - } - }) if (moduleText.includes("common")) { uiprefixImports.add('AttributeModifier'); uiprefixImports.add('CommonMethod'); - uiconfig.useMemoM3 || uiprefixImports.add('UICommonMethod'); } const addedImports = Array.from(uiprefixImports).filter((im) => !existingImports.includes(im)); @@ -146,9 +140,6 @@ function createTargetImport(sourceFile: ts.SourceFile, context: ts.Transformatio ts.factory.createNamedImports([ ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("AttributeModifier")), ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("CommonMethod")), - ...(uiconfig.useMemoM3 !== true ? [ - ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UICommonMethod")) - ] : []) ]) ), ts.factory.createStringLiteral("./common"), diff --git a/build-tools/arkui_transformer/src/arkui_config_util.ts b/build-tools/arkui_transformer/src/arkui_config_util.ts index b0b2d91c044d047d44101ad43efcdbecac8de310..a836f10899653c1b2cc9fc91ab6da64b03ccd135 100644 --- a/build-tools/arkui_transformer/src/arkui_config_util.ts +++ b/build-tools/arkui_transformer/src/arkui_config_util.ts @@ -26,10 +26,6 @@ interface NoneUIConfig { files: Array } -interface UseM3Config { - useM3: Array -} - export class ArkUIConfigUtil { static instance: ArkUIConfigUtil = new ArkUIConfigUtil constructor() { @@ -41,8 +37,6 @@ export class ArkUIConfigUtil { this.noneUIconfig.files.forEach(f => { this.noneUIFileSet.add(f) }) - const useM3Config: UseM3Config = JSON.parse(fs.readFileSync("./config/arkui_m3_white_list.json", 'utf-8')) - this._useM3Files = useM3Config.useM3 } // ui components private config: ArkUIConfig @@ -62,27 +56,13 @@ export class ArkUIConfigUtil { private file2Attrbiute: Map = new Map private shouldNotHaveAttributeModifier: Set = new Set private _useMemoM3: boolean = false - private _useM3Files: Array = [] private _configPath: string = '' - get useMemoM3(): boolean { - return this._useMemoM3 - } - - set useMemoM3(value: boolean) { - this._useMemoM3 = value - } - - withM3File(file: string): boolean { - if (this._useMemoM3) { - return true; - } - return this._useM3Files.includes(path.basename(file)) - } - get isHdsComponent(): boolean { return this._configPath.length > 0 } - + get useMemoM3(): boolean { + return this._useMemoM3 + } public loadConfig(config: OptionValues): void { if (config.useMemoM3) { this._useMemoM3 = true diff --git a/build-tools/arkui_transformer/src/arkui_transformer.ts b/build-tools/arkui_transformer/src/arkui_transformer.ts index 1ae317cfd8fa4d8e1eaffcc302fa25f6ee83a003..e96e9463eb8091bada2caea56f1b30115e367433 100644 --- a/build-tools/arkui_transformer/src/arkui_transformer.ts +++ b/build-tools/arkui_transformer/src/arkui_transformer.ts @@ -82,8 +82,7 @@ function main() { const componentFile = componentFileMap.get(f)!; const result = ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer(), addImportTransformer()]); const transformedFile = ts.createSourceFile(f, printFile(result.transformed[0]), ts.ScriptTarget.Latest, true); - const addMemoResult = ts.transform(transformedFile, [addMemoTransformer(componentFile)]); - const transformedSource = ts.createPrinter().printFile(addMemoResult.transformed[0]); + const transformedSource = ts.createPrinter().printFile(transformedFile); printResult(transformedSource, componentFile); return ts.createSourceFile("", "", ts.ScriptTarget.Latest, true); } @@ -133,4 +132,4 @@ const options = program .parse() .opts() -main() \ No newline at end of file +main() diff --git a/build-tools/arkui_transformer/src/interface_converter.ts b/build-tools/arkui_transformer/src/interface_converter.ts index 5a8c874ca1b74e5b60c279a3a80e90d4813d2b09..08e6de9349433983c79c87ed8e95093a9bfc5efd 100644 --- a/build-tools/arkui_transformer/src/interface_converter.ts +++ b/build-tools/arkui_transformer/src/interface_converter.ts @@ -22,7 +22,7 @@ import { ComponentFile } from './component_file'; import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils' function readLangTemplate(): string { - return uiconfig.useMemoM3 ? fs.readFileSync('./pattern/arkts_component_decl_m3.pattern', 'utf8') : fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8') + return uiconfig.useMemoM3 ? fs.readFileSync('./pattern/arkts_component_decl_m3.pattern', 'utf8') : fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8') } function extractSignatureComment(