diff --git a/arkoala-arkts/arkui/src/ArkComponentRoot.ts b/arkoala-arkts/arkui/src/ArkComponentRoot.ts index 92f9d3fdc061b80f86b2f7db5bfa290ef00f01f9..15dc9aa81888fd26a10388bfd7a1fd149d05ac1b 100644 --- a/arkoala-arkts/arkui/src/ArkComponentRoot.ts +++ b/arkoala-arkts/arkui/src/ArkComponentRoot.ts @@ -26,6 +26,7 @@ export function ArkComponentRoot( /** @memo */ content: () => void ) { + console.log("I'm ArkComponentRoot. Implement me.") // emulate lifecycle of ArkUI component // const appear = rememberMutableState(true) // rememberDisposable( diff --git a/arkoala-arkts/arkui/tsconfig-unmemoize.json b/arkoala-arkts/arkui/tsconfig-unmemoize.json index 271cb21d3f41eec541945066281b0d725234e6df..d1ca4235fef07aecf55ad68ab5ec05c3e728863f 100644 --- a/arkoala-arkts/arkui/tsconfig-unmemoize.json +++ b/arkoala-arkts/arkui/tsconfig-unmemoize.json @@ -37,12 +37,7 @@ "./src/**/*.ts", ], "exclude": [ - "./src/generated/arkts" - ], - "files": [ - "../../arkoala/arkui-common/ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/component/index-full.d.ts", - "../../arkoala/arkui-common/ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/component/koala-extensions.d.ts", - "../../arkoala/arkui-common/ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/api/@internal/full/global.d.ts" + "./src/generated/arkts", "src/generated/common.ts", "src/generated/test_utils.ts" ], "references": [ { "path": "../../arkoala/arkui-common" }, diff --git a/arkoala-arkts/loader/package.json b/arkoala-arkts/loader/package.json index a0cf371e151995cffa5cf7e1d1f58a4f5cdae8c0..193c9100ddc85eb72824ef5452a76ac7a5426487 100644 --- a/arkoala-arkts/loader/package.json +++ b/arkoala-arkts/loader/package.json @@ -15,7 +15,8 @@ "unmemoize": "npm run compile:ets && memo-tsc -b tsconfig-unmemoize.json", "compile:arkts": "npm run unmemoize && npm run unmemoize --prefix ../arkui && npm run compile:unmemoize --prefix ../../incremental/runtime && bash -x ../../incremental/tools/panda/arkts/arktsc --arktsconfig ./arktsconfig-run-unmemoized.json --ets-module", "compile:runner:arkts": "bash -x ../../incremental/tools/panda/arkts/arktsc --arktsconfig ./arktsconfig-run-unmemoized-runner.json", - "run": "npm run compile:arkts && npm run compile:runner:arkts && bash -x ../../incremental/tools/panda/arkts/ark build/abc/unmemoized/src/runner.abc --ark-boot-files build/abc/unmemoized/generated/hello.abc:../../incremental/demo-playground/build/arkoala.abc:$(find ../arkui/build/abc/ -name '*.abc' | paste -sd ':' -) --ark-entry-point ETSGLOBAL::main" + "execute:panda": "LD_LIBRARY_PATH=. bash -x ../../incremental/tools/panda/arkts/ark build/abc/unmemoized/src/runner.abc --ark-boot-files build/abc/unmemoized/generated/hello.abc:../../incremental/demo-playground/build/arkoala.abc:$(find ../arkui/build/abc/ ../../arkoala/arkui-common/build/abc -name '*.abc' | paste -sd ':' -) --ark-entry-point ETSGLOBAL::main", + "run": "npm run compile:arkts && npm run compile:runner:arkts && npm run execute:panda" }, "keywords": [], "dependencies": {}, diff --git a/arkoala-arkts/loader/src/ets/hello.ets b/arkoala-arkts/loader/src/ets/hello.ets index 61c433400f075f07e09d0f02d4fe3511573870eb..ef634ca99016ae7ad3e6ad1eb9d6886eb2ca8107 100644 --- a/arkoala-arkts/loader/src/ets/hello.ets +++ b/arkoala-arkts/loader/src/ets/hello.ets @@ -4,6 +4,7 @@ struct X { build() { Column() { Button() + console.log("Yay!") } } } diff --git a/arkoala-arkts/loader/src/runner.ts b/arkoala-arkts/loader/src/runner.ts index e69ffbe541f0fcf635f2f9c834e043159946b9ea..d5543dfadd4dec0c8b5f8e6eea102866cb943bb1 100644 --- a/arkoala-arkts/loader/src/runner.ts +++ b/arkoala-arkts/loader/src/runner.ts @@ -10,8 +10,8 @@ export function main() { const root/*: ComputableState */= memoRoot( // TODO: change Column to Root - new PeerNode(ArkUINodeType.Column, undefined, 0), - (node: PeerNode) => { X() } + new PeerNode(ArkUINodeType.Column, 0 , "Roor"), + (node: PeerNode) => { console.log("memoRoot second arg lambda"); X() } ) console.log(root.value.toHierarchy()) // dump ui subtree diff --git a/arkoala-arkts/loader/src/sts-stdlib/global.d.ts b/arkoala-arkts/loader/src/sts-stdlib/global.d.ts index 37e91f633550cd45174be16f3025d163eb4d611d..cfdeef90170fd29cd6f857219c6466880b2461b0 100644 --- a/arkoala-arkts/loader/src/sts-stdlib/global.d.ts +++ b/arkoala-arkts/loader/src/sts-stdlib/global.d.ts @@ -1,3 +1,5 @@ +declare type int32 = number +declare type float32 = number // This is to allow symbols of arkts stdlib // to be visible during memo-tsc preprocessing diff --git a/arkoala-arkts/loader/tsconfig-unmemoize.json b/arkoala-arkts/loader/tsconfig-unmemoize.json index 44a8917fbc900fdef307542564bd25deb645f46e..ba1c4275078d98547ab9f9c82a57a42616f164b3 100644 --- a/arkoala-arkts/loader/tsconfig-unmemoize.json +++ b/arkoala-arkts/loader/tsconfig-unmemoize.json @@ -23,6 +23,9 @@ "include": [ "./generated", "./src/runner.ts", "./src/sts-stdlib/global.d.ts" ], + "exclude": [ + "../arkui/src/generated/arkts", "../arkui/src/generated/common.ts", "../arkui/src/generated/test_utils.ts" + ], "references": [ { "path": "../../arkoala/arkui-common" }, { "path": "../../arkoala/arkui-common/tsconfig-unmemoize.json" },