From 8a47e8fba1e62f6b078e5cd5a6466e8960fa8f08 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 5 Sep 2024 18:04:32 +0300 Subject: [PATCH 01/19] works -b Signed-off-by: naumovdmitrii --- arkoala-arkts/arkui/src/ArkState.ts | 12 +++++ arkoala-arkts/arkui/src/index.ts | 6 +++ arkoala-arkts/arkui/tsconfig-unmemoize.json | 32 ++++++++++-- arkoala-arkts/arkui/tsconfig.json | 6 +++ arkoala-arkts/loader/package.json | 8 ++- arkoala-arkts/loader/src/ets/hello.ets | 1 + arkoala-arkts/loader/tsconfig-unmemoize.json | 50 +++++++++++++------ arkoala-arkts/package.json | 1 - arkoala/arkui-common/arktsconfig.json | 48 +++++++++++------- arkoala/arkui-common/package.json | 5 ++ arkoala/arkui-common/src/ArkState.ts | 2 +- arkoala/arkui-common/src/Router.ts | 2 +- .../src/arkts}/ArkPageTransition.ts | 0 .../arkui-common/src/arkts}/Storage.ts | 0 arkoala/arkui-common/src/arkts/index.ts | 18 +++++++ arkoala/arkui-common/src/arkts/observable.ts | 36 +++++++++++++ arkoala/arkui-common/src/index.ts | 12 +---- .../src/{ => typescript}/ArkPageTransition.ts | 0 .../src/{ => typescript}/Storage.ts | 0 arkoala/arkui-common/src/typescript/index.ts | 28 +++++++++++ .../src/{ => typescript}/observable.ts | 2 +- arkoala/arkui-common/tsconfig-unmemoize.json | 12 ++++- arkoala/arkui-common/tsconfig.json | 5 +- 23 files changed, 229 insertions(+), 57 deletions(-) create mode 100644 arkoala-arkts/arkui/src/ArkState.ts rename {arkoala-arkts/arkui/src => arkoala/arkui-common/src/arkts}/ArkPageTransition.ts (100%) rename {arkoala-arkts/arkui/src => arkoala/arkui-common/src/arkts}/Storage.ts (100%) create mode 100644 arkoala/arkui-common/src/arkts/index.ts create mode 100644 arkoala/arkui-common/src/arkts/observable.ts rename arkoala/arkui-common/src/{ => typescript}/ArkPageTransition.ts (100%) rename arkoala/arkui-common/src/{ => typescript}/Storage.ts (100%) create mode 100644 arkoala/arkui-common/src/typescript/index.ts rename arkoala/arkui-common/src/{ => typescript}/observable.ts (99%) diff --git a/arkoala-arkts/arkui/src/ArkState.ts b/arkoala-arkts/arkui/src/ArkState.ts new file mode 100644 index 000000000..f045858e0 --- /dev/null +++ b/arkoala-arkts/arkui/src/ArkState.ts @@ -0,0 +1,12 @@ +import { mutableState, MutableState } from "@koalaui/runtime"; +import { observableProxy } from "@koalaui/arkui-common" + +/** + * So what's going on here? We need to create states that persists across + * routing and lifecycle events. To achieve that we create `ValueStorage` + * instance and make it a router-local variable. As these variables persists + * across routing, so we'll get stable values. + */ +export function stateOf(value: Value, instance?: CustomComponent, index?: number): MutableState { + return mutableState(observableProxy(value)) +} diff --git a/arkoala-arkts/arkui/src/index.ts b/arkoala-arkts/arkui/src/index.ts index dee4afb2e..884a1c815 100644 --- a/arkoala-arkts/arkui/src/index.ts +++ b/arkoala-arkts/arkui/src/index.ts @@ -16,5 +16,11 @@ export * from "./ArkStructBase" export * from "./Storage" export * from "./ArkPageTransition" + export * from "./generated/ArkButton" export * from "./generated/ArkColumn" + +export { stateOf } from "./ArkState" + +export * from "@koalaui/arkui-common" +export * from "@koalaui/runtime" \ No newline at end of file diff --git a/arkoala-arkts/arkui/tsconfig-unmemoize.json b/arkoala-arkts/arkui/tsconfig-unmemoize.json index 035e6b201..cc1ac140d 100644 --- a/arkoala-arkts/arkui/tsconfig-unmemoize.json +++ b/arkoala-arkts/arkui/tsconfig-unmemoize.json @@ -10,9 +10,28 @@ } ], "outDir": "./build/garbage", + "baseUrl": ".", "paths": { - "#arkui": ["./src/generated/ts"] - } + "@koalaui/common": [ + "../../incremental/common/src" + ], + "@koalaui/runtime": [ + "../../incremental/runtime/src" + ], + "@koalaui/compat": [ + "../../incremental/compat/src" + ], + "@koalaui/arkui-common": [ + "../../arkoala/arkui-common/src" + ], + "#arkui-common/*": [ + "../../arkoala/arkui-common/src/arkts" + ], + "#arkui": [ + "./src/generated/ts" + ] + }, + "rootDir": "../../../" }, "include": [ "./src/**/*.ts", @@ -20,9 +39,14 @@ "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" + ], // TODO: maybe delete this section "references": [ - { "path": "../../incremental/runtime" }, - { "path": "../../incremental/runtime/tsconfig-unmemoize.json" }, + { "path": "../../arkoala/arkui-common" }, + { "path": "../../arkoala/arkui-common/tsconfig-unmemoize.json" }, { "path": "../../interop" } ] } diff --git a/arkoala-arkts/arkui/tsconfig.json b/arkoala-arkts/arkui/tsconfig.json index 6bf82d250..aa3845164 100644 --- a/arkoala-arkts/arkui/tsconfig.json +++ b/arkoala-arkts/arkui/tsconfig.json @@ -12,8 +12,14 @@ "#arkui": ["./src/generated/ts"] } }, + "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" + ], // TODO: maybe delete this section "references": [ { "path": "../../incremental/runtime" }, + { "path": "../../arkoala/arkui-common" }, { "path": "../../interop" } ] } diff --git a/arkoala-arkts/loader/package.json b/arkoala-arkts/loader/package.json index dc9afb459..177cc1ecb 100644 --- a/arkoala-arkts/loader/package.json +++ b/arkoala-arkts/loader/package.json @@ -5,9 +5,13 @@ "description": "", "scripts": { "clean": "rimraf generated unmemoized js_output abc", - "compile:plugin": "cd ../../arkoala/ets-plugin && npm run compile", - "compile:ets": "npm run compile:plugin && cd src/ets && ets-tsc -p ./tsconfig.ets.json", "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", + + "compile:plugin": "cd ../../arkoala/ets-plugin && npm run compile", + "compile:arkui": "cd ../arkui && npm run compile && npm run unmemoize", + "compile:deps": "npm run compile:plugin && npm run compile:plugin", + + "compile:ets": "npm run compile:deps && cd src/ets && ets-tsc -p ./tsconfig.ets.json", "unmemoize": "npm run compile:ets && memo-tsc -b tsconfig-unmemoize.json", "run": "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" }, diff --git a/arkoala-arkts/loader/src/ets/hello.ets b/arkoala-arkts/loader/src/ets/hello.ets index b5950f7a1..61c433400 100644 --- a/arkoala-arkts/loader/src/ets/hello.ets +++ b/arkoala-arkts/loader/src/ets/hello.ets @@ -1,5 +1,6 @@ @Component struct X { + @State x: number = 7 build() { Column() { Button() diff --git a/arkoala-arkts/loader/tsconfig-unmemoize.json b/arkoala-arkts/loader/tsconfig-unmemoize.json index 0ce299f8e..24b43265e 100644 --- a/arkoala-arkts/loader/tsconfig-unmemoize.json +++ b/arkoala-arkts/loader/tsconfig-unmemoize.json @@ -1,22 +1,42 @@ { - "extends": "@koalaui/build-common/tsconfig.json", - "compilerOptions": { - "types": [], - "plugins": [ - { - "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", - "trace": false, - "only_unmemoize": true - } - ], - "outDir": "./build/garbage" - }, + "extends": "@koalaui/build-common/tsconfig.json", + "compilerOptions": { + "types": [], + "plugins": [ + { + "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", + "trace": false, + "only_unmemoize": true + } + ], + "outDir": "./build/garbage", + "baseUrl": ".", + "paths": { + "@koalaui/common": [ + "../../incremental/common/src" + ], + "@koalaui/runtime": [ + "../../incremental/runtime/src" + ], + "@koalaui/compat": [ + "../../incremental/compat/src" + ], + "@koalaui/arkts-arkui": [ + "../../arkoala-arkts/arkui/src" + ], + "#arkui-common": [ + "../../arkoala/arkui-common/src" + ] + } + }, "include": [ "./generated" ], "references": [ - { "path": "../../arkoala/arkui-common" }, - { "path": "../../incremental/runtime" }, - { "path": "../arkui" }, + { "path": "../../arkoala/arkui-common" }, + { "path": "../../arkoala/arkui-common/tsconfig-unmemoize.json" }, + { "path": "../../incremental/runtime" }, + { "path": "../arkui" }, + ] } diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index 28158af47..20d2f7acc 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -3,7 +3,6 @@ "private": true, "workspaces": [ "./arkui", - "./loader", "../arkoala/arkui-common", "../arkoala/ets-plugin", "../incremental/build-common", diff --git a/arkoala/arkui-common/arktsconfig.json b/arkoala/arkui-common/arktsconfig.json index b45c7bef0..f071b4b2e 100644 --- a/arkoala/arkui-common/arktsconfig.json +++ b/arkoala/arkui-common/arktsconfig.json @@ -1,19 +1,33 @@ { - "files": [ - "./ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/component/index-full.d.ts", - "./ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/api/@internal/full/global.d.ts" - ], - "compilerOptions": { - "baseUrl": ".", - "paths": { - "@koalaui/common": ["../../incremental/common/src"], - "@koalaui/runtime": ["../../incremental/runtime/src"] - } - }, - "include": ["./src/**/*.ts"], - "references": [ - { "path": "../../incremental/common" }, - { "path": "../../incremental/runtime" } - ] - + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@koalaui/common": [ + "../../incremental/common/src" + ], + "@koalaui/runtime": [ + "../../incremental/runtime/src" + ], + "@koalaui/compat": [ + "../../incremental/compat/src" + ], + "#arkui-common/*": [ + "./unmemoized/src/arkts/*" + ], + "#platform": [ + "../../incremental/compat/src/arkts" + ] + } + }, + "include": [ + "./unmemoized/src/index.ts" + ], + "references": [ + { + "path": "../../incremental/common" + }, + { + "path": "../../incremental/runtime" + } + ] } diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json index 3416c7728..e430cc57e 100644 --- a/arkoala/arkui-common/package.json +++ b/arkoala/arkui-common/package.json @@ -8,6 +8,11 @@ "./config/tsconfig.base.json": "./config/tsconfig.base.json", "./*": "./build/lib/src/*.js" }, + "imports": { + "#arkui-common/*": { + "default": "./build/src/arkts/" + } + }, "types": "./index.d.ts", "typesVersions": { "*": { diff --git a/arkoala/arkui-common/src/ArkState.ts b/arkoala/arkui-common/src/ArkState.ts index f90ca7f0b..ce68366f3 100644 --- a/arkoala/arkui-common/src/ArkState.ts +++ b/arkoala/arkui-common/src/ArkState.ts @@ -15,7 +15,7 @@ import { propDeepCopy } from "@koalaui/common"; import { MutableState, __context, __id, mutableState, scheduleCallback } from "@koalaui/runtime" -import { observableProxy } from "./observable" +import { observableProxy } from "#arkui-common/observable" /** * @param name - a name of a context state diff --git a/arkoala/arkui-common/src/Router.ts b/arkoala/arkui-common/src/Router.ts index a3352297a..5aaccd308 100644 --- a/arkoala/arkui-common/src/Router.ts +++ b/arkoala/arkui-common/src/Router.ts @@ -24,7 +24,7 @@ import { remember, RepeatByArray, } from "@koalaui/runtime" -import { observableProxyArray } from "./observable" +import { observableProxyArray } from "#arkui-common/observable" export enum RouterTransitionVisibility { Hidden, diff --git a/arkoala-arkts/arkui/src/ArkPageTransition.ts b/arkoala/arkui-common/src/arkts/ArkPageTransition.ts similarity index 100% rename from arkoala-arkts/arkui/src/ArkPageTransition.ts rename to arkoala/arkui-common/src/arkts/ArkPageTransition.ts diff --git a/arkoala-arkts/arkui/src/Storage.ts b/arkoala/arkui-common/src/arkts/Storage.ts similarity index 100% rename from arkoala-arkts/arkui/src/Storage.ts rename to arkoala/arkui-common/src/arkts/Storage.ts diff --git a/arkoala/arkui-common/src/arkts/index.ts b/arkoala/arkui-common/src/arkts/index.ts new file mode 100644 index 000000000..7493dda4e --- /dev/null +++ b/arkoala/arkui-common/src/arkts/index.ts @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from "./observable" +export * from "./ArkPageTransition" +export * from "./Storage" \ No newline at end of file diff --git a/arkoala/arkui-common/src/arkts/observable.ts b/arkoala/arkui-common/src/arkts/observable.ts new file mode 100644 index 000000000..4f521f8f8 --- /dev/null +++ b/arkoala/arkui-common/src/arkts/observable.ts @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Observable } from "@koalaui/runtime" + +/** + * Data class decorator that makes all child fields trackable. + */ +export function Observed(constructorFunction: Function) { +} + +/** + * @internal + */ +export function observableProxyArray(...value: Value[]): Value[] { + return observableProxy(value) +} + +/** + * @internal + */ +export function observableProxy(value: Value, parent?: Observable, observed?: boolean, strict: boolean = true): Value { + return value +} diff --git a/arkoala/arkui-common/src/index.ts b/arkoala/arkui-common/src/index.ts index 85568ee0b..0a327ac8e 100644 --- a/arkoala/arkui-common/src/index.ts +++ b/arkoala/arkui-common/src/index.ts @@ -13,14 +13,4 @@ * limitations under the License. */ -import "./enumImpl" -export * from "./ArkState" -export * from "./basic" -export * from "./observable" -export * from "./Router" -export * from "./ArkPageTransition" -export * from "./ohos.router" -export * from "./ohos.matrix4" -export * from "./interfaces" -export * from "./Storage" -export * from "./system.router" +export * from "#arkui-common/index" diff --git a/arkoala/arkui-common/src/ArkPageTransition.ts b/arkoala/arkui-common/src/typescript/ArkPageTransition.ts similarity index 100% rename from arkoala/arkui-common/src/ArkPageTransition.ts rename to arkoala/arkui-common/src/typescript/ArkPageTransition.ts diff --git a/arkoala/arkui-common/src/Storage.ts b/arkoala/arkui-common/src/typescript/Storage.ts similarity index 100% rename from arkoala/arkui-common/src/Storage.ts rename to arkoala/arkui-common/src/typescript/Storage.ts diff --git a/arkoala/arkui-common/src/typescript/index.ts b/arkoala/arkui-common/src/typescript/index.ts new file mode 100644 index 000000000..677ca7c34 --- /dev/null +++ b/arkoala/arkui-common/src/typescript/index.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import "../enumImpl" + +export * from "./ArkPageTransition" +export * from "./Storage" +export * from "./observable" + +export * from "../ArkState" +export * from "../basic" +export * from "../Router" +export * from "../ohos.router" +export * from "../ohos.matrix4" +export * from "../interfaces" +export * from "../system.router" diff --git a/arkoala/arkui-common/src/observable.ts b/arkoala/arkui-common/src/typescript/observable.ts similarity index 99% rename from arkoala/arkui-common/src/observable.ts rename to arkoala/arkui-common/src/typescript/observable.ts index d4081a724..d13655497 100644 --- a/arkoala/arkui-common/src/observable.ts +++ b/arkoala/arkui-common/src/typescript/observable.ts @@ -172,7 +172,7 @@ function proxyObject(value: any, observable: ObservableHandler) { return new Proxy(value, { get(target, property, receiver) { if (property == OBSERVABLE_TARGET) return target - const value = Reflect.get(target, property, receiver) + const value: any = Reflect.get(target, property, receiver) ObservableHandler.find(target)?.onAccess() return typeof value == "function" ? value.bind(target) diff --git a/arkoala/arkui-common/tsconfig-unmemoize.json b/arkoala/arkui-common/tsconfig-unmemoize.json index 7c5d1cda1..6bbdda4f8 100644 --- a/arkoala/arkui-common/tsconfig-unmemoize.json +++ b/arkoala/arkui-common/tsconfig-unmemoize.json @@ -6,7 +6,7 @@ "./ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/api/@internal/full/global.d.ts", ], "compilerOptions": { - "outDir": "build/lib/garbage", + "outDir": "build/garbage", "lib": ["ES2020"], "rootDirs": ["src", "test"], "baseUrl": ".", @@ -15,8 +15,16 @@ "plugins": [ { "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", "trace": false, "only_unmemoize": true } ], + "paths": { + "#arkui-common/*": [ + "./src/arkts/*", + ] + } }, - "include": ["src/**/*"], + "include": [ + "src/index.ts", + "src/arkts/**/*.ts" + ], "references": [ { "path": "../../incremental/compiler-plugin" }, { "path": "../../incremental/common" }, diff --git a/arkoala/arkui-common/tsconfig.json b/arkoala/arkui-common/tsconfig.json index 644434def..e21032711 100644 --- a/arkoala/arkui-common/tsconfig.json +++ b/arkoala/arkui-common/tsconfig.json @@ -13,14 +13,15 @@ "baseUrl": ".", "module": "CommonJS", "experimentalDecorators": true, - "plugins": [ /* TODO Check */ + "plugins": [ { "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", "trace": false } ], "paths": { "@koalaui/common": ["../../incremental/common/src"], "@koalaui/runtime": ["../../incremental/runtime/src"], "@koalaui/arkui-common": ["./src"], - "@koalaui/arkui-common/*": ["./src/*"] + "@koalaui/arkui-common/*": ["./src/*"], + "#arkui-common/*": ["./src/typescript/*"] } }, -- Gitee From e17ef7813ddd1d23ee0e46f8f0b2b60644f7a347 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 5 Sep 2024 18:13:57 +0300 Subject: [PATCH 02/19] works -b Signed-off-by: naumovdmitrii --- arkoala-arkts/loader/tsconfig-unmemoize.json | 13 ---------- .../arkui-common/tsconfig-run-unmemoized.json | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/arkoala-arkts/loader/tsconfig-unmemoize.json b/arkoala-arkts/loader/tsconfig-unmemoize.json index 24b43265e..25253f2ee 100644 --- a/arkoala-arkts/loader/tsconfig-unmemoize.json +++ b/arkoala-arkts/loader/tsconfig-unmemoize.json @@ -12,18 +12,6 @@ "outDir": "./build/garbage", "baseUrl": ".", "paths": { - "@koalaui/common": [ - "../../incremental/common/src" - ], - "@koalaui/runtime": [ - "../../incremental/runtime/src" - ], - "@koalaui/compat": [ - "../../incremental/compat/src" - ], - "@koalaui/arkts-arkui": [ - "../../arkoala-arkts/arkui/src" - ], "#arkui-common": [ "../../arkoala/arkui-common/src" ] @@ -37,6 +25,5 @@ { "path": "../../arkoala/arkui-common/tsconfig-unmemoize.json" }, { "path": "../../incremental/runtime" }, { "path": "../arkui" }, - ] } diff --git a/arkoala/arkui-common/tsconfig-run-unmemoized.json b/arkoala/arkui-common/tsconfig-run-unmemoized.json index bbbaffa4d..dd4c3d614 100644 --- a/arkoala/arkui-common/tsconfig-run-unmemoized.json +++ b/arkoala/arkui-common/tsconfig-run-unmemoized.json @@ -3,18 +3,23 @@ "baseUrl": ".", "compilerOptions": { "outDir": "build/lib/unmemoized", - "paths": { - "@koalaui/common": ["../../incremental/common/src"], - "@koalaui/runtime": ["../../incremental/runtime/unmemoized/src"] - }, "plugins": [] - }, - "include": ["unmemoized/src/**/*"], - "exclude": ["src/**/*"], + "include": [ + "unmemoized/src/**/*" + ], + "exclude": [ + "src/**/*" + ], "references": [ - { "path": "../../incremental/common" }, - { "path": "../../incremental/compiler-plugin" }, - { "path": "../../incremental/runtime/tsconfig-run-unmemoized.json" } + { + "path": "../../incremental/common" + }, + { + "path": "../../incremental/compiler-plugin" + }, + { + "path": "../../incremental/runtime/tsconfig-run-unmemoized.json" + } ] } -- Gitee From bd504c7d9d1075951e5b8913142663e85317ef75 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 5 Sep 2024 19:15:06 +0300 Subject: [PATCH 03/19] cosmetic Signed-off-by: naumovdmitrii --- .../loader/arktsconfig-run-unmemoized.json | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/arkoala-arkts/loader/arktsconfig-run-unmemoized.json b/arkoala-arkts/loader/arktsconfig-run-unmemoized.json index f6614a808..82cd239ac 100644 --- a/arkoala-arkts/loader/arktsconfig-run-unmemoized.json +++ b/arkoala-arkts/loader/arktsconfig-run-unmemoized.json @@ -1,15 +1,33 @@ { - "include": ["./unmemoized/generated/hello.ts"], + "include": [ + "./unmemoized/generated/hello.ts" + ], "compilerOptions": { "outDir": "build/abc", "baseUrl": ".", "paths": { - "@koalaui/compat": ["../../incremental/compat/src/arkts"], - "@koalaui/common": ["../../incremental/common/src"], - "@koalaui/runtime": ["../../incremental/runtime/unmemoized/src"], - "@koalaui/arkts-arkui": ["../arkui/unmemoized/src"], + "@koalaui/compat": [ + "../../incremental/compat/src/arkts" + ], + "@koalaui/common": [ + "../../incremental/common/src" + ], + "@koalaui/runtime": [ + "../../incremental/runtime/unmemoized/src" + ], + "@koalaui/arkts-arkui": [ + "../arkui/unmemoized/src" + ], "@koalaui/interop": ["../../interop/src/arkts"], - "#arkui": ["../arkui/unmemoized/src/generated/arkts"] + "#arkui": [ + "../arkui/unmemoized/src/generated/arkts" + ], + "@koalaui/arkui-common": [ + "../../arkoala/arkui-common/unmemoized/src" + ], + "#arkui-common": [ + "../../arkoala/arkui-common/src" + ] } } } \ No newline at end of file -- Gitee From 32dcf64cf5f3a5e3a565eefcc5dbe5dcbc948841 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Fri, 6 Sep 2024 12:57:25 +0300 Subject: [PATCH 04/19] path * Signed-off-by: naumovdmitrii --- arkoala/arkui-common/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arkoala/arkui-common/tsconfig.json b/arkoala/arkui-common/tsconfig.json index e21032711..10cfcf5b3 100644 --- a/arkoala/arkui-common/tsconfig.json +++ b/arkoala/arkui-common/tsconfig.json @@ -21,7 +21,8 @@ "@koalaui/runtime": ["../../incremental/runtime/src"], "@koalaui/arkui-common": ["./src"], "@koalaui/arkui-common/*": ["./src/*"], - "#arkui-common/*": ["./src/typescript/*"] + "#arkui-common/*": ["./src/typescript/*"], + "#arkui-common": ["./src/typescript"] } }, -- Gitee From a24c5e451639d63a01bb6cb895ce448466943154 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 19 Sep 2024 16:03:56 +0300 Subject: [PATCH 05/19] ci fixes Signed-off-by: naumovdmitrii --- .../arkui-common/tsconfig-unmemoize-ts.json | 28 +++++++++++++++++++ arkoala/arkui/tsconfig.json | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 arkoala/arkui-common/tsconfig-unmemoize-ts.json diff --git a/arkoala/arkui-common/tsconfig-unmemoize-ts.json b/arkoala/arkui-common/tsconfig-unmemoize-ts.json new file mode 100644 index 000000000..ca3833f94 --- /dev/null +++ b/arkoala/arkui-common/tsconfig-unmemoize-ts.json @@ -0,0 +1,28 @@ +{ + "extends": "@koalaui/build-common/tsconfig.json", + "compilerOptions": { + "outDir": "build/garbage", + "lib": ["ES2020"], + "rootDirs": ["src", "test"], + "baseUrl": ".", + "module": "CommonJS", + "experimentalDecorators": true, + "plugins": [ + { "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", "trace": false, "only_unmemoize": true } + ], + "paths": { + "#arkui-common/*": [ + "./src/typescript/*", + ] + } + }, + "include": [ + "src/index.ts", + "src/typescript/**/*.ts" + ], + "references": [ + { "path": "../../incremental/compiler-plugin" }, + { "path": "../../incremental/common" }, + { "path": "../../incremental/runtime/tsconfig-unmemoize.json" } + ] +} diff --git a/arkoala/arkui/tsconfig.json b/arkoala/arkui/tsconfig.json index 243ae1392..5ed2c92a4 100644 --- a/arkoala/arkui/tsconfig.json +++ b/arkoala/arkui/tsconfig.json @@ -22,6 +22,7 @@ { "path": "../../interop" }, { "path": "../../incremental/runtime" }, { "path": "../arkui-common" }, - { "path": "../framework" } + { "path": "../framework" }, + { "path": "../arkui-common/tsconfig-unmemoize-ts.json" } ] } -- Gitee From 7be9afb9b9f6f8f184d6504faf426e8b73d9ebd9 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Tue, 24 Sep 2024 13:33:45 +0300 Subject: [PATCH 06/19] files section Signed-off-by: naumovdmitrii --- arkoala/arkui-common/tsconfig-unmemoize-ts.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arkoala/arkui-common/tsconfig-unmemoize-ts.json b/arkoala/arkui-common/tsconfig-unmemoize-ts.json index ca3833f94..8c9135c3a 100644 --- a/arkoala/arkui-common/tsconfig-unmemoize-ts.json +++ b/arkoala/arkui-common/tsconfig-unmemoize-ts.json @@ -17,8 +17,15 @@ } }, "include": [ - "src/index.ts", - "src/typescript/**/*.ts" + "src/**/*.ts", + ], + "exclude": [ + "src/arkts/**/*", + ], + "files": [ + "./ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/component/index-full.d.ts", + "./ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/component/koala-extensions.d.ts", + "./ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/api/@internal/full/global.d.ts", ], "references": [ { "path": "../../incremental/compiler-plugin" }, -- Gitee From 12e4a32593a73f5e717c792d17738127ed0c3ba9 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Tue, 24 Sep 2024 15:08:14 +0300 Subject: [PATCH 07/19] fix build arkola-arkui Signed-off-by: naumovdmitrii --- arkoala/arkui/tsconfig.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arkoala/arkui/tsconfig.json b/arkoala/arkui/tsconfig.json index 5ed2c92a4..5fb028927 100644 --- a/arkoala/arkui/tsconfig.json +++ b/arkoala/arkui/tsconfig.json @@ -10,6 +10,24 @@ "lib": ["ES2020"], "rootDirs": ["src", "test"], "baseUrl": "..", + "paths": { + "#arkui-common/*": [ + "../arkui-common/src/*", + "../arkui-common/src/typescript/*" + ], + "#arkui-common": [ + "../arkui-common/src", + "../arkui-common/src/typescript" + ], + "@koalaui/arkui-common/*": [ + "../arkoala/arkui-common/src/*", + "../arkoala/arkui-common/src/typescript/*" + ], + "@koalaui/arkui-common": [ + "../../arkoala/arkui-common/src", + "../../arkoala/arkui-common/src/typescript" + ], + }, "module": "ESNext", "experimentalDecorators": true, "plugins": [ -- Gitee From 83b04d2cad65e574a1e39ec44be03ce702aa53f6 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Wed, 25 Sep 2024 18:32:25 +0300 Subject: [PATCH 08/19] remove index.ts from arkui-common Signed-off-by: naumovdmitrii --- arkoala/arkui-common/src/index.ts | 16 ---------------- arkoala/arkui-common/tsconfig.json | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 arkoala/arkui-common/src/index.ts diff --git a/arkoala/arkui-common/src/index.ts b/arkoala/arkui-common/src/index.ts deleted file mode 100644 index 0a327ac8e..000000000 --- a/arkoala/arkui-common/src/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from "#arkui-common/index" diff --git a/arkoala/arkui-common/tsconfig.json b/arkoala/arkui-common/tsconfig.json index 10cfcf5b3..d1d787395 100644 --- a/arkoala/arkui-common/tsconfig.json +++ b/arkoala/arkui-common/tsconfig.json @@ -19,8 +19,8 @@ "paths": { "@koalaui/common": ["../../incremental/common/src"], "@koalaui/runtime": ["../../incremental/runtime/src"], - "@koalaui/arkui-common": ["./src"], - "@koalaui/arkui-common/*": ["./src/*"], + "@koalaui/arkui-common": ["./src/typescript"], + "@koalaui/arkui-common/*": ["./src/typescript/*"], "#arkui-common/*": ["./src/typescript/*"], "#arkui-common": ["./src/typescript"] } -- Gitee From d872d426323c90d40e275062c543ece7fa9cb0d7 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 26 Sep 2024 12:23:58 +0300 Subject: [PATCH 09/19] fix compile arkoala-arkui Signed-off-by: naumovdmitrii --- arkoala/arkui/src/index.ts | 2 +- arkoala/arkui/tsconfig.json | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arkoala/arkui/src/index.ts b/arkoala/arkui/src/index.ts index 77f150238..94905ec51 100644 --- a/arkoala/arkui/src/index.ts +++ b/arkoala/arkui/src/index.ts @@ -122,7 +122,7 @@ export { ArkPageTransitionExitComponent, ArkPageTransitionExitComponent as PageTransitionExitAttribute } from "@koalaui/arkui-common" -export * from "@koalaui/arkui-common/Storage" +export * from "@koalaui/arkui-common" export * from "./shared/ArkUtils" export * from "./ArkSideBarContainer" export * from "./peers/ArkButtonPeer" diff --git a/arkoala/arkui/tsconfig.json b/arkoala/arkui/tsconfig.json index 5fb028927..1c8c65477 100644 --- a/arkoala/arkui/tsconfig.json +++ b/arkoala/arkui/tsconfig.json @@ -9,22 +9,15 @@ "outDir": "build/lib", "lib": ["ES2020"], "rootDirs": ["src", "test"], - "baseUrl": "..", + "baseUrl": ".", "paths": { "#arkui-common/*": [ - "../arkui-common/src/*", "../arkui-common/src/typescript/*" ], "#arkui-common": [ - "../arkui-common/src", "../arkui-common/src/typescript" ], - "@koalaui/arkui-common/*": [ - "../arkoala/arkui-common/src/*", - "../arkoala/arkui-common/src/typescript/*" - ], "@koalaui/arkui-common": [ - "../../arkoala/arkui-common/src", "../../arkoala/arkui-common/src/typescript" ], }, -- Gitee From 57202916e68852437c78324ecc11b7cd06798146 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 26 Sep 2024 15:21:29 +0300 Subject: [PATCH 10/19] fix demo node Signed-off-by: naumovdmitrii --- arkoala/arkui-common/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json index e430cc57e..2557d8925 100644 --- a/arkoala/arkui-common/package.json +++ b/arkoala/arkui-common/package.json @@ -4,13 +4,13 @@ "description": "", "main": "build/lib/src/index.js", "exports": { - ".": "./build/lib/src/index.js", + ".": "./build/lib/src/typescript/index.js", "./config/tsconfig.base.json": "./config/tsconfig.base.json", "./*": "./build/lib/src/*.js" }, "imports": { "#arkui-common/*": { - "default": "./build/src/arkts/" + "default": "./build/src/typescript/*" } }, "types": "./index.d.ts", -- Gitee From 25c37ddf6660b415fb00f14f648400cf48ef2eb2 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 26 Sep 2024 15:26:40 +0300 Subject: [PATCH 11/19] fix demo node Signed-off-by: naumovdmitrii --- arkoala/arkui-common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json index 2557d8925..e89551b82 100644 --- a/arkoala/arkui-common/package.json +++ b/arkoala/arkui-common/package.json @@ -10,7 +10,7 @@ }, "imports": { "#arkui-common/*": { - "default": "./build/src/typescript/*" + "default": "./build/lib/src/typescript/*" } }, "types": "./index.d.ts", -- Gitee From d7bc79a0bdf0404f6d3ad00d31ccfc892569047a Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Mon, 30 Sep 2024 11:24:06 +0300 Subject: [PATCH 12/19] fix ohos demo peas Signed-off-by: naumovdmitrii --- arkoala/arkui-common/tsconfig-run-unmemoized.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arkoala/arkui-common/tsconfig-run-unmemoized.json b/arkoala/arkui-common/tsconfig-run-unmemoized.json index dd4c3d614..5d7149c3a 100644 --- a/arkoala/arkui-common/tsconfig-run-unmemoized.json +++ b/arkoala/arkui-common/tsconfig-run-unmemoized.json @@ -3,13 +3,22 @@ "baseUrl": ".", "compilerOptions": { "outDir": "build/lib/unmemoized", - "plugins": [] + "plugins": [], + "baseUrl": ".", + "paths": { + "#arkui-common/*": [ + "./unmemoized/src/typescript/*", + ], + "@koalaui/runtime": [ + "../../incremental/runtime/unmemoized/src" + ] + } }, "include": [ "unmemoized/src/**/*" ], "exclude": [ - "src/**/*" + "src/arkts/*" ], "references": [ { -- Gitee From 42bce31b3bbafcb1f645550be879a1db69ab2dd6 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Mon, 30 Sep 2024 13:04:51 +0300 Subject: [PATCH 13/19] fix loader unmemoized Signed-off-by: naumovdmitrii --- arkoala/arkui/tsconfig-unmemoize.json | 7 ++++++- arkoala/loader/tsconfig-run-unmemoized.json | 8 ++++++-- arkoala/loader/tsconfig-unmemoize.json | 6 +++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arkoala/arkui/tsconfig-unmemoize.json b/arkoala/arkui/tsconfig-unmemoize.json index 24f71dd44..f4c9946db 100644 --- a/arkoala/arkui/tsconfig-unmemoize.json +++ b/arkoala/arkui/tsconfig-unmemoize.json @@ -14,7 +14,12 @@ "experimentalDecorators": true, "plugins": [ { "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", "trace": false, "only_unmemoize": true } - ] + ], + "paths": { + "#arkui-common": ["../arkui-common/src/typescript"], + "#arkui-common/*": ["../arkui-common/src/typescript/*"], + "@koalaui/arkui-common": ["../arkui-common/src/typescript"] + } }, "include": ["src/**/*"], "references": [ diff --git a/arkoala/loader/tsconfig-run-unmemoized.json b/arkoala/loader/tsconfig-run-unmemoized.json index def431dc8..7004f1662 100644 --- a/arkoala/loader/tsconfig-run-unmemoized.json +++ b/arkoala/loader/tsconfig-run-unmemoized.json @@ -18,11 +18,15 @@ "baseUrl": "..", "paths": { "@koalaui/runtime": ["../incremental/runtime/unmemoized/src"], - "@koalaui/arkui-common": ["./arkui-common/unmemoized/src"], + "@koalaui/arkui-common": ["./arkui-common/unmemoized/src/typescript"], "@koalaui/arkoala": ["./framework/unmemoized/src"], "@koalaui/arkoala-arkui": ["./arkui/unmemoized/src"], "@koalaui/arkoala-extension-component": ["./extension-component/unmemoized/src"], - "#common/wrappers/*": ["../interop/src/napi/wrappers/*", "../interop/src/wasm/wrappers/*"] + "#common/wrappers/*": ["../interop/src/napi/wrappers/*", "../interop/src/wasm/wrappers/*"], + + + "#arkui-common": ["./arkui-common/src/typescript"], + "#arkui-common/*": ["./arkui-common/src/typescript/*"] }, "plugins": [] diff --git a/arkoala/loader/tsconfig-unmemoize.json b/arkoala/loader/tsconfig-unmemoize.json index c5a370e55..568841d06 100644 --- a/arkoala/loader/tsconfig-unmemoize.json +++ b/arkoala/loader/tsconfig-unmemoize.json @@ -20,7 +20,11 @@ "outDir": "build/garbage", "baseUrl": "..", "paths": { - "#common/wrappers/*": ["../interop/src/napi/wrappers/*", "../interop/src/wasm/wrappers/*"] + "#common/wrappers/*": ["../interop/src/napi/wrappers/*", "../interop/src/wasm/wrappers/*"], + + "#arkui-common": ["./arkui-common/src/typescript"], + "#arkui-common/*": ["./arkui-common/src/typescript/*"], + "@koalaui/arkui-common": ["./arkui-common/src/typescript"] } }, "files": [ -- Gitee From b3b1b120b8f3861347772c54ae0b832ee732d388 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Mon, 30 Sep 2024 13:10:03 +0300 Subject: [PATCH 14/19] fix (fix loader unmemoized) Signed-off-by: naumovdmitrii --- arkoala/loader/tsconfig-run-unmemoized.json | 4 ++-- arkoala/loader/tsconfig-unmemoize.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arkoala/loader/tsconfig-run-unmemoized.json b/arkoala/loader/tsconfig-run-unmemoized.json index 7004f1662..ed26cb591 100644 --- a/arkoala/loader/tsconfig-run-unmemoized.json +++ b/arkoala/loader/tsconfig-run-unmemoized.json @@ -25,8 +25,8 @@ "#common/wrappers/*": ["../interop/src/napi/wrappers/*", "../interop/src/wasm/wrappers/*"], - "#arkui-common": ["./arkui-common/src/typescript"], - "#arkui-common/*": ["./arkui-common/src/typescript/*"] + "#arkui-common": ["./arkui-common/unmemoized/src/typescript"], + "#arkui-common/*": ["./arkui-common/unmemoized/src/typescript/*"] }, "plugins": [] diff --git a/arkoala/loader/tsconfig-unmemoize.json b/arkoala/loader/tsconfig-unmemoize.json index 568841d06..e8157dfff 100644 --- a/arkoala/loader/tsconfig-unmemoize.json +++ b/arkoala/loader/tsconfig-unmemoize.json @@ -48,7 +48,7 @@ { "path": "../extension-component" }, { "path": "../../incremental/runtime/tsconfig-unmemoize.json" }, { "path": "../framework/tsconfig-unmemoize.json" }, - { "path": "../arkui-common/tsconfig-unmemoize.json" }, + { "path": "../arkui-common/tsconfig-unmemoize-ts.json" }, { "path": "../arkui/tsconfig-unmemoize.json" }, { "path": "../extension-component/tsconfig-unmemoize.json" } -- Gitee From 87c1ccc22e481c64dd97ffbbdd15aa416f8a3514 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Mon, 30 Sep 2024 13:13:30 +0300 Subject: [PATCH 15/19] fix (fix loader unmemoized) Signed-off-by: naumovdmitrii --- arkoala/arkui/tsconfig-unmemoize.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala/arkui/tsconfig-unmemoize.json b/arkoala/arkui/tsconfig-unmemoize.json index f4c9946db..337600f1f 100644 --- a/arkoala/arkui/tsconfig-unmemoize.json +++ b/arkoala/arkui/tsconfig-unmemoize.json @@ -26,7 +26,7 @@ { "path": "../../incremental/compiler-plugin" }, { "path": "../../interop" }, { "path": "../../incremental/runtime/tsconfig-unmemoize.json" }, - { "path": "../arkui-common/tsconfig-unmemoize.json" }, + { "path": "../arkui-common/tsconfig-unmemoize-ts.json" }, { "path": "../framework/tsconfig-unmemoize.json" } ] } -- Gitee From ef3935dc543f4bfe4109f035ff1d06a12bc5404f Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Mon, 30 Sep 2024 13:18:23 +0300 Subject: [PATCH 16/19] fix (fix loader unmemoized) Signed-off-by: naumovdmitrii --- arkoala/arkui/tsconfig-run-unmemoized.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arkoala/arkui/tsconfig-run-unmemoized.json b/arkoala/arkui/tsconfig-run-unmemoized.json index 7fcef6ba7..57424f10b 100644 --- a/arkoala/arkui/tsconfig-run-unmemoized.json +++ b/arkoala/arkui/tsconfig-run-unmemoized.json @@ -14,9 +14,10 @@ "experimentalDecorators": true, "paths": { "@koalaui/runtime": ["../../incremental/runtime/unmemoized/src"], - "@koalaui/arkui-common": ["../arkui-common/unmemoized/src"], + "@koalaui/arkui-common": ["../arkui-common/unmemoized/src/typescript"], "@koalaui/arkoala": ["../framework/unmemoized/src"], - "@koalaui/arkoala-arkui": ["./unmemoized/src"] + "@koalaui/arkoala-arkui": ["./unmemoized/src"], + "#arkui-common": ["../arkui-common/unmemoized/src/typescript"], }, "plugins": [] -- Gitee From 463c35fd309e330477e2631f12136ee8388854ed Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Mon, 30 Sep 2024 18:28:05 +0300 Subject: [PATCH 17/19] fix har Signed-off-by: naumovdmitrii --- arkoala/har/arkoala-har-bundle/tsconfig.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arkoala/har/arkoala-har-bundle/tsconfig.json b/arkoala/har/arkoala-har-bundle/tsconfig.json index 6ac4abf7d..1fd9841f2 100644 --- a/arkoala/har/arkoala-har-bundle/tsconfig.json +++ b/arkoala/har/arkoala-har-bundle/tsconfig.json @@ -3,6 +3,15 @@ "lib": ["ESNext"], "types": [] }, + "baseUrl": ".", + "paths": { + "@koalaui/arkui-common": [ + "../../arkui-common/build/lib/src/typescript" + ], + "#arkui-common": [ + "../../arkui-common/build/lib/src/typescript" + ], + } // "files": ["bundle.d.ts"] "include": [ "bundle.d.ts", -- Gitee From a254ceb7f576ea6cfb87e14d76a562b060a446cc Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 3 Oct 2024 14:28:36 +0300 Subject: [PATCH 18/19] wip Signed-off-by: naumovdmitrii --- arkoala-arkts/arkui/src/index.ts | 2 -- arkoala-arkts/arkui/tsconfig-unmemoize.json | 8 ++++---- arkoala-arkts/loader/tsconfig-unmemoize.json | 7 +++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arkoala-arkts/arkui/src/index.ts b/arkoala-arkts/arkui/src/index.ts index 884a1c815..a5bc83d5b 100644 --- a/arkoala-arkts/arkui/src/index.ts +++ b/arkoala-arkts/arkui/src/index.ts @@ -14,8 +14,6 @@ */ export * from "./ArkStructBase" -export * from "./Storage" -export * from "./ArkPageTransition" export * from "./generated/ArkButton" export * from "./generated/ArkColumn" diff --git a/arkoala-arkts/arkui/tsconfig-unmemoize.json b/arkoala-arkts/arkui/tsconfig-unmemoize.json index cc1ac140d..39bb23217 100644 --- a/arkoala-arkts/arkui/tsconfig-unmemoize.json +++ b/arkoala-arkts/arkui/tsconfig-unmemoize.json @@ -22,10 +22,10 @@ "../../incremental/compat/src" ], "@koalaui/arkui-common": [ - "../../arkoala/arkui-common/src" + "../../arkoala/arkui-common/src/arkts" ], "#arkui-common/*": [ - "../../arkoala/arkui-common/src/arkts" + "../../arkoala/arkui-common/src/arkts/*" ], "#arkui": [ "./src/generated/ts" @@ -37,13 +37,13 @@ "./src/**/*.ts", ], "exclude": [ - "./src/generated/arkts" + "./src/generated/typescript" ], "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" - ], // TODO: maybe delete this section + ], "references": [ { "path": "../../arkoala/arkui-common" }, { "path": "../../arkoala/arkui-common/tsconfig-unmemoize.json" }, diff --git a/arkoala-arkts/loader/tsconfig-unmemoize.json b/arkoala-arkts/loader/tsconfig-unmemoize.json index 25253f2ee..7bf4359ee 100644 --- a/arkoala-arkts/loader/tsconfig-unmemoize.json +++ b/arkoala-arkts/loader/tsconfig-unmemoize.json @@ -12,13 +12,16 @@ "outDir": "./build/garbage", "baseUrl": ".", "paths": { + "@koalaui/arkui-common": [ + "../../arkoala/arkui-common/src/arkts", + ], "#arkui-common": [ - "../../arkoala/arkui-common/src" + "../../arkoala/arkui-common/src/arkts", ] } }, "include": [ - "./generated" + "./generated" ], "references": [ { "path": "../../arkoala/arkui-common" }, -- Gitee From 77b305c1dd6eea30cacc8f40b595451223e6dd45 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 3 Oct 2024 16:23:30 +0300 Subject: [PATCH 19/19] kinda works loader Signed-off-by: naumovdmitrii --- arkoala-arkts/arkui/src/ArkState.ts | 1 + arkoala-arkts/arkui/src/CustomComponent.ts | 2 +- arkoala-arkts/arkui/src/generated/arkts/index.ts | 2 +- arkoala-arkts/arkui/tsconfig-unmemoize.json | 2 +- arkoala-arkts/arkui/tsconfig.json | 10 +++++++++- arkoala-arkts/loader/arktsconfig-run-unmemoized.json | 6 ++++-- arkoala-arkts/loader/package.json | 2 +- arkoala/arkui-common/src/arkts/observable.ts | 6 ------ 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/arkoala-arkts/arkui/src/ArkState.ts b/arkoala-arkts/arkui/src/ArkState.ts index f045858e0..e81fa37c6 100644 --- a/arkoala-arkts/arkui/src/ArkState.ts +++ b/arkoala-arkts/arkui/src/ArkState.ts @@ -1,5 +1,6 @@ import { mutableState, MutableState } from "@koalaui/runtime"; import { observableProxy } from "@koalaui/arkui-common" +import { CustomComponent } from "./CustomComponent" /** * So what's going on here? We need to create states that persists across diff --git a/arkoala-arkts/arkui/src/CustomComponent.ts b/arkoala-arkts/arkui/src/CustomComponent.ts index e1f1c83b7..d54587b3e 100644 --- a/arkoala-arkts/arkui/src/CustomComponent.ts +++ b/arkoala-arkts/arkui/src/CustomComponent.ts @@ -53,7 +53,7 @@ export interface CustomComponent { // onDidBuild?(): void; } -export abstract class CustomComponentImpl { +export abstract class CustomComponentImpl implements CustomComponent { // /** @memo */ // build(): void { // } diff --git a/arkoala-arkts/arkui/src/generated/arkts/index.ts b/arkoala-arkts/arkui/src/generated/arkts/index.ts index d52673bcf..da7583c94 100644 --- a/arkoala-arkts/arkui/src/generated/arkts/index.ts +++ b/arkoala-arkts/arkui/src/generated/arkts/index.ts @@ -6,4 +6,4 @@ import { NativeModule as NativeModule1, nativeModule as nativeModule1 } from "./ // export * from "./NativeModule" export type TypeChecker = TypeChecker1 export type NativeModule = NativeModule1 -export const nativeModule = nativeModule1 +export const nativeModule: (() => NativeModule) = nativeModule1 diff --git a/arkoala-arkts/arkui/tsconfig-unmemoize.json b/arkoala-arkts/arkui/tsconfig-unmemoize.json index 39bb23217..271cb21d3 100644 --- a/arkoala-arkts/arkui/tsconfig-unmemoize.json +++ b/arkoala-arkts/arkui/tsconfig-unmemoize.json @@ -37,7 +37,7 @@ "./src/**/*.ts", ], "exclude": [ - "./src/generated/typescript" + "./src/generated/arkts" ], "files": [ "../../arkoala/arkui-common/ohos-sdk-ets/HarmonyOS-NEXT-DB1/openharmony/ets/component/index-full.d.ts", diff --git a/arkoala-arkts/arkui/tsconfig.json b/arkoala-arkts/arkui/tsconfig.json index aa3845164..c85032ebd 100644 --- a/arkoala-arkts/arkui/tsconfig.json +++ b/arkoala-arkts/arkui/tsconfig.json @@ -9,7 +9,15 @@ "compilerOptions": { "outDir": "./build/ts", "paths": { - "#arkui": ["./src/generated/ts"] + "@koalaui/arkui-common": [ + "../../arkoala/arkui-common/src/arkts" + ], + "#arkui-common/*": [ + "../../arkoala/arkui-common/src/arkts/*" + ], + "#arkui": [ + "./src/generated/ts" + ], } }, "files": [ diff --git a/arkoala-arkts/loader/arktsconfig-run-unmemoized.json b/arkoala-arkts/loader/arktsconfig-run-unmemoized.json index 82cd239ac..0a7a59d1f 100644 --- a/arkoala-arkts/loader/arktsconfig-run-unmemoized.json +++ b/arkoala-arkts/loader/arktsconfig-run-unmemoized.json @@ -18,12 +18,14 @@ "@koalaui/arkts-arkui": [ "../arkui/unmemoized/src" ], - "@koalaui/interop": ["../../interop/src/arkts"], + "@koalaui/interop": [ + "../../interop/src/arkts" + ], "#arkui": [ "../arkui/unmemoized/src/generated/arkts" ], "@koalaui/arkui-common": [ - "../../arkoala/arkui-common/unmemoized/src" + "../../arkoala/arkui-common/unmemoized/src/arkts" ], "#arkui-common": [ "../../arkoala/arkui-common/src" diff --git a/arkoala-arkts/loader/package.json b/arkoala-arkts/loader/package.json index 177cc1ecb..c178008c3 100644 --- a/arkoala-arkts/loader/package.json +++ b/arkoala-arkts/loader/package.json @@ -4,7 +4,7 @@ "private": true, "description": "", "scripts": { - "clean": "rimraf generated unmemoized js_output abc", + "clean": "rimraf build generated unmemoized js_output abc", "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", "compile:plugin": "cd ../../arkoala/ets-plugin && npm run compile", diff --git a/arkoala/arkui-common/src/arkts/observable.ts b/arkoala/arkui-common/src/arkts/observable.ts index 4f521f8f8..329711e86 100644 --- a/arkoala/arkui-common/src/arkts/observable.ts +++ b/arkoala/arkui-common/src/arkts/observable.ts @@ -15,12 +15,6 @@ import { Observable } from "@koalaui/runtime" -/** - * Data class decorator that makes all child fields trackable. - */ -export function Observed(constructorFunction: Function) { -} - /** * @internal */ -- Gitee