diff --git a/ui2abc/arkui-plugins/common/debug.ts b/ui2abc/arkui-plugins/common/debug.ts index 68019981a872ebdab137f05fea885173c00e0dc7..c4ed715ade7ea99c58a89199155af25045441f5e 100644 --- a/ui2abc/arkui-plugins/common/debug.ts +++ b/ui2abc/arkui-plugins/common/debug.ts @@ -49,7 +49,7 @@ export function debugDumpAstNode( programFileName: string): void { if (!isDebugDump) { return; - } + } const currentDirectory = process.cwd(); const modifiedFileName = programFileName.replaceAll('.', '_'); const outputDir: string = cachePath diff --git a/ui2abc/arkui-plugins/common/program-visitor.ts b/ui2abc/arkui-plugins/common/program-visitor.ts index 5255e60f13b300e9bff021bc8a84dece6d0ff991..ee2a39e00c570f45bb4eebeae85e19bacfe7221b 100644 --- a/ui2abc/arkui-plugins/common/program-visitor.ts +++ b/ui2abc/arkui-plugins/common/program-visitor.ts @@ -269,7 +269,7 @@ export class ProgramVisitor extends AbstractVisitor { if (this.legacyStructMap.size > 0 && transformer instanceof ComponentTransformer) { transformer.registerMap(this.legacyStructMap); } - this.visitTransformer(transformer, script, externalSourceName, program); + script = this.visitTransformer(transformer, script, externalSourceName, program); transformer.reset(); if (!transformer.isExternal) { debugDumpAstNode( @@ -318,7 +318,7 @@ export class ProgramVisitor extends AbstractVisitor { export class CanSkipPhasesCache { static resultCache = new Map() - + static check(program: arkts.Program) { if (!CanSkipPhasesCache.resultCache.has(program)) { const result = arkts.global.es2panda._ProgramCanSkipPhases(arkts.global.context, program.peer); diff --git a/ui2abc/build_config.json b/ui2abc/build_config.json index 6f2950b825e70295233cc885a2ce845f838ad084..8c4a7f1984d9aed7b6d3aac33fe5a72a40bfe588 100644 --- a/ui2abc/build_config.json +++ b/ui2abc/build_config.json @@ -1,7 +1,11 @@ { + "plugins_legacy": { + "ui_plugin": "../../../../../../../../../../../../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/ui-plugins/lib/ui-plugins/index.js", + "memo_plugin": "../../../../../../../../../../../../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/ui-plugins/lib/memo-plugins/index.js" + }, "plugins": { - "ui_plugin": "../../../../../../../../../../../../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/ui-plugins/lib/ui-plugins/index", - "memo_plugin": "../../../../../../../../../../../../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/ui-plugins/lib/memo-plugins/index" + "ui_plugin": "../../../../../../../../../../../../ui2abc/arkui-plugins/lib/ui-plugin.js", + "memo_plugin": "../../../../../../../../../../../../ui2abc/arkui-plugins/lib/memo-plugin.js" }, "compileFiles": [ @@ -23,8 +27,10 @@ "loaderOutPath": "./dist", "cachePath": "./dist/cache", + "es2pandaMode": 2, "buildSdkPath": "../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/", + "pandaSdkPath": "../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools", "dependentModuleList": [] } diff --git a/ui2abc/demo/localtest/entry/new.ets b/ui2abc/demo/localtest/entry/new.ets index 6be63461599131b537311d3558582240bae6d294..c885bab1ba6254f461658cb4e258c19161dc99df 100644 --- a/ui2abc/demo/localtest/entry/new.ets +++ b/ui2abc/demo/localtest/entry/new.ets @@ -1,4 +1,4 @@ -import { Component, Entry } from '@ohos.arkui.component' +import { Component, Entry, PageLifeCycle, CustomComponent } from '@ohos.arkui.component' @Component @Entry diff --git a/ui2abc/libarkts/src/arkts-api/visitor.ts b/ui2abc/libarkts/src/arkts-api/visitor.ts index b850b4b7ef77eba8d34fc678a7b0654b43d6690c..98359f64ad37c394f38f9566fe6f13b9f4d27a83 100644 --- a/ui2abc/libarkts/src/arkts-api/visitor.ts +++ b/ui2abc/libarkts/src/arkts-api/visitor.ts @@ -1124,6 +1124,8 @@ export function initVisitsTable() { visitsTable[Es2pandaAstNodeType.AST_NODE_TYPE_CLASS_STATIC_BLOCK] = visitClassStaticBlock } +initVisitsTable() + export function visitEachChild( node: AstNode, visitor: Visitor diff --git a/ui2abc/package.json b/ui2abc/package.json index f6348d6c8a0ecd142c0724b1f6b01d52f889d644..eecb367bceb450e2c70e1e960bd14fefc675197f 100644 --- a/ui2abc/package.json +++ b/ui2abc/package.json @@ -46,7 +46,7 @@ "test:all": "npm run build:all --prefix ../incremental/harness && npm run test:light --prefix libarkts && npm run demo:run:light --prefix memo-plugin-ng && npm run test:all --prefix memo-plugin-ng", "all": "npm run clean:all && npm run build:all && npm run test:all", "demo": "LD_LIBRARY_PATH=../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/ets2panda/lib node ../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/driver/build-system/dist/entry.js ./build_config.json", - "demo2": "LD_LIBRARY_PATH=../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/lib node ../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/driver/build-system/dist/entry.js ./build_config.json" + "demo2": "export KOALA_WRAPPER_PATH=`pwd`/libarkts/lib/libarkts && npm run compile:rollup -C arkui-plugins && LD_LIBRARY_PATH=../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/lib node ../tools/ohos-tools/ohos-sdk1.2/ohos-sdk/20/ets/ets1.2/build-tools/driver/build-system/dist/entry.js ./build_config.json" } }