From f694943dac74e8cac39b02a7c22e43c1572f38bf Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 29 Nov 2024 15:01:35 +0300 Subject: [PATCH 1/2] WIP Signed-off-by: Nikolay Igotti --- arkoala-arkts/arkui/package.json | 4 +- arkoala-arkts/arkui/src/ArkComponentRoot.ts | 2 +- .../arkui/src/generated/MaterializedBase.ts | 2 +- arkoala-arkts/arkui/tsconfig-unmemoize.json | 2 +- .../{arkui => framework}/src/Application.ts | 11 ++-- .../src}/CallbacksChecker.ts | 21 ++++--- .../src}/DeserializerBase.ts | 14 ++--- .../src/generated => framework/src}/Events.ts | 0 .../src}/Finalizable.ts | 0 .../src}/NativePeerNode.ts | 19 +++++- .../generated => framework/src}/PeerNode.ts | 21 +++++-- .../peers => framework/src}/SerializerBase.ts | 9 +-- .../{arkui => framework}/src/UserView.ts | 4 +- arkoala-arkts/package.json | 10 +++- .../src/ArkSwiperControllerMaterialized.ts | 3 +- .../src/peers/CallbackDeserializeCall.ts | 59 ++++++++++--------- 16 files changed, 108 insertions(+), 73 deletions(-) rename arkoala-arkts/{arkui => framework}/src/Application.ts (95%) rename arkoala-arkts/{arkui/src/generated/peers => framework/src}/CallbacksChecker.ts (67%) rename arkoala-arkts/{arkui/src/generated/peers => framework/src}/DeserializerBase.ts (96%) rename arkoala-arkts/{arkui/src/generated => framework/src}/Events.ts (100%) rename arkoala-arkts/{arkui/src/generated => framework/src}/Finalizable.ts (100%) rename arkoala-arkts/{arkui/src/generated => framework/src}/NativePeerNode.ts (63%) rename arkoala-arkts/{arkui/src/generated => framework/src}/PeerNode.ts (73%) rename arkoala-arkts/{arkui/src/generated/peers => framework/src}/SerializerBase.ts (98%) rename arkoala-arkts/{arkui => framework}/src/UserView.ts (94%) diff --git a/arkoala-arkts/arkui/package.json b/arkoala-arkts/arkui/package.json index 1a98da0e2..2352a63d4 100644 --- a/arkoala-arkts/arkui/package.json +++ b/arkoala-arkts/arkui/package.json @@ -7,8 +7,8 @@ "scripts": { "clean": "rimraf build", "clean:arkui-no-common": "npm run clean", - "build:arkui-no-common:inc": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-no-common && ninja -f build/build.ninja", - "build:arkui-no-common": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-no-common && ninja -f build/build.ninja", + "build:arkui-no-common:inc": "fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-no-common && ninja -f build/build.ninja", + "build:arkui-no-common": "npm run unmemoize && npm run build:arkui-no-common:inc", "unmemoize": "memo-tsc -b ./tsconfig-unmemoize.json && cp -r ./src/generated/arkts ./build/unmemoized/src/generated" } } diff --git a/arkoala-arkts/arkui/src/ArkComponentRoot.ts b/arkoala-arkts/arkui/src/ArkComponentRoot.ts index 4eb378ba9..754b1ac18 100644 --- a/arkoala-arkts/arkui/src/ArkComponentRoot.ts +++ b/arkoala-arkts/arkui/src/ArkComponentRoot.ts @@ -17,7 +17,7 @@ import { NodeAttach, RunEffect, rememberDisposable, rememberMutableState, schedu // import { CurrentRouterTransitionState, RouterTransitionVisibility, WithRouterTransitionState } from "@koalaui/arkui-common" // import { ArkCommonPeer } from "./peers/ArkCommonPeer"; import { ArkStructBase } from "./ArkStructBase"; -import { PeerNode } from "./generated/PeerNode"; +import { PeerNode } from "@koalaui/arkts-framework" import { ArkUINodeType } from "./generated/peers/ArkUINodeType"; /** @memo */ diff --git a/arkoala-arkts/arkui/src/generated/MaterializedBase.ts b/arkoala-arkts/arkui/src/generated/MaterializedBase.ts index 3f26a861e..67956eb90 100644 --- a/arkoala-arkts/arkui/src/generated/MaterializedBase.ts +++ b/arkoala-arkts/arkui/src/generated/MaterializedBase.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Finalizable } from "./Finalizable" +import { Finalizable } from "@koalaui/arkts-framework" export interface MaterializedBase { getPeer(): Finalizable | undefined diff --git a/arkoala-arkts/arkui/tsconfig-unmemoize.json b/arkoala-arkts/arkui/tsconfig-unmemoize.json index 8e3b4b759..23caae89f 100644 --- a/arkoala-arkts/arkui/tsconfig-unmemoize.json +++ b/arkoala-arkts/arkui/tsconfig-unmemoize.json @@ -38,7 +38,7 @@ "rootDir": "." }, "include": [ - "./src/**/*.ts", + "./src/**/*.ts" ], "exclude": [ "./src/generated/arkts", diff --git a/arkoala-arkts/arkui/src/Application.ts b/arkoala-arkts/framework/src/Application.ts similarity index 95% rename from arkoala-arkts/arkui/src/Application.ts rename to arkoala-arkts/framework/src/Application.ts index d881f775f..e72b7a84c 100644 --- a/arkoala-arkts/arkui/src/Application.ts +++ b/arkoala-arkts/framework/src/Application.ts @@ -16,12 +16,11 @@ import { ComputableState, IncrementalNode, GlobalStateManager, StateManager, StateContext, memoEntry, MutableState, createAnimationTimer, callScheduledCallbacks } from "@koalaui/runtime" import { int32, int64 } from "@koalaui/common" import { pointer, nullptr } from "@koalaui/interop" -import { PeerNode } from "./generated/PeerNode" -import { ArkUINodeType } from "./generated/peers/ArkUINodeType" -import { NativeModule } from "#components" +import { PeerNode } from "./PeerNode" +import { NativeModule } from "#language" import { UserView, UserViewBuilder } from "./UserView" -import { checkEvents, setCustomEventsChecker } from "./generated/Events" -import { checkArkoalaCallbacks } from "./generated/peers/CallbacksChecker" +import { checkEvents, setCustomEventsChecker } from "./Events" +import { checkArkoalaCallbacks } from "./CallbacksChecker" setCustomEventsChecker(checkArkoalaCallbacks) @@ -72,7 +71,7 @@ function createMemoRoot(manager: StateManager, /** @memo */ builder: UserViewBuilder ): ComputableState { - const peer = new PeerNode(ArkUINodeType.Root, 0, "Root") + const peer = new PeerNode(0 /* ArkUINodeType.Root */, 0, "Root") rootPointer = peer.peer.ptr const node = manager.updatableNode(peer, (context: StateContext) => { diff --git a/arkoala-arkts/arkui/src/generated/peers/CallbacksChecker.ts b/arkoala-arkts/framework/src/CallbacksChecker.ts similarity index 67% rename from arkoala-arkts/arkui/src/generated/peers/CallbacksChecker.ts rename to arkoala-arkts/framework/src/CallbacksChecker.ts index 861a5eefc..630225e3a 100644 --- a/arkoala-arkts/arkui/src/generated/peers/CallbacksChecker.ts +++ b/arkoala-arkts/framework/src/CallbacksChecker.ts @@ -1,8 +1,7 @@ import { KBuffer } from "@koalaui/interop" -import { Deserializer } from "./Deserializer"; -import { deserializeAndCallCallback } from "./CallbackDeserializeCall" -import { ResourceHolder, KUint8ArrayPtr } from "@koalaui/interop" -import { nativeModule } from "#components" +import { DeserializerBase } from "./DeserializerBase"; +import { ResourceHolder } from "@koalaui/interop" +import { NativeModule } from "#language" enum CallbackEventKind { Event_CallCallback = 0, @@ -10,13 +9,19 @@ enum CallbackEventKind { Event_ReleaseManagedResource = 2, } +let deserializeAndCallCallback = (deserializer: DeserializerBase) => {} + +export function setDeserializeAndCallCallback(callback: (deserializer: DeserializerBase) => void) { + deserializeAndCallCallback = callback +} + const bufferSize = 1024 const buffer = new KBuffer(bufferSize) -const deserializer = new Deserializer(buffer.buffer, bufferSize) +const deserializer = new DeserializerBase(buffer.buffer, bufferSize) export function checkArkoalaCallbacks() { while (true) { deserializer.resetCurrentPosition() - let result = nativeModule()._CheckArkoalaCallbackEvent(buffer.buffer, bufferSize) + let result = NativeModule._CheckArkoalaCallbackEvent(buffer.buffer, bufferSize) if (result == 0) break const eventKind = deserializer.readInt32() as CallbackEventKind @@ -24,12 +29,12 @@ export function checkArkoalaCallbacks() { case CallbackEventKind.Event_CallCallback: { deserializeAndCallCallback(deserializer) break; - } + } case CallbackEventKind.Event_HoldManagedResource: { const resourceId = deserializer.readInt32() ResourceHolder.instance().hold(resourceId) break; - } + } case CallbackEventKind.Event_ReleaseManagedResource: { const resourceId = deserializer.readInt32() ResourceHolder.instance().release(resourceId) diff --git a/arkoala-arkts/arkui/src/generated/peers/DeserializerBase.ts b/arkoala-arkts/framework/src/DeserializerBase.ts similarity index 96% rename from arkoala-arkts/arkui/src/generated/peers/DeserializerBase.ts rename to arkoala-arkts/framework/src/DeserializerBase.ts index e901391b6..589557795 100644 --- a/arkoala-arkts/arkui/src/generated/peers/DeserializerBase.ts +++ b/arkoala-arkts/framework/src/DeserializerBase.ts @@ -14,11 +14,11 @@ */ import { float32, int32, int64, float32FromBits } from "@koalaui/common" -import {pointer, KUint8ArrayPtr, KBuffer} from "@koalaui/interop" -import {RuntimeType, Tags, CallbackResource} from "./SerializerBase"; -import { Length } from "../ArkUnitsInterfaces" -import { Resource } from "../ArkResourceInterfaces" -import { NativeModule } from "#components" +import { pointer, KUint8ArrayPtr, KBuffer } from "@koalaui/interop" +import { Tags, CallbackResource} from "./SerializerBase"; +//import { Length } from "../ArkUnitsInterfaces" +//import { Resource } from "../ArkResourceInterfaces" +import { NativeModule } from "#language" export class DeserializerBase { private position = 0 @@ -184,7 +184,7 @@ export class DeserializerBase { throw new Error(`Unknown number tag: ${tag}`) } } - + /* readLength(): Length | undefined { this.checkCapacity(1) const valueType = this.readInt8() @@ -222,7 +222,7 @@ export class DeserializerBase { suffix = "" } return suffix - } + } */ readBuffer(): ArrayBuffer { this.readPointer() diff --git a/arkoala-arkts/arkui/src/generated/Events.ts b/arkoala-arkts/framework/src/Events.ts similarity index 100% rename from arkoala-arkts/arkui/src/generated/Events.ts rename to arkoala-arkts/framework/src/Events.ts diff --git a/arkoala-arkts/arkui/src/generated/Finalizable.ts b/arkoala-arkts/framework/src/Finalizable.ts similarity index 100% rename from arkoala-arkts/arkui/src/generated/Finalizable.ts rename to arkoala-arkts/framework/src/Finalizable.ts diff --git a/arkoala-arkts/arkui/src/generated/NativePeerNode.ts b/arkoala-arkts/framework/src/NativePeerNode.ts similarity index 63% rename from arkoala-arkts/arkui/src/generated/NativePeerNode.ts rename to arkoala-arkts/framework/src/NativePeerNode.ts index a7736f90b..1f0983227 100644 --- a/arkoala-arkts/arkui/src/generated/NativePeerNode.ts +++ b/arkoala-arkts/framework/src/NativePeerNode.ts @@ -1,15 +1,28 @@ +/* + * Copyright (c) 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 { int32 } from "@koalaui/common" import { pointer } from "@koalaui/interop" import { Finalizable } from "./Finalizable" -import { ArkUINodeType } from "./peers/ArkUINodeType" -import { NativeModule } from "#components" +import { NativeModule } from "#language" export class NativePeerNode extends Finalizable { constructor(ptr: pointer, finalizerPtr: pointer) { super(ptr, finalizerPtr) } - static create(type: ArkUINodeType, id: int32, flags: int32): NativePeerNode { + static create(type: int32, id: int32, flags: int32): NativePeerNode { const ptr = NativeModule._CreateNode(type as int32, id, flags) return new NativePeerNode(ptr, NativeModule._GetNodeFinalizer()) } diff --git a/arkoala-arkts/arkui/src/generated/PeerNode.ts b/arkoala-arkts/framework/src/PeerNode.ts similarity index 73% rename from arkoala-arkts/arkui/src/generated/PeerNode.ts rename to arkoala-arkts/framework/src/PeerNode.ts index 025b087d2..ce0f3baf5 100644 --- a/arkoala-arkts/arkui/src/generated/PeerNode.ts +++ b/arkoala-arkts/framework/src/PeerNode.ts @@ -1,11 +1,26 @@ +/* + * Copyright (c) 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 { int32 } from "@koalaui/common" import { IncrementalNode } from "@koalaui/runtime" -import { ArkUINodeType } from "./peers/ArkUINodeType" import { NativePeerNode } from "./NativePeerNode" export const PeerNodeType = 11 export class PeerNode extends IncrementalNode { + private static currentId: int32 = 1000 + peer: NativePeerNode private id: int32 = PeerNode.currentId++ private static peerNodeMap = new Map() @@ -14,9 +29,7 @@ export class PeerNode extends IncrementalNode { return PeerNode.peerNodeMap.get(id) } - private static currentId: int32 = 1000 - - constructor(type: ArkUINodeType, flags: int32, name: string) { + constructor(type: int32, flags: int32, name: string) { super(PeerNodeType) this.peer = NativePeerNode.create(type, this.id, flags) PeerNode.peerNodeMap.set(this.id, this) diff --git a/arkoala-arkts/arkui/src/generated/peers/SerializerBase.ts b/arkoala-arkts/framework/src/SerializerBase.ts similarity index 98% rename from arkoala-arkts/arkui/src/generated/peers/SerializerBase.ts rename to arkoala-arkts/framework/src/SerializerBase.ts index 5cdfb5c50..174a1afd3 100644 --- a/arkoala-arkts/arkui/src/generated/peers/SerializerBase.ts +++ b/arkoala-arkts/framework/src/SerializerBase.ts @@ -14,9 +14,9 @@ */ import { float32, float64, int8, int32, int64 } from "@koalaui/common" import { pointer, KUint8ArrayPtr, KBuffer, ResourceId, ResourceHolder } from "@koalaui/interop" -import { Length } from "../ArkUnitsInterfaces" -import { Resource } from "../ArkResourceInterfaces" -import { NativeModule } from "#components" +//import { Length } from "../ArkUnitsInterfaces" +//import { Resource } from "../ArkResourceInterfaces" +import { NativeModule } from "#language" /** * Value representing possible JS runtime object type. @@ -297,6 +297,7 @@ export class SerializerBase { this.setInt32(this.position, encodedLength) this.position += encodedLength + 4 } + /* // Length is an important common case. writeLength(value: Length|undefined) { this.checkCapacity(1) @@ -310,7 +311,7 @@ export class SerializerBase { } else if (valueType == RuntimeType.OBJECT) { this.writeInt32((value as Resource).id as int32) } - } + } */ //TODO: Needs to be implemented writeBuffer(value: ArrayBuffer) { this.writePointer(42) diff --git a/arkoala-arkts/arkui/src/UserView.ts b/arkoala-arkts/framework/src/UserView.ts similarity index 94% rename from arkoala-arkts/arkui/src/UserView.ts rename to arkoala-arkts/framework/src/UserView.ts index 0abe2feeb..29d3adb90 100644 --- a/arkoala-arkts/arkui/src/UserView.ts +++ b/arkoala-arkts/framework/src/UserView.ts @@ -12,11 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { PeerNode } from "./generated/PeerNode" -import { NativeModule } from "#components" +import { NativeModule } from "#language" import { int32, int8Array } from "@koalaui/common" - export type UserViewBuilder = /** @memo */ (/*root: PeerNode*/) => void diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index f3a128c75..f1535f101 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -3,6 +3,7 @@ "private": true, "workspaces": [ "./arkui", + "./framework", "./loader", "./har", "../arkoala/arkui-common", @@ -49,11 +50,14 @@ "build:arkui-no-common": "npm run build:arkui-no-common --prefix arkui", "build:arkui-no-common:inc": "npm run build:arkui-no-common:inc --prefix arkui", "clean:arkui-no-common": "npm run clean:arkui-no-common --prefix arkui", - "build:arkoala:components": "npm run build:incremental && npm run build:interop && npm run build:arkui-common && npm run build:arkui-no-common", - "build:arkoala:components:inc": "npm run build:incremental:inc && npm run build:interop:inc && npm run build:arkui-common:inc && npm run build:arkui-no-common:inc", + "build:framework": "npm run build:framework --prefix framework", + "build:framework:inc": "npm run build:framework:inc --prefix framework", + "clean:framework": "npm run clean:framework --prefix framework", + "build:arkoala:components": "npm run build:incremental && npm run build:interop && npm run build:framework && npm run build:arkui-common && npm run build:arkui-no-common", + "build:arkoala:components:inc": "npm run build:incremental:inc && npm run build:interop:inc && && npm run build:framework:inc && npm run build:arkui-common:inc && npm run build:arkui-no-common:inc", "build:arkoala": "npm run build:arkoala:components && npm run link:arkoala", "build:arkoala:inc": "npm run build:arkoala:components:inc && npm run link:arkoala", - "link:arkoala": "mkdir -p build && ../incremental/tools/panda/arkts/arklink --output build/arkoala.abc -- ./arkui/build/arkui-no-common.abc ../arkoala/arkui-common/build/arkui-common.abc ../incremental/runtime/build/incremental.abc ../interop/build/interop.abc", + "link:arkoala": "mkdir -p build && ../incremental/tools/panda/arkts/arklink --output build/arkoala.abc -- ./arkui/build/arkui-no-common.abc ../arkoala/arkui-common/build/arkui-common.abc ../incremental/runtime/build/incremental.abc ../interop/build/interop.abc ../interop/build/framework.abc", "build:user": "npm run build:user --prefix user && mkdir -p ./build && cp -r user/build/user.abc ./build/", "run:node": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda", "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda 10", diff --git a/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts b/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts index b4c1056e2..f27028933 100644 --- a/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts +++ b/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts @@ -17,12 +17,11 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { NativePeerNode } from "./PeerNode" import { nativeModule } from "@koalaui/arkoala" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, withLength, withLengthArray, RuntimeType, SerializerBase } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, SerializerBase, Finalizable } from "@koalaui/arkts-framework" import { unsafeCast } from "./shared/generated-utils" import { registerCallback } from "./peers/SerializerBase" import { wrapCallback } from "@koalaui/interop" diff --git a/arkoala/arkui/src/peers/CallbackDeserializeCall.ts b/arkoala/arkui/src/peers/CallbackDeserializeCall.ts index fa5e08d0a..7e3b0da73 100644 --- a/arkoala/arkui/src/peers/CallbackDeserializeCall.ts +++ b/arkoala/arkui/src/peers/CallbackDeserializeCall.ts @@ -18,6 +18,7 @@ import { Deserializer } from "./Deserializer" import { int32 } from "@koalaui/common" import { ResourceHolder, KInt, KStringPtr } from "@koalaui/interop" import { RuntimeType } from "./SerializerBase" +import { setDeserializeAndCallCallback } from "@koalaui/arkts-framework" export function deserializeAndCallAccessibilityCallback(thisDeserializer: Deserializer) { const _resourceId: int32 = thisDeserializer.readInt32() @@ -243,7 +244,7 @@ export function deserializeAndCallCallback_DragEvent_String_Union_CustomBuilder_ const _call = (ResourceHolder.instance().get(_resourceId) as ((event: DragEvent, extraParams?: string) => CustomBuilder | DragItemInfo)) let event: DragEvent = thisDeserializer.readDragEvent() const extraParams_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let extraParams_buf: string | undefined|undefined + let extraParams_buf: string | undefined|undefined if ((RuntimeType.UNDEFINED) != (extraParams_buf_runtimeType)) { extraParams_buf = (thisDeserializer.readString() as string) @@ -257,7 +258,7 @@ export function deserializeAndCallCallback_DragEvent_String_Void(thisDeserialize const _call = (ResourceHolder.instance().get(_resourceId) as ((event: DragEvent, extraParams?: string) => void)) let event: DragEvent = thisDeserializer.readDragEvent() const extraParams_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let extraParams_buf: string | undefined|undefined + let extraParams_buf: string | undefined|undefined if ((RuntimeType.UNDEFINED) != (extraParams_buf_runtimeType)) { extraParams_buf = (thisDeserializer.readString() as string) @@ -396,7 +397,7 @@ export function deserializeAndCallCallback_Literal_Function_callback_Object_file const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((event?: { callback: Function, fileSelector: Object }) => void)) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: { callback: Function, fileSelector: Object } | undefined|undefined + let event_buf: { callback: Function, fileSelector: Object } | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { const event_buf__callback: Function = (thisDeserializer.readFunction() as Function) @@ -410,7 +411,7 @@ export function deserializeAndCallCallback_Literal_Function_handler_Object_error const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((event?: { handler: Function, error: Object }) => void)) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: { handler: Function, error: Object } | undefined|undefined + let event_buf: { handler: Function, error: Object } | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { const event_buf__handler: Function = (thisDeserializer.readFunction() as Function) @@ -425,7 +426,7 @@ export function deserializeAndCallCallback_Literal_Number_code_Want_want_Void(th const _call = (ResourceHolder.instance().get(_resourceId) as ((parameter: { code: number, want?: Want }) => void)) const parameter_buf_code: number = (thisDeserializer.readNumber() as number) const parameter_buf_want_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let parameter_buf_want_buf: Want | undefined|undefined + let parameter_buf_want_buf: Want | undefined|undefined if ((RuntimeType.UNDEFINED) != (parameter_buf_want_buf_runtimeType)) { parameter_buf_want_buf = thisDeserializer.readWant() @@ -453,7 +454,7 @@ export function deserializeAndCallCallback_Literal_Object_detail_Boolean(thisDes const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((event?: { detail: Object }) => boolean)) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: { detail: Object } | undefined|undefined + let event_buf: { detail: Object } | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { const event_buf__detail: Object = (thisDeserializer.readCustomObject("Object") as Object) @@ -849,7 +850,7 @@ export function deserializeAndCallCallback_Opt_Array_String_Void(thisDeserialize const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((error?: Array | undefined) => void)) const error_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let error_buf: Array | undefined|undefined + let error_buf: Array | undefined|undefined if ((RuntimeType.UNDEFINED) != (error_buf_runtimeType)) { const error_buf__length: int32 = thisDeserializer.readInt32() @@ -868,7 +869,7 @@ export function deserializeAndCallCallback_Opt_NavigationAnimatedTransition_Void const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((value: NavigationAnimatedTransition | undefined) => void)) const value_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let value_buf: NavigationAnimatedTransition | undefined|undefined + let value_buf: NavigationAnimatedTransition | undefined|undefined if ((RuntimeType.UNDEFINED) != (value_buf_runtimeType)) { value_buf = thisDeserializer.readNavigationAnimatedTransition() @@ -880,14 +881,14 @@ export function deserializeAndCallCallback_Opt_StyledString_Opt_Array_String_Voi const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((value?: StyledString | undefined, error?: Array | undefined) => void)) const value_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let value_buf: StyledString | undefined|undefined + let value_buf: StyledString | undefined|undefined if ((RuntimeType.UNDEFINED) != (value_buf_runtimeType)) { value_buf = (thisDeserializer.readStyledString() as StyledString) } let value: StyledString | undefined|undefined = value_buf const error_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let error_buf: Array | undefined|undefined + let error_buf: Array | undefined|undefined if ((RuntimeType.UNDEFINED) != (error_buf_runtimeType)) { const error_buf__length: int32 = thisDeserializer.readInt32() @@ -906,7 +907,7 @@ export function deserializeAndCallCallback_Opt_TabContentAnimatedTransition_Void const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((value: TabContentAnimatedTransition | undefined) => void)) const value_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let value_buf: TabContentAnimatedTransition | undefined|undefined + let value_buf: TabContentAnimatedTransition | undefined|undefined if ((RuntimeType.UNDEFINED) != (value_buf_runtimeType)) { value_buf = thisDeserializer.readTabContentAnimatedTransition() @@ -1124,7 +1125,7 @@ export function deserializeAndCallCallback_Type_ImageAttribute_onComplete_callba const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((event?: { width: number, height: number, componentWidth: number, componentHeight: number, loadingStatus: number, contentWidth: number, contentHeight: number, contentOffsetX: number, contentOffsetY: number }) => void)) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: { width: number, height: number, componentWidth: number, componentHeight: number, loadingStatus: number, contentWidth: number, contentHeight: number, contentOffsetX: number, contentOffsetY: number } | undefined|undefined + let event_buf: { width: number, height: number, componentWidth: number, componentHeight: number, loadingStatus: number, contentWidth: number, contentHeight: number, contentOffsetX: number, contentOffsetY: number } | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { const event_buf__width: number = (thisDeserializer.readNumber() as number) @@ -1151,7 +1152,7 @@ export function deserializeAndCallCallback_Union_CustomBuilder_DragItemInfo_Void const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((value: CustomBuilder | DragItemInfo) => void)) const value_buf_selector: int32 = thisDeserializer.readInt8() - let value_buf: CustomBuilder | DragItemInfo | undefined|undefined + let value_buf: CustomBuilder | DragItemInfo | undefined|undefined if (value_buf_selector == 0) { value_buf = thisDeserializer.readCallback_Any() } @@ -1198,7 +1199,7 @@ export function deserializeAndCallEditableTextOnChangeCallback(thisDeserializer: const _call = (ResourceHolder.instance().get(_resourceId) as EditableTextOnChangeCallback) let value: string = (thisDeserializer.readString() as string) const previewText_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let previewText_buf: PreviewText | undefined|undefined + let previewText_buf: PreviewText | undefined|undefined if ((RuntimeType.UNDEFINED) != (previewText_buf_runtimeType)) { previewText_buf = thisDeserializer.readPreviewText() @@ -1258,7 +1259,7 @@ export function deserializeAndCallInterceptionShowCallback(thisDeserializer: Des const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as InterceptionShowCallback) const from_buf_selector: int32 = thisDeserializer.readInt8() - let from_buf: NavDestinationContext | NavBar | undefined|undefined + let from_buf: NavDestinationContext | NavBar | undefined|undefined if (from_buf_selector == 0) { from_buf = (thisDeserializer.readNavDestinationContext() as NavDestinationContext) } @@ -1267,7 +1268,7 @@ export function deserializeAndCallInterceptionShowCallback(thisDeserializer: Des } let from: NavDestinationContext | NavBar = (from_buf as NavDestinationContext | NavBar) const to_buf_selector: int32 = thisDeserializer.readInt8() - let to_buf: NavDestinationContext | NavBar | undefined|undefined + let to_buf: NavDestinationContext | NavBar | undefined|undefined if (to_buf_selector == 0) { to_buf = (thisDeserializer.readNavDestinationContext() as NavDestinationContext) } @@ -1416,7 +1417,7 @@ export function deserializeAndCallOnNativeLoadCallback(thisDeserializer: Deseria const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as OnNativeLoadCallback) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: Object | undefined|undefined + let event_buf: Object | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { event_buf = (thisDeserializer.readCustomObject("Object") as Object) @@ -1587,7 +1588,7 @@ export function deserializeAndCallPasteEventCallback(thisDeserializer: Deseriali const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as PasteEventCallback) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: PasteEvent | undefined|undefined + let event_buf: PasteEvent | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { event_buf = thisDeserializer.readPasteEvent() @@ -1624,7 +1625,7 @@ export function deserializeAndCallSearchSubmitCallback(thisDeserializer: Deseria const _call = (ResourceHolder.instance().get(_resourceId) as SearchSubmitCallback) let searchContent: string = (thisDeserializer.readString() as string) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: SubmitEvent | undefined|undefined + let event_buf: SubmitEvent | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { event_buf = thisDeserializer.readSubmitEvent() @@ -1681,7 +1682,7 @@ export function deserializeAndCallTextAreaSubmitCallback(thisDeserializer: Deser const _call = (ResourceHolder.instance().get(_resourceId) as TextAreaSubmitCallback) let enterKeyType: EnterKeyType = (thisDeserializer.readInt32() as EnterKeyType) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: SubmitEvent | undefined|undefined + let event_buf: SubmitEvent | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { event_buf = thisDeserializer.readSubmitEvent() @@ -1693,7 +1694,7 @@ export function deserializeAndCallTextPickerScrollStopCallback(thisDeserializer: const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as TextPickerScrollStopCallback) const value_buf_selector: int32 = thisDeserializer.readInt8() - let value_buf: string | Array | undefined|undefined + let value_buf: string | Array | undefined|undefined if (value_buf_selector == 0) { value_buf = (thisDeserializer.readString() as string) } @@ -1709,7 +1710,7 @@ export function deserializeAndCallTextPickerScrollStopCallback(thisDeserializer: } let value: string | Array = (value_buf as string | Array) const index_buf_selector: int32 = thisDeserializer.readInt8() - let index_buf: number | Array | undefined|undefined + let index_buf: number | Array | undefined|undefined if (index_buf_selector == 0) { index_buf = (thisDeserializer.readNumber() as number) } @@ -1745,7 +1746,7 @@ export function deserializeAndCallType_TextPickerAttribute_onChange_callback(thi const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((value: string | Array, index: number | Array) => void)) const value_buf_selector: int32 = thisDeserializer.readInt8() - let value_buf: string | Array | undefined|undefined + let value_buf: string | Array | undefined|undefined if (value_buf_selector == 0) { value_buf = (thisDeserializer.readString() as string) } @@ -1761,7 +1762,7 @@ export function deserializeAndCallType_TextPickerAttribute_onChange_callback(thi } let value: string | Array = (value_buf as string | Array) const index_buf_selector: int32 = thisDeserializer.readInt8() - let index_buf: number | Array | undefined|undefined + let index_buf: number | Array | undefined|undefined if (index_buf_selector == 0) { index_buf = (thisDeserializer.readNumber() as number) } @@ -1782,11 +1783,11 @@ export function deserializeAndCallType_WebAttribute_onUrlLoadIntercept_callback( const _resourceId: int32 = thisDeserializer.readInt32() const _call = (ResourceHolder.instance().get(_resourceId) as ((event?: { data: string | WebResourceRequest }) => boolean)) const event_buf_runtimeType = (thisDeserializer.readInt8() as int32) - let event_buf: { data: string | WebResourceRequest } | undefined|undefined + let event_buf: { data: string | WebResourceRequest } | undefined|undefined if ((RuntimeType.UNDEFINED) != (event_buf_runtimeType)) { const event_buf__data_buf_selector: int32 = thisDeserializer.readInt8() - let event_buf__data_buf: string | WebResourceRequest | undefined|undefined + let event_buf__data_buf: string | WebResourceRequest | undefined|undefined if (event_buf__data_buf_selector == 0) { event_buf__data_buf = (thisDeserializer.readString() as string) } @@ -1826,7 +1827,7 @@ export function deserializeAndCallWithThemeInterface(thisDeserializer: Deseriali let _continuation: ((value: WithThemeAttribute) => void) = thisDeserializer.readCallback_WithThemeAttribute_Void() _continuation(_call(options)) } -export function deserializeAndCallCallback(thisDeserializer: Deserializer) { +function deserializeAndCallCallback(thisDeserializer: Deserializer) { const kind: int32 = thisDeserializer.readInt32() switch (kind) { case 0/*CallbackKind.Kind_AccessibilityCallback*/: return deserializeAndCallAccessibilityCallback(thisDeserializer); @@ -2065,4 +2066,6 @@ export function deserializeAndCallCallback(thisDeserializer: Deserializer) { case 233/*CallbackKind.Kind_WithThemeInterface*/: return deserializeAndCallWithThemeInterface(thisDeserializer); } throw new Error("Unknown callback kind") -} \ No newline at end of file +} + +setDeserializeAndCallCallback(deserializeAndCallCallback) \ No newline at end of file -- Gitee From e2952a9b3c481a6d768e9ef3cd444c5e5b0da509 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 2 Dec 2024 12:41:11 +0300 Subject: [PATCH 2/2] Tweaks Signed-off-by: Nikolay Igotti --- .../generated/ArkAlertDialogMaterialized.ts | 4 +- .../ArkAttributeModifierMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkBlank.ts | 2 +- .../arkui/src/generated/ArkButton.ts | 2 +- .../arkui/src/generated/ArkCalendarPicker.ts | 2 +- .../arkui/src/generated/ArkCanvas.ts | 2 +- .../ArkCanvasGradientMaterialized.ts | 4 +- .../generated/ArkCanvasPathMaterialized.ts | 4 +- .../generated/ArkCanvasPatternMaterialized.ts | 4 +- .../ArkCanvasRendererMaterialized.ts | 4 +- ...ArkCanvasRenderingContext2DMaterialized.ts | 4 +- .../ArkChildrenMainSizeMaterialized.ts | 4 +- .../arkui/src/generated/ArkCircle.ts | 2 +- ...ctorAndAllOptionalParamsDTSMaterialized.ts | 4 +- ...uctorAndFieldsAndMethodsDTSMaterialized.ts | 4 +- ...ithConstructorAndMethodsDTSMaterialized.ts | 4 +- ...ctorAndNonOptionalParamsDTSMaterialized.ts | 4 +- ...torAndSomeOptionalParamsDTSMaterialized.ts | 4 +- ...structorAndStaticMethodsDTSMaterialized.ts | 4 +- ...structorAndWithoutParamsDTSMaterialized.ts | 4 +- .../arkui/src/generated/ArkColumn.ts | 2 +- .../arkui/src/generated/ArkCommon.ts | 5 +- .../src/generated/ArkCommonInterfaces.ts | 2 - .../arkui/src/generated/ArkCounter.ts | 2 +- .../generated/ArkCustomSpanMaterialized.ts | 4 +- .../arkui/src/generated/ArkDivider.ts | 2 +- .../generated/ArkDrawModifierMaterialized.ts | 4 +- .../ArkDrawingRenderingContextMaterialized.ts | 4 +- .../generated/ArkDynamicNodeMaterialized.ts | 4 +- .../ArkEditMenuOptionsMaterialized.ts | 4 +- .../arkui/src/generated/ArkEllipse.ts | 2 +- .../src/generated/ArkEmbeddedComponent.ts | 2 +- .../ArkEventTargetInfoMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkFlex.ts | 2 +- .../arkui/src/generated/ArkFormComponent.ts | 2 +- .../ArkGestureModifierMaterialized.ts | 4 +- .../ArkGestureRecognizerMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkGrid.ts | 2 +- .../arkui/src/generated/ArkGridContainer.ts | 2 +- .../arkui/src/generated/ArkGridItem.ts | 2 +- .../src/generated/ArkICurveMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkImage.ts | 2 +- .../ArkImageAnalyzerControllerMaterialized.ts | 4 +- .../generated/ArkImageBitmapMaterialized.ts | 4 +- ...ndicatorComponentControllerMaterialized.ts | 4 +- .../src/generated/ArkIndicatorcomponent.ts | 2 +- .../generated/ArkLayoutManagerMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkList.ts | 2 +- .../arkui/src/generated/ArkListItem.ts | 2 +- .../generated/ArkListScrollerMaterialized.ts | 4 +- .../src/generated/ArkMatrix2DMaterialized.ts | 4 +- .../ArkMutableStyledStringMaterialized.ts | 4 +- .../arkui/src/generated/ArkNavDestination.ts | 2 +- .../ArkNavDestinationContextMaterialized.ts | 4 +- .../generated/ArkNavPathStackMaterialized.ts | 4 +- .../arkui/src/generated/ArkNavigation.ts | 2 +- ...rkNavigationTransitionProxyMaterialized.ts | 4 +- .../arkui/src/generated/ArkNavigator.ts | 2 +- .../ArkPanGestureOptionsMaterialized.ts | 4 +- .../generated/ArkPanRecognizerMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkPath.ts | 2 +- .../generated/ArkPixelMapMockMaterialized.ts | 4 +- .../generated/ArkProgressMaskMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkRect.ts | 2 +- .../arkui/src/generated/ArkRichEditor.ts | 2 +- ...ArkRichEditorBaseControllerMaterialized.ts | 4 +- .../ArkRichEditorControllerMaterialized.ts | 4 +- ...ditorStyledStringControllerMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkRow.ts | 2 +- .../arkui/src/generated/ArkScroll.ts | 2 +- .../ArkScrollableTargetInfoMaterialized.ts | 4 +- .../src/generated/ArkScrollerMaterialized.ts | 4 +- .../arkui/src/generated/ArkSearch.ts | 2 +- .../ArkSearchControllerMaterialized.ts | 4 +- .../arkui/src/generated/ArkSelect.ts | 2 +- arkoala-arkts/arkui/src/generated/ArkShape.ts | 2 +- .../arkui/src/generated/ArkSidebar.ts | 2 +- arkoala-arkts/arkui/src/generated/ArkSpan.ts | 2 +- arkoala-arkts/arkui/src/generated/ArkStack.ts | 2 +- .../src/generated/ArkStdlibInterfaces.ts | 3 +- .../ArkStyledStringControllerMaterialized.ts | 4 +- .../generated/ArkStyledStringMaterialized.ts | 4 +- .../arkui/src/generated/ArkSwiper.ts | 2 +- ...wiperContentTransitionProxyMaterialized.ts | 4 +- .../ArkSwiperControllerMaterialized.ts | 4 +- .../arkui/src/generated/ArkSymbolglyph.ts | 2 +- .../arkui/src/generated/ArkTabContent.ts | 2 +- arkoala-arkts/arkui/src/generated/ArkTabs.ts | 2 +- .../ArkTabsControllerMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkTest.ts | 2 +- arkoala-arkts/arkui/src/generated/ArkText.ts | 2 +- .../ArkTextBaseControllerMaterialized.ts | 4 +- ...rkTextContentControllerBaseMaterialized.ts | 4 +- .../ArkTextControllerMaterialized.ts | 4 +- .../ArkTextEditControllerExMaterialized.ts | 4 +- .../arkui/src/generated/ArkTextInput.ts | 2 +- .../ArkTextInputControllerMaterialized.ts | 4 +- .../ArkTextMenuItemIdMaterialized.ts | 4 +- .../arkui/src/generated/ArkTextPicker.ts | 2 +- .../ArkTextPickerDialogMaterialized.ts | 4 +- .../arkui/src/generated/ArkToggle.ts | 2 +- .../ArkTransitionEffectMaterialized.ts | 4 +- .../ArkUIExtensionProxyMaterialized.ts | 4 +- .../arkui/src/generated/ArkVector.ts | 2 +- .../src/generated/ArkViewMaterialized.ts | 4 +- arkoala-arkts/arkui/src/generated/ArkWeb.ts | 2 +- .../ArkWebResourceResponseMaterialized.ts | 4 +- .../arkui/src/generated/ComponentBase.ts | 2 +- .../arkui/src/generated/arkts/type_check.ts | 3 +- .../arkui/src/generated/peer_events.ts | 3 +- .../arkui/src/generated/peers/ArkBlankPeer.ts | 4 +- .../src/generated/peers/ArkButtonPeer.ts | 4 +- .../generated/peers/ArkCalendarPickerPeer.ts | 4 +- .../src/generated/peers/ArkCanvasPeer.ts | 4 +- .../src/generated/peers/ArkCirclePeer.ts | 4 +- .../src/generated/peers/ArkColumnPeer.ts | 4 +- .../src/generated/peers/ArkCommonPeer.ts | 7 +- .../src/generated/peers/ArkCounterPeer.ts | 4 +- .../src/generated/peers/ArkDividerPeer.ts | 4 +- .../src/generated/peers/ArkEllipsePeer.ts | 4 +- .../peers/ArkEmbeddedComponentPeer.ts | 4 +- .../arkui/src/generated/peers/ArkFlexPeer.ts | 4 +- .../generated/peers/ArkFormComponentPeer.ts | 4 +- .../generated/peers/ArkGridContainerPeer.ts | 4 +- .../src/generated/peers/ArkGridItemPeer.ts | 4 +- .../arkui/src/generated/peers/ArkGridPeer.ts | 4 +- .../arkui/src/generated/peers/ArkImagePeer.ts | 4 +- .../peers/ArkIndicatorcomponentPeer.ts | 4 +- .../src/generated/peers/ArkListItemPeer.ts | 4 +- .../arkui/src/generated/peers/ArkListPeer.ts | 4 +- .../generated/peers/ArkNavDestinationPeer.ts | 4 +- .../src/generated/peers/ArkNavigationPeer.ts | 4 +- .../src/generated/peers/ArkNavigatorPeer.ts | 4 +- .../arkui/src/generated/peers/ArkPathPeer.ts | 4 +- .../arkui/src/generated/peers/ArkRectPeer.ts | 4 +- .../src/generated/peers/ArkRichEditorPeer.ts | 4 +- .../arkui/src/generated/peers/ArkRowPeer.ts | 4 +- .../src/generated/peers/ArkScrollPeer.ts | 4 +- .../src/generated/peers/ArkSearchPeer.ts | 4 +- .../src/generated/peers/ArkSelectPeer.ts | 4 +- .../arkui/src/generated/peers/ArkShapePeer.ts | 4 +- .../src/generated/peers/ArkSidebarPeer.ts | 4 +- .../arkui/src/generated/peers/ArkSpanPeer.ts | 4 +- .../arkui/src/generated/peers/ArkStackPeer.ts | 4 +- .../src/generated/peers/ArkSwiperPeer.ts | 4 +- .../src/generated/peers/ArkSymbolglyphPeer.ts | 4 +- .../src/generated/peers/ArkTabContentPeer.ts | 4 +- .../arkui/src/generated/peers/ArkTabsPeer.ts | 4 +- .../arkui/src/generated/peers/ArkTestPeer.ts | 4 +- .../src/generated/peers/ArkTextInputPeer.ts | 4 +- .../arkui/src/generated/peers/ArkTextPeer.ts | 4 +- .../src/generated/peers/ArkTextPickerPeer.ts | 4 +- .../src/generated/peers/ArkTogglePeer.ts | 4 +- .../src/generated/peers/ArkUINodeType.ts | 8 +- .../src/generated/peers/ArkVectorPeer.ts | 4 +- .../arkui/src/generated/peers/ArkWebPeer.ts | 4 +- .../peers/CallbackDeserializeCall.ts | 5 +- .../arkui/src/generated/peers/Deserializer.ts | 40 ++- .../arkui/src/generated/peers/Serializer.ts | 17 +- .../arkui/src/generated/ts/type_check.ts | 3 +- .../framework/arktsconfig-unmemoized.json | 24 ++ arkoala-arkts/framework/package.json | 14 ++ .../framework/src/DeserializerBase.ts | 49 +--- arkoala-arkts/framework/src/NativePeerNode.ts | 53 ---- arkoala-arkts/framework/src/PeerNode.ts | 69 ----- arkoala-arkts/framework/src/SerializerBase.ts | 42 +--- .../framework/src/arkts/NativeModuleBase.ts | 46 ++++ arkoala-arkts/framework/src/arkts/index.ts | 1 + arkoala-arkts/framework/src/index.ts | 8 + .../src/typescript/NativeModuleBase.ts | 46 ++++ .../framework/src/typescript/index.ts | 1 + .../framework/tsconfig-unmemoize.json | 47 ++++ .../src/ArkSwiperControllerMaterialized.ts | 3 +- arkoala/arkui/src/peers/DeserializerBase.ts | 237 ------------------ interop/src/cpp/cangjie/convertors-cj.h | 18 +- interop/src/cpp/common-interop.cc | 1 + interop/src/cpp/napi/convertors-napi.cc | 5 + 177 files changed, 535 insertions(+), 731 deletions(-) create mode 100644 arkoala-arkts/framework/arktsconfig-unmemoized.json create mode 100644 arkoala-arkts/framework/package.json delete mode 100644 arkoala-arkts/framework/src/NativePeerNode.ts delete mode 100644 arkoala-arkts/framework/src/PeerNode.ts create mode 100644 arkoala-arkts/framework/src/arkts/NativeModuleBase.ts create mode 100644 arkoala-arkts/framework/src/arkts/index.ts create mode 100644 arkoala-arkts/framework/src/index.ts create mode 100644 arkoala-arkts/framework/src/typescript/NativeModuleBase.ts create mode 100644 arkoala-arkts/framework/src/typescript/index.ts create mode 100644 arkoala-arkts/framework/tsconfig-unmemoize.json delete mode 100644 arkoala/arkui/src/peers/DeserializerBase.ts diff --git a/arkoala-arkts/arkui/src/generated/ArkAlertDialogMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkAlertDialogMaterialized.ts index 0b985b22f..46fc713fc 100644 --- a/arkoala-arkts/arkui/src/generated/ArkAlertDialogMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkAlertDialogMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { AlertDialogParamWithConfirm, AlertDialogParamWithButtons, AlertDialogParamWithOptions } from "./ArkAlertDialogInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkAttributeModifierMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkAttributeModifierMaterialized.ts index 1afb8411f..9eb9ab717 100644 --- a/arkoala-arkts/arkui/src/generated/ArkAttributeModifierMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkAttributeModifierMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { INTERFACE_AttributeModifier } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkBlank.ts b/arkoala-arkts/arkui/src/generated/ArkBlank.ts index 49318daac..155def96f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkBlank.ts +++ b/arkoala-arkts/arkui/src/generated/ArkBlank.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkButton.ts b/arkoala-arkts/arkui/src/generated/ArkButton.ts index f2134f24c..60b7a9f87 100644 --- a/arkoala-arkts/arkui/src/generated/ArkButton.ts +++ b/arkoala-arkts/arkui/src/generated/ArkButton.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkCalendarPicker.ts b/arkoala-arkts/arkui/src/generated/ArkCalendarPicker.ts index 2ab37423a..9956ac559 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCalendarPicker.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCalendarPicker.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkCanvas.ts b/arkoala-arkts/arkui/src/generated/ArkCanvas.ts index a81bd79da..bb3be1bd6 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCanvas.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCanvas.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkCanvasGradientMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkCanvasGradientMaterialized.ts index cf5686b6b..1af7845ca 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCanvasGradientMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCanvasGradientMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkCanvasPathMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkCanvasPathMaterialized.ts index d1dfb5ad2..9e1a5e32b 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCanvasPathMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCanvasPathMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkCanvasPatternMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkCanvasPatternMaterialized.ts index e6de80f07..a35a91ea7 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCanvasPatternMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCanvasPatternMaterialized.ts @@ -18,12 +18,12 @@ import { Matrix2D } from "./ArkMatrix2DMaterialized" import { INTERFACE_CanvasPattern } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkCanvasRendererMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkCanvasRendererMaterialized.ts index b17f26bf2..3d0ff3bbe 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCanvasRendererMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCanvasRendererMaterialized.ts @@ -20,12 +20,12 @@ import { CanvasPath } from "./ArkCanvasPathMaterialized" import { CanvasGradient } from "./ArkCanvasGradientMaterialized" import { CanvasPattern } from "./ArkCanvasPatternMaterialized" import { CanvasFillRule, ImageData } from "./ArkCanvasInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkCanvasRenderingContext2DMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkCanvasRenderingContext2DMaterialized.ts index 93d9e9bad..7909486e2 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCanvasRenderingContext2DMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCanvasRenderingContext2DMaterialized.ts @@ -18,12 +18,12 @@ import { CanvasRenderer } from "./ArkCanvasRendererMaterialized" import { RenderingContextSettings } from "./ArkCanvasInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkChildrenMainSizeMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkChildrenMainSizeMaterialized.ts index 249543572..5a4ae9450 100644 --- a/arkoala-arkts/arkui/src/generated/ArkChildrenMainSizeMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkChildrenMainSizeMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkCircle.ts b/arkoala-arkts/arkui/src/generated/ArkCircle.ts index 059801814..bbc280b7f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCircle.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCircle.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonShapeMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndAllOptionalParamsDTSMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndAllOptionalParamsDTSMaterialized.ts index 962aa58bc..a61470782 100644 --- a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndAllOptionalParamsDTSMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndAllOptionalParamsDTSMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndFieldsAndMethodsDTSMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndFieldsAndMethodsDTSMaterialized.ts index 64e9e6384..26e3ea41a 100644 --- a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndFieldsAndMethodsDTSMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndFieldsAndMethodsDTSMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndMethodsDTSMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndMethodsDTSMaterialized.ts index 4e87f0da7..5bea82f95 100644 --- a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndMethodsDTSMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndMethodsDTSMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndNonOptionalParamsDTSMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndNonOptionalParamsDTSMaterialized.ts index 2c2c946fc..d44693a55 100644 --- a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndNonOptionalParamsDTSMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndNonOptionalParamsDTSMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndSomeOptionalParamsDTSMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndSomeOptionalParamsDTSMaterialized.ts index 65ea52bc2..3e632314c 100644 --- a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndSomeOptionalParamsDTSMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndSomeOptionalParamsDTSMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndStaticMethodsDTSMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndStaticMethodsDTSMaterialized.ts index 23ea1bb0a..85711634b 100644 --- a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndStaticMethodsDTSMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndStaticMethodsDTSMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndWithoutParamsDTSMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndWithoutParamsDTSMaterialized.ts index a480e9f2a..613cbe20d 100644 --- a/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndWithoutParamsDTSMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkClassWithConstructorAndWithoutParamsDTSMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkColumn.ts b/arkoala-arkts/arkui/src/generated/ArkColumn.ts index aa8b8c3dc..7fcaa2ec0 100644 --- a/arkoala-arkts/arkui/src/generated/ArkColumn.ts +++ b/arkoala-arkts/arkui/src/generated/ArkColumn.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkCommon.ts b/arkoala-arkts/arkui/src/generated/ArkCommon.ts index ccab58862..00d1acebb 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCommon.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCommon.ts @@ -20,16 +20,15 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodPeer, ArkCommonShapeMethodPeer, ArkCommonPeer, ArkScrollableCommonMethodPeer } from "./peers/ArkCommonPeer" import { UseEventsProperties } from "./use_properties" -import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, MonitorDecorator, IMonitorValue, IMonitor, AnimatableArithmetic, Context, Configuration, Rectangle, ExpectedFrameRateRange, FinishCallbackType, AnimateParam, MotionPathOptions, sharedTransitionOptions, TransitionHierarchyStrategy, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEdge, TransitionEffects, PreviewParams, ItemDragInfo, CustomBuilder, DragItemInfo, PointerStyle, EventTarget, BlurStyleOptions, BlurStyleActivePolicy, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, Tuple_Number_Number, BlurOptions, ThemeColorMode, AdaptiveColor, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowType, ShadowOptions, MultiShadowOptions, SourceType, SourceTool, BaseEvent, RepeatMode, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, SizeChangeCallback, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, TransitionFinishCallback, UnifiedData, Summary, UniformDataType, DragBehavior, DragResult, DragEvent, IntentionCode, KeyEvent, BindOptions, DismissReason, DismissContentCoverAction, ModalTransition, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetSize, Type_SheetOptions_detents, SheetType, BlurStyle, ShadowStyle, SheetMode, ScrollSizeMode, UIContext, SheetKeyboardAvoidMode, HoverModeAreaType, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, AnimationRange, ContextMenuAnimationOptions, MenuPreviewMode, ContextMenuOptions, MenuOptions, RectResult, TouchTestInfo, TouchTestStrategy, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, SymbolGlyphModifier, MenuElement, Tuple_T, CommonConfiguration, ImageModifier, DragPreviewMode, DragPreviewOptions, DragInteractionOptions, InvertOptions, CircleShape, EllipseShape, PathShape, RectShape, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, PreDragStatus, Tuple_ResourceColor_Number, Type_CommonMethod_linearGradient_value, Tuple_Length_Length, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, PixelRoundPolicy, VisualEffect, Filter, OutlineStyle, AccessibilityCallback, MotionBlurOptions, BackgroundBrightnessOptions, SafeAreaType, SafeAreaEdge, LinearGradientBlurOptions, EffectType, ChainStyle, ComponentContent, OverlayOptions, BlendMode, BlendApplyType, Blender, VisibleAreaChangeCallback, CommonMethod, CommonAttribute, CommonInterface, OverlayOffset, FractionStop, CommonShapeMethod, MotionBlurAnchor, LayoutBorderInfo, LayoutInfo, SizeResult, GeometryInfo, MeasureResult, Measurable, NavDestinationInfo, NavigationInfo, RouterPageInfo, DrawContext, Theme, Literal_Empty, Layoutable, CustomComponent, CaretOffset, ContentClipMode, EdgeEffectOptions, ScrollableCommonMethod, ScrollResult, OnWillScrollCallback, OnScrollCallback, OnMoveHandler, LightSource, PointLightStyle, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, HoverCallback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, MenuPolicy, SelectionOptions } from "./ArkCommonInterfaces" +import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, IMonitorValue, IMonitor, AnimatableArithmetic, Context, Configuration, Rectangle, ExpectedFrameRateRange, FinishCallbackType, AnimateParam, MotionPathOptions, sharedTransitionOptions, TransitionHierarchyStrategy, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEdge, TransitionEffects, PreviewParams, ItemDragInfo, CustomBuilder, DragItemInfo, PointerStyle, EventTarget, BlurStyleOptions, BlurStyleActivePolicy, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, Tuple_Number_Number, BlurOptions, ThemeColorMode, AdaptiveColor, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowType, ShadowOptions, MultiShadowOptions, SourceType, SourceTool, BaseEvent, RepeatMode, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, SizeChangeCallback, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, TransitionFinishCallback, UnifiedData, Summary, UniformDataType, DragBehavior, DragResult, DragEvent, IntentionCode, KeyEvent, BindOptions, DismissReason, DismissContentCoverAction, ModalTransition, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetSize, Type_SheetOptions_detents, SheetType, BlurStyle, ShadowStyle, SheetMode, ScrollSizeMode, UIContext, SheetKeyboardAvoidMode, HoverModeAreaType, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, AnimationRange, ContextMenuAnimationOptions, MenuPreviewMode, ContextMenuOptions, MenuOptions, RectResult, TouchTestInfo, TouchTestStrategy, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, SymbolGlyphModifier, MenuElement, Tuple_T, CommonConfiguration, ImageModifier, DragPreviewMode, DragPreviewOptions, DragInteractionOptions, InvertOptions, CircleShape, EllipseShape, PathShape, RectShape, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, PreDragStatus, Tuple_ResourceColor_Number, Type_CommonMethod_linearGradient_value, Tuple_Length_Length, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, PixelRoundPolicy, VisualEffect, Filter, OutlineStyle, AccessibilityCallback, MotionBlurOptions, BackgroundBrightnessOptions, SafeAreaType, SafeAreaEdge, LinearGradientBlurOptions, EffectType, ChainStyle, ComponentContent, OverlayOptions, BlendMode, BlendApplyType, Blender, VisibleAreaChangeCallback, CommonMethod, CommonAttribute, CommonInterface, OverlayOffset, FractionStop, CommonShapeMethod, MotionBlurAnchor, LayoutBorderInfo, LayoutInfo, SizeResult, GeometryInfo, MeasureResult, Measurable, NavDestinationInfo, NavigationInfo, RouterPageInfo, DrawContext, Theme, Literal_Empty, Layoutable, CustomComponent, CaretOffset, ContentClipMode, EdgeEffectOptions, ScrollableCommonMethod, ScrollResult, OnWillScrollCallback, OnScrollCallback, OnMoveHandler, LightSource, PointLightStyle, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, HoverCallback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, MenuPolicy, SelectionOptions } from "./ArkCommonInterfaces" import { TextDecorationType, Color, TextDecorationStyle, Curve, PlayMode, SharedTransitionEffectType, HorizontalAlign, VerticalAlign, TransitionType, FontWeight, FontStyle, ColoringStrategy, MouseButton, MouseAction, AccessibilityHoverType, TouchType, KeyType, KeySource, BorderStyle, Placement, ArrowPointPosition, ClickEffectLevel, NestedScrollMode, GradientDirection, HitTestMode, Alignment, ImageSize, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, ImageRepeat, Axis, ResponseType, FunctionKey, ModifierKey, LineCapStyle, LineJoinStyle, PixelRoundCalcPolicy, BarState, EdgeEffect, ScrollSource, IlluminatedType } from "./ArkEnumsInterfaces" import { ResourceColor, Length, Bias, Area, Font, BorderRadiuses, EdgeWidths, LocalizedEdgeWidths, SizeOptions, ResourceStr, Dimension, PX, VP, FP, LPX, Percentage, EdgeColors, LocalizedEdgeColors, EdgeStyles, Position, LocalizedBorderRadiuses, Margin, Padding, ConstraintSizeOptions, ChainWeightOptions, LocalizedPadding, LocalizedMargin, BorderOptions, OutlineOptions, EdgeOutlineStyles, EdgeOutlineWidths, OutlineRadiuses, Edges, LocalizedEdges, LocalizedPosition, AccessibilityOptions, EdgeWidth, DirectionalEdgesT } from "./ArkUnitsInterfaces" import { Resource } from "./ArkResourceInterfaces" -import { MethodDecorator } from "./ArkStdlibInterfaces" import { IMPORT_default_FROM_api_application_Context, IMPORT_default_PointerStyle_FROM_api_ohos_multimodalInput_pointer, IMPORT_default_UnifiedData_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_Summary_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_UniformDataType_FROM_api_ohos_data_uniformTypeDescriptor, IMPORT_IntentionCode_FROM_api_ohos_multimodalInput_intentionCode, IMPORT_UIContext_FROM_api_ohos_arkui_UIContext, IMPORT_SymbolGlyphModifier_FROM_api_arkui_SymbolGlyphModifier, IMPORT_ImageModifier_FROM_api_arkui_ImageModifier, IMPORT_CircleShape_FROM_api_ohos_arkui_shape, IMPORT_EllipseShape_FROM_api_ohos_arkui_shape, IMPORT_PathShape_FROM_api_ohos_arkui_shape, IMPORT_RectShape_FROM_api_ohos_arkui_shape, IMPORT_default_VisualEffect_FROM_api_ohos_graphics_uiEffect, IMPORT_default_Filter_FROM_api_ohos_graphics_uiEffect, IMPORT_ComponentContent_T_FROM_api_arkui_ComponentContent, IMPORT_default_Blender_FROM_api_ohos_graphics_uiEffect, IMPORT_default_NavDestinationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_NavigationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_RouterPageInfo_FROM_api_ohos_arkui_observer, IMPORT_DrawContext_FROM_api_arkui_Graphics, IMPORT_Theme_FROM_api_ohos_arkui_theme } from "./SyntheticDeclarations" import { ICurve } from "./ArkICurveMaterialized" import { TransitionEffect } from "./ArkTransitionEffectMaterialized" diff --git a/arkoala-arkts/arkui/src/generated/ArkCommonInterfaces.ts b/arkoala-arkts/arkui/src/generated/ArkCommonInterfaces.ts index 3a455b16d..81559c88b 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCommonInterfaces.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCommonInterfaces.ts @@ -1,7 +1,6 @@ import { TextDecorationType, Color, TextDecorationStyle, Curve, PlayMode, SharedTransitionEffectType, HorizontalAlign, VerticalAlign, TransitionType, FontWeight, FontStyle, ColoringStrategy, MouseButton, MouseAction, AccessibilityHoverType, TouchType, KeyType, KeySource, BorderStyle, Placement, ArrowPointPosition, ClickEffectLevel, NestedScrollMode, GradientDirection, HitTestMode, Alignment, ImageSize, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, ImageRepeat, Axis, ResponseType, FunctionKey, ModifierKey, LineCapStyle, LineJoinStyle, PixelRoundCalcPolicy, BarState, EdgeEffect, ScrollSource, IlluminatedType } from "./ArkEnumsInterfaces" import { ResourceColor, Length, Bias, Area, Font, BorderRadiuses, EdgeWidths, LocalizedEdgeWidths, SizeOptions, ResourceStr, Dimension, PX, VP, FP, LPX, Percentage, EdgeColors, LocalizedEdgeColors, EdgeStyles, Position, LocalizedBorderRadiuses, Margin, Padding, ConstraintSizeOptions, ChainWeightOptions, LocalizedPadding, LocalizedMargin, BorderOptions, OutlineOptions, EdgeOutlineStyles, EdgeOutlineWidths, OutlineRadiuses, Edges, LocalizedEdges, LocalizedPosition, AccessibilityOptions, EdgeWidth, DirectionalEdgesT } from "./ArkUnitsInterfaces" import { Resource } from "./ArkResourceInterfaces" -import { MethodDecorator } from "./ArkStdlibInterfaces" import { IMPORT_default_FROM_api_application_Context, IMPORT_default_PointerStyle_FROM_api_ohos_multimodalInput_pointer, IMPORT_default_UnifiedData_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_Summary_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_UniformDataType_FROM_api_ohos_data_uniformTypeDescriptor, IMPORT_IntentionCode_FROM_api_ohos_multimodalInput_intentionCode, IMPORT_UIContext_FROM_api_ohos_arkui_UIContext, IMPORT_SymbolGlyphModifier_FROM_api_arkui_SymbolGlyphModifier, IMPORT_ImageModifier_FROM_api_arkui_ImageModifier, IMPORT_CircleShape_FROM_api_ohos_arkui_shape, IMPORT_EllipseShape_FROM_api_ohos_arkui_shape, IMPORT_PathShape_FROM_api_ohos_arkui_shape, IMPORT_RectShape_FROM_api_ohos_arkui_shape, IMPORT_default_VisualEffect_FROM_api_ohos_graphics_uiEffect, IMPORT_default_Filter_FROM_api_ohos_graphics_uiEffect, IMPORT_ComponentContent_T_FROM_api_arkui_ComponentContent, IMPORT_default_Blender_FROM_api_ohos_graphics_uiEffect, IMPORT_default_NavDestinationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_NavigationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_RouterPageInfo_FROM_api_ohos_arkui_observer, IMPORT_DrawContext_FROM_api_arkui_Graphics, IMPORT_Theme_FROM_api_ohos_arkui_theme } from "./SyntheticDeclarations" import { ICurve } from "./ArkICurveMaterialized" import { TransitionEffect } from "./ArkTransitionEffectMaterialized" @@ -40,7 +39,6 @@ export interface TextDecorationOptions { export interface ProvideOptions { allowOverride?: string; } -export type MonitorDecorator = (value: string, args: Array) => MethodDecorator; export interface IMonitor { dirty: Array; } diff --git a/arkoala-arkts/arkui/src/generated/ArkCounter.ts b/arkoala-arkts/arkui/src/generated/ArkCounter.ts index 0e4ae9c19..7b9088645 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCounter.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCounter.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkCustomSpanMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkCustomSpanMaterialized.ts index 64fb3627f..df67c0650 100644 --- a/arkoala-arkts/arkui/src/generated/ArkCustomSpanMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkCustomSpanMaterialized.ts @@ -19,12 +19,12 @@ import { CustomSpanMeasureInfo, CustomSpanMetrics, CustomSpanDrawInfo } from "./ArkStyledStringInterfaces" import { DrawContext } from "./ArkCommonInterfaces" import { IMPORT_DrawContext_FROM_api_arkui_Graphics } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkDivider.ts b/arkoala-arkts/arkui/src/generated/ArkDivider.ts index 3e12afc9c..9060eb8f5 100644 --- a/arkoala-arkts/arkui/src/generated/ArkDivider.ts +++ b/arkoala-arkts/arkui/src/generated/ArkDivider.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkDrawModifierMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkDrawModifierMaterialized.ts index 47d3c97ba..0fb3821df 100644 --- a/arkoala-arkts/arkui/src/generated/ArkDrawModifierMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkDrawModifierMaterialized.ts @@ -18,12 +18,12 @@ import { DrawContext } from "./ArkCommonInterfaces" import { IMPORT_DrawContext_FROM_api_arkui_Graphics } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkDrawingRenderingContextMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkDrawingRenderingContextMaterialized.ts index 02d133703..5d5d94334 100644 --- a/arkoala-arkts/arkui/src/generated/ArkDrawingRenderingContextMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkDrawingRenderingContextMaterialized.ts @@ -19,12 +19,12 @@ import { Size, DrawingCanvas } from "./ArkCanvasInterfaces" import { LengthMetricsUnit } from "./ArkUnitsInterfaces" import { IMPORT_LengthMetricsUnit_FROM_api_arkui_Graphics } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkDynamicNodeMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkDynamicNodeMaterialized.ts index 2e8b7b277..8ffb8bd5b 100644 --- a/arkoala-arkts/arkui/src/generated/ArkDynamicNodeMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkDynamicNodeMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { OnMoveHandler } from "./ArkCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkEditMenuOptionsMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkEditMenuOptionsMaterialized.ts index d00413b49..a7c9e9b2c 100644 --- a/arkoala-arkts/arkui/src/generated/ArkEditMenuOptionsMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkEditMenuOptionsMaterialized.ts @@ -18,12 +18,12 @@ import { TextMenuItem, TextRange } from "./ArkTextCommonInterfaces" import { INTERFACE_EditMenuOptions } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkEllipse.ts b/arkoala-arkts/arkui/src/generated/ArkEllipse.ts index a248476c5..d39b0f3ae 100644 --- a/arkoala-arkts/arkui/src/generated/ArkEllipse.ts +++ b/arkoala-arkts/arkui/src/generated/ArkEllipse.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonShapeMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkEmbeddedComponent.ts b/arkoala-arkts/arkui/src/generated/ArkEmbeddedComponent.ts index 39273599d..1c083f3d5 100644 --- a/arkoala-arkts/arkui/src/generated/ArkEmbeddedComponent.ts +++ b/arkoala-arkts/arkui/src/generated/ArkEmbeddedComponent.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkEventTargetInfoMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkEventTargetInfoMaterialized.ts index c579d8622..b72fc32c1 100644 --- a/arkoala-arkts/arkui/src/generated/ArkEventTargetInfoMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkEventTargetInfoMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkFlex.ts b/arkoala-arkts/arkui/src/generated/ArkFlex.ts index fb335f523..2550fbf85 100644 --- a/arkoala-arkts/arkui/src/generated/ArkFlex.ts +++ b/arkoala-arkts/arkui/src/generated/ArkFlex.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkFormComponent.ts b/arkoala-arkts/arkui/src/generated/ArkFormComponent.ts index d34e1e19c..913a07f7c 100644 --- a/arkoala-arkts/arkui/src/generated/ArkFormComponent.ts +++ b/arkoala-arkts/arkui/src/generated/ArkFormComponent.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkGestureModifierMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkGestureModifierMaterialized.ts index 64230bb9a..b4b621935 100644 --- a/arkoala-arkts/arkui/src/generated/ArkGestureModifierMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkGestureModifierMaterialized.ts @@ -18,12 +18,12 @@ import { UIGestureEvent } from "./ArkCommonInterfaces" import { INTERFACE_GestureModifier } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkGestureRecognizerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkGestureRecognizerMaterialized.ts index 3838f9e68..a1441c82e 100644 --- a/arkoala-arkts/arkui/src/generated/ArkGestureRecognizerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkGestureRecognizerMaterialized.ts @@ -18,12 +18,12 @@ import { GestureControl_GestureType, GestureRecognizerState } from "./ArkGestureInterfaces" import { EventTargetInfo } from "./ArkEventTargetInfoMaterialized" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkGrid.ts b/arkoala-arkts/arkui/src/generated/ArkGrid.ts index 4f91cb151..23798d89c 100644 --- a/arkoala-arkts/arkui/src/generated/ArkGrid.ts +++ b/arkoala-arkts/arkui/src/generated/ArkGrid.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkScrollableCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkGridContainer.ts b/arkoala-arkts/arkui/src/generated/ArkGridContainer.ts index a415e1432..63179eed5 100644 --- a/arkoala-arkts/arkui/src/generated/ArkGridContainer.ts +++ b/arkoala-arkts/arkui/src/generated/ArkGridContainer.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkColumnComponent } from "./ArkColumn" diff --git a/arkoala-arkts/arkui/src/generated/ArkGridItem.ts b/arkoala-arkts/arkui/src/generated/ArkGridItem.ts index 3eda4ac60..0ab9fc5b7 100644 --- a/arkoala-arkts/arkui/src/generated/ArkGridItem.ts +++ b/arkoala-arkts/arkui/src/generated/ArkGridItem.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkICurveMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkICurveMaterialized.ts index 7bf04a7b1..3e20e1d1f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkICurveMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkICurveMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { INTERFACE_ICurve } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkImage.ts b/arkoala-arkts/arkui/src/generated/ArkImage.ts index 5908d6d97..778824e04 100644 --- a/arkoala-arkts/arkui/src/generated/ArkImage.ts +++ b/arkoala-arkts/arkui/src/generated/ArkImage.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkImageAnalyzerControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkImageAnalyzerControllerMaterialized.ts index bbfd9f1a9..46e7ad054 100644 --- a/arkoala-arkts/arkui/src/generated/ArkImageAnalyzerControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkImageAnalyzerControllerMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { ImageAnalyzerType } from "./ArkImageCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkImageBitmapMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkImageBitmapMaterialized.ts index 2fd8f5f6b..6a2c02de2 100644 --- a/arkoala-arkts/arkui/src/generated/ArkImageBitmapMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkImageBitmapMaterialized.ts @@ -19,12 +19,12 @@ import { LengthMetricsUnit } from "./ArkUnitsInterfaces" import { IMPORT_LengthMetricsUnit_FROM_api_arkui_Graphics } from "./SyntheticDeclarations" import { PixelMap } from "./ArkArkui-externalInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkIndicatorComponentControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkIndicatorComponentControllerMaterialized.ts index fd88c85c4..1d0970982 100644 --- a/arkoala-arkts/arkui/src/generated/ArkIndicatorComponentControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkIndicatorComponentControllerMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkIndicatorcomponent.ts b/arkoala-arkts/arkui/src/generated/ArkIndicatorcomponent.ts index 7a24514cd..2c304e276 100644 --- a/arkoala-arkts/arkui/src/generated/ArkIndicatorcomponent.ts +++ b/arkoala-arkts/arkui/src/generated/ArkIndicatorcomponent.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkLayoutManagerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkLayoutManagerMaterialized.ts index 33ad300d7..e7d125b2f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkLayoutManagerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkLayoutManagerMaterialized.ts @@ -19,12 +19,12 @@ import { PositionWithAffinity, LineMetrics, TextRange, TextBox } from "./ArkTextCommonInterfaces" import { IMPORT_default_LineMetrics_FROM_api_ohos_graphics_text, IMPORT_default_TextBox_FROM_api_ohos_graphics_text, INTERFACE_LayoutManager } from "./SyntheticDeclarations" import { RectWidthStyle, RectHeightStyle } from "./ArkArkui-externalInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkList.ts b/arkoala-arkts/arkui/src/generated/ArkList.ts index 1e90b9190..024b8aaca 100644 --- a/arkoala-arkts/arkui/src/generated/ArkList.ts +++ b/arkoala-arkts/arkui/src/generated/ArkList.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkScrollableCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkListItem.ts b/arkoala-arkts/arkui/src/generated/ArkListItem.ts index 7b001eb34..cf2fc0334 100644 --- a/arkoala-arkts/arkui/src/generated/ArkListItem.ts +++ b/arkoala-arkts/arkui/src/generated/ArkListItem.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkListScrollerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkListScrollerMaterialized.ts index 69ea2e08b..a9e3e097f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkListScrollerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkListScrollerMaterialized.ts @@ -20,12 +20,12 @@ import { Scroller } from "./ArkScrollerMaterialized" import { RectResult } from "./ArkCommonInterfaces" import { ScrollAlign } from "./ArkScrollInterfaces" import { CloseSwipeActionOptions, VisibleListContentInfo } from "./ArkListInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkMatrix2DMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkMatrix2DMaterialized.ts index 3e951e029..b999b9602 100644 --- a/arkoala-arkts/arkui/src/generated/ArkMatrix2DMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkMatrix2DMaterialized.ts @@ -18,12 +18,12 @@ import { LengthMetricsUnit } from "./ArkUnitsInterfaces" import { IMPORT_LengthMetricsUnit_FROM_api_arkui_Graphics } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkMutableStyledStringMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkMutableStyledStringMaterialized.ts index a28e55443..d545c1e18 100644 --- a/arkoala-arkts/arkui/src/generated/ArkMutableStyledStringMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkMutableStyledStringMaterialized.ts @@ -18,12 +18,12 @@ import { StyledString } from "./ArkStyledStringMaterialized" import { SpanStyle, StyledStringKey } from "./ArkStyledStringInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkNavDestination.ts b/arkoala-arkts/arkui/src/generated/ArkNavDestination.ts index 958040177..38ddd9c1d 100644 --- a/arkoala-arkts/arkui/src/generated/ArkNavDestination.ts +++ b/arkoala-arkts/arkui/src/generated/ArkNavDestination.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkNavDestinationContextMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkNavDestinationContextMaterialized.ts index 9f213136b..a0d5ee457 100644 --- a/arkoala-arkts/arkui/src/generated/ArkNavDestinationContextMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkNavDestinationContextMaterialized.ts @@ -20,12 +20,12 @@ import { NavPathInfo } from "./ArkNavigationInterfaces" import { NavPathStack } from "./ArkNavPathStackMaterialized" import { RouteMapConfig } from "./ArkNavDestinationInterfaces" import { INTERFACE_NavDestinationContext } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkNavPathStackMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkNavPathStackMaterialized.ts index 85ee74846..743bdb7cf 100644 --- a/arkoala-arkts/arkui/src/generated/ArkNavPathStackMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkNavPathStackMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { NavPathInfo, NavigationOptions, PopInfo, NavigationInterception } from "./ArkNavigationInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkNavigation.ts b/arkoala-arkts/arkui/src/generated/ArkNavigation.ts index e950d95e4..96def7231 100644 --- a/arkoala-arkts/arkui/src/generated/ArkNavigation.ts +++ b/arkoala-arkts/arkui/src/generated/ArkNavigation.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkNavigationTransitionProxyMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkNavigationTransitionProxyMaterialized.ts index ed99e718d..519e13004 100644 --- a/arkoala-arkts/arkui/src/generated/ArkNavigationTransitionProxyMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkNavigationTransitionProxyMaterialized.ts @@ -18,12 +18,12 @@ import { NavContentInfo } from "./ArkNavigationInterfaces" import { INTERFACE_NavigationTransitionProxy } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkNavigator.ts b/arkoala-arkts/arkui/src/generated/ArkNavigator.ts index 29e01b446..eef5dd582 100644 --- a/arkoala-arkts/arkui/src/generated/ArkNavigator.ts +++ b/arkoala-arkts/arkui/src/generated/ArkNavigator.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkPanGestureOptionsMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkPanGestureOptionsMaterialized.ts index fd8c5dea0..eb68180e1 100644 --- a/arkoala-arkts/arkui/src/generated/ArkPanGestureOptionsMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkPanGestureOptionsMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { Literal_Number_distance_fingers_PanDirection_direction, PanDirection } from "./ArkGestureInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkPanRecognizerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkPanRecognizerMaterialized.ts index 4d04ecd1b..83c80d7db 100644 --- a/arkoala-arkts/arkui/src/generated/ArkPanRecognizerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkPanRecognizerMaterialized.ts @@ -18,12 +18,12 @@ import { GestureRecognizer } from "./ArkGestureRecognizerMaterialized" import { PanGestureOptions } from "./ArkPanGestureOptionsMaterialized" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkPath.ts b/arkoala-arkts/arkui/src/generated/ArkPath.ts index 258f7bc85..9c5663ee0 100644 --- a/arkoala-arkts/arkui/src/generated/ArkPath.ts +++ b/arkoala-arkts/arkui/src/generated/ArkPath.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonShapeMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkPixelMapMockMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkPixelMapMockMaterialized.ts index 4d1a6dcd5..f42a6152d 100644 --- a/arkoala-arkts/arkui/src/generated/ArkPixelMapMockMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkPixelMapMockMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { INTERFACE_PixelMapMock } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkProgressMaskMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkProgressMaskMaterialized.ts index ecf255e21..d2973a986 100644 --- a/arkoala-arkts/arkui/src/generated/ArkProgressMaskMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkProgressMaskMaterialized.ts @@ -19,12 +19,12 @@ import { ResourceColor } from "./ArkUnitsInterfaces" import { Color } from "./ArkEnumsInterfaces" import { Resource } from "./ArkResourceInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkRect.ts b/arkoala-arkts/arkui/src/generated/ArkRect.ts index 96f59e5ac..902c3184e 100644 --- a/arkoala-arkts/arkui/src/generated/ArkRect.ts +++ b/arkoala-arkts/arkui/src/generated/ArkRect.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonShapeMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkRichEditor.ts b/arkoala-arkts/arkui/src/generated/ArkRichEditor.ts index daeaaa96a..241e9d31b 100644 --- a/arkoala-arkts/arkui/src/generated/ArkRichEditor.ts +++ b/arkoala-arkts/arkui/src/generated/ArkRichEditor.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkRichEditorBaseControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkRichEditorBaseControllerMaterialized.ts index 54cb32164..b968ebe11 100644 --- a/arkoala-arkts/arkui/src/generated/ArkRichEditorBaseControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkRichEditorBaseControllerMaterialized.ts @@ -21,12 +21,12 @@ import { RichEditorTextStyle } from "./ArkRichEditorInterfaces" import { SelectionOptions } from "./ArkCommonInterfaces" import { LayoutManager } from "./ArkLayoutManagerMaterialized" import { PreviewText } from "./ArkTextCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkRichEditorControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkRichEditorControllerMaterialized.ts index 24466cb27..f0ef03f27 100644 --- a/arkoala-arkts/arkui/src/generated/ArkRichEditorControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkRichEditorControllerMaterialized.ts @@ -23,12 +23,12 @@ import { ResourceStr } from "./ArkUnitsInterfaces" import { Resource } from "./ArkResourceInterfaces" import { CustomBuilder } from "./ArkCommonInterfaces" import { StyledString } from "./ArkStyledStringMaterialized" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkRichEditorStyledStringControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkRichEditorStyledStringControllerMaterialized.ts index 6868c9b44..cf8c7a4e2 100644 --- a/arkoala-arkts/arkui/src/generated/ArkRichEditorStyledStringControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkRichEditorStyledStringControllerMaterialized.ts @@ -22,12 +22,12 @@ import { StyledString } from "./ArkStyledStringMaterialized" import { MutableStyledString } from "./ArkMutableStyledStringMaterialized" import { RichEditorRange } from "./ArkRichEditorInterfaces" import { StyledStringChangedListener } from "./ArkTextCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkRow.ts b/arkoala-arkts/arkui/src/generated/ArkRow.ts index bac16d3c7..571bd2f1f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkRow.ts +++ b/arkoala-arkts/arkui/src/generated/ArkRow.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkScroll.ts b/arkoala-arkts/arkui/src/generated/ArkScroll.ts index 143ce1bac..7ad87b959 100644 --- a/arkoala-arkts/arkui/src/generated/ArkScroll.ts +++ b/arkoala-arkts/arkui/src/generated/ArkScroll.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkScrollableCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkScrollableTargetInfoMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkScrollableTargetInfoMaterialized.ts index ffbd7ca3b..a2c1863f6 100644 --- a/arkoala-arkts/arkui/src/generated/ArkScrollableTargetInfoMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkScrollableTargetInfoMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { EventTargetInfo } from "./ArkEventTargetInfoMaterialized" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkScrollerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkScrollerMaterialized.ts index 88345fa83..14c9c1edc 100644 --- a/arkoala-arkts/arkui/src/generated/ArkScrollerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkScrollerMaterialized.ts @@ -21,12 +21,12 @@ import { Edge, Axis } from "./ArkEnumsInterfaces" import { Length } from "./ArkUnitsInterfaces" import { Resource } from "./ArkResourceInterfaces" import { RectResult } from "./ArkCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkSearch.ts b/arkoala-arkts/arkui/src/generated/ArkSearch.ts index 03aa76b1b..df4fde407 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSearch.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSearch.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkSearchControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkSearchControllerMaterialized.ts index cb0cefc99..c74699f2a 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSearchControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSearchControllerMaterialized.ts @@ -18,12 +18,12 @@ import { TextContentControllerBase } from "./ArkTextContentControllerBaseMaterialized" import { SelectionOptions } from "./ArkCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkSelect.ts b/arkoala-arkts/arkui/src/generated/ArkSelect.ts index 96cd7e946..b21f8e911 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSelect.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSelect.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkShape.ts b/arkoala-arkts/arkui/src/generated/ArkShape.ts index 75360bc71..6c068268d 100644 --- a/arkoala-arkts/arkui/src/generated/ArkShape.ts +++ b/arkoala-arkts/arkui/src/generated/ArkShape.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkSidebar.ts b/arkoala-arkts/arkui/src/generated/ArkSidebar.ts index d8085b3c8..4a38094a6 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSidebar.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSidebar.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkSpan.ts b/arkoala-arkts/arkui/src/generated/ArkSpan.ts index 5a1c8e53e..a31770dd6 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSpan.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSpan.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkStack.ts b/arkoala-arkts/arkui/src/generated/ArkStack.ts index 1e69e3d1b..eaa88be3a 100644 --- a/arkoala-arkts/arkui/src/generated/ArkStack.ts +++ b/arkoala-arkts/arkui/src/generated/ArkStack.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkStdlibInterfaces.ts b/arkoala-arkts/arkui/src/generated/ArkStdlibInterfaces.ts index 9dc8fc9d1..4dcd2005e 100644 --- a/arkoala-arkts/arkui/src/generated/ArkStdlibInterfaces.ts +++ b/arkoala-arkts/arkui/src/generated/ArkStdlibInterfaces.ts @@ -1,4 +1,3 @@ import { int32, float32 } from "@koalaui/common" import { KInt, KBoolean, KStringPtr, wrapCallback } from "@koalaui/interop" -import { NodeAttach, remember } from "@koalaui/runtime" -export type MethodDecorator = object; \ No newline at end of file +import { NodeAttach, remember } from "@koalaui/runtime" \ No newline at end of file diff --git a/arkoala-arkts/arkui/src/generated/ArkStyledStringControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkStyledStringControllerMaterialized.ts index 007cd493d..f0da40833 100644 --- a/arkoala-arkts/arkui/src/generated/ArkStyledStringControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkStyledStringControllerMaterialized.ts @@ -19,12 +19,12 @@ import { StyledString } from "./ArkStyledStringMaterialized" import { MutableStyledString } from "./ArkMutableStyledStringMaterialized" import { INTERFACE_StyledStringController } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkStyledStringMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkStyledStringMaterialized.ts index 69019c3ee..55734a79b 100644 --- a/arkoala-arkts/arkui/src/generated/ArkStyledStringMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkStyledStringMaterialized.ts @@ -18,12 +18,12 @@ import { ImageAttachment, StyleOptions, StyledStringKey, SpanStyle } from "./ArkStyledStringInterfaces" import { CustomSpan } from "./ArkCustomSpanMaterialized" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkSwiper.ts b/arkoala-arkts/arkui/src/generated/ArkSwiper.ts index 19c21a9b9..5f67a48ce 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSwiper.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSwiper.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkSwiperContentTransitionProxyMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkSwiperContentTransitionProxyMaterialized.ts index efc7557a4..556b23252 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSwiperContentTransitionProxyMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSwiperContentTransitionProxyMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { INTERFACE_SwiperContentTransitionProxy } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkSwiperControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkSwiperControllerMaterialized.ts index e1bda1fe4..abed601e7 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSwiperControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSwiperControllerMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { VoidCallback } from "./ArkUnitsInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkSymbolglyph.ts b/arkoala-arkts/arkui/src/generated/ArkSymbolglyph.ts index 2c89bee11..adc09e3ec 100644 --- a/arkoala-arkts/arkui/src/generated/ArkSymbolglyph.ts +++ b/arkoala-arkts/arkui/src/generated/ArkSymbolglyph.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkTabContent.ts b/arkoala-arkts/arkui/src/generated/ArkTabContent.ts index cfa74d165..2e10f1b59 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTabContent.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTabContent.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkTabs.ts b/arkoala-arkts/arkui/src/generated/ArkTabs.ts index 8e59a94f0..557d4f14d 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTabs.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTabs.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkTabsControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTabsControllerMaterialized.ts index 10f55eae4..ff90ddb1b 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTabsControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTabsControllerMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkTest.ts b/arkoala-arkts/arkui/src/generated/ArkTest.ts index ee193d6b5..074cfc461 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTest.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTest.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkText.ts b/arkoala-arkts/arkui/src/generated/ArkText.ts index fc862e98d..c541b48c7 100644 --- a/arkoala-arkts/arkui/src/generated/ArkText.ts +++ b/arkoala-arkts/arkui/src/generated/ArkText.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextBaseControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTextBaseControllerMaterialized.ts index 02b1f509b..4e91ee4fa 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextBaseControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextBaseControllerMaterialized.ts @@ -19,12 +19,12 @@ import { SelectionOptions } from "./ArkCommonInterfaces" import { LayoutManager } from "./ArkLayoutManagerMaterialized" import { INTERFACE_TextBaseController } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextContentControllerBaseMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTextContentControllerBaseMaterialized.ts index f2296cd31..eb175ac59 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextContentControllerBaseMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextContentControllerBaseMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { CaretOffset, RectResult } from "./ArkCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTextControllerMaterialized.ts index 4af17f83f..96f68df67 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextControllerMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { StyledString } from "./ArkStyledStringMaterialized" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextEditControllerExMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTextEditControllerExMaterialized.ts index 2fed44b6a..2936d3471 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextEditControllerExMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextEditControllerExMaterialized.ts @@ -18,12 +18,12 @@ import { PreviewText } from "./ArkTextCommonInterfaces" import { INTERFACE_TextEditControllerEx } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextInput.ts b/arkoala-arkts/arkui/src/generated/ArkTextInput.ts index c30a90a40..97be5aa79 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextInput.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextInput.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextInputControllerMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTextInputControllerMaterialized.ts index de730159f..e1c703880 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextInputControllerMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextInputControllerMaterialized.ts @@ -18,12 +18,12 @@ import { TextContentControllerBase } from "./ArkTextContentControllerBaseMaterialized" import { SelectionOptions } from "./ArkCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextMenuItemIdMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTextMenuItemIdMaterialized.ts index 65dab6979..232d4844a 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextMenuItemIdMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextMenuItemIdMaterialized.ts @@ -18,12 +18,12 @@ import { ResourceStr } from "./ArkUnitsInterfaces" import { Resource } from "./ArkResourceInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextPicker.ts b/arkoala-arkts/arkui/src/generated/ArkTextPicker.ts index b64808f2b..88ab3b1cd 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextPicker.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextPicker.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkTextPickerDialogMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTextPickerDialogMaterialized.ts index c849236c3..33d412e7f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTextPickerDialogMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTextPickerDialogMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { TextPickerDialogOptions } from "./ArkTextPickerInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkToggle.ts b/arkoala-arkts/arkui/src/generated/ArkToggle.ts index 14e19ceaa..209a8127f 100644 --- a/arkoala-arkts/arkui/src/generated/ArkToggle.ts +++ b/arkoala-arkts/arkui/src/generated/ArkToggle.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkTransitionEffectMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkTransitionEffectMaterialized.ts index 70ec25e60..88bb6567c 100644 --- a/arkoala-arkts/arkui/src/generated/ArkTransitionEffectMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkTransitionEffectMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { TransitionEffects, TranslateOptions, RotateOptions, ScaleOptions, TransitionEdge, AnimateParam } from "./ArkCommonInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkUIExtensionProxyMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkUIExtensionProxyMaterialized.ts index ec7cae491..5c9d9e600 100644 --- a/arkoala-arkts/arkui/src/generated/ArkUIExtensionProxyMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkUIExtensionProxyMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { INTERFACE_UIExtensionProxy } from "./SyntheticDeclarations" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkVector.ts b/arkoala-arkts/arkui/src/generated/ArkVector.ts index 203cfe070..7f04122cb 100644 --- a/arkoala-arkts/arkui/src/generated/ArkVector.ts +++ b/arkoala-arkts/arkui/src/generated/ArkVector.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkViewMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkViewMaterialized.ts index 5048ec0e4..e5948d077 100644 --- a/arkoala-arkts/arkui/src/generated/ArkViewMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkViewMaterialized.ts @@ -16,12 +16,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ArkWeb.ts b/arkoala-arkts/arkui/src/generated/ArkWeb.ts index 06b3f8a14..b70926301 100644 --- a/arkoala-arkts/arkui/src/generated/ArkWeb.ts +++ b/arkoala-arkts/arkui/src/generated/ArkWeb.ts @@ -20,7 +20,7 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KBoolean } from "@koalaui/interop" import { NodeAttach, remember } from "@koalaui/runtime" import { ArkUINodeType } from "./peers/ArkUINodeType" -import { runtimeType, RuntimeType, isResource, isInstanceOf } from "./peers/SerializerBase" +import { runtimeType, RuntimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { ComponentBase } from "./ComponentBase" import { TypeChecker } from "#components" import { ArkCommonMethodComponent } from "./ArkCommon" diff --git a/arkoala-arkts/arkui/src/generated/ArkWebResourceResponseMaterialized.ts b/arkoala-arkts/arkui/src/generated/ArkWebResourceResponseMaterialized.ts index 3aafe2a3b..266a0bc78 100644 --- a/arkoala-arkts/arkui/src/generated/ArkWebResourceResponseMaterialized.ts +++ b/arkoala-arkts/arkui/src/generated/ArkWebResourceResponseMaterialized.ts @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { Resource } from "./ArkResourceInterfaces" +import { Finalizable } from "@koalaui/arkts-framework" import { TypeChecker } from "#components" -import { Finalizable } from "./Finalizable" import { MaterializedBase } from "./MaterializedBase" import { Serializer } from "./peers/Serializer" -import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "./peers/SerializerBase" +import { isResource, isInstanceOf, runtimeType, RuntimeType, SerializerBase, registerCallback } from "@koalaui/arkts-framework" import { NativeModule } from "#components" import { wrapCallback } from "@koalaui/interop" import { CallbackKind } from "./peers/CallbackKind" diff --git a/arkoala-arkts/arkui/src/generated/ComponentBase.ts b/arkoala-arkts/arkui/src/generated/ComponentBase.ts index 0015fa458..8dfb0a855 100644 --- a/arkoala-arkts/arkui/src/generated/ComponentBase.ts +++ b/arkoala-arkts/arkui/src/generated/ComponentBase.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { PeerNode } from './PeerNode' +import { PeerNode } from '@koalaui/arkts-framework' import { NativeModule } from "#components" export class ComponentBase { diff --git a/arkoala-arkts/arkui/src/generated/arkts/type_check.ts b/arkoala-arkts/arkui/src/generated/arkts/type_check.ts index aa5bf2f97..75406e024 100644 --- a/arkoala-arkts/arkui/src/generated/arkts/type_check.ts +++ b/arkoala-arkts/arkui/src/generated/arkts/type_check.ts @@ -9,7 +9,7 @@ import { CalendarPickerInterface, CalendarPickerAttribute, CalendarAlign } from import { ImageData, RenderingContextSettings, DrawingCanvas, Size, CanvasInterface, CanvasAttribute, CanvasFillRule } from "./../ArkCanvasInterfaces" import { CircleOptions, CircleInterface, CircleAttribute } from "./../ArkCircleInterfaces" import { ColumnOptions, ColumnInterface, ColumnAttribute } from "./../ArkColumnInterfaces" -import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, IMonitor, AnimatableArithmetic, Configuration, Rectangle, ExpectedFrameRateRange, AnimateParam, MotionPathOptions, sharedTransitionOptions, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEffects, PreviewParams, ItemDragInfo, DragItemInfo, EventTarget, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, BlurOptions, BlurStyleOptions, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowOptions, MultiShadowOptions, BaseEvent, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, DragEvent, KeyEvent, BindOptions, DismissContentCoverAction, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, ContextMenuAnimationOptions, ContextMenuOptions, MenuOptions, TouchTestInfo, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, MenuElement, CommonConfiguration, DragPreviewOptions, DragInteractionOptions, InvertOptions, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, Type_CommonMethod_linearGradient_value, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, CommonMethod, CommonAttribute, CommonInterface, OverlayOptions, OverlayOffset, CommonShapeMethod, PixelRoundPolicy, LinearGradientBlurOptions, MotionBlurAnchor, MotionBlurOptions, LayoutBorderInfo, LayoutInfo, GeometryInfo, Measurable, SizeResult, MeasureResult, Literal_Empty, CustomComponent, RectResult, CaretOffset, ScrollableCommonMethod, ScrollResult, EdgeEffectOptions, BackgroundBrightnessOptions, PointLightStyle, LightSource, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, SelectionOptions, FinishCallbackType, TouchTestStrategy, TransitionHierarchyStrategy, ChainStyle, TransitionEdge, EffectType, PreDragStatus, SourceType, SourceTool, RepeatMode, BlurStyle, BlurStyleActivePolicy, ThemeColorMode, AdaptiveColor, ModalTransition, ShadowType, ShadowStyle, SafeAreaType, SafeAreaEdge, LayoutSafeAreaType, LayoutSafeAreaEdge, SheetSize, DragBehavior, DragResult, BlendMode, BlendApplyType, SheetType, SheetMode, ScrollSizeMode, SheetKeyboardAvoidMode, DismissReason, MenuPreviewMode, OutlineStyle, DragPreviewMode, MenuPolicy, ContentClipMode, KeyboardAvoidMode, HoverModeAreaType, IMonitorValue, CustomBuilder, UnifiedData, Summary, IntentionCode, UIContext, AnimationRange, SymbolGlyphModifier, ImageModifier, VisualEffect, Filter, AccessibilityCallback, UniformDataType, CircleShape, EllipseShape, PathShape, RectShape, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, ComponentContent, Blender, VisibleAreaChangeCallback, FractionStop, Theme, Layoutable, NavDestinationInfo, NavigationInfo, RouterPageInfo, HoverCallback, MonitorDecorator, Context, PointerStyle, Tuple_Number_Number, Type_SheetOptions_detents, Tuple_T, Tuple_ResourceColor_Number, Tuple_Length_Length, DrawContext, OnWillScrollCallback, OnScrollCallback, OnMoveHandler } from "./../ArkCommonInterfaces" +import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, IMonitor, AnimatableArithmetic, Configuration, Rectangle, ExpectedFrameRateRange, AnimateParam, MotionPathOptions, sharedTransitionOptions, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEffects, PreviewParams, ItemDragInfo, DragItemInfo, EventTarget, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, BlurOptions, BlurStyleOptions, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowOptions, MultiShadowOptions, BaseEvent, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, DragEvent, KeyEvent, BindOptions, DismissContentCoverAction, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, ContextMenuAnimationOptions, ContextMenuOptions, MenuOptions, TouchTestInfo, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, MenuElement, CommonConfiguration, DragPreviewOptions, DragInteractionOptions, InvertOptions, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, Type_CommonMethod_linearGradient_value, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, CommonMethod, CommonAttribute, CommonInterface, OverlayOptions, OverlayOffset, CommonShapeMethod, PixelRoundPolicy, LinearGradientBlurOptions, MotionBlurAnchor, MotionBlurOptions, LayoutBorderInfo, LayoutInfo, GeometryInfo, Measurable, SizeResult, MeasureResult, Literal_Empty, CustomComponent, RectResult, CaretOffset, ScrollableCommonMethod, ScrollResult, EdgeEffectOptions, BackgroundBrightnessOptions, PointLightStyle, LightSource, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, SelectionOptions, FinishCallbackType, TouchTestStrategy, TransitionHierarchyStrategy, ChainStyle, TransitionEdge, EffectType, PreDragStatus, SourceType, SourceTool, RepeatMode, BlurStyle, BlurStyleActivePolicy, ThemeColorMode, AdaptiveColor, ModalTransition, ShadowType, ShadowStyle, SafeAreaType, SafeAreaEdge, LayoutSafeAreaType, LayoutSafeAreaEdge, SheetSize, DragBehavior, DragResult, BlendMode, BlendApplyType, SheetType, SheetMode, ScrollSizeMode, SheetKeyboardAvoidMode, DismissReason, MenuPreviewMode, OutlineStyle, DragPreviewMode, MenuPolicy, ContentClipMode, KeyboardAvoidMode, HoverModeAreaType, IMonitorValue, CustomBuilder, UnifiedData, Summary, IntentionCode, UIContext, AnimationRange, SymbolGlyphModifier, ImageModifier, VisualEffect, Filter, AccessibilityCallback, UniformDataType, CircleShape, EllipseShape, PathShape, RectShape, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, ComponentContent, Blender, VisibleAreaChangeCallback, FractionStop, Theme, Layoutable, NavDestinationInfo, NavigationInfo, RouterPageInfo, HoverCallback, Context, PointerStyle, Tuple_Number_Number, Type_SheetOptions_detents, Tuple_T, Tuple_ResourceColor_Number, Tuple_Length_Length, DrawContext, OnWillScrollCallback, OnScrollCallback, OnMoveHandler } from "./../ArkCommonInterfaces" import { CounterInterface, CounterAttribute } from "./../ArkCounterInterfaces" import { DividerInterface, DividerAttribute } from "./../ArkDividerInterfaces" import { EllipseOptions, EllipseInterface, EllipseAttribute } from "./../ArkEllipseInterfaces" @@ -64,7 +64,6 @@ import { Padding, LocalizedPadding, EdgeWidths, LocalizedEdgeWidths, EdgeOutline import { Vector1, Vector2, VectorInterface, VectorAttribute } from "./../ArkVectorInterfaces" import { OnHttpErrorReceiveEvent, NativeEmbedInfo, NativeEmbedDataInfo, WebInterface, OnRenderExitedEvent, Literal_Object_detail, WebAttribute, RenderExitReason } from "./../ArkWebInterfaces" import { INTERFACE_CanvasPattern, INTERFACE_ICurve, INTERFACE_PixelMapMock, INTERFACE_AttributeModifier, INTERFACE_GestureModifier, INTERFACE_NavDestinationContext, INTERFACE_NavigationTransitionProxy, INTERFACE_SwiperContentTransitionProxy, INTERFACE_TextBaseController, INTERFACE_TextEditControllerEx, INTERFACE_StyledStringController, INTERFACE_LayoutManager, INTERFACE_EditMenuOptions, INTERFACE_UIExtensionProxy, IMPORT_LengthMetricsUnit_FROM_api_arkui_Graphics, IMPORT_default_FROM_api_application_Context, IMPORT_default_PointerStyle_FROM_api_ohos_multimodalInput_pointer, IMPORT_default_UnifiedData_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_Summary_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_UniformDataType_FROM_api_ohos_data_uniformTypeDescriptor, IMPORT_IntentionCode_FROM_api_ohos_multimodalInput_intentionCode, IMPORT_UIContext_FROM_api_ohos_arkui_UIContext, IMPORT_SymbolGlyphModifier_FROM_api_arkui_SymbolGlyphModifier, IMPORT_ImageModifier_FROM_api_arkui_ImageModifier, IMPORT_CircleShape_FROM_api_ohos_arkui_shape, IMPORT_EllipseShape_FROM_api_ohos_arkui_shape, IMPORT_PathShape_FROM_api_ohos_arkui_shape, IMPORT_RectShape_FROM_api_ohos_arkui_shape, IMPORT_default_VisualEffect_FROM_api_ohos_graphics_uiEffect, IMPORT_default_Filter_FROM_api_ohos_graphics_uiEffect, IMPORT_ComponentContent_T_FROM_api_arkui_ComponentContent, IMPORT_default_Blender_FROM_api_ohos_graphics_uiEffect, IMPORT_default_NavDestinationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_NavigationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_RouterPageInfo_FROM_api_ohos_arkui_observer, IMPORT_DrawContext_FROM_api_arkui_Graphics, IMPORT_Theme_FROM_api_ohos_arkui_theme, IMPORT_ErrorCallback_FROM_api_ohos_base, IMPORT_ColorMetrics_FROM_api_arkui_Graphics, IMPORT_DrawableDescriptor_FROM_api_ohos_arkui_drawableDescriptor, IMPORT_default_ColorFilter_FROM_api_ohos_graphics_drawing, IMPORT_default_ResolutionQuality_FROM_api_ohos_multimedia_image, IMPORT_default_Lattice_FROM_api_ohos_graphics_drawing, IMPORT_default_SystemBarStyle_FROM_api_ohos_window, IMPORT_default_Affinity_FROM_api_ohos_graphics_text, IMPORT_default_LineMetrics_FROM_api_ohos_graphics_text, IMPORT_default_TextBox_FROM_api_ohos_graphics_text } from "./../SyntheticDeclarations" -import { MethodDecorator } from "./../ArkStdlibInterfaces" import { Resource } from "./../ArkResourceInterfaces" import { TransitionEffect } from "./../ArkTransitionEffectMaterialized" import { CanvasRenderingContext2D } from "./../ArkCanvasRenderingContext2DMaterialized" diff --git a/arkoala-arkts/arkui/src/generated/peer_events.ts b/arkoala-arkts/arkui/src/generated/peer_events.ts index da23ccc66..d8a4c3731 100644 --- a/arkoala-arkts/arkui/src/generated/peer_events.ts +++ b/arkoala-arkts/arkui/src/generated/peer_events.ts @@ -3,12 +3,11 @@ import { int32 } from "@koalaui/common" import { KStringPtr, KPointer } from "@koalaui/interop" import { NodeController, TextModifier, PixelMap, Want, LengthUnit, LengthMetrics } from "./ArkArkui-externalInterfaces" import { Serializer, Deserializer, CallbackBuffer, CallbackResourceHolder, Tag, GENERATED_ArkUIEventsAPI, CallbackKind } from "./ArkInterop-typesInterfaces" -import { MethodDecorator } from "./ArkStdlibInterfaces" import { DialogButtonStyle, Color, WordBreak, BorderStyle, TextOverflow, TextHeightAdaptivePolicy, FontWeight, FontStyle, HorizontalAlign, FlexAlign, TextDecorationType, TextDecorationStyle, Curve, PlayMode, SharedTransitionEffectType, VerticalAlign, TransitionType, ColoringStrategy, MouseButton, MouseAction, AccessibilityHoverType, TouchType, KeyType, KeySource, Placement, ArrowPointPosition, ClickEffectLevel, NestedScrollMode, GradientDirection, HitTestMode, Alignment, ImageSize, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, ImageRepeat, Axis, ResponseType, FunctionKey, ModifierKey, LineCapStyle, LineJoinStyle, PixelRoundCalcPolicy, BarState, EdgeEffect, ScrollSource, IlluminatedType, EmbeddedType, Nullable, FlexDirection, FlexWrap, ImageFit, CopyOptions, TitleHeight, TextAlign, LineBreakStrategy, ImageSpanAlignment, Edge, TextCase, TextContentStyle } from "./ArkEnumsInterfaces" import { ResourceStr, ResourceColor, VoidCallback, Offset, Dimension, PX, VP, FP, LPX, Percentage, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles, Font, Length, LengthMetricsUnit, Bias, Area, SizeOptions, Position, Margin, Padding, ConstraintSizeOptions, ChainWeightOptions, LocalizedPadding, LocalizedMargin, BorderOptions, OutlineOptions, EdgeOutlineStyles, EdgeOutlineWidths, OutlineRadiuses, Edges, LocalizedEdges, LocalizedPosition, AccessibilityOptions, EdgeWidth, DirectionalEdgesT, ColorMetrics, ColorFilter, LengthConstrain, Degree, MarkStyle, TouchPoint, DividerStyleOptions } from "./ArkUnitsInterfaces" import { Resource } from "./ArkResourceInterfaces" import { AlertDialogButtonBaseOptions, AlertDialogButtonOptions, TextStyle_alert_dialog, DismissDialogAction, DialogAlignment, AlertDialogParam, AlertDialogParamWithConfirm, AlertDialogParamWithButtons, DialogButtonDirection, AlertDialogParamWithOptions } from "./ArkAlertDialogInterfaces" -import { Rectangle, BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, DismissReason, CommonMethod, CommonConfiguration, CommonShapeMethod, PointLightStyle, ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, MonitorDecorator, IMonitorValue, IMonitor, AnimatableArithmetic, Context, Configuration, ExpectedFrameRateRange, FinishCallbackType, AnimateParam, MotionPathOptions, sharedTransitionOptions, TransitionHierarchyStrategy, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEdge, TransitionEffects, PreviewParams, ItemDragInfo, CustomBuilder, DragItemInfo, PointerStyle, EventTarget, BlurStyleOptions, BlurStyleActivePolicy, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, Tuple_Number_Number, BlurOptions, ThemeColorMode, AdaptiveColor, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowType, MultiShadowOptions, SourceType, SourceTool, BaseEvent, RepeatMode, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, SizeChangeCallback, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, TransitionFinishCallback, UnifiedData, Summary, UniformDataType, DragBehavior, DragResult, DragEvent, IntentionCode, KeyEvent, BindOptions, DismissContentCoverAction, ModalTransition, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetSize, Type_SheetOptions_detents, SheetType, SheetMode, ScrollSizeMode, UIContext, SheetKeyboardAvoidMode, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, AnimationRange, ContextMenuAnimationOptions, MenuPreviewMode, ContextMenuOptions, MenuOptions, RectResult, TouchTestInfo, TouchTestStrategy, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, SymbolGlyphModifier, MenuElement, Tuple_T, ImageModifier, DragPreviewMode, DragPreviewOptions, DragInteractionOptions, InvertOptions, CircleShape, EllipseShape, PathShape, RectShape, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, PreDragStatus, Tuple_ResourceColor_Number, Type_CommonMethod_linearGradient_value, Tuple_Length_Length, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, PixelRoundPolicy, VisualEffect, Filter, OutlineStyle, AccessibilityCallback, MotionBlurOptions, BackgroundBrightnessOptions, SafeAreaType, SafeAreaEdge, LinearGradientBlurOptions, EffectType, ChainStyle, ComponentContent, OverlayOptions, BlendMode, BlendApplyType, Blender, VisibleAreaChangeCallback, CommonAttribute, CommonInterface, OverlayOffset, FractionStop, MotionBlurAnchor, LayoutBorderInfo, LayoutInfo, SizeResult, GeometryInfo, MeasureResult, Measurable, NavDestinationInfo, NavigationInfo, RouterPageInfo, DrawContext, Theme, Literal_Empty, Layoutable, CustomComponent, CaretOffset, ContentClipMode, EdgeEffectOptions, ScrollableCommonMethod, ScrollResult, OnWillScrollCallback, OnScrollCallback, OnMoveHandler, LightSource, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, HoverCallback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, MenuPolicy, SelectionOptions, LayoutSafeAreaType, LayoutSafeAreaEdge } from "./ArkCommonInterfaces" +import { Rectangle, BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, DismissReason, CommonMethod, CommonConfiguration, CommonShapeMethod, PointLightStyle, ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, IMonitorValue, IMonitor, AnimatableArithmetic, Context, Configuration, ExpectedFrameRateRange, FinishCallbackType, AnimateParam, MotionPathOptions, sharedTransitionOptions, TransitionHierarchyStrategy, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEdge, TransitionEffects, PreviewParams, ItemDragInfo, CustomBuilder, DragItemInfo, PointerStyle, EventTarget, BlurStyleOptions, BlurStyleActivePolicy, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, Tuple_Number_Number, BlurOptions, ThemeColorMode, AdaptiveColor, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowType, MultiShadowOptions, SourceType, SourceTool, BaseEvent, RepeatMode, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, SizeChangeCallback, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, TransitionFinishCallback, UnifiedData, Summary, UniformDataType, DragBehavior, DragResult, DragEvent, IntentionCode, KeyEvent, BindOptions, DismissContentCoverAction, ModalTransition, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetSize, Type_SheetOptions_detents, SheetType, SheetMode, ScrollSizeMode, UIContext, SheetKeyboardAvoidMode, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, AnimationRange, ContextMenuAnimationOptions, MenuPreviewMode, ContextMenuOptions, MenuOptions, RectResult, TouchTestInfo, TouchTestStrategy, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, SymbolGlyphModifier, MenuElement, Tuple_T, ImageModifier, DragPreviewMode, DragPreviewOptions, DragInteractionOptions, InvertOptions, CircleShape, EllipseShape, PathShape, RectShape, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, PreDragStatus, Tuple_ResourceColor_Number, Type_CommonMethod_linearGradient_value, Tuple_Length_Length, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, PixelRoundPolicy, VisualEffect, Filter, OutlineStyle, AccessibilityCallback, MotionBlurOptions, BackgroundBrightnessOptions, SafeAreaType, SafeAreaEdge, LinearGradientBlurOptions, EffectType, ChainStyle, ComponentContent, OverlayOptions, BlendMode, BlendApplyType, Blender, VisibleAreaChangeCallback, CommonAttribute, CommonInterface, OverlayOffset, FractionStop, MotionBlurAnchor, LayoutBorderInfo, LayoutInfo, SizeResult, GeometryInfo, MeasureResult, Measurable, NavDestinationInfo, NavigationInfo, RouterPageInfo, DrawContext, Theme, Literal_Empty, Layoutable, CustomComponent, CaretOffset, ContentClipMode, EdgeEffectOptions, ScrollableCommonMethod, ScrollResult, OnWillScrollCallback, OnScrollCallback, OnMoveHandler, LightSource, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, HoverCallback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, MenuPolicy, SelectionOptions, LayoutSafeAreaType, LayoutSafeAreaEdge } from "./ArkCommonInterfaces" import { TransitionEffect } from "./ArkTransitionEffectMaterialized" import { BlankAttribute, BlankInterface } from "./ArkBlankInterfaces" import { ButtonTriggerClickCallback, ButtonConfiguration, ButtonType, ButtonStyleMode, ControlSize, ButtonRole, ButtonOptions, ButtonAttribute, ButtonInterface, LabelStyle } from "./ArkButtonInterfaces" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkBlankPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkBlankPeer.ts index bd91f4246..0c7c9a59f 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkBlankPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkBlankPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { BlankAttribute, BlankInterface } from "./../ArkBlankInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" @@ -32,7 +32,7 @@ import { Resource } from "./../ArkResourceInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkButtonPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkButtonPeer.ts index 8f5f22729..2feb54f07 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkButtonPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkButtonPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ButtonTriggerClickCallback, ButtonConfiguration, ButtonType, ButtonStyleMode, ControlSize, ButtonRole, ButtonOptions, ButtonAttribute, ButtonInterface, LabelStyle } from "./../ArkButtonInterfaces" import { CommonConfiguration, CommonMethod } from "./../ArkCommonInterfaces" @@ -33,7 +33,7 @@ import { ContentModifier } from "./../ConflictedDeclarations" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkCalendarPickerPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkCalendarPickerPeer.ts index 65f16c235..fca810e3d 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkCalendarPickerPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkCalendarPickerPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { CalendarPickerAttribute, CalendarPickerInterface, CalendarAlign } from "./../ArkCalendarPickerInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" @@ -30,7 +30,7 @@ import { Offset } from "./../ArkUnitsInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkCanvasPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkCanvasPeer.ts index c5964cc35..80a9f32b3 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkCanvasPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkCanvasPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { CanvasFillRule, ImageData, RenderingContextSettings, DrawingCanvas, Size, CanvasAttribute, CanvasInterface } from "./../ArkCanvasInterfaces" import { LengthMetricsUnit } from "./../ArkUnitsInterfaces" @@ -33,7 +33,7 @@ import { CommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkCirclePeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkCirclePeer.ts index e0d83d6db..e5de79d9e 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkCirclePeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkCirclePeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonShapeMethodPeer, ArkCommonShapeMethodAttributes } from "./ArkCommonPeer" import { CircleOptions, CircleAttribute, CircleInterface } from "./../ArkCircleInterfaces" import { CommonShapeMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkColumnPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkColumnPeer.ts index ff2b5623f..ad5641396 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkColumnPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkColumnPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ColumnOptions, ColumnAttribute, ColumnInterface } from "./../ArkColumnInterfaces" import { CommonMethod, PointLightStyle } from "./../ArkCommonInterfaces" @@ -30,7 +30,7 @@ import { HorizontalAlign, FlexAlign } from "./../ArkEnumsInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkCommonPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkCommonPeer.ts index 5f0ac0c46..c68af5d7c 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkCommonPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkCommonPeer.ts @@ -18,17 +18,16 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { PeerNode } from "./../PeerNode" -import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, MonitorDecorator, IMonitorValue, IMonitor, AnimatableArithmetic, Context, Configuration, Rectangle, ExpectedFrameRateRange, FinishCallbackType, AnimateParam, MotionPathOptions, sharedTransitionOptions, TransitionHierarchyStrategy, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEdge, TransitionEffects, PreviewParams, ItemDragInfo, CustomBuilder, DragItemInfo, PointerStyle, EventTarget, BlurStyleOptions, BlurStyleActivePolicy, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, Tuple_Number_Number, BlurOptions, ThemeColorMode, AdaptiveColor, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowType, ShadowOptions, MultiShadowOptions, SourceType, SourceTool, BaseEvent, RepeatMode, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, SizeChangeCallback, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, TransitionFinishCallback, UnifiedData, Summary, UniformDataType, DragBehavior, DragResult, DragEvent, IntentionCode, KeyEvent, BindOptions, DismissReason, DismissContentCoverAction, ModalTransition, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetSize, Type_SheetOptions_detents, SheetType, BlurStyle, ShadowStyle, SheetMode, ScrollSizeMode, UIContext, SheetKeyboardAvoidMode, HoverModeAreaType, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, AnimationRange, ContextMenuAnimationOptions, MenuPreviewMode, ContextMenuOptions, MenuOptions, RectResult, TouchTestInfo, TouchTestStrategy, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, SymbolGlyphModifier, MenuElement, Tuple_T, CommonConfiguration, ImageModifier, DragPreviewMode, DragPreviewOptions, DragInteractionOptions, InvertOptions, CircleShape, EllipseShape, PathShape, RectShape, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, PreDragStatus, Tuple_ResourceColor_Number, Type_CommonMethod_linearGradient_value, Tuple_Length_Length, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, PixelRoundPolicy, VisualEffect, Filter, OutlineStyle, AccessibilityCallback, MotionBlurOptions, BackgroundBrightnessOptions, SafeAreaType, SafeAreaEdge, LinearGradientBlurOptions, EffectType, ChainStyle, ComponentContent, OverlayOptions, BlendMode, BlendApplyType, Blender, VisibleAreaChangeCallback, CommonMethod, CommonAttribute, CommonInterface, OverlayOffset, FractionStop, CommonShapeMethod, MotionBlurAnchor, LayoutBorderInfo, LayoutInfo, SizeResult, GeometryInfo, MeasureResult, Measurable, NavDestinationInfo, NavigationInfo, RouterPageInfo, DrawContext, Theme, Literal_Empty, Layoutable, CustomComponent, CaretOffset, ContentClipMode, EdgeEffectOptions, ScrollableCommonMethod, ScrollResult, OnWillScrollCallback, OnScrollCallback, OnMoveHandler, LightSource, PointLightStyle, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, HoverCallback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, MenuPolicy, SelectionOptions } from "./../ArkCommonInterfaces" +import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, IMonitorValue, IMonitor, AnimatableArithmetic, Context, Configuration, Rectangle, ExpectedFrameRateRange, FinishCallbackType, AnimateParam, MotionPathOptions, sharedTransitionOptions, TransitionHierarchyStrategy, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEdge, TransitionEffects, PreviewParams, ItemDragInfo, CustomBuilder, DragItemInfo, PointerStyle, EventTarget, BlurStyleOptions, BlurStyleActivePolicy, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, Tuple_Number_Number, BlurOptions, ThemeColorMode, AdaptiveColor, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowType, ShadowOptions, MultiShadowOptions, SourceType, SourceTool, BaseEvent, RepeatMode, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, SizeChangeCallback, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, TransitionFinishCallback, UnifiedData, Summary, UniformDataType, DragBehavior, DragResult, DragEvent, IntentionCode, KeyEvent, BindOptions, DismissReason, DismissContentCoverAction, ModalTransition, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetSize, Type_SheetOptions_detents, SheetType, BlurStyle, ShadowStyle, SheetMode, ScrollSizeMode, UIContext, SheetKeyboardAvoidMode, HoverModeAreaType, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, AnimationRange, ContextMenuAnimationOptions, MenuPreviewMode, ContextMenuOptions, MenuOptions, RectResult, TouchTestInfo, TouchTestStrategy, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, SymbolGlyphModifier, MenuElement, Tuple_T, CommonConfiguration, ImageModifier, DragPreviewMode, DragPreviewOptions, DragInteractionOptions, InvertOptions, CircleShape, EllipseShape, PathShape, RectShape, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, PreDragStatus, Tuple_ResourceColor_Number, Type_CommonMethod_linearGradient_value, Tuple_Length_Length, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, PixelRoundPolicy, VisualEffect, Filter, OutlineStyle, AccessibilityCallback, MotionBlurOptions, BackgroundBrightnessOptions, SafeAreaType, SafeAreaEdge, LinearGradientBlurOptions, EffectType, ChainStyle, ComponentContent, OverlayOptions, BlendMode, BlendApplyType, Blender, VisibleAreaChangeCallback, CommonMethod, CommonAttribute, CommonInterface, OverlayOffset, FractionStop, CommonShapeMethod, MotionBlurAnchor, LayoutBorderInfo, LayoutInfo, SizeResult, GeometryInfo, MeasureResult, Measurable, NavDestinationInfo, NavigationInfo, RouterPageInfo, DrawContext, Theme, Literal_Empty, Layoutable, CustomComponent, CaretOffset, ContentClipMode, EdgeEffectOptions, ScrollableCommonMethod, ScrollResult, OnWillScrollCallback, OnScrollCallback, OnMoveHandler, LightSource, PointLightStyle, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, HoverCallback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, MenuPolicy, SelectionOptions } from "./../ArkCommonInterfaces" import { TextDecorationType, Color, TextDecorationStyle, Curve, PlayMode, SharedTransitionEffectType, HorizontalAlign, VerticalAlign, TransitionType, FontWeight, FontStyle, ColoringStrategy, MouseButton, MouseAction, AccessibilityHoverType, TouchType, KeyType, KeySource, BorderStyle, Placement, ArrowPointPosition, ClickEffectLevel, NestedScrollMode, GradientDirection, HitTestMode, Alignment, ImageSize, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, ImageRepeat, Axis, ResponseType, FunctionKey, ModifierKey, LineCapStyle, LineJoinStyle, PixelRoundCalcPolicy, BarState, EdgeEffect, ScrollSource, IlluminatedType } from "./../ArkEnumsInterfaces" import { ResourceColor, Length, Bias, Area, Font, BorderRadiuses, EdgeWidths, LocalizedEdgeWidths, SizeOptions, ResourceStr, Dimension, PX, VP, FP, LPX, Percentage, EdgeColors, LocalizedEdgeColors, EdgeStyles, Position, LocalizedBorderRadiuses, Margin, Padding, ConstraintSizeOptions, ChainWeightOptions, LocalizedPadding, LocalizedMargin, BorderOptions, OutlineOptions, EdgeOutlineStyles, EdgeOutlineWidths, OutlineRadiuses, Edges, LocalizedEdges, LocalizedPosition, AccessibilityOptions, EdgeWidth, DirectionalEdgesT } from "./../ArkUnitsInterfaces" import { Resource } from "./../ArkResourceInterfaces" -import { MethodDecorator } from "./../ArkStdlibInterfaces" import { IMPORT_default_FROM_api_application_Context, IMPORT_default_PointerStyle_FROM_api_ohos_multimodalInput_pointer, IMPORT_default_UnifiedData_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_Summary_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_UniformDataType_FROM_api_ohos_data_uniformTypeDescriptor, IMPORT_IntentionCode_FROM_api_ohos_multimodalInput_intentionCode, IMPORT_UIContext_FROM_api_ohos_arkui_UIContext, IMPORT_SymbolGlyphModifier_FROM_api_arkui_SymbolGlyphModifier, IMPORT_ImageModifier_FROM_api_arkui_ImageModifier, IMPORT_CircleShape_FROM_api_ohos_arkui_shape, IMPORT_EllipseShape_FROM_api_ohos_arkui_shape, IMPORT_PathShape_FROM_api_ohos_arkui_shape, IMPORT_RectShape_FROM_api_ohos_arkui_shape, IMPORT_default_VisualEffect_FROM_api_ohos_graphics_uiEffect, IMPORT_default_Filter_FROM_api_ohos_graphics_uiEffect, IMPORT_ComponentContent_T_FROM_api_arkui_ComponentContent, IMPORT_default_Blender_FROM_api_ohos_graphics_uiEffect, IMPORT_default_NavDestinationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_NavigationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_RouterPageInfo_FROM_api_ohos_arkui_observer, IMPORT_DrawContext_FROM_api_arkui_Graphics, IMPORT_Theme_FROM_api_ohos_arkui_theme } from "./../SyntheticDeclarations" import { ICurve } from "./../ArkICurveMaterialized" import { TransitionEffect } from "./../ArkTransitionEffectMaterialized" @@ -52,7 +51,7 @@ import { ScrollOnWillScrollCallback } from "./../ArkScrollInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkCounterPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkCounterPeer.ts index 24f3851c5..8cee8151e 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkCounterPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkCounterPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { CounterAttribute, CounterInterface } from "./../ArkCounterInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" @@ -30,7 +30,7 @@ import { VoidCallback } from "./../ArkUnitsInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkDividerPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkDividerPeer.ts index 43052cc32..9febe7f4c 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkDividerPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkDividerPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { DividerAttribute, DividerInterface } from "./../ArkDividerInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" @@ -32,7 +32,7 @@ import { Resource } from "./../ArkResourceInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkEllipsePeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkEllipsePeer.ts index c92807f5f..ffdef5c62 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkEllipsePeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkEllipsePeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonShapeMethodPeer, ArkCommonShapeMethodAttributes } from "./ArkCommonPeer" import { EllipseOptions, EllipseAttribute, EllipseInterface } from "./../ArkEllipseInterfaces" import { CommonShapeMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkEmbeddedComponentPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkEmbeddedComponentPeer.ts index 0e571c25c..5df90efcd 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkEmbeddedComponentPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkEmbeddedComponentPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { Want } from "./../ArkArkui-externalInterfaces" import { EmbeddedType } from "./../ArkEnumsInterfaces" @@ -32,7 +32,7 @@ import { IMPORT_ErrorCallback_FROM_api_ohos_base } from "./../SyntheticDeclarati import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkFlexPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkFlexPeer.ts index 35072c777..8df3885bf 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkFlexPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkFlexPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { FlexDirection, FlexWrap, FlexAlign, ItemAlign } from "./../ArkEnumsInterfaces" import { FlexSpaceOptions, FlexOptions, FlexAttribute, FlexInterface } from "./../ArkFlexInterfaces" @@ -31,7 +31,7 @@ import { CommonMethod, PointLightStyle } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkFormComponentPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkFormComponentPeer.ts index 9998179eb..3a9e7e965 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkFormComponentPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkFormComponentPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { FormCallbackInfo, FormComponentAttribute, FormComponentInterface, Literal_Number_height_width } from "./../ArkFormComponentInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" @@ -30,7 +30,7 @@ import { SizeOptions } from "./../ArkUnitsInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkGridContainerPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkGridContainerPeer.ts index e9e3b555a..b4f892abf 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkGridContainerPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkGridContainerPeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkColumnPeer, ArkColumnAttributes } from "./ArkColumnPeer" import { SizeType, GridContainerOptions, GridContainerAttribute, GridContainerInterface } from "./../ArkGridContainerInterfaces" import { ColumnAttribute } from "./../ArkColumnInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkGridItemPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkGridItemPeer.ts index ba8685276..9137d3095 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkGridItemPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkGridItemPeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { GridItemAttribute, GridItemInterface } from "./../ArkGridItemInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkGridPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkGridPeer.ts index 71a522712..e56acc4de 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkGridPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkGridPeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkScrollableCommonMethodPeer, ArkScrollableCommonMethodAttributes } from "./ArkCommonPeer" import { GridAttribute, GridInterface } from "./../ArkGridInterfaces" import { ScrollableCommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkImagePeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkImagePeer.ts index f62318aa2..a0830e8a4 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkImagePeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkImagePeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { IMPORT_DrawableDescriptor_FROM_api_ohos_arkui_drawableDescriptor, IMPORT_default_ColorFilter_FROM_api_ohos_graphics_drawing, IMPORT_default_ResolutionQuality_FROM_api_ohos_multimedia_image, IMPORT_default_Lattice_FROM_api_ohos_graphics_drawing } from "./../SyntheticDeclarations" import { DrawableDescriptor, DrawingColorFilter, ResolutionQuality, DrawingLattice, ImageAttribute, ImageContent, ImageInterface, ImageSourceSize, Type_ImageAttribute_onComplete_callback_event, ImageRenderMode, DynamicRangeMode, ImageInterpolation, ImageErrorCallback, ResizableOptions, ImageRotateOrientation, ImageError } from "./../ArkImageInterfaces" @@ -35,7 +35,7 @@ import { Color, ImageFit, ImageRepeat, CopyOptions } from "./../ArkEnumsInterfac import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkIndicatorcomponentPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkIndicatorcomponentPeer.ts index 57c446e63..bedfdd58f 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkIndicatorcomponentPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkIndicatorcomponentPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { IndicatorComponentController } from "./../ArkIndicatorComponentControllerMaterialized" import { IndicatorComponentAttribute, IndicatorComponentInterface } from "./../ArkIndicatorcomponentInterfaces" @@ -32,7 +32,7 @@ import { DigitIndicator } from "./../ArkDigitIndicatorBuilder" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { SubTabBarStyle } from "./../ArkSubTabBarStyleBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkListItemPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkListItemPeer.ts index 6bb0b6048..20bfebec1 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkListItemPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkListItemPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { SwipeActionState, SwipeActionItem, SwipeEdgeEffect, SwipeActionOptions, ListItemStyle, ListItemOptions, ListItemAttribute, ListItemInterface, Sticky, EditMode } from "./../ArkListItemInterfaces" import { CustomBuilder, CommonMethod } from "./../ArkCommonInterfaces" @@ -31,7 +31,7 @@ import { Resource } from "./../ArkResourceInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkListPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkListPeer.ts index 492e358c9..63f7f7414 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkListPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkListPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkScrollableCommonMethodPeer, ArkScrollableCommonMethodAttributes } from "./ArkCommonPeer" import { Length, ResourceColor, LengthConstrain, Dimension, PX, VP, FP, LPX, Percentage } from "./../ArkUnitsInterfaces" import { Resource } from "./../ArkResourceInterfaces" @@ -34,7 +34,7 @@ import { ChildrenMainSize } from "./../ArkChildrenMainSizeMaterialized" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkNavDestinationPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkNavDestinationPeer.ts index fb08ad7c3..ffb4f1cf0 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkNavDestinationPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkNavDestinationPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { NavDestinationCommonTitle, NavDestinationCustomTitle, NavDestinationAttribute, NavDestinationInterface, RouteMapConfig, NavDestinationMode } from "./../ArkNavDestinationInterfaces" import { CustomBuilder, CommonMethod, SymbolGlyphModifier, LayoutSafeAreaType, LayoutSafeAreaEdge } from "./../ArkCommonInterfaces" @@ -36,7 +36,7 @@ import { NavigationMenuItem, SystemBarStyle, NavigationTitleOptions } from "./.. import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkNavigationPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkNavigationPeer.ts index 7ba1ef5cb..5a30491e9 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkNavigationPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkNavigationPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { IMPORT_default_SystemBarStyle_FROM_api_ohos_window, IMPORT_SymbolGlyphModifier_FROM_api_arkui_SymbolGlyphModifier } from "./../SyntheticDeclarations" import { SystemBarStyle, NavigationCommonTitle, NavigationCustomTitle, NavigationMenuItem, NavPathInfo, PopInfo, LaunchMode, NavigationOptions, NavBar, NavigationOperation, InterceptionShowCallback, NavigationMode, InterceptionModeCallback, NavigationInterception, NavigationAttribute, NavigationInterface, ToolbarItemStatus, ToolbarItem, BarStyle, NavigationTitleOptions, NavigationToolbarOptions, Tuple_Dimension_Dimension, NavigationTitleMode, NavContentInfo, NavigationAnimatedTransition, NavBarPosition } from "./../ArkNavigationInterfaces" @@ -38,7 +38,7 @@ import { NavDestinationMode } from "./../ArkNavDestinationInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkNavigatorPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkNavigatorPeer.ts index 8ff16356a..b0289a285 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkNavigatorPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkNavigatorPeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { NavigationType, Literal_String_target_NavigationType_type, NavigatorAttribute, NavigatorInterface } from "./../ArkNavigatorInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkPathPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkPathPeer.ts index 24a525f2a..e443295dd 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkPathPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkPathPeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonShapeMethodPeer, ArkCommonShapeMethodAttributes } from "./ArkCommonPeer" import { PathOptions, PathAttribute, PathInterface } from "./../ArkPathInterfaces" import { CommonShapeMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkRectPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkRectPeer.ts index 6d8be24a9..81ccf3ead 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkRectPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkRectPeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonShapeMethodPeer, ArkCommonShapeMethodAttributes } from "./ArkCommonPeer" import { RectOptions, RoundedRectOptions, RectAttribute, RectInterface } from "./../ArkRectInterfaces" import { CommonShapeMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkRichEditorPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkRichEditorPeer.ts index dcce9948d..1f6f89f70 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkRichEditorPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkRichEditorPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { RichEditorSpanPosition, RichEditorTextStyle, LeadingMarginPlaceholder, RichEditorParagraphStyle, PasteEvent, RichEditorTextSpan, RichEditorLayoutStyle, RichEditorImageSpanStyle, RichEditorSymbolSpanStyle, RichEditorTextStyleResult, RichEditorParagraphResult, RichEditorSymbolSpanStyleResult, RichEditorTextSpanResult, RichEditorImageSpanStyleResult, RichEditorImageSpanResult, RichEditorImageSpan, RichEditorRange, RichEditorGesture, RichEditorTextSpanOptions, KeyboardOptions, RichEditorImageSpanOptions, RichEditorBuilderSpanOptions, PlaceholderStyle, RichEditorSpanStyleOptions, RichEditorParagraphStyleOptions, RichEditorUpdateTextSpanStyleOptions, RichEditorUpdateImageSpanStyleOptions, RichEditorUpdateSymbolSpanStyleOptions, RichEditorSymbolSpanOptions, RichEditorSelection, RichEditorInsertValue, RichEditorDeleteDirection, RichEditorDeleteValue, RichEditorChangeValue, RichEditorOptions, RichEditorStyledStringOptions, MenuOnAppearCallback, SelectionMenuOptions, RichEditorSpan, CutEvent, CopyEvent, RichEditorAttribute, PasteEventCallback, SubmitCallback, RichEditorSpanType, RichEditorResponseType, RichEditorInterface } from "./../ArkRichEditorInterfaces" import { ResourceColor, Length, ResourceStr, Dimension, PX, VP, FP, LPX, Percentage, Margin, Padding, BorderRadiuses, Font } from "./../ArkUnitsInterfaces" @@ -41,7 +41,7 @@ import { EditMenuOptions } from "./../ArkEditMenuOptionsMaterialized" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkRowPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkRowPeer.ts index 609903cf3..4db8510a2 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkRowPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkRowPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { RowOptions, RowAttribute, RowInterface } from "./../ArkRowInterfaces" import { CommonMethod, PointLightStyle } from "./../ArkCommonInterfaces" @@ -30,7 +30,7 @@ import { VerticalAlign, FlexAlign } from "./../ArkEnumsInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkScrollPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkScrollPeer.ts index 2a1b9f6d1..28919009c 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkScrollPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkScrollPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkScrollableCommonMethodPeer, ArkScrollableCommonMethodAttributes } from "./ArkCommonPeer" import { OffsetResult, ScrollEdgeOptions, ScrollToIndexOptions, ScrollAnimationOptions, OffsetOptions, Literal_Boolean_next_Axis_direction, ScrollOptions, ScrollPageOptions, ScrollSnapOptions, ScrollAttribute, ScrollInterface, OnScrollEdgeCallback, OnScrollFrameBeginHandlerResult, OnScrollFrameBeginCallback, ScrollDirection, ScrollOnWillScrollCallback, ScrollOnScrollCallback } from "./../ArkScrollInterfaces" import { LengthMetrics } from "./../ArkArkui-externalInterfaces" @@ -36,7 +36,7 @@ import { ScrollableCommonMethod, NestedScrollOptions, EdgeEffectOptions } from " import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkSearchPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkSearchPeer.ts index 80543f6f4..c744f9d89 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkSearchPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkSearchPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ResourceStr, Length, ResourceColor, Dimension, PX, VP, FP, LPX, Percentage, Font } from "./../ArkUnitsInterfaces" import { Resource } from "./../ArkResourceInterfaces" @@ -38,7 +38,7 @@ import { KeyboardOptions } from "./../ArkRichEditorInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkSelectPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkSelectPeer.ts index 6de2454e2..a6b6e9472 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkSelectPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkSelectPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ResourceStr } from "./../ArkUnitsInterfaces" import { Resource } from "./../ArkResourceInterfaces" @@ -33,7 +33,7 @@ import { ContentModifier } from "./../ConflictedDeclarations" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkShapePeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkShapePeer.ts index 3a65f217c..c5b865bae 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkShapePeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkShapePeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ShapeAttribute, ShapeInterface } from "./../ArkShapeInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkSidebarPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkSidebarPeer.ts index 027019d92..66fc9676a 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkSidebarPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkSidebarPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { SideBarContainerAttribute, SideBarContainerInterface } from "./../ArkSidebarInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" @@ -31,7 +31,7 @@ import { Resource } from "./../ArkResourceInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkSpanPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkSpanPeer.ts index 0a7a9770d..275ba8092 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkSpanPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkSpanPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ResourceColor, Dimension, PX, VP, FP, LPX, Percentage, BorderRadiuses, Font, Length } from "./../ArkUnitsInterfaces" import { Color, FontStyle, FontWeight, TextCase } from "./../ArkEnumsInterfaces" @@ -34,7 +34,7 @@ import { DecorationStyleInterface } from "./../ArkStyledStringInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkStackPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkStackPeer.ts index 6ffd22bdb..7963674e2 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkStackPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkStackPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { Alignment } from "./../ArkEnumsInterfaces" import { StackOptions, StackAttribute, StackInterface } from "./../ArkStackInterfaces" @@ -30,7 +30,7 @@ import { CommonMethod, PointLightStyle } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkSwiperPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkSwiperPeer.ts index f2fe9922b..d2ca8220e 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkSwiperPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkSwiperPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { VP, Length, ResourceColor } from "./../ArkUnitsInterfaces" import { SwiperAutoFill, ArrowStyle, SwiperAttribute, SwiperInterface, IndicatorStyle, SwiperAnimationEvent, OnSwiperAnimationStartCallback, OnSwiperAnimationEndCallback, OnSwiperGestureSwipeCallback, SwiperDisplayMode, SwiperNestedScrollMode, SwiperContentAnimatedTransition, ContentDidScrollCallback } from "./../ArkSwiperInterfaces" @@ -38,7 +38,7 @@ import { SwiperContentTransitionProxy } from "./../ArkSwiperContentTransitionPro import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { SubTabBarStyle } from "./../ArkSubTabBarStyleBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkSymbolglyphPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkSymbolglyphPeer.ts index f767cb913..baa0d6419 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkSymbolglyphPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkSymbolglyphPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { Resource } from "./../ArkResourceInterfaces" import { SymbolGlyphAttribute, SymbolGlyphInterface, SymbolEffect, EffectScope, EffectDirection, ScaleSymbolEffect, EffectFillStyle, HierarchicalSymbolEffect, AppearSymbolEffect, DisappearSymbolEffect, BounceSymbolEffect, ReplaceSymbolEffect, PulseSymbolEffect, SymbolEffectStrategy, SymbolRenderingStrategy } from "./../ArkSymbolglyphInterfaces" @@ -32,7 +32,7 @@ import { Color, FontWeight } from "./../ArkEnumsInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkTabContentPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkTabContentPeer.ts index e82a5bb10..24acc899f 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkTabContentPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkTabContentPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { Length, ResourceColor } from "./../ArkUnitsInterfaces" import { Resource } from "./../ArkResourceInterfaces" @@ -35,7 +35,7 @@ import { BottomTabBarStyle } from "./../ArkBottomTabBarStyleBuilder" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkTabsPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkTabsPeer.ts index 8764aee62..5a0d280ba 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkTabsPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkTabsPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { BarPosition, TabsOptions, TabsAttribute, TabsInterface, BarMode } from "./../ArkTabsInterfaces" import { TabsController } from "./../ArkTabsControllerMaterialized" @@ -32,7 +32,7 @@ import { Resource } from "./../ArkResourceInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkTestPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkTestPeer.ts index 0c299f82c..377087336 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkTestPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkTestPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { BooleanInterfaceDTS, NumberInterfaceDTS, StringInterfaceDTS, UnionInterfaceDTS, UnionOptionalInterfaceDTS, Tuple_Number_Boolean, TupleInterfaceDTS, Tuple_Boolean_Number, OptionInterfaceDTS, ArrayRefNumberInterfaceDTS, ArrayRefTuplesInterfaceDTS, ClassDTS, ClassWithConstructorDTS, ClassWithConstructorAndFieldsDTS, TestAttribute, TestInterface, EnumDTS, Tuple_Number_String_EnumDTS, Tuple_Number_String_Boolean_EnumDTS, Type_TestAttribute_testTupleUnion_value } from "./../ArkTestInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" @@ -36,7 +36,7 @@ import { ClassWithConstructorAndWithoutParamsDTS } from "./../ArkClassWithConstr import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkTextInputPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkTextInputPeer.ts index 268569d15..e9bc3ca92 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkTextInputPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkTextInputPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ResourceColor, ResourceStr, Dimension, PX, VP, FP, LPX, Percentage, Font, Length } from "./../ArkUnitsInterfaces" import { Color, TextOverflow, FontStyle, FontWeight, CopyOptions, TextAlign, TextContentStyle, BarState, WordBreak, LineBreakStrategy, TextHeightAdaptivePolicy } from "./../ArkEnumsInterfaces" @@ -37,7 +37,7 @@ import { EditMenuOptions } from "./../ArkEditMenuOptionsMaterialized" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkTextPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkTextPeer.ts index a27243741..173f6bc9d 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkTextPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkTextPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { TextController } from "./../ArkTextControllerMaterialized" import { TextOptions, TextOverflowOptions, TextAttribute, TextInterface } from "./../ArkTextInterfaces" @@ -33,7 +33,7 @@ import { Font, ResourceColor } from "./../ArkUnitsInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkTextPickerPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkTextPickerPeer.ts index 535d1a614..05010a8ae 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkTextPickerPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkTextPickerPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { Resource } from "./../ArkResourceInterfaces" import { TextPickerRangeContent, TextCascadePickerRangeContent, TextPickerOptions, TextPickerAttribute, TextPickerInterface, DividerOptions, TextPickerScrollStopCallback, TextPickerResult, TextPickerDialogOptions } from "./../ArkTextPickerInterfaces" @@ -33,7 +33,7 @@ import { DialogAlignment } from "./../ArkAlertDialogInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkTogglePeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkTogglePeer.ts index d72cbad21..68bbe4aa6 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkTogglePeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkTogglePeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { ToggleType, ToggleOptions, ToggleAttribute, ToggleInterface } from "./../ArkToggleInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkUINodeType.ts b/arkoala-arkts/arkui/src/generated/peers/ArkUINodeType.ts index f46169dea..6d088054d 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkUINodeType.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkUINodeType.ts @@ -1,14 +1,14 @@ export enum ArkUINodeType { - Root = 0, + Root, ComponentRoot, CustomNode, BaseSpan, - Blank = 8, + Blank, Button, CalendarPicker, Canvas, Circle, - Column = 16, + Column, Common, CommonMethod, CommonShapeMethod, @@ -45,7 +45,7 @@ export enum ArkUINodeType { TabContent, Tabs, Test, - Text = 102, + Text, TextInput, TextPicker, Toggle, diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkVectorPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkVectorPeer.ts index 3a3f89295..9b1aae644 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkVectorPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkVectorPeer.ts @@ -18,18 +18,18 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { Vector1, Vector2, VectorAttribute, VectorInterface } from "./../ArkVectorInterfaces" import { CommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/ArkWebPeer.ts b/arkoala-arkts/arkui/src/generated/peers/ArkWebPeer.ts index d7452ad70..0f99ccbe2 100644 --- a/arkoala-arkts/arkui/src/generated/peers/ArkWebPeer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/ArkWebPeer.ts @@ -18,11 +18,11 @@ import { int32 } from "@koalaui/common" import { nullptr, KPointer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { isResource, isInstanceOf, runtimeType, RuntimeType } from "./SerializerBase" import { Serializer } from "./Serializer" import { ArkUINodeType } from "./ArkUINodeType" import { ComponentBase } from "../ComponentBase" import { NativeModule } from "#components" +import { isResource, isInstanceOf, runtimeType, RuntimeType } from "@koalaui/arkts-framework" import { ArkCommonMethodPeer, ArkCommonMethodAttributes } from "./ArkCommonPeer" import { WebResourceResponse } from "./../ArkWebResourceResponseMaterialized" import { OnHttpErrorReceiveEvent, NativeEmbedInfo, NativeEmbedDataInfo, WebAttribute, WebInterface, RenderExitReason, OnRenderExitedEvent, Literal_Object_detail } from "./../ArkWebInterfaces" @@ -30,7 +30,7 @@ import { CommonMethod } from "./../ArkCommonInterfaces" import { GestureName, GestureComponent } from "./../shared/generated-utils" import { CallbackKind } from "./CallbackKind" import { TypeChecker } from "#components" -import { registerCallback } from "./SerializerBase" +import { registerCallback } from "@koalaui/arkts-framework" import { wrapCallback } from "@koalaui/interop" import { MaterializedBase } from "./../MaterializedBase" import { DotIndicator } from "./../ArkDotIndicatorBuilder" diff --git a/arkoala-arkts/arkui/src/generated/peers/CallbackDeserializeCall.ts b/arkoala-arkts/arkui/src/generated/peers/CallbackDeserializeCall.ts index 3e3ac91d4..4ca4b2338 100644 --- a/arkoala-arkts/arkui/src/generated/peers/CallbackDeserializeCall.ts +++ b/arkoala-arkts/arkui/src/generated/peers/CallbackDeserializeCall.ts @@ -45,7 +45,6 @@ import { DrawingRenderingContext } from "./../ArkDrawingRenderingContextMaterial import { CanvasAttribute, DrawingCanvas, Size, RenderingContextSettings, ImageData } from "./../ArkCanvasInterfaces" import { CircleOptions, CircleAttribute } from "./../ArkCircleInterfaces" import { ColumnOptions, ColumnAttribute } from "./../ArkColumnInterfaces" -import { MethodDecorator } from "./../ArkStdlibInterfaces" import { ICurve } from "./../ArkICurveMaterialized" import { BaseGestureEvent, GestureJudgeResult, GestureInfo, GestureControl_GestureType, GestureMask, GestureHandler, GesturePriority, TapGestureInterface, LongPressGestureInterface, PanGestureInterface, PinchGestureInterface, SwipeGestureInterface, RotationGestureInterface, GestureGroupInterface, FingerInfo, GestureEvent, GestureInterface, TapGestureParameters, Literal_Number_duration_fingers_Boolean_repeat, PanDirection, Literal_Number_distance_fingers_PanDirection_direction, SwipeDirection, Literal_Number_fingers_speed_SwipeDirection_direction, Literal_Number_distance_fingers, Literal_Number_angle_fingers, GestureMode, TapGestureHandler, TapGestureHandlerOptions, LongPressGestureHandler, LongPressGestureHandlerOptions, PanGestureHandler, PanGestureHandlerOptions, SwipeGestureHandler, SwipeGestureHandlerOptions, PinchGestureHandler, PinchGestureHandlerOptions, RotationGestureHandler, RotationGestureHandlerOptions } from "./../ArkGestureInterfaces" import { GestureRecognizer } from "./../ArkGestureRecognizerMaterialized" @@ -1174,7 +1173,7 @@ export function deserializeAndCallCallback(thisDeserializer: Deserializer) { case 7/*CallbackKind.Kind_Callback_Boolean_HoverEvent_Void*/: return deserializeAndCallCallback_Boolean_HoverEvent_Void(thisDeserializer); case 8/*CallbackKind.Kind_Callback_Boolean_Void*/: return deserializeAndCallCallback_Boolean_Void(thisDeserializer); case 9/*CallbackKind.Kind_Callback_Callback_Any_Void*/: return deserializeAndCallCallback_Callback_Any_Void(thisDeserializer); - case 19/*CallbackKind.Kind_Callback_ClickEvent_Void*/: return deserializeAndCallCallback_ClickEvent_Void(thisDeserializer); + case 10/*CallbackKind.Kind_Callback_ClickEvent_Void*/: return deserializeAndCallCallback_ClickEvent_Void(thisDeserializer); case 11/*CallbackKind.Kind_Callback_CopyEvent_Void*/: return deserializeAndCallCallback_CopyEvent_Void(thisDeserializer); case 12/*CallbackKind.Kind_Callback_CutEvent_Void*/: return deserializeAndCallCallback_CutEvent_Void(thisDeserializer); case 13/*CallbackKind.Kind_Callback_DeleteValue_Boolean*/: return deserializeAndCallCallback_DeleteValue_Boolean(thisDeserializer); @@ -1183,7 +1182,7 @@ export function deserializeAndCallCallback(thisDeserializer: Deserializer) { case 16/*CallbackKind.Kind_Callback_DismissDialogAction_Void*/: return deserializeAndCallCallback_DismissDialogAction_Void(thisDeserializer); case 17/*CallbackKind.Kind_Callback_DismissPopupAction_Void*/: return deserializeAndCallCallback_DismissPopupAction_Void(thisDeserializer); case 18/*CallbackKind.Kind_Callback_DismissSheetAction_Void*/: return deserializeAndCallCallback_DismissSheetAction_Void(thisDeserializer); - case 10/*CallbackKind.Kind_Callback_DragEvent_String_Union_CustomBuilder_DragItemInfo*/: return deserializeAndCallCallback_DragEvent_String_Union_CustomBuilder_DragItemInfo(thisDeserializer); + case 19/*CallbackKind.Kind_Callback_DragEvent_String_Union_CustomBuilder_DragItemInfo*/: return deserializeAndCallCallback_DragEvent_String_Union_CustomBuilder_DragItemInfo(thisDeserializer); case 20/*CallbackKind.Kind_Callback_DragEvent_String_Void*/: return deserializeAndCallCallback_DragEvent_String_Void(thisDeserializer); case 21/*CallbackKind.Kind_Callback_FormCallbackInfo_Void*/: return deserializeAndCallCallback_FormCallbackInfo_Void(thisDeserializer); case 22/*CallbackKind.Kind_Callback_GestureEvent_Void*/: return deserializeAndCallCallback_GestureEvent_Void(thisDeserializer); diff --git a/arkoala-arkts/arkui/src/generated/peers/Deserializer.ts b/arkoala-arkts/arkui/src/generated/peers/Deserializer.ts index dce454a8d..d032dec06 100644 --- a/arkoala-arkts/arkui/src/generated/peers/Deserializer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/Deserializer.ts @@ -50,7 +50,6 @@ import { DrawingRenderingContext, DrawingRenderingContextInternal } from "./../A import { CanvasAttribute, DrawingCanvas, Size, RenderingContextSettings, ImageData } from "./../ArkCanvasInterfaces" import { CircleOptions, CircleAttribute } from "./../ArkCircleInterfaces" import { ColumnOptions, ColumnAttribute } from "./../ArkColumnInterfaces" -import { MethodDecorator } from "./../ArkStdlibInterfaces" import { ICurve, ICurveInternal } from "./../ArkICurveMaterialized" import { BaseGestureEvent, GestureJudgeResult, GestureInfo, GestureControl_GestureType, GestureMask, GestureHandler, GesturePriority, TapGestureInterface, LongPressGestureInterface, PanGestureInterface, PinchGestureInterface, SwipeGestureInterface, RotationGestureInterface, GestureGroupInterface, FingerInfo, GestureEvent, GestureInterface, TapGestureParameters, Literal_Number_duration_fingers_Boolean_repeat, PanDirection, Literal_Number_distance_fingers_PanDirection_direction, SwipeDirection, Literal_Number_fingers_speed_SwipeDirection_direction, Literal_Number_distance_fingers, Literal_Number_angle_fingers, GestureMode, TapGestureHandler, TapGestureHandlerOptions, LongPressGestureHandler, LongPressGestureHandlerOptions, PanGestureHandler, PanGestureHandlerOptions, SwipeGestureHandler, SwipeGestureHandlerOptions, PinchGestureHandler, PinchGestureHandlerOptions, RotationGestureHandler, RotationGestureHandlerOptions } from "./../ArkGestureInterfaces" import { GestureRecognizer, GestureRecognizerInternal } from "./../ArkGestureRecognizerMaterialized" @@ -149,6 +148,45 @@ import { LayoutManagerInternal } from "./../ArkLayoutManagerMaterialized" import { TextPickerDialogInternal } from "./../ArkTextPickerDialogMaterialized" export class Deserializer extends DeserializerBase { + + readLength(): Length | undefined { + this.checkCapacity(1) + const valueType = this.readInt8() + if (valueType == RuntimeType.OBJECT) { + return ({ + id: this.readInt32(), + bundleName: "", + moduleName: "" + }) as Resource + } else if (valueType == RuntimeType.STRING) { + return this.readString() + } else if (valueType == RuntimeType.NUMBER) { + return (this.readFloat32() as number) + } else { + return undefined + } + } + + static lengthUnitFromInt(unit: int32): string { + let suffix: string + switch (unit) { + case 0: + suffix = "px" + break + case 1: + suffix = "vp" + break + case 3: + suffix = "%" + break + case 4: + suffix = "lpx" + break + default: + suffix = "" + } + return suffix + } constructor(data: KUint8ArrayPtr, length: int32) { super(data, length) } diff --git a/arkoala-arkts/arkui/src/generated/peers/Serializer.ts b/arkoala-arkts/arkui/src/generated/peers/Serializer.ts index 04c53b74f..b11ec205f 100644 --- a/arkoala-arkts/arkui/src/generated/peers/Serializer.ts +++ b/arkoala-arkts/arkui/src/generated/peers/Serializer.ts @@ -13,8 +13,8 @@ * limitations under the License. */ -import { SerializerBase, Tags, RuntimeType, runtimeType, isResource, isInstanceOf } from "./SerializerBase" import { int32 } from "@koalaui/common" +import { SerializerBase, Tags, RuntimeType, runtimeType, isResource, isInstanceOf } from "@koalaui/arkts-framework" import { MaterializedBase } from "./../MaterializedBase" import { NativeModule } from "#components" import { CallbackKind } from "./CallbackKind" @@ -48,7 +48,6 @@ import { DrawingRenderingContext, DrawingRenderingContextInternal } from "./../A import { CanvasAttribute, DrawingCanvas, Size, RenderingContextSettings, ImageData } from "./../ArkCanvasInterfaces" import { CircleOptions, CircleAttribute } from "./../ArkCircleInterfaces" import { ColumnOptions, ColumnAttribute } from "./../ArkColumnInterfaces" -import { MethodDecorator } from "./../ArkStdlibInterfaces" import { ICurve, ICurveInternal } from "./../ArkICurveMaterialized" import { BaseGestureEvent, GestureJudgeResult, GestureInfo, GestureControl_GestureType, GestureMask, GestureHandler, GesturePriority, TapGestureInterface, LongPressGestureInterface, PanGestureInterface, PinchGestureInterface, SwipeGestureInterface, RotationGestureInterface, GestureGroupInterface, FingerInfo, GestureEvent, GestureInterface, TapGestureParameters, Literal_Number_duration_fingers_Boolean_repeat, PanDirection, Literal_Number_distance_fingers_PanDirection_direction, SwipeDirection, Literal_Number_fingers_speed_SwipeDirection_direction, Literal_Number_distance_fingers, Literal_Number_angle_fingers, GestureMode, TapGestureHandler, TapGestureHandlerOptions, LongPressGestureHandler, LongPressGestureHandlerOptions, PanGestureHandler, PanGestureHandlerOptions, SwipeGestureHandler, SwipeGestureHandlerOptions, PinchGestureHandler, PinchGestureHandlerOptions, RotationGestureHandler, RotationGestureHandlerOptions } from "./../ArkGestureInterfaces" import { GestureRecognizer, GestureRecognizerInternal } from "./../ArkGestureRecognizerMaterialized" @@ -146,6 +145,20 @@ import { StyledStringControllerInternal } from "./../ArkStyledStringControllerMa import { LayoutManagerInternal } from "./../ArkLayoutManagerMaterialized" import { TextPickerDialogInternal } from "./../ArkTextPickerDialogMaterialized" export class Serializer extends SerializerBase { + + writeLength(value: Length|undefined) { + this.checkCapacity(1) + let valueType = runtimeType(value) + this.writeInt8(valueType as int32) + // TODO: without explicitly checking value for undefined, leads to segmentation fault + if (valueType == RuntimeType.NUMBER && value !== undefined) { + this.writeFloat32(value as float32) + } else if (valueType == RuntimeType.STRING) { + this.writeString(value as string) + } else if (valueType == RuntimeType.OBJECT) { + this.writeInt32((value as Resource).id as int32) + } + } private static cache?: Serializer | undefined = undefined static hold(): Serializer { if (!(Serializer.cache != undefined)) diff --git a/arkoala-arkts/arkui/src/generated/ts/type_check.ts b/arkoala-arkts/arkui/src/generated/ts/type_check.ts index dd210ab58..57a1d9be5 100644 --- a/arkoala-arkts/arkui/src/generated/ts/type_check.ts +++ b/arkoala-arkts/arkui/src/generated/ts/type_check.ts @@ -9,7 +9,7 @@ import { CalendarPickerInterface, CalendarPickerAttribute, CalendarAlign } from import { ImageData, RenderingContextSettings, DrawingCanvas, Size, CanvasInterface, CanvasAttribute, CanvasFillRule } from "./../ArkCanvasInterfaces" import { CircleOptions, CircleInterface, CircleAttribute } from "./../ArkCircleInterfaces" import { ColumnOptions, ColumnInterface, ColumnAttribute } from "./../ArkColumnInterfaces" -import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, IMonitor, AnimatableArithmetic, Configuration, Rectangle, ExpectedFrameRateRange, AnimateParam, MotionPathOptions, sharedTransitionOptions, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEffects, PreviewParams, ItemDragInfo, DragItemInfo, EventTarget, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, BlurOptions, BlurStyleOptions, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowOptions, MultiShadowOptions, BaseEvent, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, DragEvent, KeyEvent, BindOptions, DismissContentCoverAction, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, ContextMenuAnimationOptions, ContextMenuOptions, MenuOptions, TouchTestInfo, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, MenuElement, CommonConfiguration, DragPreviewOptions, DragInteractionOptions, InvertOptions, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, Type_CommonMethod_linearGradient_value, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, CommonMethod, CommonAttribute, CommonInterface, OverlayOptions, OverlayOffset, CommonShapeMethod, PixelRoundPolicy, LinearGradientBlurOptions, MotionBlurAnchor, MotionBlurOptions, LayoutBorderInfo, LayoutInfo, GeometryInfo, Measurable, SizeResult, MeasureResult, Literal_Empty, CustomComponent, RectResult, CaretOffset, ScrollableCommonMethod, ScrollResult, EdgeEffectOptions, BackgroundBrightnessOptions, PointLightStyle, LightSource, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, SelectionOptions, FinishCallbackType, TouchTestStrategy, TransitionHierarchyStrategy, ChainStyle, TransitionEdge, EffectType, PreDragStatus, SourceType, SourceTool, RepeatMode, BlurStyle, BlurStyleActivePolicy, ThemeColorMode, AdaptiveColor, ModalTransition, ShadowType, ShadowStyle, SafeAreaType, SafeAreaEdge, LayoutSafeAreaType, LayoutSafeAreaEdge, SheetSize, DragBehavior, DragResult, BlendMode, BlendApplyType, SheetType, SheetMode, ScrollSizeMode, SheetKeyboardAvoidMode, DismissReason, MenuPreviewMode, OutlineStyle, DragPreviewMode, MenuPolicy, ContentClipMode, KeyboardAvoidMode, HoverModeAreaType, IMonitorValue, CustomBuilder, UnifiedData, Summary, IntentionCode, UIContext, AnimationRange, SymbolGlyphModifier, ImageModifier, VisualEffect, Filter, AccessibilityCallback, UniformDataType, CircleShape, EllipseShape, PathShape, RectShape, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, ComponentContent, Blender, VisibleAreaChangeCallback, FractionStop, Theme, Layoutable, NavDestinationInfo, NavigationInfo, RouterPageInfo, HoverCallback, MonitorDecorator, Context, PointerStyle, Tuple_Number_Number, Type_SheetOptions_detents, Tuple_T, Tuple_ResourceColor_Number, Tuple_Length_Length, DrawContext, OnWillScrollCallback, OnScrollCallback, OnMoveHandler } from "./../ArkCommonInterfaces" +import { ComponentOptions, InputCounterOptions, TextDecorationOptions, ProvideOptions, IMonitor, AnimatableArithmetic, Configuration, Rectangle, ExpectedFrameRateRange, AnimateParam, MotionPathOptions, sharedTransitionOptions, GeometryTransitionOptions, TranslateOptions, ScaleOptions, Literal_String_anchor_HorizontalAlign_align, Literal_String_anchor_VerticalAlign_align, AlignRuleOption, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, LocalizedAlignRuleOptions, RotateOptions, TransitionOptions, Literal_TransitionEffect_appear_disappear, TransitionEffects, PreviewParams, ItemDragInfo, DragItemInfo, EventTarget, BackgroundBlurStyleOptions, ForegroundBlurStyleOptions, BlurOptions, BlurStyleOptions, BackgroundEffectOptions, ForegroundEffectOptions, PickerTextStyle, PickerDialogButtonStyle, ShadowOptions, MultiShadowOptions, BaseEvent, BorderImageOption, ClickEvent, HoverEvent, MouseEvent, AccessibilityHoverEvent, TouchObject, HistoricalPoint, TouchEvent, DragEvent, KeyEvent, BindOptions, DismissContentCoverAction, ContentCoverOptions, SheetTitleOptions, SheetDismiss, DismissSheetAction, SpringBackAction, SheetOptions, StateStyles, PopupMessageOptions, DismissPopupAction, Literal_String_value_Callback_Void_action, Literal_Boolean_isVisible, Literal_ResourceColor_color, PopupOptions, CustomPopupOptions, ContextMenuAnimationOptions, ContextMenuOptions, MenuOptions, TouchTestInfo, TouchResult, PixelStretchEffectOptions, ClickEffect, FadingEdgeOptions, NestedScrollOptions, MenuElement, CommonConfiguration, DragPreviewOptions, DragInteractionOptions, InvertOptions, Literal_Number_offset_span, Literal_Union_Number_Literal_Number_offset_span_lg_md_sm_xs, Type_CommonMethod_linearGradient_value, Type_CommonMethod_sweepGradient_value, Type_CommonMethod_radialGradient_value, Literal_Alignment_align, CommonMethod, CommonAttribute, CommonInterface, OverlayOptions, OverlayOffset, CommonShapeMethod, PixelRoundPolicy, LinearGradientBlurOptions, MotionBlurAnchor, MotionBlurOptions, LayoutBorderInfo, LayoutInfo, GeometryInfo, Measurable, SizeResult, MeasureResult, Literal_Empty, CustomComponent, RectResult, CaretOffset, ScrollableCommonMethod, ScrollResult, EdgeEffectOptions, BackgroundBrightnessOptions, PointLightStyle, LightSource, WrappedBuilder, KeyframeAnimateParam, KeyframeState, Callback, VisibleAreaEventOptions, UICommonEvent, UIGestureEvent, SelectionOptions, FinishCallbackType, TouchTestStrategy, TransitionHierarchyStrategy, ChainStyle, TransitionEdge, EffectType, PreDragStatus, SourceType, SourceTool, RepeatMode, BlurStyle, BlurStyleActivePolicy, ThemeColorMode, AdaptiveColor, ModalTransition, ShadowType, ShadowStyle, SafeAreaType, SafeAreaEdge, LayoutSafeAreaType, LayoutSafeAreaEdge, SheetSize, DragBehavior, DragResult, BlendMode, BlendApplyType, SheetType, SheetMode, ScrollSizeMode, SheetKeyboardAvoidMode, DismissReason, MenuPreviewMode, OutlineStyle, DragPreviewMode, MenuPolicy, ContentClipMode, KeyboardAvoidMode, HoverModeAreaType, IMonitorValue, CustomBuilder, UnifiedData, Summary, IntentionCode, UIContext, AnimationRange, SymbolGlyphModifier, ImageModifier, VisualEffect, Filter, AccessibilityCallback, UniformDataType, CircleShape, EllipseShape, PathShape, RectShape, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, ComponentContent, Blender, VisibleAreaChangeCallback, FractionStop, Theme, Layoutable, NavDestinationInfo, NavigationInfo, RouterPageInfo, HoverCallback, Context, PointerStyle, Tuple_Number_Number, Type_SheetOptions_detents, Tuple_T, Tuple_ResourceColor_Number, Tuple_Length_Length, DrawContext, OnWillScrollCallback, OnScrollCallback, OnMoveHandler } from "./../ArkCommonInterfaces" import { CounterInterface, CounterAttribute } from "./../ArkCounterInterfaces" import { DividerInterface, DividerAttribute } from "./../ArkDividerInterfaces" import { EllipseOptions, EllipseInterface, EllipseAttribute } from "./../ArkEllipseInterfaces" @@ -64,7 +64,6 @@ import { Padding, LocalizedPadding, EdgeWidths, LocalizedEdgeWidths, EdgeOutline import { Vector1, Vector2, VectorInterface, VectorAttribute } from "./../ArkVectorInterfaces" import { OnHttpErrorReceiveEvent, NativeEmbedInfo, NativeEmbedDataInfo, WebInterface, OnRenderExitedEvent, Literal_Object_detail, WebAttribute, RenderExitReason } from "./../ArkWebInterfaces" import { INTERFACE_CanvasPattern, INTERFACE_ICurve, INTERFACE_PixelMapMock, INTERFACE_AttributeModifier, INTERFACE_GestureModifier, INTERFACE_NavDestinationContext, INTERFACE_NavigationTransitionProxy, INTERFACE_SwiperContentTransitionProxy, INTERFACE_TextBaseController, INTERFACE_TextEditControllerEx, INTERFACE_StyledStringController, INTERFACE_LayoutManager, INTERFACE_EditMenuOptions, INTERFACE_UIExtensionProxy, IMPORT_LengthMetricsUnit_FROM_api_arkui_Graphics, IMPORT_default_FROM_api_application_Context, IMPORT_default_PointerStyle_FROM_api_ohos_multimodalInput_pointer, IMPORT_default_UnifiedData_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_Summary_FROM_api_ohos_data_unifiedDataChannel, IMPORT_default_UniformDataType_FROM_api_ohos_data_uniformTypeDescriptor, IMPORT_IntentionCode_FROM_api_ohos_multimodalInput_intentionCode, IMPORT_UIContext_FROM_api_ohos_arkui_UIContext, IMPORT_SymbolGlyphModifier_FROM_api_arkui_SymbolGlyphModifier, IMPORT_ImageModifier_FROM_api_arkui_ImageModifier, IMPORT_CircleShape_FROM_api_ohos_arkui_shape, IMPORT_EllipseShape_FROM_api_ohos_arkui_shape, IMPORT_PathShape_FROM_api_ohos_arkui_shape, IMPORT_RectShape_FROM_api_ohos_arkui_shape, IMPORT_default_VisualEffect_FROM_api_ohos_graphics_uiEffect, IMPORT_default_Filter_FROM_api_ohos_graphics_uiEffect, IMPORT_ComponentContent_T_FROM_api_arkui_ComponentContent, IMPORT_default_Blender_FROM_api_ohos_graphics_uiEffect, IMPORT_default_NavDestinationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_NavigationInfo_FROM_api_ohos_arkui_observer, IMPORT_default_RouterPageInfo_FROM_api_ohos_arkui_observer, IMPORT_DrawContext_FROM_api_arkui_Graphics, IMPORT_Theme_FROM_api_ohos_arkui_theme, IMPORT_ErrorCallback_FROM_api_ohos_base, IMPORT_ColorMetrics_FROM_api_arkui_Graphics, IMPORT_DrawableDescriptor_FROM_api_ohos_arkui_drawableDescriptor, IMPORT_default_ColorFilter_FROM_api_ohos_graphics_drawing, IMPORT_default_ResolutionQuality_FROM_api_ohos_multimedia_image, IMPORT_default_Lattice_FROM_api_ohos_graphics_drawing, IMPORT_default_SystemBarStyle_FROM_api_ohos_window, IMPORT_default_Affinity_FROM_api_ohos_graphics_text, IMPORT_default_LineMetrics_FROM_api_ohos_graphics_text, IMPORT_default_TextBox_FROM_api_ohos_graphics_text } from "./../SyntheticDeclarations" -import { MethodDecorator } from "./../ArkStdlibInterfaces" import { Resource } from "./../ArkResourceInterfaces" import { TransitionEffect } from "./../ArkTransitionEffectMaterialized" import { CanvasRenderingContext2D } from "./../ArkCanvasRenderingContext2DMaterialized" diff --git a/arkoala-arkts/framework/arktsconfig-unmemoized.json b/arkoala-arkts/framework/arktsconfig-unmemoized.json new file mode 100644 index 000000000..b5f06f5e3 --- /dev/null +++ b/arkoala-arkts/framework/arktsconfig-unmemoized.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "outDir": "build/abc", + "baseUrl": ".", + "paths": { + "#components": ["../arkui/build/unmemoized/src/generated/arkts"], + "#arkcompat/*": ["../../arkoala/arkui-common/src/arkts/*"], + "@koalaui/interop": ["../../interop/src/arkts"], + "@koalaui/common": ["../../incremental/common/src"], + "@koalaui/compat": ["../../incremental/compat/src/arkts"], + "@koalaui/runtime": ["../../incremental/runtime/build/unmemoized/src"], + "#language": [ + "./src/arkts" + ] + } + }, + "include": [ + "build/unmemoized/src/**/*.ts" + ], + "exclude": [ + "**/index.ts", + "build/unmemoized/src/typescript/*.ts" + ] +} diff --git a/arkoala-arkts/framework/package.json b/arkoala-arkts/framework/package.json new file mode 100644 index 000000000..23eeb38bb --- /dev/null +++ b/arkoala-arkts/framework/package.json @@ -0,0 +1,14 @@ +{ + "name": "@koalaui/arkts-framework", + "version": "1.4.1", + "description": "", + "main": "build/junk/src/index.js", + "types": "build/junk/src/index.d.ts", + "scripts": { + "clean": "rimraf build", + "clean:framework": "npm run clean", + "build:framework:inc": "fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name framework && ninja -f build/build.ninja", + "build:framework": "npm run unmemoize && npm run build:framework:inc", + "unmemoize": "rm -rf ./build && memo-tsc -b ./tsconfig-unmemoize.json" + } +} diff --git a/arkoala-arkts/framework/src/DeserializerBase.ts b/arkoala-arkts/framework/src/DeserializerBase.ts index 589557795..c1ed4d9c3 100644 --- a/arkoala-arkts/framework/src/DeserializerBase.ts +++ b/arkoala-arkts/framework/src/DeserializerBase.ts @@ -16,8 +16,6 @@ import { float32, int32, int64, float32FromBits } from "@koalaui/common" import { pointer, KUint8ArrayPtr, KBuffer } from "@koalaui/interop" import { Tags, CallbackResource} from "./SerializerBase"; -//import { Length } from "../ArkUnitsInterfaces" -//import { Resource } from "../ArkResourceInterfaces" import { NativeModule } from "#language" export class DeserializerBase { @@ -63,7 +61,7 @@ export class DeserializerBase { this.position = 0 } - private checkCapacity(value: int32) { + protected checkCapacity(value: int32) { if (value > this.length) { throw new Error(`${value} is less than remaining buffer length`) } @@ -137,11 +135,6 @@ export class DeserializerBase { return id } - // readMaterialized(): object { - // const ptr = this.readPointer() - // return { ptr: ptr } - // } - readCallbackResource(): CallbackResource { return ({ resourceId: this.readInt32(), @@ -184,46 +177,6 @@ export class DeserializerBase { throw new Error(`Unknown number tag: ${tag}`) } } - /* - readLength(): Length | undefined { - this.checkCapacity(1) - const valueType = this.readInt8() - if (valueType == RuntimeType.OBJECT) { - return ({ - id: this.readInt32(), - bundleName: "", - moduleName: "" - }) as Resource - } else if (valueType == RuntimeType.STRING) { - return this.readString() - } else if (valueType == RuntimeType.NUMBER) { - return (this.readFloat32() as number) - } else { - return undefined - } - } - - static lengthUnitFromInt(unit: int32): string { - let suffix: string - switch (unit) { - case 0: - suffix = "px" - break - case 1: - suffix = "vp" - break - case 3: - suffix = "%" - break - case 4: - suffix = "lpx" - break - default: - suffix = "" - } - return suffix - } */ - readBuffer(): ArrayBuffer { this.readPointer() const length = this.readInt64() diff --git a/arkoala-arkts/framework/src/NativePeerNode.ts b/arkoala-arkts/framework/src/NativePeerNode.ts deleted file mode 100644 index 1f0983227..000000000 --- a/arkoala-arkts/framework/src/NativePeerNode.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 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 { int32 } from "@koalaui/common" -import { pointer } from "@koalaui/interop" -import { Finalizable } from "./Finalizable" -import { NativeModule } from "#language" - -export class NativePeerNode extends Finalizable { - constructor(ptr: pointer, finalizerPtr: pointer) { - super(ptr, finalizerPtr) - } - - static create(type: int32, id: int32, flags: int32): NativePeerNode { - const ptr = NativeModule._CreateNode(type as int32, id, flags) - return new NativePeerNode(ptr, NativeModule._GetNodeFinalizer()) - } - - dispose() { - NativeModule._DisposeNode(this.ptr); - } - - addChild(node: NativePeerNode) { - NativeModule._AddChild(this.ptr, node.ptr); - } - removeChild(node: NativePeerNode) { - NativeModule._RemoveChild(this.ptr, node.ptr); - } - insertChildBefore(node: NativePeerNode, sibling: NativePeerNode | undefined) { - NativeModule._InsertChildBefore(this.ptr, node.ptr, sibling == undefined ? 0 : sibling.ptr); - } - insertChildAfter(node: NativePeerNode, sibling: NativePeerNode | undefined) { - NativeModule._InsertChildAfter(this.ptr, node.ptr, sibling == undefined ? 0 : sibling.ptr); - } - insertChildAt(node: NativePeerNode, position: int32) { - NativeModule._InsertChildAt(this.ptr, node.ptr, position); - } - - dumpTree() { - NativeModule._DumpTreeNode(this.ptr); - } -} diff --git a/arkoala-arkts/framework/src/PeerNode.ts b/arkoala-arkts/framework/src/PeerNode.ts deleted file mode 100644 index ce0f3baf5..000000000 --- a/arkoala-arkts/framework/src/PeerNode.ts +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 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 { int32 } from "@koalaui/common" -import { IncrementalNode } from "@koalaui/runtime" -import { NativePeerNode } from "./NativePeerNode" - -export const PeerNodeType = 11 - -export class PeerNode extends IncrementalNode { - private static currentId: int32 = 1000 - - peer: NativePeerNode - private id: int32 = PeerNode.currentId++ - private static peerNodeMap = new Map() - - static findPeerByNativeId(id: number): PeerNode | undefined { - return PeerNode.peerNodeMap.get(id) - } - - constructor(type: int32, flags: int32, name: string) { - super(PeerNodeType) - this.peer = NativePeerNode.create(type, this.id, flags) - PeerNode.peerNodeMap.set(this.id, this) - this.onChildInserted = (child: IncrementalNode) => { - // TODO: rework to avoid search - let peer = findPeerNode(child) - if (peer) { - // Find the closest peer node backward. - let sibling: PeerNode | undefined = undefined - for (let node = child.previousSibling; node; node = node!.previousSibling) { - if (node!.isKind(PeerNodeType)) { - sibling = node as PeerNode - break - } - } - this.peer.insertChildAfter(peer.peer, sibling?.peer) - } - } - this.onChildRemoved = (child: IncrementalNode) => { - let peer = findPeerNode(child) - if (peer) { - this.peer.removeChild(peer.peer) - } - } - } - applyAttributes(attrs: Object) {} -} - - -function findPeerNode(node: IncrementalNode): PeerNode | undefined { - if (node.isKind(PeerNodeType)) return node as PeerNode - for (let child = node.firstChild; child; child = child!.nextSibling) { - let peer = findPeerNode(child!) - if (peer) return peer - } - return undefined -} \ No newline at end of file diff --git a/arkoala-arkts/framework/src/SerializerBase.ts b/arkoala-arkts/framework/src/SerializerBase.ts index 174a1afd3..885bd9782 100644 --- a/arkoala-arkts/framework/src/SerializerBase.ts +++ b/arkoala-arkts/framework/src/SerializerBase.ts @@ -14,8 +14,6 @@ */ import { float32, float64, int8, int32, int64 } from "@koalaui/common" import { pointer, KUint8ArrayPtr, KBuffer, ResourceId, ResourceHolder } from "@koalaui/interop" -//import { Length } from "../ArkUnitsInterfaces" -//import { Resource } from "../ArkResourceInterfaces" import { NativeModule } from "#language" /** @@ -63,24 +61,18 @@ export function runtimeType(value: Object|String|number|undefined|null): int32 { throw new Error(`bug: ${value} is ${type}`) } -export function registerCallback(value: object): int32 { +// TODO: remove those 3! +export function isInstanceOf(className: string, value: Object|undefined): boolean { // TODO: fix me! - return 42 + throw new Error("Must not be used") } -function registerMaterialized(value: Object): int32 { - // TODO: fix me! - return 42 +export function registerCallback(value: object): int32 { + throw new Error("Must not be used") } export function isResource(value: Object|undefined): boolean { - // TODO: fix me! - return false -} - -export function isInstanceOf(className: string, value: Object|undefined): boolean { - // TODO: fix me! - return false + throw new Error("Must not be used") } export interface CallbackResource { @@ -134,7 +126,7 @@ export class SerializerBase { return this.position } currentPosition(): int32 { return this.position } - private checkCapacity(value: int32) { + protected checkCapacity(value: int32) { if (value < 1) { throw new Error(`${value} is less than 1`) } @@ -214,7 +206,7 @@ export class SerializerBase { this.writeInt8(Tags.UNDEFINED as int32) } writeFunction(value: Object) { - this.writeInt32(registerCallback(value)) + this.writeInt32(666) } writeTag(tag: int32): void { this.buffer.set(this.position, tag as int8) @@ -288,30 +280,12 @@ export class SerializerBase { } this.position++ } - writeMaterialized(value: Object) { - this.writePointer(registerMaterialized(value)) - } writeString(value: string) { this.checkCapacity((4 + value.length * 4 + 1) as int32) // length, data let encodedLength = NativeModule._ManagedStringWrite(value, this.asArray(), this.position + 4) this.setInt32(this.position, encodedLength) this.position += encodedLength + 4 } - /* - // Length is an important common case. - writeLength(value: Length|undefined) { - this.checkCapacity(1) - let valueType = runtimeType(value) - this.writeInt8(valueType as int32) - // TODO: without explicitly checking value for undefined, leads to segmentation fault - if (valueType == RuntimeType.NUMBER && value !== undefined) { - this.writeFloat32(value as float32) - } else if (valueType == RuntimeType.STRING) { - this.writeString(value as string) - } else if (valueType == RuntimeType.OBJECT) { - this.writeInt32((value as Resource).id as int32) - } - } */ //TODO: Needs to be implemented writeBuffer(value: ArrayBuffer) { this.writePointer(42) diff --git a/arkoala-arkts/framework/src/arkts/NativeModuleBase.ts b/arkoala-arkts/framework/src/arkts/NativeModuleBase.ts new file mode 100644 index 000000000..d0efb7fda --- /dev/null +++ b/arkoala-arkts/framework/src/arkts/NativeModuleBase.ts @@ -0,0 +1,46 @@ +/* + * Copyright (c) 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 { pointer, KUint8ArrayPtr } from "@koalaui/interop" +import { int32 } from "@koalaui/common" + +export class NativeModule { + native static _ShowCrash(crash: string): void + native static startNativeLog(group: int32): void + native static stopNativeLog(group: int32): void + native static getNativeLog(group: int32): string + native static _NativeLog(log: string): void + native static _MeasureLayoutAndDraw(node: pointer): void + native static _LoadUserView(url: string, params: string): Object + native static _CheckArkoalaCallbackEvent(buffer: KUint8ArrayPtr, bufferSize: int32): int32 + native static _ReleaseArkoalaResource(id: int32): void + native static _ManagedStringWrite(value: string, array: KUint8ArrayPtr, offset: int32): int32 + native static _StringData(ptr: pointer, data: KUint8ArrayPtr, length: int32): void + native static _InvokeFinalizer(ptr: pointer, finalizer: pointer): void + native static _GetNodeFinalizer(): pointer + native static _DisposeNode(node: pointer): void + native static _AddChild(ptr1: pointer, ptr2: pointer): int32 + native static _CreateNode(type: int32, arg0: int32, arg1: int32): pointer + native static _InsertChildAfter(ptr0: pointer, ptr1: pointer, ptr2: pointer): int32 + native static _Utf8ToString(data: KUint8ArrayPtr, offset: int32, length: int32): string + native static _GetStringFinalizer(): pointer + native static _RemoveChild(ptr0: pointer, ptr2: pointer): void + native static _InsertChildBefore(ptr0: pointer, ptr1: pointer, ptr2: pointer): int32 + native static _StringLength(ptr1: pointer): int32 + native static _InsertChildAt(ptr0: pointer, ptr1: pointer, arg: int32): int32 + native static _DumpTreeNode(ptr0: pointer): void + native static _StartGroupedLog(index: int32): void + native static _StopGroupedLog(index: int32): void + native static _GetGroupedLog(index: int32): pointer +} \ No newline at end of file diff --git a/arkoala-arkts/framework/src/arkts/index.ts b/arkoala-arkts/framework/src/arkts/index.ts new file mode 100644 index 000000000..ecd518819 --- /dev/null +++ b/arkoala-arkts/framework/src/arkts/index.ts @@ -0,0 +1 @@ +export * from "./NativeModuleBase" \ No newline at end of file diff --git a/arkoala-arkts/framework/src/index.ts b/arkoala-arkts/framework/src/index.ts new file mode 100644 index 000000000..b7bad24f4 --- /dev/null +++ b/arkoala-arkts/framework/src/index.ts @@ -0,0 +1,8 @@ +export * from "./Application" +export * from "./CallbacksChecker" +export * from "./Events" +export * from "./NativePeerNode" +export * from "./PeerNode" +export * from "./SerializerBase" +export * from "./UserView" +export * from "./Finalizable" \ No newline at end of file diff --git a/arkoala-arkts/framework/src/typescript/NativeModuleBase.ts b/arkoala-arkts/framework/src/typescript/NativeModuleBase.ts new file mode 100644 index 000000000..f445492cf --- /dev/null +++ b/arkoala-arkts/framework/src/typescript/NativeModuleBase.ts @@ -0,0 +1,46 @@ +/* + * Copyright (c) 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 { pointer, KUint8ArrayPtr, KBuffer,nullptr } from "@koalaui/interop" +import { int32 } from "@koalaui/common" + +export class NativeModule { + static _ShowCrash(crash: string): void {} + static startNativeLog(group: int32): void {} + static stopNativeLog(group: int32): void {} + static getNativeLog(group: int32): string { throw new Error() } + static _NativeLog(log: string): void {} + static _MeasureLayoutAndDraw(node: pointer): void {} + static _LoadUserView(url: string, params: string): Object { return new Object() } + static _CheckArkoalaCallbackEvent(buffer: KUint8ArrayPtr, bufferSize: int32): int32 {} + static _ReleaseArkoalaResource(id: int32): void {} + static _ManagedStringWrite(value: string, array: KUint8ArrayPtr, offset: int32): int32 { return 0 } + static _StringData(ptr: pointer, data: KUint8ArrayPtr, length: int32): void {} + static _InvokeFinalizer(ptr: pointer, finalizer: pointer): void {} + static _GetNodeFinalizer(): pointer { return nullptr } + static _DisposeNode(node: pointer): void {} + static _AddChild(ptr1: pointer, ptr2: pointer): int32 { return 0 } + static _CreateNode(type: int32, arg0: int32, arg1: int32): pointer { return nullptr } + static _InsertChildAfter(ptr0: pointer, ptr1: pointer, ptr2: pointer): int32 { return 0 } + static _Utf8ToString(data: KUint8ArrayPtr, offset: int32, length: int32): string { return "" } + static _GetStringFinalizer(): pointer { return nullptr } + static _RemoveChild(ptr0: pointer, ptr2: pointer): void {} + static _InsertChildBefore(ptr0: pointer, ptr1: pointer, ptr2: pointer): int32 { return 0 } + static _StringLength(ptr1: pointer): int32 { return 0 } + static _InsertChildAt(ptr0: pointer, ptr1: pointer, arg: int32): int32 { return 0 } + static _DumpTreeNode(ptr0: pointer): void {} + static _StartGroupedLog(index: int32): void {} + static _StopGroupedLog(index: int32): void {} + static _GetGroupedLog(index: int32): pointer { return nullptr } +} \ No newline at end of file diff --git a/arkoala-arkts/framework/src/typescript/index.ts b/arkoala-arkts/framework/src/typescript/index.ts new file mode 100644 index 000000000..ecd518819 --- /dev/null +++ b/arkoala-arkts/framework/src/typescript/index.ts @@ -0,0 +1 @@ +export * from "./NativeModuleBase" \ No newline at end of file diff --git a/arkoala-arkts/framework/tsconfig-unmemoize.json b/arkoala-arkts/framework/tsconfig-unmemoize.json new file mode 100644 index 000000000..1978ba303 --- /dev/null +++ b/arkoala-arkts/framework/tsconfig-unmemoize.json @@ -0,0 +1,47 @@ +{ + "extends": "@koalaui/build-common/tsconfig.json", + "compilerOptions": { + "types": [], + "plugins": [ + { + "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", + "trace": false, + "only_unmemoize": true, + "unmemoizeDir": "./build/unmemoized" + } + ], + "outDir": "./build/junk", + "baseUrl": ".", + "paths": { + "@koalaui/common": [ + "../../incremental/common/src" + ], + "@koalaui/interop": [ + "../../interop/src/interop" + ], + "@koalaui/runtime": [ + "../../incremental/runtime/src" + ], + "@koalaui/compat": [ + "../../incremental/compat/src" + ], + "#language": [ + "./src/typescript" + ] + }, + "rootDir": "." + }, + "include": [ + "./src/**/*.ts", + ], + "exclude": [ + "./src/arkts/**/*.ts" + ], + "files": [ + "../arkui/src/sts-stdlib/global.d.ts" + ], + "references": [ + { "path": "../../interop" }, + { "path": "../../incremental/runtime" } + ] +} diff --git a/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts b/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts index f27028933..3bd39b72f 100644 --- a/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts +++ b/arkoala/arkui/src/ArkSwiperControllerMaterialized.ts @@ -17,11 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Finalizable } from "@koalaui/arkts-framework" import { MaterializedBase } from "./MaterializedBase" import { NativePeerNode } from "./PeerNode" import { nativeModule } from "@koalaui/arkoala" import { Serializer } from "./peers/Serializer" -import { runtimeType, RuntimeType, SerializerBase, Finalizable } from "@koalaui/arkts-framework" +import { isResource, isInstanceOf, runtimeType, withLength, withLengthArray, RuntimeType, SerializerBase } from "./peers/SerializerBase" import { unsafeCast } from "./shared/generated-utils" import { registerCallback } from "./peers/SerializerBase" import { wrapCallback } from "@koalaui/interop" diff --git a/arkoala/arkui/src/peers/DeserializerBase.ts b/arkoala/arkui/src/peers/DeserializerBase.ts deleted file mode 100644 index ecf4d34b3..000000000 --- a/arkoala/arkui/src/peers/DeserializerBase.ts +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Copyright (c) 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 {CustomTextDecoder, float32, int32, int64} from "@koalaui/common" -import {pointer} from "@koalaui/interop" -import {RuntimeType, Tags, CallbackResource } from "./SerializerBase"; -// import { Length } from "@arkoala/arkui" - -export class DeserializerBase { - private position = 0 - private readonly buffer: ArrayBuffer - private readonly length: int32 - private view: DataView - private static textDecoder = new CustomTextDecoder() - private static customDeserializers: CustomDeserializer | undefined = undefined - - static registerCustomDeserializer(deserializer: CustomDeserializer) { - let current = DeserializerBase.customDeserializers - if (current == undefined) { - DeserializerBase.customDeserializers = deserializer - } else { - while (current.next != undefined) { - current = current.next - } - current.next = deserializer - } - } - - constructor(buffer: ArrayBuffer, length: int32) { - this.buffer = buffer - this.length = length - this.view = new DataView(this.buffer) - } - - static get( - factory: (args: Uint8Array, length: int32) => T, - args: Uint8Array, length: int32): T { - - // TBD: Use cache - return factory(args, length); - } - - asArray(position?: number, length?: number): Uint8Array { - return new Uint8Array(this.buffer, position, length) - } - - currentPosition(): int32 { - return this.position - } - - resetCurrentPosition(): void { - this.position = 0 - } - - private checkCapacity(value: int32) { - if (value > this.length) { - throw new Error(`${value} is less than remaining buffer length`) - } - } - - readInt8(): int32 { - this.checkCapacity(1) - const value = this.view.getInt8(this.position) - this.position += 1 - return value - } - - readInt32(): int32 { - this.checkCapacity(4) - const value = this.view.getInt32(this.position, true) - this.position += 4 - return value - } - - readInt64(): int64 { - this.checkCapacity(8) - const value = this.view.getBigInt64(this.position, true) - this.position += 8 - return Number(value) - } - - readPointer(): pointer { - this.checkCapacity(8) - const value = this.view.getBigInt64(this.position, true) - this.position += 8 - return value - } - - readFloat32(): float32 { - this.checkCapacity(4) - const value = this.view.getFloat32(this.position, true) - this.position += 4 - return value - } - - readBoolean(): boolean { - this.checkCapacity(1) - const value = this.view.getInt8(this.position) - this.position += 1 - return value == 1 - } - - readFunction(): any { - // TODO: not exactly correct. - const id = this.readInt32() - return id - } - - readMaterialized(): object { - const ptr = this.readPointer() - return { ptr: ptr } - } - - readString(): string { - const length = this.readInt32() - this.checkCapacity(length) - // read without null-terminated byte - const value = DeserializerBase.textDecoder.decode(this.asArray(this.position, length - 1)); - this.position += length - return value - } - - readCustomObject(kind: string): any { - let current = DeserializerBase.customDeserializers - while (current) { - if (current.supports(kind)) { - return current.deserialize(this, kind) - } - current = current.next - } - // consume tag - const tag = this.readInt8() - return undefined - } - - readNumber(): number | undefined { - const tag = this.readInt8() - switch (tag) { - case Tags.UNDEFINED: - return undefined; - case Tags.INT32: - return this.readInt32() - case Tags.FLOAT32: - return this.readFloat32() - default: - throw new Error(`Unknown number tag: ${tag}`) - break - } - } - - readLength(): Length | undefined { - this.checkCapacity(1) - const valueType = this.readInt8() - switch (valueType) { - case RuntimeType.OBJECT: - return { - id: this.readInt32(), - bundleName: "", - moduleName: "" - } - case RuntimeType.STRING: - return this.readString() - case RuntimeType.NUMBER: - return this.readFloat32() - } - return undefined - } - - readCallbackResource(): CallbackResource { - return { - resourceId: this.readInt32(), - hold: this.readPointer(), - release: this.readPointer(), - } - } - - static lengthUnitFromInt(unit: int32): string { - let suffix: string - switch (unit) { - case 0: - suffix = "px" - break - case 1: - suffix = "vp" - break - case 3: - suffix = "%" - break - case 4: - suffix = "lpx" - break - default: - suffix = "" - } - return suffix - } - readBuffer(): ArrayBuffer { - this.readPointer() - const length = this.readInt64() - return new ArrayBuffer(Number(length)) - } -} - -export abstract class CustomDeserializer { - protected constructor(protected supported: Array) { - } - - supports(kind: string): boolean { - return this.supported.includes(kind) - } - - abstract deserialize(serializer: DeserializerBase, kind: string): any - - next: CustomDeserializer | undefined = undefined -} - -class DateDeserializer extends CustomDeserializer { - constructor() { - super(["Date"]); - } - - deserialize(serializer: DeserializerBase, kind: string): any { - return new Date(serializer.readString()) - } -} -DeserializerBase.registerCustomDeserializer(new DateDeserializer()) diff --git a/interop/src/cpp/cangjie/convertors-cj.h b/interop/src/cpp/cangjie/convertors-cj.h index 60368b32c..f70aac735 100644 --- a/interop/src/cpp/cangjie/convertors-cj.h +++ b/interop/src/cpp/cangjie/convertors-cj.h @@ -41,7 +41,7 @@ public: const std::vector>& getImpls() { return implementations; } -}; +}; template struct InteropTypeConverter { @@ -143,7 +143,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P2 p2 = getArgument(_p2); \ P3 p3 = getArgument(_p3); \ return makeResult(impl_##name(p0, p1, p2, p3)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3, 0) #define KOALA_INTEROP_5(name, Ret, P0, P1, P2, P3, P4) \ @@ -203,7 +203,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P5 p5 = getArgument(_p5); \ P6 p6 = getArgument(_p6); \ return makeResult(impl_##name(p0, p1, p2, p3, p4, p5, p6)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6, 0) #define KOALA_INTEROP_8(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7) \ @@ -227,7 +227,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P6 p6 = getArgument(_p6); \ P7 p7 = getArgument(_p7); \ return makeResult(impl_##name(p0, p1, p2, p3, p4, p5, p6, p7)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7, 0) #define KOALA_INTEROP_9(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8) \ @@ -253,7 +253,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P7 p7 = getArgument(_p7); \ P8 p8 = getArgument(_p8); \ return makeResult(impl_##name(p0, p1, p2, p3, p4, p5, p6, p7, p8)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8, 0) #define KOALA_INTEROP_10(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9) \ @@ -281,7 +281,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P8 p8 = getArgument(_p8); \ P9 p9 = getArgument(_p9); \ return makeResult(impl_##name(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9, 0) #define KOALA_INTEROP_11(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) \ @@ -311,7 +311,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P9 p9 = getArgument(_p9); \ P10 p10 = getArgument(_p10); \ return makeResult(impl_##name(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9 "|" #P10, 0) #define KOALA_INTEROP_12(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11) \ @@ -343,7 +343,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P10 p10 = getArgument(_p10); \ P11 p11 = getArgument(_p11); \ return makeResult(impl_##name(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9 "|" #P10 "|" #P11, 0) #define KOALA_INTEROP_13(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12) \ @@ -377,7 +377,7 @@ KOALA_INTEROP_EXPORT Ret name( \ P11 p11 = getArgument(_p11); \ P12 p12 = getArgument(_p12); \ return makeResult(impl_##name(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); \ -} +} // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9 "|" #P10 "|" #P11 "|" #P12, 0) #define KOALA_INTEROP_14(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13) \ diff --git a/interop/src/cpp/common-interop.cc b/interop/src/cpp/common-interop.cc index f135cdcbb..5049cf95c 100644 --- a/interop/src/cpp/common-interop.cc +++ b/interop/src/cpp/common-interop.cc @@ -29,6 +29,7 @@ InteropProfiler* InteropProfiler::_instance = nullptr; using std::string; + #ifdef KOALA_NAPI static Napi::Reference g_koalaNapiCallbackDispatcher; diff --git a/interop/src/cpp/napi/convertors-napi.cc b/interop/src/cpp/napi/convertors-napi.cc index 682db98f1..64470c306 100644 --- a/interop/src/cpp/napi/convertors-napi.cc +++ b/interop/src/cpp/napi/convertors-napi.cc @@ -209,4 +209,9 @@ static Napi::Object InitModule(Napi::Env env, Napi::Object exports) { return ProvideModuleRegisterCallback()(env, exports); } +{ + "Interop": [{ "StringLength": () => {} }, ], + +} + NODE_API_MODULE_ADAPTER(INTEROP_LIBRARY_NAME, InitModule) -- Gitee