From ceaccc2d31f0e8a05f8e9351853afe44ea75c212 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 18 Oct 2024 17:34:18 +0300 Subject: [PATCH 1/2] Minor tweaks Signed-off-by: Alexander Gorshenev --- arkoala-arkts/arkui/src/ArkComponentRoot.ts | 1 + arkoala-arkts/arkui/tsconfig-unmemoize.json | 7 +------ arkoala-arkts/loader/package.json | 2 +- arkoala-arkts/loader/src/ets/hello.ets | 1 + arkoala-arkts/loader/src/runner.ts | 4 ++-- arkoala-arkts/loader/src/sts-stdlib/global.d.ts | 2 ++ arkoala-arkts/loader/tsconfig-unmemoize.json | 3 +++ 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arkoala-arkts/arkui/src/ArkComponentRoot.ts b/arkoala-arkts/arkui/src/ArkComponentRoot.ts index 92f9d3fdc..15dc9aa81 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 271cb21d3..d1ca4235f 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 a0cf371e1..9c8e24d04 100644 --- a/arkoala-arkts/loader/package.json +++ b/arkoala-arkts/loader/package.json @@ -15,7 +15,7 @@ "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" + "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/ ../../arkoala/arkui-common/build/abc -name '*.abc' | paste -sd ':' -) --ark-entry-point ETSGLOBAL::main" }, "keywords": [], "dependencies": {}, diff --git a/arkoala-arkts/loader/src/ets/hello.ets b/arkoala-arkts/loader/src/ets/hello.ets index 61c433400..ef634ca99 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 e69ffbe54..d5543dfad 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 37e91f633..cfdeef901 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 44a8917fb..ba1c42750 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" }, -- Gitee From 878575c3d2e46ccfd65040bccf44a1b7f13aaa11 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 18 Oct 2024 17:36:18 +0300 Subject: [PATCH 2/2] more Signed-off-by: Alexander Gorshenev --- arkoala-arkts/loader/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arkoala-arkts/loader/package.json b/arkoala-arkts/loader/package.json index 9c8e24d04..193c9100d 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/ ../../arkoala/arkui-common/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": {}, -- Gitee