From 0354259da652c12730efb08784d27e03d7d11685 Mon Sep 17 00:00:00 2001 From: platonovvladislav Date: Tue, 19 Aug 2025 17:36:21 +0300 Subject: [PATCH 1/2] New generation --- .../arkui/generated/AnimatorModifier.ets | 2 +- .../arkui/generated/CommonMethodModifier.ets | 6 +- arkoala-arkts/arkui/generated/Graphics.ets | 2 +- .../arkui/generated/ImageModifier.ets | 6 +- .../arkui/generated/ImageSpanModifier.ets | 4 +- .../generated/NavDestinationModifier.ets | 4 +- .../arkui/generated/NavigationModifier.ets | 4 +- .../arkui/generated/SwiperModifier.ets | 2 +- .../arkui/generated/TextClockModifier.ets | 2 +- .../arkui/generated/TimePickerModifier.ets | 2 +- .../arkui/generated/component/animator.ets | 2 +- .../arkui/generated/component/canvas.ets | 2 +- .../arkui/generated/component/column.ets | 43 +-- .../arkui/generated/component/common.ets | 18 +- .../arkui/generated/component/datePicker.ets | 2 +- .../arkui/generated/component/enums.ets | 2 +- .../arkui/generated/component/folderStack.ets | 2 +- .../arkui/generated/component/forEach.ets | 24 -- .../arkui/generated/component/idlize.ets | 4 +- .../arkui/generated/component/image.ets | 6 +- .../generated/component/imageAnimator.ets | 2 +- .../arkui/generated/component/imageSpan.ets | 4 +- .../generated/component/mediaCachedImage.ets | 2 +- .../generated/component/navDestination.ets | 6 +- .../arkui/generated/component/navigation.ets | 4 +- .../generated/component/pageTransition.ets | 2 +- .../arkui/generated/component/particle.ets | 2 +- .../arkui/generated/component/richEditor.ets | 2 +- .../arkui/generated/component/scroll.ets | 2 +- .../arkui/generated/component/shape.ets | 2 +- .../arkui/generated/component/sidebar.ets | 2 +- .../generated/component/styledString.ets | 4 +- .../arkui/generated/component/swiper.ets | 2 +- .../arkui/generated/component/textClock.ets | 2 +- .../arkui/generated/component/timePicker.ets | 2 +- .../arkui/generated/component/video.ets | 2 +- .../arkui/generated/component/web.ets | 4 +- .../arkui/generated/framework/GlobalScope.ets | 6 +- .../generated/framework/arkts/type_check.ets | 111 +++--- .../arkui/generated/framework/index.ets | 1 - .../framework/ohos.app.ability.common.ets | 1 + .../ohos.arkui.drawableDescriptor.ets | 2 +- .../framework/ohos.arkui.observer.ets | 1 + .../arkui/generated/framework/ohos.curves.ets | 1 + .../ohos.data.unifiedDataChannel.ets | 2 +- .../framework/ohos.graphics.common2D.ets | 1 + .../framework/ohos.graphics.drawing.ets | 5 +- .../framework/ohos.graphics.text.ets | 5 +- .../framework/ohos.graphics.uiEffect.ets | 1 + .../arkui/generated/framework/ohos.intl.ets | 1 + .../generated/framework/ohos.matrix4.ets | 3 +- .../generated/framework/ohos.measure.ets | 2 +- .../framework/ohos.multimedia.image.ets | 2 +- .../ohos.multimodalInput.pointer.ets | 1 + .../generated/framework/ohos.promptAction.ets | 1 + .../generated/framework/ohos.web.webview.ets | 1 + .../arkui/generated/framework/ohos.window.ets | 1 + .../peers/CallbackDeserializeCall.ets | 4 +- arkoala-arkts/arkui/sdk/Graphics.ets | 4 +- .../arkui/sdk/component/animator.ets | 2 +- arkoala-arkts/arkui/sdk/component/canvas.ets | 2 +- arkoala-arkts/arkui/sdk/component/column.ets | 2 +- arkoala-arkts/arkui/sdk/component/common.ets | 18 +- .../arkui/sdk/component/datePicker.ets | 2 +- arkoala-arkts/arkui/sdk/component/enums.ets | 2 +- .../sdk/component/extendableComponent.ets | 2 +- .../arkui/sdk/component/folderStack.ets | 2 +- arkoala-arkts/arkui/sdk/component/forEach.ets | 24 -- arkoala-arkts/arkui/sdk/component/idlize.ets | 4 +- arkoala-arkts/arkui/sdk/component/image.ets | 6 +- .../arkui/sdk/component/imageAnimator.ets | 2 +- .../arkui/sdk/component/imageSpan.ets | 4 +- .../arkui/sdk/component/mediaCachedImage.ets | 2 +- .../arkui/sdk/component/navDestination.ets | 6 +- .../arkui/sdk/component/navigation.ets | 4 +- .../arkui/sdk/component/pageTransition.ets | 2 +- .../arkui/sdk/component/particle.ets | 2 +- .../arkui/sdk/component/richEditor.ets | 2 +- arkoala-arkts/arkui/sdk/component/scroll.ets | 2 +- arkoala-arkts/arkui/sdk/component/shape.ets | 2 +- arkoala-arkts/arkui/sdk/component/sidebar.ets | 2 +- .../arkui/sdk/component/styledString.ets | 4 +- arkoala-arkts/arkui/sdk/component/swiper.ets | 2 +- .../arkui/sdk/component/textClock.ets | 2 +- .../arkui/sdk/component/timePicker.ets | 2 +- arkoala-arkts/arkui/sdk/component/video.ets | 2 +- arkoala-arkts/arkui/sdk/component/web.ets | 4 +- arkoala-arkts/arkui/sdk/framework/index.ets | 1 - .../sdk/framework/ohos.app.ability.common.ets | 1 + .../sdk/framework/ohos.arkui.UIContext.ets | 4 +- .../ohos.arkui.drawableDescriptor.ets | 2 +- .../sdk/framework/ohos.arkui.observer.ets | 1 + .../arkui/sdk/framework/ohos.curves.ets | 1 + .../sdk/framework/ohos.graphics.common2D.ets | 1 + .../sdk/framework/ohos.graphics.drawing.ets | 5 +- .../sdk/framework/ohos.graphics.text.ets | 5 +- .../sdk/framework/ohos.graphics.uiEffect.ets | 1 + .../arkui/sdk/framework/ohos.intl.ets | 1 + .../arkui/sdk/framework/ohos.matrix4.ets | 3 +- .../arkui/sdk/framework/ohos.measure.ets | 2 +- .../ohos.multimodalInput.pointer.ets | 1 + .../arkui/sdk/framework/ohos.promptAction.ets | 1 + .../arkui/sdk/framework/ohos.web.webview.ets | 1 + .../arkui/sdk/framework/ohos.window.ets | 1 + .../native/src/generated/Serializers.h | 338 ++++++++---------- .../src/generated/arkoala_api_generated.h | 77 ++-- 106 files changed, 419 insertions(+), 482 deletions(-) delete mode 100644 arkoala-arkts/arkui/generated/component/forEach.ets delete mode 100644 arkoala-arkts/arkui/sdk/component/forEach.ets diff --git a/arkoala-arkts/arkui/generated/AnimatorModifier.ets b/arkoala-arkts/arkui/generated/AnimatorModifier.ets index 5c34b8b399..7a0706e0c6 100644 --- a/arkoala-arkts/arkui/generated/AnimatorModifier.ets +++ b/arkoala-arkts/arkui/generated/AnimatorModifier.ets @@ -23,7 +23,7 @@ import { ArkAnimatorPeer, SpringMotion, FrictionMotion, ScrollMotion, AnimatorAt import { int32 } from "@koalaui/common" import { CommonMethod } from "./component/common" import { AnimationStatus, FillMode, PlayMode } from "./component/enums" -import { curves } from "./framework/ohos.curves" +import { default as curves } from "./framework/ohos.curves" export class AnimatorModifier extends CommonMethodModifier implements AnimatorAttribute,AttributeModifier { _instanceId: number = -1; setInstanceId(instanceId: number): void { diff --git a/arkoala-arkts/arkui/generated/CommonMethodModifier.ets b/arkoala-arkts/arkui/generated/CommonMethodModifier.ets index 3213338549..d21d695d09 100644 --- a/arkoala-arkts/arkui/generated/CommonMethodModifier.ets +++ b/arkoala-arkts/arkui/generated/CommonMethodModifier.ets @@ -25,13 +25,13 @@ import { Resource } from "global.resource" import { HitTestMode, Color, ImageSize, Alignment, BorderStyle, ColoringStrategy, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, FocusDrawLevel, ImageRepeat, Axis, ResponseType, FunctionKey, ModifierKey } from "./component/enums" import { LengthMetrics } from "./Graphics" import { ResizableOptions } from "./component/image" -import { uiEffect } from "./framework/ohos.graphics.uiEffect" +import { default as uiEffect } from "./framework/ohos.graphics.uiEffect" import { FocusBoxStyle, FocusPriority } from "./component/focus" import { CustomBuilder } from "./component/builder" -import { uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" +import { default as uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" import { CircleShape, EllipseShape, PathShape, RectShape } from "./framework/ohos.arkui.shape" import { GestureInfo, BaseGestureEvent, GestureJudgeResult, GestureRecognizer, GestureType, Gesture, GestureMask } from "./component/gesture" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { ComponentContent } from "./ComponentContent" import { StyledString } from "./component/styledString" export class CommonMethodModifier implements CommonMethod,AttributeModifier { diff --git a/arkoala-arkts/arkui/generated/Graphics.ets b/arkoala-arkts/arkui/generated/Graphics.ets index faca04071a..94b1a0ba4a 100644 --- a/arkoala-arkts/arkui/generated/Graphics.ets +++ b/arkoala-arkts/arkui/generated/Graphics.ets @@ -25,7 +25,7 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./CallbackTransformer" import { drawing } from "./framework/ohos.graphics.drawing" -import { common2D_Rect_serializer, common2D } from "./framework/ohos.graphics.common2D" +import { common2D_Rect_serializer, default as common2D } from "./framework/ohos.graphics.common2D" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { GlobalScope } from "./framework/GlobalScope" diff --git a/arkoala-arkts/arkui/generated/ImageModifier.ets b/arkoala-arkts/arkui/generated/ImageModifier.ets index 3d7f4dff67..c184f1a999 100644 --- a/arkoala-arkts/arkui/generated/ImageModifier.ets +++ b/arkoala-arkts/arkui/generated/ImageModifier.ets @@ -23,12 +23,12 @@ import { ArkImagePeer, ColorContent, ImageRenderMode, DynamicRangeMode, ImageInt import { int32 } from "@koalaui/common" import { CommonMethod, PointLightStyle } from "./component/common" import { Resource } from "global.resource" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { ResourceColor, ColorFilter } from "./component/units" import { Color, ImageFit, ImageRepeat, CopyOptions } from "./component/enums" import { ColorMetrics } from "./Graphics" -import { matrix4 } from "./framework/ohos.matrix4" -import { drawing } from "./framework/ohos.graphics.drawing" +import { default as matrix4 } from "./framework/ohos.matrix4" +import { default as drawing } from "./framework/ohos.graphics.drawing" import { ImageAnalyzerConfig } from "./component/imageCommon" export class ImageModifier extends CommonMethodModifier implements ImageAttribute,AttributeModifier { _instanceId: number = -1; diff --git a/arkoala-arkts/arkui/generated/ImageSpanModifier.ets b/arkoala-arkts/arkui/generated/ImageSpanModifier.ets index 2e6abe15d0..4aeefda13c 100644 --- a/arkoala-arkts/arkui/generated/ImageSpanModifier.ets +++ b/arkoala-arkts/arkui/generated/ImageSpanModifier.ets @@ -25,9 +25,9 @@ import { int32 } from "@koalaui/common" import { BaseSpan } from "./component/span" import { ImageSpanAlignment, ImageFit } from "./component/enums" import { ColorFilter } from "./component/units" -import { drawing } from "./framework/ohos.graphics.drawing" +import { default as drawing } from "./framework/ohos.graphics.drawing" import { ImageErrorCallback, ImageError } from "./component/image" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CommonMethod } from "./component/common" export class ImageSpanModifier extends BaseSpanModifier implements ImageSpanAttribute,AttributeModifier { _instanceId: number = -1; diff --git a/arkoala-arkts/arkui/generated/NavDestinationModifier.ets b/arkoala-arkts/arkui/generated/NavDestinationModifier.ets index 446be514af..f764b12e8a 100644 --- a/arkoala-arkts/arkui/generated/NavDestinationModifier.ets +++ b/arkoala-arkts/arkui/generated/NavDestinationModifier.ets @@ -24,11 +24,11 @@ import { int32 } from "@koalaui/common" import { CommonMethod, LayoutSafeAreaType, LayoutSafeAreaEdge } from "./component/common" import { ResourceStr } from "./component/units" import { Resource } from "global.resource" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { SymbolGlyphModifier } from "./SymbolGlyphModifier" import { NavigationMenuItem, NavigationOperation, NavigationTitleOptions, NavigationMenuOptions, ToolbarItem, NavigationToolbarOptions } from "./component/navigation" import { CustomBuilder } from "./component/builder" -import { window } from "./framework/ohos.window" +import { default as window } from "./framework/ohos.window" import { Scroller } from "./component/scroll" export class NavDestinationModifier extends CommonMethodModifier implements NavDestinationAttribute,AttributeModifier { _instanceId: number = -1; diff --git a/arkoala-arkts/arkui/generated/NavigationModifier.ets b/arkoala-arkts/arkui/generated/NavigationModifier.ets index 30cfc9c987..2c52469803 100644 --- a/arkoala-arkts/arkui/generated/NavigationModifier.ets +++ b/arkoala-arkts/arkui/generated/NavigationModifier.ets @@ -24,10 +24,10 @@ import { int32 } from "@koalaui/common" import { CommonMethod, Bindable, LayoutSafeAreaType, LayoutSafeAreaEdge } from "./component/common" import { Length, Dimension, ResourceStr } from "./component/units" import { Resource } from "global.resource" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { SymbolGlyphModifier } from "./SymbolGlyphModifier" import { CustomBuilder, PageMapBuilder } from "./component/builder" -import { window } from "./framework/ohos.window" +import { default as window } from "./framework/ohos.window" export class NavigationModifier extends CommonMethodModifier implements NavigationAttribute,AttributeModifier { _instanceId: number = -1; setInstanceId(instanceId: number): void { diff --git a/arkoala-arkts/arkui/generated/SwiperModifier.ets b/arkoala-arkts/arkui/generated/SwiperModifier.ets index de39906331..c5f0fb0081 100644 --- a/arkoala-arkts/arkui/generated/SwiperModifier.ets +++ b/arkoala-arkts/arkui/generated/SwiperModifier.ets @@ -24,7 +24,7 @@ import { int32 } from "@koalaui/common" import { CommonMethod, Bindable } from "./component/common" import { IndicatorComponentController } from "./component/indicatorcomponent" import { EdgeEffect, PageFlipMode } from "./component/enums" -import { curves } from "./framework/ohos.curves" +import { default as curves } from "./framework/ohos.curves" import { Length } from "./component/units" import { Resource } from "global.resource" export class SwiperModifier extends CommonMethodModifier implements SwiperAttribute,AttributeModifier { diff --git a/arkoala-arkts/arkui/generated/TextClockModifier.ets b/arkoala-arkts/arkui/generated/TextClockModifier.ets index 6e1fdc56ff..97606bf428 100644 --- a/arkoala-arkts/arkui/generated/TextClockModifier.ets +++ b/arkoala-arkts/arkui/generated/TextClockModifier.ets @@ -25,7 +25,7 @@ import { CommonMethod, ShadowOptions } from "./component/common" import { ResourceStr, ResourceColor, Length } from "./component/units" import { Resource } from "global.resource" import { Color, FontStyle, FontWeight } from "./component/enums" -import { intl } from "./framework/ohos.intl" +import { default as intl } from "./framework/ohos.intl" export class TextClockModifier extends CommonMethodModifier implements TextClockAttribute,AttributeModifier { _instanceId: number = -1; setInstanceId(instanceId: number): void { diff --git a/arkoala-arkts/arkui/generated/TimePickerModifier.ets b/arkoala-arkts/arkui/generated/TimePickerModifier.ets index 0899044aa3..baa52dc2d5 100644 --- a/arkoala-arkts/arkui/generated/TimePickerModifier.ets +++ b/arkoala-arkts/arkui/generated/TimePickerModifier.ets @@ -22,7 +22,7 @@ import { AttributeUpdaterFlag } from "./AttributeUpdater" import { ArkTimePickerPeer, OnTimePickerChangeCallback, TimePickerResult, TimePickerAttribute } from "./component/timePicker" import { int32 } from "@koalaui/common" import { CommonMethod, PickerTextStyle } from "./component/common" -import { intl } from "./framework/ohos.intl" +import { default as intl } from "./framework/ohos.intl" import { CrownSensitivity } from "./component/enums" export class TimePickerModifier extends CommonMethodModifier implements TimePickerAttribute,AttributeModifier { _instanceId: number = -1; diff --git a/arkoala-arkts/arkui/generated/component/animator.ets b/arkoala-arkts/arkui/generated/component/animator.ets index 54caa064c6..7a505b080d 100644 --- a/arkoala-arkts/arkui/generated/component/animator.ets +++ b/arkoala-arkts/arkui/generated/component/animator.ets @@ -24,7 +24,7 @@ import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" import { AnimationStatus, FillMode, PlayMode } from "./enums" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { AttributeModifier, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/canvas.ets b/arkoala-arkts/arkui/generated/component/canvas.ets index 024bbaedc4..473757250a 100644 --- a/arkoala-arkts/arkui/generated/component/canvas.ets +++ b/arkoala-arkts/arkui/generated/component/canvas.ets @@ -24,7 +24,7 @@ import { Matrix2D_serializer, Matrix2D, Matrix2DInternal } from "./matrix2d" import { Size_serializer, Size, LengthMetricsUnit, LengthMetrics_serializer, LengthMetrics, LengthMetricsInternal } from "./../Graphics" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" import { extractors, AttributeModifier, AttributeUpdater } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { ImageAIOptions_serializer, ImageAIOptions, ImageAnalyzerConfig_serializer, ImageAnalyzerConfig } from "./imageCommon" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" diff --git a/arkoala-arkts/arkui/generated/component/column.ets b/arkoala-arkts/arkui/generated/component/column.ets index bf1d0eed62..39f7032c64 100644 --- a/arkoala-arkts/arkui/generated/component/column.ets +++ b/arkoala-arkts/arkui/generated/component/column.ets @@ -30,7 +30,6 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" -import { Resource_serializer } from "./../framework/resource" export class ArkColumnPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) @@ -101,7 +100,7 @@ export class ArkColumnPeer extends ArkCommonMethodPeer { } export type SpaceType = string | number | Resource; export interface ColumnOptions { - space?: SpaceType; + space?: string | number; } export interface ColumnOptionsV2 { _stub: int32; @@ -203,19 +202,6 @@ export function Column( }) } -export class ColumnOptionsV2_serializer { - public static write(buffer: SerializerBase, value: ColumnOptionsV2): void { - let valueSerializer : SerializerBase = buffer - const valueHolderFor_stub = value._stub - valueSerializer.writeInt32(valueHolderFor_stub) - } - public static read(buffer: DeserializerBase): ColumnOptionsV2 { - let valueDeserializer : DeserializerBase = buffer - const _stubTmpResult : int32 = valueDeserializer.readInt32() - let value : ColumnOptionsV2 = ({_stub: _stubTmpResult} as ColumnOptionsV2) - return value - } -} export class ColumnOptions_serializer { public static write(buffer: SerializerBase, value: ColumnOptions): void { let valueSerializer : SerializerBase = buffer @@ -231,10 +217,6 @@ export class ColumnOptions_serializer { valueSerializer.writeInt8((1).toChar()) const valueHolderForSpaceTmpValueForIdx1 = valueHolderForSpaceTmpValue as number valueSerializer.writeNumber(valueHolderForSpaceTmpValueForIdx1) - } else if (valueHolderForSpaceTmpValue instanceof Resource) { - valueSerializer.writeInt8((2).toChar()) - const valueHolderForSpaceTmpValueForIdx2 = valueHolderForSpaceTmpValue as Resource - Resource_serializer.write(valueSerializer, valueHolderForSpaceTmpValueForIdx2) } } else { valueSerializer.writeInt8(RuntimeType.UNDEFINED) @@ -243,23 +225,34 @@ export class ColumnOptions_serializer { public static read(buffer: DeserializerBase): ColumnOptions { let valueDeserializer : DeserializerBase = buffer const spaceTmpBuf_runtimeType = valueDeserializer.readInt8().toInt() - let spaceTmpBuf : SpaceType | undefined + let spaceTmpBuf : string | number | undefined if ((spaceTmpBuf_runtimeType) != (RuntimeType.UNDEFINED)) { const spaceTmpBuf_UnionSelector : int32 = valueDeserializer.readInt8() - let spaceTmpBuf_ : string | number | Resource | undefined + let spaceTmpBuf_ : string | number | undefined if (spaceTmpBuf_UnionSelector == (0).toChar()) { spaceTmpBuf_ = (valueDeserializer.readString() as string) } else if (spaceTmpBuf_UnionSelector == (1).toChar()) { spaceTmpBuf_ = (valueDeserializer.readNumber() as number) - } else if (spaceTmpBuf_UnionSelector == (2).toChar()) { - spaceTmpBuf_ = Resource_serializer.read(valueDeserializer) } else { throw new Error("One of the branches for spaceTmpBuf_ has to be chosen through deserialisation.") } - spaceTmpBuf = (spaceTmpBuf_ as string | number | Resource) + spaceTmpBuf = (spaceTmpBuf_ as string | number) } - const spaceTmpResult : SpaceType | undefined = spaceTmpBuf + const spaceTmpResult : string | number | undefined = spaceTmpBuf let value : ColumnOptions = ({space: spaceTmpResult} as ColumnOptions) return value } } +export class ColumnOptionsV2_serializer { + public static write(buffer: SerializerBase, value: ColumnOptionsV2): void { + let valueSerializer : SerializerBase = buffer + const valueHolderFor_stub = value._stub + valueSerializer.writeInt32(valueHolderFor_stub) + } + public static read(buffer: DeserializerBase): ColumnOptionsV2 { + let valueDeserializer : DeserializerBase = buffer + const _stubTmpResult : int32 = valueDeserializer.readInt32() + let value : ColumnOptionsV2 = ({_stub: _stubTmpResult} as ColumnOptionsV2) + return value + } +} diff --git a/arkoala-arkts/arkui/generated/component/common.ets b/arkoala-arkts/arkui/generated/component/common.ets index b1b963ca3f..6042d653cd 100644 --- a/arkoala-arkts/arkui/generated/component/common.ets +++ b/arkoala-arkts/arkui/generated/component/common.ets @@ -22,7 +22,7 @@ import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { unifiedDataChannel_Summary_serializer } from "./../framework/ohos.data.unifiedDataChannel" import { extractors, GestureModifier, hookId, hookStateStyleImpl, hookGestureModifier, CustomStyles, ContentModifier, AttributeModifier, AttributeUpdater } from "#handwritten" -import { unifiedDataChannel } from "@ohos.data.unifiedDataChannel" +import { default as unifiedDataChannel } from "@ohos.data.unifiedDataChannel" import { DrawContext, DrawContextInternal, LengthMetrics_serializer, LengthMetrics } from "./../Graphics" import { KeyType, KeySource, Color, HitTestMode, ImageSize, Alignment, BorderStyle, ColoringStrategy, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, FocusDrawLevel, ImageRepeat, Axis, ResponseType, FunctionKey, ModifierKey, InteractionHand, GradientDirection, SharedTransitionEffectType, ArrowPointPosition, Placement, LineCapStyle, LineJoinStyle, BarState, CrownSensitivity, EdgeEffect, TransitionType, TextDecorationType, TextDecorationStyle, PlayMode, VerticalAlign, HorizontalAlign, FontWeight, FontStyle, TouchType, CrownAction, ClickEffectLevel, NestedScrollMode, PixelRoundCalcPolicy, ScrollSource, IlluminatedType, AccessibilityHoverType, AxisAction, AxisModel, MouseButton, MouseAction } from "./enums" import { IntentionCode } from "./../framework/ohos.multimodalInput.intentionCode" @@ -31,7 +31,7 @@ import { Resource_serializer } from "./../framework/resource" import { Resource } from "global.resource" import { TextRange_serializer, TextRange } from "./textCommon" import { ResizableOptions_serializer, ResizableOptions } from "./image" -import { uiEffect_VisualEffect_serializer, uiEffect_Filter_serializer, uiEffect_BrightnessBlender_serializer, uiEffect } from "./../framework/ohos.graphics.uiEffect" +import { uiEffect_VisualEffect_serializer, uiEffect_Filter_serializer, uiEffect_BrightnessBlender_serializer, default as uiEffect } from "./../framework/ohos.graphics.uiEffect" import { FocusBoxStyle_serializer, FocusBoxStyle, FocusPriority } from "./focus" import { CircleShape_serializer, EllipseShape_serializer, PathShape_serializer, RectShape_serializer, CircleShape, EllipseShape, PathShape, RectShape } from "./../framework/ohos.arkui.shape" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" @@ -41,22 +41,22 @@ import { StyledString_serializer, StyledString, ImageAttachment, CustomSpan, Sty import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { CustomBuilder } from "./builder" -import { uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" -import { image } from "@ohos.multimedia.image" -import { curves, curves_ICurve_serializer } from "./../framework/ohos.curves" +import { default as uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" +import { default as image } from "@ohos.multimedia.image" +import { default as curves, curves_ICurve_serializer } from "./../framework/ohos.curves" import { SymbolGlyphModifier, SymbolGlyphModifier_serializer } from "./../SymbolGlyphModifier" import { UIContext, UIContext_serializer } from "./../framework/ohos.arkui.UIContext" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Context } from "./../framework/application.Context" -import { pointer } from "./../framework/ohos.multimodalInput.pointer" +import { default as pointer } from "./../framework/ohos.multimodalInput.pointer" import { ButtonType, ButtonStyleMode, ButtonRole } from "./button" -import { uiObserver } from "./../framework/ohos.arkui.observer" -import { promptAction } from "./../framework/ohos.promptAction" +import { default as uiObserver } from "./../framework/ohos.arkui.observer" +import { default as promptAction } from "./../framework/ohos.promptAction" import { ScrollState } from "./list" import { Want, Want_serializer } from "./../framework/ohos.app.ability.Want" -import { intl } from "./../framework/ohos.intl" +import { default as intl } from "./../framework/ohos.intl" import { NodeAttach, remember } from "@koalaui/runtime" import { GlobalScope } from "./../framework/GlobalScope" export interface BaseEvent { diff --git a/arkoala-arkts/arkui/generated/component/datePicker.ets b/arkoala-arkts/arkui/generated/component/datePicker.ets index 61b9aa9686..b4f14cfe35 100644 --- a/arkoala-arkts/arkui/generated/component/datePicker.ets +++ b/arkoala-arkts/arkui/generated/component/datePicker.ets @@ -31,7 +31,7 @@ import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { ResourceColor, Offset, VoidCallback } from "./units" import { Resource } from "global.resource" import { DialogAlignment } from "./alertDialog" -import { intl } from "./../framework/ohos.intl" +import { default as intl } from "./../framework/ohos.intl" import { NodeAttach, remember } from "@koalaui/runtime" export class DatePickerDialogInternal { public static fromPtr(ptr: KPointer): DatePickerDialog { diff --git a/arkoala-arkts/arkui/generated/component/enums.ets b/arkoala-arkts/arkui/generated/component/enums.ets index f286c7e95b..bdb8fd0c38 100644 --- a/arkoala-arkts/arkui/generated/component/enums.ets +++ b/arkoala-arkts/arkui/generated/component/enums.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" export enum CheckBoxShape { CIRCLE = 0, ROUNDED_SQUARE = 1 diff --git a/arkoala-arkts/arkui/generated/component/folderStack.ets b/arkoala-arkts/arkui/generated/component/folderStack.ets index 5e48922340..183745a191 100644 --- a/arkoala-arkts/arkui/generated/component/folderStack.ets +++ b/arkoala-arkts/arkui/generated/component/folderStack.ets @@ -28,7 +28,7 @@ import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { window } from "./../framework/ohos.window" +import { default as window } from "./../framework/ohos.window" import { NodeAttach, remember } from "@koalaui/runtime" export class ArkFolderStackPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { diff --git a/arkoala-arkts/arkui/generated/component/forEach.ets b/arkoala-arkts/arkui/generated/component/forEach.ets deleted file mode 100644 index d38e4f0560..0000000000 --- a/arkoala-arkts/arkui/generated/component/forEach.ets +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2024-2025 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. - */ - - -// WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! - -import { int32, int64, float32 } from "@koalaui/common" -import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" -import { memo, memo_stable } from "@koalaui/runtime/annotations" -import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -export type ItemGeneratorFunc = (item: T, index: number) => void; -export type KeyGeneratorFunc = (item: T, index: number) => string; diff --git a/arkoala-arkts/arkui/generated/component/idlize.ets b/arkoala-arkts/arkui/generated/component/idlize.ets index 8d271d89f6..e5c6ac24e3 100644 --- a/arkoala-arkts/arkui/generated/component/idlize.ets +++ b/arkoala-arkts/arkui/generated/component/idlize.ets @@ -39,7 +39,7 @@ import { SliderConfiguration } from "./slider" import { TextClockConfiguration } from "./textClock" import { TextTimerConfiguration } from "./textTimer" import { ToggleConfiguration } from "./toggle" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { FontOptions_serializer, FontInfo_serializer } from "./../framework/ohos.font" import { FontOptions, FontInfo } from "@ohos.font" import { MeasureOptions_serializer, MeasureOptions } from "./../framework/ohos.measure" @@ -50,7 +50,7 @@ import { PeerNode } from "./../PeerNode" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { curves, curves_ICurve_serializer } from "./../framework/ohos.curves" +import { default as curves, curves_ICurve_serializer } from "./../framework/ohos.curves" import { CustomDialogController } from "./customDialogController" import { CustomBuilder } from "./builder" import { NodeAttach, remember } from "@koalaui/runtime" diff --git a/arkoala-arkts/arkui/generated/component/image.ets b/arkoala-arkts/arkui/generated/component/image.ets index 794eb38903..ce3a08c82d 100644 --- a/arkoala-arkts/arkui/generated/component/image.ets +++ b/arkoala-arkts/arkui/generated/component/image.ets @@ -25,15 +25,15 @@ import { Resource_serializer } from "./../framework/resource" import { DrawableDescriptor_serializer, DrawableDescriptor } from "./../framework/ohos.arkui.drawableDescriptor" import { ImageAIOptions_serializer, ImageAnalyzerConfig_serializer, ImageAnalyzerConfig, ImageAIOptions } from "./imageCommon" import { ColorMetrics_serializer, ColorMetrics } from "./../Graphics" -import { matrix4_Matrix4Transit_serializer, matrix4 } from "./../framework/ohos.matrix4" +import { matrix4_Matrix4Transit_serializer, default as matrix4 } from "./../framework/ohos.matrix4" import { ColorFilter_serializer, ResourceColor, ColorFilter, ResourceStr, EdgeWidths, EdgeWidths_serializer } from "./units" -import { drawing_ColorFilter_serializer, drawing, drawing_Lattice_serializer } from "./../framework/ohos.graphics.drawing" +import { drawing_ColorFilter_serializer, default as drawing, drawing_Lattice_serializer } from "./../framework/ohos.graphics.drawing" import { PointLightStyle_serializer, ArkCommonMethodPeer, CommonMethod, PointLightStyle, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { Resource } from "global.resource" import { extractors, AttributeModifier, AttributeUpdater } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { Color, ImageFit, ImageRepeat, CopyOptions } from "./enums" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/imageAnimator.ets b/arkoala-arkts/arkui/generated/component/imageAnimator.ets index fb663488e1..816dfa731d 100644 --- a/arkoala-arkts/arkui/generated/component/imageAnimator.ets +++ b/arkoala-arkts/arkui/generated/component/imageAnimator.ets @@ -29,7 +29,7 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { NodeAttach, remember } from "@koalaui/runtime" import { Resource_serializer } from "./../framework/resource" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" diff --git a/arkoala-arkts/arkui/generated/component/imageSpan.ets b/arkoala-arkts/arkui/generated/component/imageSpan.ets index a0e531e5e7..d94e08bf3a 100644 --- a/arkoala-arkts/arkui/generated/component/imageSpan.ets +++ b/arkoala-arkts/arkui/generated/component/imageSpan.ets @@ -20,7 +20,7 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KS import { Resource_serializer } from "./../framework/resource" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" import { ColorFilter_serializer, ColorFilter, ResourceStr } from "./units" -import { drawing_ColorFilter_serializer, drawing } from "./../framework/ohos.graphics.drawing" +import { drawing_ColorFilter_serializer, default as drawing } from "./../framework/ohos.graphics.drawing" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -29,7 +29,7 @@ import { ArkBaseSpanPeer, BaseSpan, ArkBaseSpanComponent, ArkBaseSpanStyle } fro import { ImageSpanAlignment, ImageFit } from "./enums" import { ImageErrorCallback, ImageError } from "./image" import { extractors, AttributeModifier, AttributeUpdater } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets b/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets index e0643c6c80..4ff3d7ec21 100644 --- a/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets +++ b/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets @@ -27,7 +27,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkImagePeer, ImageAttribute, ArkImageComponent, ArkImageStyle } from "./image" import { AttributeModifier, extractors, AttributeUpdater } from "#handwritten" import { CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { ResourceStr } from "./units" import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/navDestination.ets b/arkoala-arkts/arkui/generated/component/navDestination.ets index 11109918a6..9b5aaff88c 100644 --- a/arkoala-arkts/arkui/generated/component/navDestination.ets +++ b/arkoala-arkts/arkui/generated/component/navDestination.ets @@ -24,7 +24,7 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { Resource_serializer } from "./../framework/resource" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" import { SymbolGlyphModifier_serializer, SymbolGlyphModifier } from "./../SymbolGlyphModifier" -import { window_SystemBarStyle_serializer, window } from "./../framework/ohos.window" +import { window_SystemBarStyle_serializer, default as window } from "./../framework/ohos.window" import { Scroller_serializer, Scroller } from "./scroll" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -32,7 +32,7 @@ import { ArkCommonMethodPeer, CommonMethod, LayoutSafeAreaType, LayoutSafeAreaEd import { ResourceStr, Length, ResourceColor } from "./units" import { Resource } from "global.resource" import { extractors, AttributeModifier, AttributeUpdater } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CustomBuilder } from "./builder" import { TitleHeight, Color } from "./enums" import { LengthMetrics } from "./../Graphics" @@ -40,7 +40,7 @@ import { TextModifier } from "./../TextModifier" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { NodeAttach, remember } from "@koalaui/runtime" export interface NavDestinationContext { pathInfo: NavPathInfo diff --git a/arkoala-arkts/arkui/generated/component/navigation.ets b/arkoala-arkts/arkui/generated/component/navigation.ets index 99015f0cd2..71abf3c1a7 100644 --- a/arkoala-arkts/arkui/generated/component/navigation.ets +++ b/arkoala-arkts/arkui/generated/component/navigation.ets @@ -25,12 +25,12 @@ import { Resource_serializer } from "./../framework/resource" import { Bindable_Arkui_Component_Units_Length_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, LayoutSafeAreaType, LayoutSafeAreaEdge, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, ArkCommonMethodComponent, ArkCommonMethodStyle, BackgroundBlurStyleOptions_serializer, BackgroundEffectOptions_serializer } from "./common" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" import { SymbolGlyphModifier_serializer, SymbolGlyphModifier } from "./../SymbolGlyphModifier" -import { window_SystemBarStyle_serializer, window } from "./../framework/ohos.window" +import { window_SystemBarStyle_serializer, default as window } from "./../framework/ohos.window" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { Resource } from "global.resource" import { extractors, AttributeModifier, AttributeUpdater } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CustomBuilder, PageMapBuilder } from "./builder" import { TitleHeight, Color } from "./enums" import { LengthMetrics, LengthMetrics_serializer } from "./../Graphics" diff --git a/arkoala-arkts/arkui/generated/component/pageTransition.ets b/arkoala-arkts/arkui/generated/component/pageTransition.ets index d7c037fca1..5c5741e89c 100644 --- a/arkoala-arkts/arkui/generated/component/pageTransition.ets +++ b/arkoala-arkts/arkui/generated/component/pageTransition.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" export enum RouteType { NONE = 0, None = 0, diff --git a/arkoala-arkts/arkui/generated/component/particle.ets b/arkoala-arkts/arkui/generated/component/particle.ets index 902bf9ec13..54139b4302 100644 --- a/arkoala-arkts/arkui/generated/component/particle.ets +++ b/arkoala-arkts/arkui/generated/component/particle.ets @@ -23,7 +23,7 @@ import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { VP, Dimension, ResourceStr, ResourceColor } from "./units" import { Resource } from "global.resource" import { ImageFit, Color } from "./enums" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { Vector2T, LengthMetrics } from "./../Graphics" export interface VelocityOptions { speed: [ number, number ]; diff --git a/arkoala-arkts/arkui/generated/component/richEditor.ets b/arkoala-arkts/arkui/generated/component/richEditor.ets index 142385586d..4d69a74b57 100644 --- a/arkoala-arkts/arkui/generated/component/richEditor.ets +++ b/arkoala-arkts/arkui/generated/component/richEditor.ets @@ -36,7 +36,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { DecorationStyleInterface, DecorationStyleInterface_serializer, StyledString, StyledStringInternal, MutableStyledString, MutableStyledStringInternal } from "./styledString" import { TextBackgroundStyle, TextBackgroundStyle_serializer } from "./span" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { SymbolEffectStrategy, SymbolRenderingStrategy } from "./symbolglyph" import { GestureEvent, GestureEvent_serializer } from "./gesture" import { ColorMetrics, ColorMetrics_serializer } from "./../Graphics" diff --git a/arkoala-arkts/arkui/generated/component/scroll.ets b/arkoala-arkts/arkui/generated/component/scroll.ets index 85a28997ea..360f1fb130 100644 --- a/arkoala-arkts/arkui/generated/component/scroll.ets +++ b/arkoala-arkts/arkui/generated/component/scroll.ets @@ -33,7 +33,7 @@ import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { LengthMetrics, LengthMetrics_serializer } from "./../Graphics" -import { curves, curves_ICurve_serializer } from "./../framework/ohos.curves" +import { default as curves, curves_ICurve_serializer } from "./../framework/ohos.curves" import { NodeAttach, remember } from "@koalaui/runtime" export class ScrollerInternal { public static fromPtr(ptr: KPointer): Scroller { diff --git a/arkoala-arkts/arkui/generated/component/shape.ets b/arkoala-arkts/arkui/generated/component/shape.ets index 2f4bebe71f..b54937a2a5 100644 --- a/arkoala-arkts/arkui/generated/component/shape.ets +++ b/arkoala-arkts/arkui/generated/component/shape.ets @@ -28,7 +28,7 @@ import { ResourceColor, Length } from "./units" import { Color, LineCapStyle, LineJoinStyle } from "./enums" import { Resource } from "global.resource" import { AttributeModifier, extractors, AttributeUpdater } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/sidebar.ets b/arkoala-arkts/arkui/generated/component/sidebar.ets index ba10974632..fac97f0326 100644 --- a/arkoala-arkts/arkui/generated/component/sidebar.ets +++ b/arkoala-arkts/arkui/generated/component/sidebar.ets @@ -30,7 +30,7 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { extractors, AttributeModifier, AttributeUpdater } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { NodeAttach, remember } from "@koalaui/runtime" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" export class ArkSideBarContainerPeer extends ArkCommonMethodPeer { diff --git a/arkoala-arkts/arkui/generated/component/styledString.ets b/arkoala-arkts/arkui/generated/component/styledString.ets index a25a79ed17..b9a7259081 100644 --- a/arkoala-arkts/arkui/generated/component/styledString.ets +++ b/arkoala-arkts/arkui/generated/component/styledString.ets @@ -26,9 +26,9 @@ import { Resource_serializer } from "./../framework/resource" import { TextDecorationType, Color, TextDecorationStyle, ImageSpanAlignment, ImageFit, TextAlign, TextOverflow, WordBreak, FontStyle, FontWeight } from "./enums" import { ResourceColor, SizeOptions_serializer, ColorFilter_serializer, SizeOptions, ColorFilter, ColorFilterInternal, ResourceStr, Padding, BorderRadiuses, Padding_serializer, BorderRadiuses_serializer } from "./units" import { Resource } from "global.resource" -import { drawing_ColorFilter_serializer, drawing } from "./../framework/ohos.graphics.drawing" +import { drawing_ColorFilter_serializer, default as drawing } from "./../framework/ohos.graphics.drawing" import { extractors } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { LeadingMarginPlaceholder_serializer, LeadingMarginPlaceholder } from "./richEditor" import { ShadowOptions_serializer, ShadowOptions, ClickEvent, ClickEvent_serializer } from "./common" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/swiper.ets b/arkoala-arkts/arkui/generated/component/swiper.ets index 7ffdb9466b..d794bf88cf 100644 --- a/arkoala-arkts/arkui/generated/component/swiper.ets +++ b/arkoala-arkts/arkui/generated/component/swiper.ets @@ -23,7 +23,7 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { VoidCallback, Length, ResourceColor, VP, Font, Font_serializer } from "./units" import { Bindable_Number_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" import { IndicatorComponentController_serializer, IndicatorComponentController } from "./indicatorcomponent" -import { curves_ICurve_serializer, curves } from "./../framework/ohos.curves" +import { curves_ICurve_serializer, default as curves } from "./../framework/ohos.curves" import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" diff --git a/arkoala-arkts/arkui/generated/component/textClock.ets b/arkoala-arkts/arkui/generated/component/textClock.ets index 868124ce57..c202c405e8 100644 --- a/arkoala-arkts/arkui/generated/component/textClock.ets +++ b/arkoala-arkts/arkui/generated/component/textClock.ets @@ -22,7 +22,7 @@ import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { Resource_serializer } from "./../framework/resource" import { ShadowOptions_serializer, ArkCommonMethodPeer, CommonMethod, ShadowOptions, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" -import { intl_DateTimeOptions_serializer, intl } from "./../framework/ohos.intl" +import { intl_DateTimeOptions_serializer, default as intl } from "./../framework/ohos.intl" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ResourceStr, ResourceColor, Length } from "./units" diff --git a/arkoala-arkts/arkui/generated/component/timePicker.ets b/arkoala-arkts/arkui/generated/component/timePicker.ets index 01ff9daf86..e97a835c55 100644 --- a/arkoala-arkts/arkui/generated/component/timePicker.ets +++ b/arkoala-arkts/arkui/generated/component/timePicker.ets @@ -21,7 +21,7 @@ import { Finalizable, runtimeType, RuntimeType, SerializerBase, DeserializerBase import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { PickerTextStyle_serializer, ArkCommonMethodPeer, CommonMethod, PickerTextStyle, Bindable, PickerDialogButtonStyle, Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, ShadowOptions, ShadowStyle, HoverModeAreaType, ArkCommonMethodComponent, ArkCommonMethodStyle, Bindable_Date_serializer } from "./common" -import { intl_DateTimeOptions_serializer, intl } from "./../framework/ohos.intl" +import { intl_DateTimeOptions_serializer, default as intl } from "./../framework/ohos.intl" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { CrownSensitivity, Color } from "./enums" diff --git a/arkoala-arkts/arkui/generated/component/video.ets b/arkoala-arkts/arkui/generated/component/video.ets index 1966261c6b..a061bad0f5 100644 --- a/arkoala-arkts/arkui/generated/component/video.ets +++ b/arkoala-arkts/arkui/generated/component/video.ets @@ -31,7 +31,7 @@ import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { NodeAttach, remember } from "@koalaui/runtime" import { Resource_serializer } from "./../framework/resource" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" diff --git a/arkoala-arkts/arkui/generated/component/web.ets b/arkoala-arkts/arkui/generated/component/web.ets index ec944478ce..499690c29f 100644 --- a/arkoala-arkts/arkui/generated/component/web.ets +++ b/arkoala-arkts/arkui/generated/component/web.ets @@ -20,7 +20,7 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, DeserializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { webview, webview_WebviewController_serializer } from "./../framework/ohos.web.webview" +import { default as webview, webview_WebviewController_serializer } from "./../framework/ohos.web.webview" import { Resource_serializer } from "./../framework/resource" import { Resource } from "global.resource" import { NestedScrollOptions_serializer, ArkCommonMethodPeer, CommonMethod, KeyEvent, NestedScrollOptions, TouchEvent, ArkCommonMethodComponent, ArkCommonMethodStyle, TouchEvent_serializer } from "./common" @@ -34,7 +34,7 @@ import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Position, Position_serializer } from "./units" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { NodeAttach, remember } from "@koalaui/runtime" import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" export class ClientAuthenticationHandlerInternal { diff --git a/arkoala-arkts/arkui/generated/framework/GlobalScope.ets b/arkoala-arkts/arkui/generated/framework/GlobalScope.ets index 057b0d4507..6b187ba820 100644 --- a/arkoala-arkts/arkui/generated/framework/GlobalScope.ets +++ b/arkoala-arkts/arkui/generated/framework/GlobalScope.ets @@ -21,14 +21,14 @@ import { SerializerBase, DeserializerBase, NativeBuffer, Finalizable, runtimeTyp import { Resource_serializer } from "./resource" import { AnimateParam_serializer, AnimateParam, FinishCallbackType, ExpectedFrameRateRange } from "./../component/common" import { ComponentInfo_serializer, ComponentInfo, Offset_componentutils, TranslateResult, ScaleResult, RotateResult, Matrix4Result } from "./../component/idlize" -import { uiEffect_BrightnessBlenderParam_serializer, uiEffect_BrightnessBlender_serializer, uiEffect } from "./ohos.graphics.uiEffect" -import { text_FontDescriptor_serializer, text } from "./ohos.graphics.text" +import { uiEffect_BrightnessBlenderParam_serializer, uiEffect_BrightnessBlender_serializer, default as uiEffect } from "./ohos.graphics.uiEffect" +import { text_FontDescriptor_serializer, default as text } from "./ohos.graphics.text" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Resource } from "global.resource" import { BorderStyle, PlayMode } from "./../component/enums" import { curves } from "./ohos.curves" import { Size } from "./../Graphics" -import { pointer } from "./ohos.multimodalInput.pointer" +import { default as pointer } from "./ohos.multimodalInput.pointer" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { CallbackKind } from "./peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets b/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets index 1d54e4bebe..71de707968 100644 --- a/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets +++ b/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets @@ -18,11 +18,11 @@ import { KBoolean, KStringPtr, MaterializedBase } from "@koalaui/interop" import { int32 } from "@koalaui/common" -import { AccessibilityHoverType, Alignment, AnimationStatus, AppRotation, ArrowPointPosition, Axis, AxisAction, AxisModel, BarState, BorderStyle, CheckBoxShape, Color, ClickEffectLevel, ColoringStrategy, CopyOptions, CrownAction, CrownSensitivity, DialogButtonStyle, Direction, DividerMode, Edge, EdgeEffect, EllipsisMode, EmbeddedType, FillMode, FlexAlign, FlexDirection, FlexWrap, FocusDrawLevel, FoldStatus, FontStyle, FontWeight, FunctionKey, GradientDirection, HeightBreakpoint, HitTestMode, HorizontalAlign, HoverEffect, IlluminatedType, ImageFit, ImageRepeat, ImageSize, ImageSpanAlignment, InteractionHand, ItemAlign, KeySource, KeyType, LineBreakStrategy, LineCapStyle, LineJoinStyle, MarqueeUpdateStrategy, ModifierKey, MouseAction, MouseButton, NestedScrollMode, ObscuredReasons, OptionWidthMode, PageFlipMode, PixelRoundCalcPolicy, PixelRoundMode, Placement, PlayMode, RelateType, RenderFit, ResponseType, ScrollSource, SharedTransitionEffectType, TextAlign, TextCase, TextContentStyle, TextDecorationStyle, TextDecorationType, TextHeightAdaptivePolicy, TextOverflow, TextSelectableMode, TitleHeight, TouchType, TransitionType, WidthBreakpoint, VerticalAlign, Visibility, Week, WordBreak, XComponentType } from "./../../component/enums" -import { AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, BlendApplyType, BlendMode, BlurStyle, BlurStyleActivePolicy, TouchEvent, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DraggingSizeChangeEffect, DragPreviewMode, DragResult, EffectEdge, EffectType, FinishCallbackType, SourceTool, HapticFeedbackMode, HoverModeAreaType, KeyboardAvoidMode, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, RectResult, CommonConfiguration, TranslateOptions, ScaleOptions, RotateOptions, MenuPolicy, MenuPreviewMode, ModalTransition, NestedScrollOptions, OutlineStyle, PixelMapMock, PopupStateChangeParam, PreDragStatus, ProgressMask, PopupCommonOptions, MenuOptions, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollResult, ScrollSizeMode, TextContentControllerBase, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SizeResult, SourceType, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, AsymmetricTransitionOption, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, ClickEvent, KeyEvent, HoverCallback, HoverEvent, MouseEvent, SizeChangeCallback, VisibleAreaEventOptions, VisibleAreaChangeCallback, SheetOptions, Measurable, Layoutable, AlignRuleOption, BackgroundBrightnessOptions, BackgroundImageOptions, BackgroundOptions, Bindable, BlurOptions, ChildrenMainSize, ClickEffect, CrownEvent, DateRange, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, DragEvent, ModifierKeyStateGetter, Rectangle, DragInteractionOptions, DragItemInfo, DrawModifier, DropOptions, EdgeEffectOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InputCounterOptions, InvertOptions, ItemDragInfo, FractionStop, LinearGradientBlurOptions, LinearGradientOptions, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, MeasureResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PopupButton, PreviewConfiguration, SheetDismiss, SpringBackAction, StateStyles, SystemAdaptiveOptions, ShadowOptions, TouchObject, TouchResult, BackgroundBlurStyleOptions, BlurStyleOptions, BackgroundEffectOptions, ContentCoverOptions, BindOptions, ContextMenuAnimationOptions, AnimationNumberRange, MultiShadowOptions, DragPreviewOptions, FadingEdgeOptions, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PopupMaskType, ReuseOptions, ReuseIdCallback, sharedTransitionOptions, SheetTitleOptions, TerminationInfo, TextDecorationOptions, DividerStyle, PixelStretchEffectOptions, PointLightStyle, RadialGradientOptions, SweepGradientOptions, TipsOptions, BorderImageOption, ContextMenuOptions, BorderRadiusType, CustomPopupOptions, PopupStateChangeCallback, EventTarget, FocusAxisEvent, BaseEvent, GeometryInfo, LayoutChild, PickerDialogButtonStyle, PickerTextStyle, PopupMessageOptions, TripleLengthDetents, AccessibilityHoverEvent, AxisEvent, PopupOptions } from "./../../component/common" +import { AccessibilityHoverType, Alignment, AnimationStatus, AppRotation, ArrowPointPosition, Axis, AxisAction, AxisModel, BarState, BorderStyle, CheckBoxShape, Color, ClickEffectLevel, ColoringStrategy, ObscuredReasons, ModifierKey, HitTestMode, ImageSize, HoverEffect, Visibility, ItemAlign, Direction, RenderFit, FocusDrawLevel, ImageRepeat, ResponseType, FunctionKey, CopyOptions, CrownAction, CrownSensitivity, DialogButtonStyle, DividerMode, Edge, EdgeEffect, EllipsisMode, EmbeddedType, FillMode, FlexAlign, FlexDirection, FlexWrap, FoldStatus, FontStyle, FontWeight, GradientDirection, HeightBreakpoint, HorizontalAlign, IlluminatedType, ImageFit, ImageSpanAlignment, InteractionHand, KeySource, KeyType, LineBreakStrategy, LineCapStyle, LineJoinStyle, MarqueeUpdateStrategy, MouseAction, MouseButton, NestedScrollMode, OptionWidthMode, PageFlipMode, PixelRoundCalcPolicy, PixelRoundMode, Placement, PlayMode, RelateType, ScrollSource, SharedTransitionEffectType, TextAlign, TextCase, TextContentStyle, TextDecorationStyle, TextDecorationType, TextHeightAdaptivePolicy, TextOverflow, TextSelectableMode, TitleHeight, TouchType, TransitionType, WidthBreakpoint, VerticalAlign, Week, WordBreak, XComponentType } from "./../../component/enums" +import { AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, BlendApplyType, BlendMode, BlurStyle, BlurStyleActivePolicy, TouchEvent, ChainStyle, Rectangle, TouchTestInfo, SafeAreaType, SafeAreaEdge, MenuElement, CommonMethod, LayoutPolicy, DrawModifier, TouchResult, PixelRoundPolicy, BackgroundEffectOptions, ForegroundEffectOptions, BorderImageOption, OutlineStyle, ClickEvent, HoverEvent, AccessibilityCallback, AccessibilityHoverEvent, MouseEvent, KeyEvent, CrownEvent, FocusAxisEvent, AxisEvent, FocusMovement, AnimateParam, TransitionEffect, MotionBlurOptions, InvertOptions, TranslateOptions, ScaleOptions, RotateOptions, AlignRuleOption, LocalizedAlignRuleOptions, ClickEffect, DragEvent, DragItemInfo, PreDragStatus, LinearGradientOptions, SweepGradientOptions, RadialGradientOptions, MotionPathOptions, ShadowOptions, ShadowStyle, ProgressMask, StateStyles, PixelStretchEffectOptions, AccessibilityFocusCallback, ReuseOptions, BackgroundBrightnessOptions, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, CustomProperty, BackgroundOptions, BackgroundImageOptions, BackgroundBlurStyleOptions, SystemAdaptiveOptions, ForegroundBlurStyleOptions, TransitionFinishCallback, BlurOptions, LinearGradientBlurOptions, EffectType, sharedTransitionOptions, OnDragEventCallback, DropOptions, PreviewConfiguration, DragPreviewOptions, DragInteractionOptions, OverlayOptions, GeometryTransitionOptions, TipsMessageType, TipsOptions, PopupOptions, CustomPopupOptions, MenuOptions, ContextMenuOptions, Bindable, ModalTransition, ContentCoverOptions, SheetOptions, VisibleAreaChangeCallback, VisibleAreaEventOptions, ContentClipMode, DismissReason, DragBehavior, DraggingSizeChangeEffect, DragPreviewMode, DragResult, EffectEdge, FinishCallbackType, SourceTool, HapticFeedbackMode, HoverModeAreaType, KeyboardAvoidMode, LayoutSafeAreaEdge, LayoutSafeAreaType, RectResult, CommonConfiguration, MenuPolicy, MenuPreviewMode, NestedScrollOptions, PixelMapMock, PopupStateChangeParam, PopupCommonOptions, RepeatMode, SelectionOptions, ScrollResult, ScrollSizeMode, TextContentControllerBase, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SizeResult, SourceType, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestStrategy, TransitionEdge, AsymmetricTransitionOption, TransitionHierarchyStrategy, UICommonEvent, HoverCallback, Measurable, Layoutable, ChildrenMainSize, DateRange, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, ModifierKeyStateGetter, EdgeEffectOptions, ExpectedFrameRateRange, InputCounterOptions, ItemDragInfo, FractionStop, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, MeasureResult, MotionBlurAnchor, OverlayOffset, PopupButton, SheetDismiss, SpringBackAction, TouchObject, BlurStyleOptions, BindOptions, ContextMenuAnimationOptions, AnimationNumberRange, MultiShadowOptions, FadingEdgeOptions, HistoricalPoint, LightSource, PopupMaskType, ReuseIdCallback, SheetTitleOptions, TerminationInfo, TextDecorationOptions, DividerStyle, PointLightStyle, BorderRadiusType, PopupStateChangeCallback, EventTarget, BaseEvent, GeometryInfo, LayoutChild, PickerDialogButtonStyle, PickerTextStyle, PopupMessageOptions, TripleLengthDetents } from "./../../component/common" import { AnimationMode, BarMode, BarPosition, LayoutStyle, TabContentTransitionProxy, TabsAnimationEvent, TabsCacheMode, TabsController, TabContentAnimatedTransition, TabsOptions, BarGridColumnOptions, ScrollableBarModeOptions } from "./../../component/tabs" import { ArrowPosition, AvoidanceMode, MenuAlignType, MenuItemConfiguration, SelectOption, MenuOutlineOptions } from "./../../component/select" -import { AttributeModifier, ContentModifier, extractors, GestureModifier, UIGestureEvent, CustomStyles } from "#handwritten" +import { AttributeModifier, GestureModifier, extractors, ContentModifier, UIGestureEvent, CustomStyles } from "#handwritten" import { AttributeUpdaterFlag } from "./../../AttributeUpdater" import { AudioSessionType, BlurOnKeyboardHideMode, CacheMode, ClientAuthenticationHandler, ConsoleMessage, MessageLevel, ContextMenuEditStateFlags, ContextMenuInputFieldType, ContextMenuMediaType, ContextMenuSourceType, ControllerHandler, DataResubmissionHandler, EventResult, FileSelectorMode, FileSelectorParam, FileSelectorResult, FullScreenExitHandler, HitTestType, HttpAuthHandler, JsGeolocation, JsResult, MixedMode, NativeEmbedStatus, NativeMediaPlayerConfig, OnAudioStateChangedEvent, OnConsoleEvent, OnDataResubmittedEvent, OnFaviconReceivedEvent, OnFirstContentfulPaintEvent, OnOverScrollEvent, OnProgressChangeEvent, OnScaleChangeEvent, OnScrollEvent, OnSearchResultReceiveEvent, OnShowFileSelectorEvent, OverScrollMode, PermissionRequest, ProtectedResourceType, RenderExitReason, RenderMode, RenderProcessNotRespondingReason, ScreenCaptureHandler, ScreenCaptureConfig, SslError, SslErrorHandler, ThreatType, ViewportFit, WebCaptureMode, WebContextMenuParam, WebContextMenuResult, WebCookie, WebDarkMode, WebElementType, WebKeyboardAvoidMode, WebKeyboardController, WebLayoutMode, WebNavigationType, WebResourceError, Header, WebResourceRequest, WebResourceResponse, WebResponseType, AdsBlockedDetails, EmbedOptions, FirstMeaningfulPaint, FullScreenEnterEvent, IntelligentTrackingPreventionDetails, JavaScriptProxy, LargestContentfulPaint, LoadCommittedDetails, NativeEmbedVisibilityInfo, NestedScrollOptionsExt, OnAlertEvent, OnBeforeUnloadEvent, OnClientAuthenticationEvent, OnConfirmEvent, OnContextMenuShowEvent, OnDownloadStartEvent, OnErrorReceiveEvent, OnGeolocationShowEvent, OnHttpAuthRequestEvent, OnHttpErrorReceiveEvent, OnInterceptRequestEvent, OnLoadInterceptEvent, OnPageBeginEvent, OnPageEndEvent, OnPageVisibleEvent, OnPermissionRequestEvent, OnPromptEvent, OnRefreshAccessedHistoryEvent, OnRenderExitedEvent, OnResourceLoadEvent, OnScreenCaptureRequestEvent, OnSslErrorEventReceiveEvent, OnTitleReceiveEvent, OnTouchIconUrlReceivedEvent, OnWindowNewEvent, RenderProcessNotRespondingData, ScriptItem, SelectionMenuOptionsExt, SslErrorEvent, WebKeyboardCallbackInfo, WebKeyboardOptions, WebMediaOptions, WebOptions, NativeEmbedInfo, NativeEmbedDataInfo, NativeEmbedTouchInfo } from "./../../component/web" import { AutoCapitalizationMode, KeyboardAppearance, LayoutManager, PositionWithAffinity, MenuType, TextEditControllerEx, PreviewText, StyledStringController, StyledStringChangedListener, TextBaseController, TextRange, TextDataDetectorType, TextDeleteDirection, TextMenuOptions, TextMenuItemId, TextMenuShowMode, TextMenuItem, DeleteValue, EditMenuOptions, OnCreateMenuCallback, OnMenuItemClickCallback, FontSettingOptions, InsertValue, StyledStringChangeValue, OnDidChangeCallback, DecorationStyleResult, TextChangeOptions, CaretStyle, EditableTextChangeValue, TextDataDetectorConfig } from "./../../component/textCommon" @@ -31,7 +31,7 @@ import { BarrierDirection, LocalizedBarrierDirection, BarrierStyle, GuideLinePos import { BarStyle, LaunchMode, NavBarPosition, NavigationMode, NavigationOperation, NavigationTitleMode, NavPathInfo, NavPathStack, NavigationOptions, PopInfo, NavigationInterception, ToolbarItemStatus, NavContentInfo, NavigationAnimatedTransition, NavigationTransitionProxy, InterceptionShowCallback, NavBar, InterceptionModeCallback, NavigationCommonTitle, NavigationMenuItem, UpdateTransitionCallback, ToolbarItem, MoreButtonOptions, NavigationCustomTitle, NavigationTitleOptions, NavigationMenuOptions, NavigationToolbarOptions } from "./../../component/navigation" import { BaseContext } from "./../application.BaseContext" import { BaseShape, BuilderNodeOps, BuilderNodeOptions, CommonShape, Offset_componentutils, PerfMonitorActionType, PerfMonitorSourceType, RotateResult, ScaleResult, Scene, TranslateResult, DoubleAnimationParam, Callback_Extender_OnProgress, Callback_Extender_OnFinish, ErrorEvent, Event, MessageEvents, PostMessageOptions, SnapshotOptions, WorkerOptions, ComponentInfo, Matrix4Result, RestrictedWorker, RestrictedWorker_onexit_Callback, RestrictedWorker_onerror_Callback, RestrictedWorker_onmessage_Callback, WorkerEventListener } from "./../../component/idlize" -import { Length, SizeOptions, Position, ResourceColor, ColorFilter, ResourceStr, VoidCallback, AccessibilityOptions, Bias, ChainWeightOptions, DirectionalEdgesT, EdgeOutlineStyles, EdgeStyles, ConstraintSizeOptions, VP, DividerStyleOptions, EdgeColors, LengthConstrain, Dimension, LocalizedBorderRadiuses, LocalizedEdgeColors, LocalizedEdges, LocalizedEdgeWidths, LocalizedPadding, LocalizedPosition, Offset, BorderRadiuses, EdgeOutlineWidths, Edges, EdgeWidths, Font, PX, LPX, MarkStyle, OutlineRadiuses, Padding, Area, BorderOptions, OutlineOptions } from "./../../component/units" +import { Length, SizeOptions, Position, ResourceColor, ColorFilter, ConstraintSizeOptions, ChainWeightOptions, Padding, LocalizedPadding, BorderOptions, EdgeStyles, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, BorderRadiuses, LocalizedBorderRadiuses, OutlineOptions, EdgeOutlineStyles, Dimension, EdgeOutlineWidths, OutlineRadiuses, VoidCallback, Area, Edges, LocalizedEdges, LocalizedPosition, ResourceStr, AccessibilityOptions, Bias, DirectionalEdgesT, VP, DividerStyleOptions, LengthConstrain, Offset, Font, PX, LPX, MarkStyle } from "./../../component/units" import { Resource } from "global.resource" import { BreakpointsReference, GridRowDirection, BreakPoints, GridRowColumnOption, GridRowSizeOption, GutterOption, GridRowOptions } from "./../../component/gridRow" import { ButtonRole, ButtonStyleMode, ButtonType, ControlSize, ButtonConfiguration, ButtonTriggerClickCallback, ButtonOptions, ButtonLabelStyle } from "./../../component/button" @@ -40,14 +40,21 @@ import { CancelButtonStyle, SearchController, SearchType, CancelButtonSymbolOpti import { CanvasGradient, CanvasPath, CanvasPattern, OffscreenCanvas, ImageBitmap, RenderingContextSettings, OffscreenCanvasRenderingContext2D, Path2D, TextMetrics, DrawingRenderingContext, ImageData, CanvasRenderer, ImageSmoothingQuality, CanvasLineCap, CanvasLineJoin, CanvasDirection, CanvasTextAlign, CanvasTextBaseline, CanvasFillRule, CanvasRenderingContext2D } from "./../../component/canvas" import { Matrix2D } from "./../../component/matrix2d" import { ChainEdgeEffect, ListItemAlign, ListItemGroupArea, ListScroller, CloseSwipeActionOptions, VisibleListContentInfo, ScrollSnapAlign, ScrollState, StickyStyle, ListOptions, ChainAnimationOptions, ListDividerOptions } from "./../../component/list" -import { CircleShape, ShapeSize, EllipseShape, PathShape, PathShapeOptions, RectShape, RectShapeOptions, RoundRectShapeOptions } from "./../ohos.arkui.shape" -import { ColorContent, DynamicRangeMode, ImageContent, ImageInterpolation, ImageRenderMode, ImageRotateOrientation, ImageCompleteEvent, ImageSourceSize, ImageError, ResizableOptions } from "./../../component/image" -import { ColorMetrics, CornerRadius, DrawContext, Size, LengthMetricsUnit, LengthUnit, ShapeClip, RoundRect, Circle, CommandPath, ShapeMask, Vector2, Vector3, LengthMetrics, Frame } from "./../../Graphics" +import { CircleShape, ShapeSize, EllipseShape, PathShape, RectShape, PathShapeOptions, RectShapeOptions, RoundRectShapeOptions } from "./../ohos.arkui.shape" +import { ColorContent, ResizableOptions, DynamicRangeMode, ImageContent, ImageInterpolation, ImageRenderMode, ImageRotateOrientation, ImageCompleteEvent, ImageSourceSize, ImageError } from "./../../component/image" +import { ColorMetrics, LengthMetrics, CornerRadius, DrawContext, Size, LengthMetricsUnit, LengthUnit, ShapeClip, RoundRect, Circle, CommandPath, ShapeMask, Vector2, Vector3, Frame } from "./../../Graphics" +import { default as uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" +import { GestureRecognizer, GestureInfo, BaseGestureEvent, GestureJudgeResult, GestureType, Gesture, GestureMask, EventTargetInfo, GestureControl, GestureMode, GesturePriority, GestureRecognizerState, LongPressGestureHandlerOptions, GestureEvent, LongPressRecognizer, PanDirection, PanGestureOptions, PanGestureHandlerOptions, PanRecognizer, PinchGestureHandlerOptions, PinchRecognizer, RotationGesture, RotationGestureHandlerOptions, RotationRecognizer, ScrollableTargetInfo, SwipeDirection, SwipeGesture, SwipeGestureHandlerOptions, SwipeRecognizer, TapGestureParameters, TapRecognizer, GestureHandler, FingerInfo, BaseHandlerOptions, LongPressGestureEvent, PanGestureEvent, PinchGestureEvent, RotationGestureEvent, SwipeGestureEvent, TapGestureEvent } from "./../../component/gesture" +import { default as uiEffect } from "./../ohos.graphics.uiEffect" +import { FocusBoxStyle, FocusPriority, KeyProcessingMode } from "./../../component/focus" +import { CustomBuilder } from "./../../component/builder" +import { default as image } from "@ohos.multimedia.image" import { ComponentContent } from "./../../ComponentContent" +import { StyledString, GestureStyle, GestureStyleInterface, MutableStyledString, StyleOptions, SpanStyle, ImageAttachment, CustomSpan, StyledStringKey, StyledStringMarshallCallback, UserDataSpan, StyledStringUnmarshallCallback, UrlStyle, BaselineOffsetStyle, CustomSpanMeasureInfo, CustomSpanMetrics, CustomSpanDrawInfo, LetterSpacingStyle, LineHeightStyle, TextShadowStyle, DecorationStyle, DecorationStyleInterface, TextStyle, TextStyleInterface, ImageAttachmentLayoutStyle, ParagraphStyle, ParagraphStyleInterface, BackgroundColorStyle, ColorFilterType, ImageAttachmentInterface, AttachmentType, ResourceImageAttachmentOptions, StyledStringValue } from "./../../component/styledString" import { ContentType, EnterKeyType, InputType, SubmitEvent, TextInputController, TextInputStyle, PasswordIcon, UnderlineColor, TextInputOptions } from "./../../component/textInput" import { Context } from "./../application.Context" -import { webview } from "./../ohos.web.webview" -import { curves } from "./../ohos.curves" +import { default as webview } from "./../ohos.web.webview" +import { default as curves } from "./../ohos.curves" import { CustomDialogController, CustomDialogControllerOptions, CustomDialogControllerExternalOptions } from "./../../component/customDialogController" import { DataOperationType } from "./../../component/lazyForEach" import { DataPanelType, ColorStop, LinearGradient, DataPanelConfiguration, DataPanelOptions, DataPanelShadowOptions } from "./../../component/dataPanel" @@ -56,21 +63,17 @@ import { DialogAlignment, DialogButtonDirection, AlertDialogButtonOptions } from import { DistributionType, DisturbanceFieldShape, ParticleEmitterShape, ParticleType, ParticleUpdater, ParticlePropertyAnimation } from "./../../component/particle" import { DpiFollowStrategy, UIExtensionProxy, WindowModeFollowStrategy, UIExtensionOptions } from "./../../component/uiExtensionComponent" import { DrawableDescriptor } from "./../ohos.arkui.drawableDescriptor" -import { image } from "@ohos.multimedia.image" -import { drawing } from "./../ohos.graphics.drawing" -import { common2D } from "./../ohos.graphics.common2D" +import { default as drawing } from "./../ohos.graphics.drawing" +import { default as common2D } from "./../ohos.graphics.common2D" import { EffectDirection, EffectFillStyle, EffectScope, PulseSymbolEffect, SymbolEffect, SymbolEffectStrategy, SymbolRenderingStrategy, AppearSymbolEffect, BounceSymbolEffect, DisappearSymbolEffect, HierarchicalSymbolEffect, ReplaceSymbolEffect, ScaleSymbolEffect } from "./../../component/symbolglyph" -import { EventTargetInfo, Gesture, GestureControl, GestureType, GestureMode, GestureJudgeResult, GestureMask, GesturePriority, GestureRecognizer, GestureRecognizerState, LongPressGestureHandlerOptions, GestureEvent, LongPressRecognizer, PanDirection, PanGestureOptions, PanGestureHandlerOptions, PanRecognizer, PinchGestureHandlerOptions, PinchRecognizer, RotationGesture, RotationGestureHandlerOptions, RotationRecognizer, ScrollableTargetInfo, SwipeDirection, SwipeGesture, SwipeGestureHandlerOptions, SwipeRecognizer, TapGestureParameters, TapRecognizer, GestureHandler, FingerInfo, GestureInfo, BaseHandlerOptions, LongPressGestureEvent, BaseGestureEvent, PanGestureEvent, PinchGestureEvent, RotationGestureEvent, SwipeGestureEvent, TapGestureEvent } from "./../../component/gesture" import { ExtendableComponent, LifeCycle } from "./../../component/extendableComponent" import { UIContext, PromptAction, TargetInfo, TextMenuController } from "./../ohos.arkui.UIContext" -import { uiObserver } from "./../ohos.arkui.observer" -import { FocusPriority, KeyProcessingMode, FocusBoxStyle } from "./../../component/focus" +import { default as uiObserver } from "./../ohos.arkui.observer" import { FormDimension, FormRenderingMode, FormShape, FormSize, ErrorInformation, FormCallbackInfo, FormInfo } from "./../../component/formComponent" import { FrameNode, CrossLanguageOptions, LayoutConstraint } from "./../../FrameNode" import { FrictionMotion, ScrollMotion, SpringProp, SpringMotion } from "./../../component/animator" import { FullscreenInfo, PlaybackInfo, PlaybackSpeed, PreparedInfo, SeekMode, VideoController, PosterOptions, VideoOptions } from "./../../component/video" import { GestureGroupInterface, LongPressGestureInterface, GestureInterface, LongPressGestureInterface_Invoke_Literal, PanGestureInterface, PanGestureInterface_Invoke_Literal, PinchGestureInterface, PinchGestureInterface_Invoke_Literal, TapGestureInterface } from "./../../component/gesture.extra" -import { GestureStyle, GestureStyleInterface, StyledString, MutableStyledString, StyleOptions, SpanStyle, ImageAttachment, CustomSpan, StyledStringKey, StyledStringMarshallCallback, UserDataSpan, StyledStringUnmarshallCallback, UrlStyle, BaselineOffsetStyle, CustomSpanMeasureInfo, CustomSpanMetrics, CustomSpanDrawInfo, LetterSpacingStyle, LineHeightStyle, TextShadowStyle, DecorationStyle, DecorationStyleInterface, TextStyle, TextStyleInterface, ImageAttachmentLayoutStyle, ParagraphStyle, ParagraphStyleInterface, BackgroundColorStyle, ColorFilterType, ImageAttachmentInterface, AttachmentType, ResourceImageAttachmentOptions, StyledStringValue } from "./../../component/styledString" import { GridDirection, GridItemAlignment, ComputedBarAttribute, GridLayoutOptions } from "./../../component/grid" import { GridItemStyle, GridItemOptions } from "./../../component/gridItem" import { ImageAnalyzerType, ImageAnalyzerController, ImageAIOptions, ImageAnalyzerConfig } from "./../../component/imageCommon" @@ -86,7 +89,7 @@ import { ListItemStyle, SwipeActionState, SwipeEdgeEffect, ListItemOptions, Swip import { Scroller, ScrollAlign, OffsetResult, OnScrollFrameBeginHandlerResult, ScrollDirection, ScrollOptions, ScrollEdgeOptions, ScrollPageOptions, ScrollToIndexOptions, ScrollAnimationOptions, OffsetOptions, ScrollSnapOptions } from "./../../component/scroll" import { LoadingProgressConfiguration, LoadingProgressStyle } from "./../../component/loadingProgress" import { MarqueeStartPolicy, MarqueeState, TextController, TextOptions, TextOverflowOptions, TextResponseType, TextSpanType, TextMarqueeOptions } from "./../../component/text" -import { matrix4 } from "./../ohos.matrix4" +import { default as matrix4 } from "./../ohos.matrix4" import { NavDestinationActiveReason, NavDestinationMode, NavigationSystemTransitionType, NavDestinationTransition, NavDestinationContext, NestedScrollInfo, RouteMapConfig, NavDestinationCommonTitle, NavDestinationCustomTitle } from "./../../component/navDestination" import { NavigationType } from "./../../component/navigator" import { NodeContent } from "./../../NodeContent" @@ -95,12 +98,11 @@ import { NodeController } from "./../ohos.arkui.node" import { OnFoldStatusChangeInfo, FolderStackOptions, HoverEventParam } from "./../../component/folderStack" import { PasteButtonOnClickResult, PasteDescription, PasteIconStyle } from "./../../component/pasteButton" import { PatternLockChallengeResult, PatternLockController, CircleStyleOptions } from "./../../component/patternLock" -import { pointer } from "./../ohos.multimodalInput.pointer" +import { default as pointer } from "./../ohos.multimodalInput.pointer" import { ProgressConfiguration, ProgressStatus, ProgressStyle, ProgressType, ProgressOptions, LinearStyleOptions, ScanEffectOptions, CommonProgressStyleOptions, ProgressStyleOptions, RingStyleOptions, CapsuleStyleOptions } from "./../../component/progress" import { RadioIndicatorType, RadioConfiguration, RadioOptions, RadioStyle } from "./../../component/radio" import { RefreshStatus, RefreshOptions } from "./../../component/refresh" import { RichEditorBaseController, RichEditorTextStyle, RichEditorParagraphResult, RichEditorSpan, RichEditorController, RichEditorTextSpanOptions, RichEditorImageSpanOptions, RichEditorBuilderSpanOptions, RichEditorSymbolSpanOptions, RichEditorUpdateTextSpanStyleOptions, RichEditorUpdateImageSpanStyleOptions, RichEditorUpdateSymbolSpanStyleOptions, RichEditorParagraphStyleOptions, RichEditorRange, RichEditorImageSpanResult, RichEditorTextSpanResult, RichEditorSelection, RichEditorDeleteDirection, RichEditorOptions, RichEditorResponseType, RichEditorSpanType, RichEditorStyledStringController, RichEditorStyledStringOptions, KeyboardOptions, PreviewMenuOptions, RichEditorDeleteValue, RichEditorGesture, RichEditorInsertValue, RichEditorSpanPosition, CopyEvent, CutEvent, PasteEvent, RichEditorChangeValue, RichEditorSymbolSpanStyle, RichEditorSpanStyleOptions, RichEditorUrlStyle, SelectionMenuOptions, MenuOnAppearCallback, MenuCallback, LeadingMarginPlaceholder, PlaceholderStyle, RichEditorLayoutStyle, RichEditorParagraphStyle, RichEditorImageSpanStyle, RichEditorImageSpanStyleResult, RichEditorTextStyleResult, OnHoverCallback } from "./../../component/richEditor" -import { CustomBuilder } from "./../../component/builder" import { RootSceneSession } from "./../../component/rootScene" import { RouteType, SlideEffect } from "./../../component/pageTransition" import { RowOptionsV2, RowOptions } from "./../../component/row" @@ -114,7 +116,7 @@ import { SliderBlockType, SliderChangeMode, SliderInteraction, SliderStyle, Slid import { SubMenuExpandingMode } from "./../../component/menu" import { SwiperAnimationEvent, SwiperAnimationMode, SwiperContentTransitionProxy, SwiperContentWillScrollResult, SwiperController, SwiperDisplayMode, SwiperNestedScrollMode, AutoPlayOptions, SwiperAutoFill, SwiperContentAnimatedTransition, ArrowStyle, DotIndicator, Indicator, DigitIndicator } from "./../../component/swiper" import { SymbolGlyphModifier } from "./../../SymbolGlyphModifier" -import { text } from "./../ohos.graphics.text" +import { default as text } from "./../ohos.graphics.text" import { TextAreaController, TextAreaType, TextAreaOptions } from "./../../component/textArea" import { TextClockConfiguration, TextClockController, TextClockOptions } from "./../../component/textClock" import { TextModifier } from "./../../TextModifier" @@ -124,19 +126,17 @@ import { ThemeControl, CustomTheme, Colors } from "./../ohos.arkui.theme" import { TimePickerDialog, TimePickerFormat, TimePickerResult, TimePickerOptions } from "./../../component/timePicker" import { ToggleType, ToggleConfiguration, SwitchStyle, ToggleOptions } from "./../../component/toggle" import { ToolBarItemPlacement, ToolBarItemOptions } from "./../../component/toolbar" -import { common, Context_getGroupDir_Callback } from "./../ohos.app.ability.common" -import { uiEffect } from "./../ohos.graphics.uiEffect" +import { default as common, Context_getGroupDir_Callback } from "./../ohos.app.ability.common" import { RecordData, PluginComponentTemplate, PluginErrorData, PluginComponentOptions } from "./../../component/pluginComponent" -import { unifiedDataChannel } from "@ohos.data.unifiedDataChannel" -import { uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" +import { default as unifiedDataChannel } from "@ohos.data.unifiedDataChannel" import { WaterFlowLayoutMode, SectionOptions, WaterFlowSections, WaterFlowOptions, GetItemMainSizeByIndex } from "./../../component/waterFlow" -import { window } from "./../ohos.window" +import { default as window } from "./../ohos.window" import { ASTCResource } from "./../../component/mediaCachedImage" import { BorderRadiuses_graphics, RenderNode } from "./../../RenderNode" import { BusinessError } from "./../ohos.base" import { CheckBoxConfiguration, CheckboxOptions } from "./../../component/checkbox" import { CircleOptions } from "./../../component/circle" -import { ColumnOptionsV2, ColumnOptions, SpaceType } from "./../../component/column" +import { ColumnOptions, ColumnOptionsV2 } from "./../../component/column" import { DismissDialogAction, SheetInfo } from "./../../component/actionSheet" import { EllipseOptions } from "./../../component/ellipse" import { FontInfo, FontOptions } from "@ohos.font" @@ -144,7 +144,7 @@ import { FormLinkOptions } from "./../../component/formLink" import { GaugeConfiguration, GaugeOptions, GaugeShadowOptions, GaugeIndicatorOptions } from "./../../component/gauge" import { GridColColumnOption, GridColOptions } from "./../../component/gridCol" import { ImageLoadResult } from "./../../component/imageSpan" -import { intl } from "./../ohos.intl" +import { default as intl } from "./../ohos.intl" import { LineOptions, ShapePoint } from "./../../component/line" import { MarqueeOptions } from "./../../component/marquee" import { PathOptions } from "./../../component/path" @@ -574,6 +574,9 @@ export class TypeChecker { static iscommon2D_Rect(value: Object | string | number | undefined, arg0: boolean, arg1: boolean, arg2: boolean, arg3: boolean): boolean { return value instanceof common2D.Rect } + static isCommonMethod(value: Object | string | number | undefined, arg0: boolean, arg1: boolean, arg2: boolean, arg3: boolean, arg4: boolean, arg5: boolean, arg6: boolean, arg7: boolean, arg8: boolean, arg9: boolean, arg10: boolean, arg11: boolean, arg12: boolean, arg13: boolean, arg14: boolean, arg15: boolean, arg16: boolean, arg17: boolean, arg18: boolean, arg19: boolean, arg20: boolean, arg21: boolean, arg22: boolean, arg23: boolean, arg24: boolean, arg25: boolean, arg26: boolean, arg27: boolean, arg28: boolean, arg29: boolean, arg30: boolean, arg31: boolean, arg32: boolean, arg33: boolean, arg34: boolean, arg35: boolean, arg36: boolean, arg37: boolean, arg38: boolean, arg39: boolean, arg40: boolean, arg41: boolean, arg42: boolean, arg43: boolean, arg44: boolean, arg45: boolean, arg46: boolean, arg47: boolean, arg48: boolean, arg49: boolean, arg50: boolean, arg51: boolean, arg52: boolean, arg53: boolean, arg54: boolean, arg55: boolean, arg56: boolean, arg57: boolean, arg58: boolean, arg59: boolean, arg60: boolean, arg61: boolean, arg62: boolean, arg63: boolean, arg64: boolean, arg65: boolean, arg66: boolean, arg67: boolean, arg68: boolean, arg69: boolean, arg70: boolean, arg71: boolean, arg72: boolean, arg73: boolean, arg74: boolean, arg75: boolean, arg76: boolean, arg77: boolean, arg78: boolean, arg79: boolean, arg80: boolean, arg81: boolean, arg82: boolean, arg83: boolean, arg84: boolean, arg85: boolean, arg86: boolean, arg87: boolean, arg88: boolean, arg89: boolean, arg90: boolean, arg91: boolean, arg92: boolean, arg93: boolean, arg94: boolean, arg95: boolean, arg96: boolean, arg97: boolean, arg98: boolean, arg99: boolean, arg100: boolean, arg101: boolean, arg102: boolean, arg103: boolean, arg104: boolean, arg105: boolean, arg106: boolean, arg107: boolean, arg108: boolean, arg109: boolean, arg110: boolean, arg111: boolean, arg112: boolean, arg113: boolean, arg114: boolean, arg115: boolean, arg116: boolean, arg117: boolean, arg118: boolean, arg119: boolean, arg120: boolean, arg121: boolean, arg122: boolean, arg123: boolean, arg124: boolean, arg125: boolean, arg126: boolean, arg127: boolean, arg128: boolean, arg129: boolean, arg130: boolean, arg131: boolean, arg132: boolean, arg133: boolean, arg134: boolean, arg135: boolean, arg136: boolean, arg137: boolean, arg138: boolean, arg139: boolean, arg140: boolean, arg141: boolean, arg142: boolean, arg143: boolean, arg144: boolean, arg145: boolean, arg146: boolean, arg147: boolean, arg148: boolean, arg149: boolean, arg150: boolean, arg151: boolean, arg152: boolean, arg153: boolean, arg154: boolean): boolean { + return value instanceof CommonMethod + } static isCommonShape(value: Object | string | number | undefined): boolean { return value instanceof CommonShape } @@ -5602,6 +5605,33 @@ export class TypeChecker { static isArray_Number(value: Object | string | number | undefined): boolean { return value instanceof Array } + static isArray_Rectangle(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_TouchTestInfo(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_uniformTypeDescriptor_UniformDataType(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_ObscuredReasons(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_GestureRecognizer(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_SafeAreaType(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_SafeAreaEdge(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_MenuElement(value: Object | string | number | undefined): boolean { + return value instanceof Array + } + static isArray_ModifierKey(value: Object | string | number | undefined): boolean { + return value instanceof Array + } static isArray_common2D_Point(value: Object | string | number | undefined): boolean { return value instanceof Array } @@ -5680,9 +5710,6 @@ export class TypeChecker { static isArray_TextMenuItem(value: Object | string | number | undefined): boolean { return value instanceof Array } - static isArray_TouchTestInfo(value: Object | string | number | undefined): boolean { - return value instanceof Array - } static isArray_Measurable(value: Object | string | number | undefined): boolean { return value instanceof Array } @@ -5692,9 +5719,6 @@ export class TypeChecker { static isArray_NavDestinationTransition(value: Object | string | number | undefined): boolean { return value instanceof Array } - static isArray_GestureRecognizer(value: Object | string | number | undefined): boolean { - return value instanceof Array - } static isArray_FractionStop(value: Object | string | number | undefined): boolean { return value instanceof Array } @@ -5788,27 +5812,6 @@ export class TypeChecker { static isArray_AlertDialogButtonOptions(value: Object | string | number | undefined): boolean { return value instanceof Array } - static isArray_Rectangle(value: Object | string | number | undefined): boolean { - return value instanceof Array - } - static isArray_uniformTypeDescriptor_UniformDataType(value: Object | string | number | undefined): boolean { - return value instanceof Array - } - static isArray_ObscuredReasons(value: Object | string | number | undefined): boolean { - return value instanceof Array - } - static isArray_SafeAreaType(value: Object | string | number | undefined): boolean { - return value instanceof Array - } - static isArray_SafeAreaEdge(value: Object | string | number | undefined): boolean { - return value instanceof Array - } - static isArray_MenuElement(value: Object | string | number | undefined): boolean { - return value instanceof Array - } - static isArray_ModifierKey(value: Object | string | number | undefined): boolean { - return value instanceof Array - } static isArray_Length(value: Object | string | number | undefined): boolean { return value instanceof Array } diff --git a/arkoala-arkts/arkui/generated/framework/index.ets b/arkoala-arkts/arkui/generated/framework/index.ets index fcf988c659..3e5990facb 100644 --- a/arkoala-arkts/arkui/generated/framework/index.ets +++ b/arkoala-arkts/arkui/generated/framework/index.ets @@ -156,7 +156,6 @@ export * from "./../component/flex" export * from "./../component/flowItem" export * from "./../component/focus" export * from "./../component/folderStack" -export * from "./../component/forEach" export * from "./../component/formComponent" export * from "./../component/formLink" export * from "./../component/gauge" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.app.ability.common.ets b/arkoala-arkts/arkui/generated/framework/ohos.app.ability.common.ets index bce2c03c9c..aaaf22b0c2 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.app.ability.common.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.app.ability.common.ets @@ -35,6 +35,7 @@ export class common_Context_serializer { return common.ContextInternal.fromPtr(ptr) } } +export default common export namespace common { export class ContextInternal { public static fromPtr(ptr: KPointer): common.Context { diff --git a/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets b/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets index 2b97c69889..258e80e127 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { extractors } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, DeserializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, CallbackResource, InteropNativeModule, Tags, nullptr, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets b/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets index 4b95b7cb5f..df5cf344f9 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets @@ -241,6 +241,7 @@ export class uiObserver_NavDestinationSwitchInfo_serializer { return value } } +export default uiObserver export namespace uiObserver { export class DensityInfoInternal { public static fromPtr(ptr: KPointer): uiObserver.DensityInfo { diff --git a/arkoala-arkts/arkui/generated/framework/ohos.curves.ets b/arkoala-arkts/arkui/generated/framework/ohos.curves.ets index 64b0c3e554..48946cb12d 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.curves.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.curves.ets @@ -34,6 +34,7 @@ export class curves_ICurve_serializer { return curves.ICurveInternal.fromPtr(ptr) } } +export default curves export namespace curves { export interface ICurve { interpolate(fraction: number): number diff --git a/arkoala-arkts/arkui/generated/framework/ohos.data.unifiedDataChannel.ets b/arkoala-arkts/arkui/generated/framework/ohos.data.unifiedDataChannel.ets index 28ba015a3a..0fdbf8315f 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.data.unifiedDataChannel.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.data.unifiedDataChannel.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { extractors } from "#handwritten" -import { unifiedDataChannel } from "@ohos.data.unifiedDataChannel" +import { default as unifiedDataChannel } from "@ohos.data.unifiedDataChannel" import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KPointer, NativeBuffer, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { TypeChecker } from "#components" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.graphics.common2D.ets b/arkoala-arkts/arkui/generated/framework/ohos.graphics.common2D.ets index 61e4530865..eb79ef89b7 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.graphics.common2D.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.graphics.common2D.ets @@ -101,6 +101,7 @@ export class common2D_Rect_serializer { return value } } +export default common2D export namespace common2D { export interface Color { alpha: number; diff --git a/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets b/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets index 5c1750737c..8aa21d39c7 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets @@ -20,9 +20,9 @@ import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" -import { common2D_Color_serializer, common2D, common2D_Rect_serializer, common2D_Point3d_serializer, common2D_Point_serializer } from "./ohos.graphics.common2D" +import { common2D_Color_serializer, default as common2D, common2D_Rect_serializer, common2D_Point3d_serializer, common2D_Point_serializer } from "./ohos.graphics.common2D" import { extractors } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" export class drawing_Brush_serializer { @@ -421,6 +421,7 @@ export class drawing_TextBlobRunBuffer_serializer { return value } } +export default drawing export namespace drawing { export class BrushInternal { public static fromPtr(ptr: KPointer): drawing.Brush { diff --git a/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets b/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets index 8d7b5f03bd..935c9eab5d 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets @@ -20,8 +20,8 @@ import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" -import { common2D_Color_serializer, common2D, common2D_Rect_serializer, common2D_Point_serializer } from "./ohos.graphics.common2D" -import { drawing_FontMetrics_serializer, drawing } from "./ohos.graphics.drawing" +import { common2D_Color_serializer, default as common2D, common2D_Rect_serializer, common2D_Point_serializer } from "./ohos.graphics.common2D" +import { drawing_FontMetrics_serializer, default as drawing } from "./ohos.graphics.drawing" import { Resource_serializer } from "./resource" import { Resource } from "global.resource" import { memo, memo_stable } from "@koalaui/runtime/annotations" @@ -1237,6 +1237,7 @@ export class text_RunMetrics_serializer { return value } } +export default text export namespace text { export class FontCollectionInternal { public static fromPtr(ptr: KPointer): text.FontCollection { diff --git a/arkoala-arkts/arkui/generated/framework/ohos.graphics.uiEffect.ets b/arkoala-arkts/arkui/generated/framework/ohos.graphics.uiEffect.ets index 9132988d31..106c5ff63d 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.graphics.uiEffect.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.graphics.uiEffect.ets @@ -142,6 +142,7 @@ export class uiEffect_BrightnessBlenderParam_serializer { return value } } +export default uiEffect export namespace uiEffect { export interface VisualEffect { backgroundColorBlender(blender: BrightnessBlender): VisualEffect diff --git a/arkoala-arkts/arkui/generated/framework/ohos.intl.ets b/arkoala-arkts/arkui/generated/framework/ohos.intl.ets index b536e238b2..1a2e463b43 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.intl.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.intl.ets @@ -298,6 +298,7 @@ export class intl_DateTimeOptions_serializer { return value } } +export default intl export namespace intl { export interface DateTimeOptions { locale?: string; diff --git a/arkoala-arkts/arkui/generated/framework/ohos.matrix4.ets b/arkoala-arkts/arkui/generated/framework/ohos.matrix4.ets index 0beb470dbb..3e656ae570 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.matrix4.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.matrix4.ets @@ -20,7 +20,7 @@ import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" -import { common2D_Point_serializer, common2D } from "./ohos.graphics.common2D" +import { common2D_Point_serializer, default as common2D } from "./ohos.graphics.common2D" import { TranslateOptions_serializer, ScaleOptions_serializer, RotateOptions_serializer, TranslateOptions, ScaleOptions, RotateOptions } from "./../component/common" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" @@ -111,6 +111,7 @@ export class matrix4_PolyToPolyOptions_serializer { return value } } +export default matrix4 export namespace matrix4 { export interface Matrix4Transit { copy(): Matrix4Transit diff --git a/arkoala-arkts/arkui/generated/framework/ohos.measure.ets b/arkoala-arkts/arkui/generated/framework/ohos.measure.ets index 9a01cfeddc..30015d3811 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.measure.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.measure.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" import { FontStyle, FontWeight, TextOverflow, TextCase } from "./../component/enums" -import { text } from "./ohos.graphics.text" +import { default as text } from "./ohos.graphics.text" import { Resource_serializer } from "./resource" import { TypeChecker } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets b/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets index 8243753da1..9e4c29c90b 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { extractors } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KPointer, NativeBuffer, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { TypeChecker } from "#components" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.multimodalInput.pointer.ets b/arkoala-arkts/arkui/generated/framework/ohos.multimodalInput.pointer.ets index 4d62bc31d2..578e6334de 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.multimodalInput.pointer.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.multimodalInput.pointer.ets @@ -20,6 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" +export default pointer export namespace pointer { export enum PointerStyle { DEFAULT = 0, diff --git a/arkoala-arkts/arkui/generated/framework/ohos.promptAction.ets b/arkoala-arkts/arkui/generated/framework/ohos.promptAction.ets index 06aa92f594..f165fdc23f 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.promptAction.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.promptAction.ets @@ -81,6 +81,7 @@ export class LevelOrder_serializer { return LevelOrderInternal.fromPtr(ptr) } } +export default promptAction export namespace promptAction { export interface DialogController { } diff --git a/arkoala-arkts/arkui/generated/framework/ohos.web.webview.ets b/arkoala-arkts/arkui/generated/framework/ohos.web.webview.ets index 71c8c7e655..d284ec276f 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.web.webview.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.web.webview.ets @@ -51,6 +51,7 @@ export class webview_WebviewController_serializer { return webview.WebviewControllerInternal.fromPtr(ptr) } } +export default webview export namespace webview { export class WebviewControllerInternal { public static fromPtr(ptr: KPointer): webview.WebviewController { diff --git a/arkoala-arkts/arkui/generated/framework/ohos.window.ets b/arkoala-arkts/arkui/generated/framework/ohos.window.ets index 541d9190ea..5467f9bdd2 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.window.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.window.ets @@ -46,6 +46,7 @@ export class window_SystemBarStyle_serializer { return value } } +export default window export namespace window { export enum WindowStatusType { UNDEFINED = 0, diff --git a/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets b/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets index 57681c24ca..30c65af05f 100644 --- a/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets +++ b/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets @@ -24,7 +24,7 @@ import { TextMenuItem_serializer, DeleteValue_serializer, EditableTextChangeValu import { ComputedBarAttribute_serializer, ComputedBarAttribute } from "./../../component/grid" import { CopyEvent_serializer, CutEvent_serializer, RichEditorChangeValue_serializer, RichEditorDeleteValue_serializer, RichEditorInsertValue_serializer, RichEditorRange_serializer, RichEditorSelection_serializer, RichEditorTextSpanResult_serializer, PasteEvent_serializer, CopyEvent, CutEvent, RichEditorChangeValue, RichEditorDeleteValue, RichEditorInsertValue, RichEditorRange, RichEditorSelection, RichEditorTextSpanResult, PasteEvent, MenuCallback, MenuOnAppearCallback, OnHoverCallback, PasteEventCallback, SubmitCallback } from "./../../component/richEditor" import { CustomSpanMeasureInfo_serializer, CustomSpanMetrics_serializer, CustomSpanDrawInfo_serializer, StyledString_serializer, UserDataSpan_serializer, CustomSpanMeasureInfo, CustomSpanMetrics, CustomSpanDrawInfo, StyledString, UserDataSpan, StyledStringMarshallCallback, StyledStringUnmarshallCallback } from "./../../component/styledString" -import { uiObserver_DensityInfo_serializer, uiObserver_NavDestinationInfo_serializer, uiObserver_NavDestinationSwitchInfo_serializer, uiObserver_RouterPageInfo_serializer, uiObserver_ScrollEventInfo_serializer, uiObserver_TabContentInfo_serializer, uiObserver } from "./../ohos.arkui.observer" +import { uiObserver_DensityInfo_serializer, uiObserver_NavDestinationInfo_serializer, uiObserver_NavDestinationSwitchInfo_serializer, uiObserver_RouterPageInfo_serializer, uiObserver_ScrollEventInfo_serializer, uiObserver_TabContentInfo_serializer, default as uiObserver } from "./../ohos.arkui.observer" import { DismissDialogAction_serializer, DismissDialogAction } from "./../../component/actionSheet" import { DrawContext_serializer, DrawContext } from "./../../Graphics" import { ErrorInformation_serializer, FormCallbackInfo_serializer, ErrorInformation, FormCallbackInfo } from "./../../component/formComponent" @@ -66,7 +66,7 @@ import { registerApiEventHandler, ResourceHolder, KInt, KStringPtr, wrapSystemCa import { int32, float32, int64 } from "@koalaui/common" import { CallbackTransformer } from "./../../CallbackTransformer" import { extractors } from "#handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { PasteButtonOnClickResult } from "./../../component/pasteButton" import { SaveButtonOnClickResult } from "./../../component/saveButton" import { HitTestMode, Edge, ScrollSource } from "./../../component/enums" diff --git a/arkoala-arkts/arkui/sdk/Graphics.ets b/arkoala-arkts/arkui/sdk/Graphics.ets index fb060f7d46..547688de17 100644 --- a/arkoala-arkts/arkui/sdk/Graphics.ets +++ b/arkoala-arkts/arkui/sdk/Graphics.ets @@ -20,11 +20,11 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { drawing } from "./framework/ohos.graphics.drawing" +import { default as drawing } from "./framework/ohos.graphics.drawing" import { Resource } from "global.resource" import { ResourceColor } from "./component/units" import { Color } from "./component/enums" -import { common2D } from "./framework/ohos.graphics.common2D" +import { default as common2D } from "./framework/ohos.graphics.common2D" export declare interface Size { width: number; height: number; diff --git a/arkoala-arkts/arkui/sdk/component/animator.ets b/arkoala-arkts/arkui/sdk/component/animator.ets index 5d435c4823..f038cd96b8 100644 --- a/arkoala-arkts/arkui/sdk/component/animator.ets +++ b/arkoala-arkts/arkui/sdk/component/animator.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AnimationStatus, FillMode, PlayMode } from "./enums" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { AttributeModifier, AttributeUpdater } from "./../handwritten" export declare class SpringProp { constructor(mass: number, stiffness: number, damping: number) diff --git a/arkoala-arkts/arkui/sdk/component/canvas.ets b/arkoala-arkts/arkui/sdk/component/canvas.ets index d4bc652cbd..3f3c15cccd 100644 --- a/arkoala-arkts/arkui/sdk/component/canvas.ets +++ b/arkoala-arkts/arkui/sdk/component/canvas.ets @@ -23,7 +23,7 @@ import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { LengthMetricsUnit, LengthMetrics, Size } from "./../Graphics" import { Matrix2D } from "./matrix2d" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { FrameNode } from "./../FrameNode" import { ImageAnalyzerConfig, ImageAIOptions } from "./imageCommon" import { CommonMethod, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/column.ets b/arkoala-arkts/arkui/sdk/component/column.ets index 1221be50e3..ddcfc8d94b 100644 --- a/arkoala-arkts/arkui/sdk/component/column.ets +++ b/arkoala-arkts/arkui/sdk/component/column.ets @@ -26,7 +26,7 @@ import { HorizontalAlign, FlexAlign } from "./enums" import { AttributeModifier, AttributeUpdater } from "./../handwritten" export type SpaceType = string | number | Resource; export declare interface ColumnOptions { - space?: SpaceType; + space?: string | number; } export declare interface ColumnOptionsV2 { _stub: int32; diff --git a/arkoala-arkts/arkui/sdk/component/common.ets b/arkoala-arkts/arkui/sdk/component/common.ets index 3a15fd9f7c..d22dc1e193 100644 --- a/arkoala-arkts/arkui/sdk/component/common.ets +++ b/arkoala-arkts/arkui/sdk/component/common.ets @@ -24,31 +24,31 @@ import { TransitionType, TextDecorationType, Color, TextDecorationStyle, PlayMod import { Position, ConstraintSizeOptions, ResourceColor, Length, Bias, Area, Font, BorderRadiuses, EdgeWidths, LocalizedEdgeWidths, SizeOptions, VoidCallback, ResourceStr, Dimension, EdgeColors, LocalizedEdgeColors, EdgeStyles, LocalizedBorderRadiuses, Padding, EdgeOutlineWidths, ChainWeightOptions, LocalizedPadding, BorderOptions, OutlineOptions, EdgeOutlineStyles, OutlineRadiuses, Edges, LocalizedEdges, LocalizedPosition, AccessibilityOptions, DirectionalEdgesT } from "./units" import { Resource } from "global.resource" import { Context } from "./../framework/application.Context" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { DrawContext, LengthMetrics } from "./../Graphics" import { extractors, CustomStyles, ContentModifier, GestureModifier, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CustomBuilder } from "./builder" -import { pointer } from "./../framework/ohos.multimodalInput.pointer" +import { default as pointer } from "./../framework/ohos.multimodalInput.pointer" import { ButtonType, ButtonStyleMode, ButtonRole } from "./button" import { BaseGestureEvent, GestureRecognizer, GestureJudgeResult, GestureInfo, GestureType, Gesture, GestureMask } from "./gesture" -import { unifiedDataChannel } from "@ohos.data.unifiedDataChannel" -import { uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" +import { default as unifiedDataChannel } from "@ohos.data.unifiedDataChannel" +import { default as uniformTypeDescriptor } from "@ohos.data.uniformTypeDescriptor" import { IntentionCode } from "./../framework/ohos.multimodalInput.intentionCode" import { UIContext } from "./../framework/ohos.arkui.UIContext" import { SymbolGlyphModifier } from "./../SymbolGlyphModifier" import { StyledString } from "./styledString" import { ResizableOptions } from "./image" -import { uiEffect } from "./../framework/ohos.graphics.uiEffect" +import { default as uiEffect } from "./../framework/ohos.graphics.uiEffect" import { FocusBoxStyle, FocusPriority } from "./focus" import { CircleShape, EllipseShape, PathShape, RectShape } from "./../framework/ohos.arkui.shape" import { ComponentContent } from "./../ComponentContent" -import { uiObserver } from "./../framework/ohos.arkui.observer" -import { promptAction } from "./../framework/ohos.promptAction" +import { default as uiObserver } from "./../framework/ohos.arkui.observer" +import { default as promptAction } from "./../framework/ohos.promptAction" import { TextRange } from "./textCommon" import { ScrollState } from "./list" import { Want } from "./../framework/ohos.app.ability.Want" -import { intl } from "./../framework/ohos.intl" +import { default as intl } from "./../framework/ohos.intl" export declare interface TransitionOptions { type?: TransitionType; opacity?: number; diff --git a/arkoala-arkts/arkui/sdk/component/datePicker.ets b/arkoala-arkts/arkui/sdk/component/datePicker.ets index 0f147b91cc..6919d9e986 100644 --- a/arkoala-arkts/arkui/sdk/component/datePicker.ets +++ b/arkoala-arkts/arkui/sdk/component/datePicker.ets @@ -26,7 +26,7 @@ import { AttributeModifier, AttributeUpdater } from "./../handwritten" import { ResourceColor, Offset, VoidCallback } from "./units" import { Resource } from "global.resource" import { DialogAlignment } from "./alertDialog" -import { intl } from "./../framework/ohos.intl" +import { default as intl } from "./../framework/ohos.intl" export declare interface DatePickerResult { year?: number; month?: number; diff --git a/arkoala-arkts/arkui/sdk/component/enums.ets b/arkoala-arkts/arkui/sdk/component/enums.ets index 430526e069..ccc535c265 100644 --- a/arkoala-arkts/arkui/sdk/component/enums.ets +++ b/arkoala-arkts/arkui/sdk/component/enums.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" export enum CheckBoxShape { CIRCLE = 0, ROUNDED_SQUARE = 1 diff --git a/arkoala-arkts/arkui/sdk/component/extendableComponent.ets b/arkoala-arkts/arkui/sdk/component/extendableComponent.ets index 15143fdb0c..907f427a40 100644 --- a/arkoala-arkts/arkui/sdk/component/extendableComponent.ets +++ b/arkoala-arkts/arkui/sdk/component/extendableComponent.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { UIContext } from "./../framework/ohos.arkui.UIContext" -import { uiObserver } from "./../framework/ohos.arkui.observer" +import { default as uiObserver } from "./../framework/ohos.arkui.observer" export declare interface LifeCycle { aboutToAppear(): void aboutToDisappear(): void diff --git a/arkoala-arkts/arkui/sdk/component/folderStack.ets b/arkoala-arkts/arkui/sdk/component/folderStack.ets index 4b50eb210a..4b11a8996e 100644 --- a/arkoala-arkts/arkui/sdk/component/folderStack.ets +++ b/arkoala-arkts/arkui/sdk/component/folderStack.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { window } from "./../framework/ohos.window" +import { default as window } from "./../framework/ohos.window" import { FoldStatus, Alignment, AppRotation } from "./enums" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AttributeModifier, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/forEach.ets b/arkoala-arkts/arkui/sdk/component/forEach.ets deleted file mode 100644 index 7268764e32..0000000000 --- a/arkoala-arkts/arkui/sdk/component/forEach.ets +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2024-2025 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. - */ - - -// WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! - -import { int32, int64, float32 } from "@koalaui/common" -import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" -import { memo, memo_stable } from "@koalaui/runtime/annotations" -import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -export type ItemGeneratorFunc = (item: T, index: number) => void; -export type KeyGeneratorFunc = (item: T, index: number) => string; diff --git a/arkoala-arkts/arkui/sdk/component/idlize.ets b/arkoala-arkts/arkui/sdk/component/idlize.ets index efee530e19..b53c4cc764 100644 --- a/arkoala-arkts/arkui/sdk/component/idlize.ets +++ b/arkoala-arkts/arkui/sdk/component/idlize.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { AnimateParam, TranslateOptions, TouchEvent, GeometryInfo, Measurable, SizeResult, Layoutable, ClickEvent } from "./common" import { Size, Frame } from "./../Graphics" import { ButtonConfiguration } from "./button" @@ -42,7 +42,7 @@ import { CustomBuilder } from "./builder" import { Resource } from "global.resource" import { ResourceStr, ResourceColor, Position, Length, SizeOptions, ConstraintSizeOptions } from "./units" import { Color } from "./enums" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { FontOptions, FontInfo } from "@ohos.font" import { MeasureOptions } from "./../framework/ohos.measure" import { NavPathStack, NavPathInfo, NavigationOptions } from "./navigation" diff --git a/arkoala-arkts/arkui/sdk/component/image.ets b/arkoala-arkts/arkui/sdk/component/image.ets index 6191b048f1..275fe6552c 100644 --- a/arkoala-arkts/arkui/sdk/component/image.ets +++ b/arkoala-arkts/arkui/sdk/component/image.ets @@ -20,9 +20,9 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { drawing } from "./../framework/ohos.graphics.drawing" -import { image } from "@ohos.multimedia.image" -import { matrix4 } from "./../framework/ohos.matrix4" +import { default as drawing } from "./../framework/ohos.graphics.drawing" +import { default as image } from "@ohos.multimedia.image" +import { default as matrix4 } from "./../framework/ohos.matrix4" import { CommonMethod, PointLightStyle, ArkCommonMethodStyle } from "./common" import { Resource } from "global.resource" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/imageAnimator.ets b/arkoala-arkts/arkui/sdk/component/imageAnimator.ets index a1cc4d7066..272fba7ca4 100644 --- a/arkoala-arkts/arkui/sdk/component/imageAnimator.ets +++ b/arkoala-arkts/arkui/sdk/component/imageAnimator.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AnimationStatus, FillMode } from "./enums" export declare interface ImageFrameInfo { diff --git a/arkoala-arkts/arkui/sdk/component/imageSpan.ets b/arkoala-arkts/arkui/sdk/component/imageSpan.ets index 5cb5b0395a..46b45b8f45 100644 --- a/arkoala-arkts/arkui/sdk/component/imageSpan.ets +++ b/arkoala-arkts/arkui/sdk/component/imageSpan.ets @@ -23,10 +23,10 @@ import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { BaseSpan, ArkBaseSpanStyle } from "./span" import { ImageSpanAlignment, ImageFit } from "./enums" import { ColorFilter, ResourceStr } from "./units" -import { drawing } from "./../framework/ohos.graphics.drawing" +import { default as drawing } from "./../framework/ohos.graphics.drawing" import { ImageErrorCallback, ImageError } from "./image" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { Resource } from "global.resource" export interface ImageSpanAttribute extends BaseSpan { diff --git a/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets b/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets index fc4b6e1b14..5197a2d139 100644 --- a/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets +++ b/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets @@ -23,7 +23,7 @@ import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { ImageAttribute, ArkImageStyle } from "./image" import { AttributeModifier, extractors, AttributeUpdater } from "./../handwritten" import { CommonMethod, ArkCommonMethodStyle } from "./common" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { ResourceStr } from "./units" import { Resource } from "global.resource" import { DrawableDescriptor } from "./../framework/ohos.arkui.drawableDescriptor" diff --git a/arkoala-arkts/arkui/sdk/component/navDestination.ets b/arkoala-arkts/arkui/sdk/component/navDestination.ets index 0d4c08ec5b..c1b3ee9292 100644 --- a/arkoala-arkts/arkui/sdk/component/navDestination.ets +++ b/arkoala-arkts/arkui/sdk/component/navDestination.ets @@ -26,12 +26,12 @@ import { TitleHeight } from "./enums" import { Length, ResourceStr } from "./units" import { NavPathInfo, NavPathStack, NavigationMenuItem, NavigationOperation, NavigationTitleOptions, NavigationMenuOptions, ToolbarItem, NavigationToolbarOptions } from "./navigation" import { Scroller } from "./scroll" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { CommonMethod, LayoutSafeAreaType, LayoutSafeAreaEdge, ArkCommonMethodStyle } from "./common" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { SymbolGlyphModifier } from "./../SymbolGlyphModifier" -import { window } from "./../framework/ohos.window" +import { default as window } from "./../framework/ohos.window" export type Orientation = object; export declare interface NavDestinationCommonTitle { main: string | Resource; diff --git a/arkoala-arkts/arkui/sdk/component/navigation.ets b/arkoala-arkts/arkui/sdk/component/navigation.ets index 6835713794..1ca4ce1c22 100644 --- a/arkoala-arkts/arkui/sdk/component/navigation.ets +++ b/arkoala-arkts/arkui/sdk/component/navigation.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { window } from "./../framework/ohos.window" +import { default as window } from "./../framework/ohos.window" import { Resource } from "global.resource" import { CustomBuilder, PageMapBuilder } from "./builder" import { TitleHeight, Color } from "./enums" @@ -31,7 +31,7 @@ import { BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, CommonM import { LengthMetrics } from "./../Graphics" import { TextModifier } from "./../TextModifier" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" export type SystemBarStyle = window.SystemBarStyle; export declare interface NavigationCommonTitle { main: string | Resource; diff --git a/arkoala-arkts/arkui/sdk/component/pageTransition.ets b/arkoala-arkts/arkui/sdk/component/pageTransition.ets index e47cf145f1..aca2fba6a6 100644 --- a/arkoala-arkts/arkui/sdk/component/pageTransition.ets +++ b/arkoala-arkts/arkui/sdk/component/pageTransition.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" export enum RouteType { NONE = 0, None = 0, diff --git a/arkoala-arkts/arkui/sdk/component/particle.ets b/arkoala-arkts/arkui/sdk/component/particle.ets index 08f05d51d6..c06daa972b 100644 --- a/arkoala-arkts/arkui/sdk/component/particle.ets +++ b/arkoala-arkts/arkui/sdk/component/particle.ets @@ -23,7 +23,7 @@ import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { VP, Dimension, ResourceStr, ResourceColor } from "./units" import { Resource } from "global.resource" import { ImageFit, Color } from "./enums" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { Vector2T, LengthMetrics } from "./../Graphics" export declare interface VelocityOptions { speed: [ number, number ]; diff --git a/arkoala-arkts/arkui/sdk/component/richEditor.ets b/arkoala-arkts/arkui/sdk/component/richEditor.ets index f1349f01eb..0cf12988e6 100644 --- a/arkoala-arkts/arkui/sdk/component/richEditor.ets +++ b/arkoala-arkts/arkui/sdk/component/richEditor.ets @@ -27,7 +27,7 @@ import { DecorationStyleInterface, StyledString, MutableStyledString } from "./s import { ShadowOptions, ClickEvent, HoverEvent, HapticFeedbackMode, SelectionOptions, RectResult, CommonMethod, ArkCommonMethodStyle } from "./common" import { TextBackgroundStyle } from "./span" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { SymbolEffectStrategy, SymbolRenderingStrategy } from "./symbolglyph" import { DecorationStyleResult, TextRange, MenuType, TextEditControllerEx, LayoutManager, PreviewText, StyledStringController, StyledStringChangedListener, TextDataDetectorConfig, OnDidChangeCallback, EditMenuOptions, KeyboardAppearance } from "./textCommon" import { GestureEvent } from "./gesture" diff --git a/arkoala-arkts/arkui/sdk/component/scroll.ets b/arkoala-arkts/arkui/sdk/component/scroll.ets index 5e80f8736f..ba91820509 100644 --- a/arkoala-arkts/arkui/sdk/component/scroll.ets +++ b/arkoala-arkts/arkui/sdk/component/scroll.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { LengthMetrics } from "./../Graphics" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { Dimension, Length, VoidCallback } from "./units" import { Resource } from "global.resource" import { Edge, ScrollSource, BarState, Color, EdgeEffect } from "./enums" diff --git a/arkoala-arkts/arkui/sdk/component/shape.ets b/arkoala-arkts/arkui/sdk/component/shape.ets index 89a44d2722..090345ffc8 100644 --- a/arkoala-arkts/arkui/sdk/component/shape.ets +++ b/arkoala-arkts/arkui/sdk/component/shape.ets @@ -25,7 +25,7 @@ import { ResourceColor, Length } from "./units" import { Color, LineCapStyle, LineJoinStyle } from "./enums" import { Resource } from "global.resource" import { AttributeModifier, extractors, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" export declare interface ViewportRect { x?: double | string; y?: double | string; diff --git a/arkoala-arkts/arkui/sdk/component/sidebar.ets b/arkoala-arkts/arkui/sdk/component/sidebar.ets index 31c79d85b1..997e8790e9 100644 --- a/arkoala-arkts/arkui/sdk/component/sidebar.ets +++ b/arkoala-arkts/arkui/sdk/component/sidebar.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { Resource } from "global.resource" import { CommonMethod, Bindable, DividerStyle, ArkCommonMethodStyle } from "./common" import { Length, Dimension } from "./units" diff --git a/arkoala-arkts/arkui/sdk/component/styledString.ets b/arkoala-arkts/arkui/sdk/component/styledString.ets index 6ae4e7ea16..ed37528df4 100644 --- a/arkoala-arkts/arkui/sdk/component/styledString.ets +++ b/arkoala-arkts/arkui/sdk/component/styledString.ets @@ -29,8 +29,8 @@ import { TextBackgroundStyle } from "./span" import { GestureEvent } from "./gesture" import { LeadingMarginPlaceholder } from "./richEditor" import { extractors } from "./../handwritten" -import { image } from "@ohos.multimedia.image" -import { drawing } from "./../framework/ohos.graphics.drawing" +import { default as image } from "@ohos.multimedia.image" +import { default as drawing } from "./../framework/ohos.graphics.drawing" export type StyledStringMarshallingValue = UserDataSpan; export type StyledStringMarshallCallback = (marshallableVal: UserDataSpan) => ArrayBuffer; export type StyledStringUnmarshallCallback = (buf: ArrayBuffer) => UserDataSpan; diff --git a/arkoala-arkts/arkui/sdk/component/swiper.ets b/arkoala-arkts/arkui/sdk/component/swiper.ets index f310ea4239..a7ef14d751 100644 --- a/arkoala-arkts/arkui/sdk/component/swiper.ets +++ b/arkoala-arkts/arkui/sdk/component/swiper.ets @@ -26,7 +26,7 @@ import { LengthMetrics } from "./../Graphics" import { Color, EdgeEffect, PageFlipMode } from "./enums" import { CommonMethod, Bindable, ArkCommonMethodStyle } from "./common" import { IndicatorComponentController } from "./indicatorcomponent" -import { curves } from "./../framework/ohos.curves" +import { default as curves } from "./../framework/ohos.curves" import { AttributeModifier, AttributeUpdater } from "./../handwritten" export declare class SwiperController { constructor() diff --git a/arkoala-arkts/arkui/sdk/component/textClock.ets b/arkoala-arkts/arkui/sdk/component/textClock.ets index 1bc744f2f2..99a254f24d 100644 --- a/arkoala-arkts/arkui/sdk/component/textClock.ets +++ b/arkoala-arkts/arkui/sdk/component/textClock.ets @@ -25,7 +25,7 @@ import { ResourceStr, ResourceColor, Length } from "./units" import { Resource } from "global.resource" import { Color, FontStyle, FontWeight } from "./enums" import { ContentModifier, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { intl } from "./../framework/ohos.intl" +import { default as intl } from "./../framework/ohos.intl" export declare class TextClockController { constructor() start(): void diff --git a/arkoala-arkts/arkui/sdk/component/timePicker.ets b/arkoala-arkts/arkui/sdk/component/timePicker.ets index b84d1a19c5..b2e964407d 100644 --- a/arkoala-arkts/arkui/sdk/component/timePicker.ets +++ b/arkoala-arkts/arkui/sdk/component/timePicker.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Bindable, CommonMethod, PickerTextStyle, PickerDialogButtonStyle, Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, ShadowOptions, ShadowStyle, HoverModeAreaType, ArkCommonMethodStyle } from "./common" -import { intl } from "./../framework/ohos.intl" +import { default as intl } from "./../framework/ohos.intl" import { CrownSensitivity, Color } from "./enums" import { AttributeModifier, AttributeUpdater } from "./../handwritten" import { DialogAlignment } from "./alertDialog" diff --git a/arkoala-arkts/arkui/sdk/component/video.ets b/arkoala-arkts/arkui/sdk/component/video.ets index b570b58cc6..ac849c00a4 100644 --- a/arkoala-arkts/arkui/sdk/component/video.ets +++ b/arkoala-arkts/arkui/sdk/component/video.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { ImageAIOptions, ImageAnalyzerConfig } from "./imageCommon" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { ImageFit } from "./enums" diff --git a/arkoala-arkts/arkui/sdk/component/web.ets b/arkoala-arkts/arkui/sdk/component/web.ets index b190f8be14..3bddb1236d 100644 --- a/arkoala-arkts/arkui/sdk/component/web.ets +++ b/arkoala-arkts/arkui/sdk/component/web.ets @@ -20,13 +20,13 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { webview } from "./../framework/ohos.web.webview" +import { default as webview } from "./../framework/ohos.web.webview" import { CustomBuilder } from "./builder" import { Resource } from "global.resource" import { Position } from "./units" import { TouchEvent, KeyEvent, CommonMethod, NestedScrollOptions, ArkCommonMethodStyle } from "./common" import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" import { MenuType, EditMenuOptions } from "./textCommon" import { CopyOptions, NestedScrollMode } from "./enums" export declare class WebCookie { diff --git a/arkoala-arkts/arkui/sdk/framework/index.ets b/arkoala-arkts/arkui/sdk/framework/index.ets index b05a614963..1121e5ffe5 100644 --- a/arkoala-arkts/arkui/sdk/framework/index.ets +++ b/arkoala-arkts/arkui/sdk/framework/index.ets @@ -48,7 +48,6 @@ export * from "./../component/flex" export * from "./../component/flowItem" export * from "./../component/focus" export * from "./../component/folderStack" -export * from "./../component/forEach" export * from "./../component/formComponent" export * from "./../component/formLink" export * from "./../component/gauge" diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.app.ability.common.ets b/arkoala-arkts/arkui/sdk/framework/ohos.app.ability.common.ets index c78be5cdd8..5a7dfec8ad 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.app.ability.common.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.app.ability.common.ets @@ -22,6 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { BaseContext } from "./application.BaseContext" export type Context_getGroupDir_Callback = (result: string) => void; +export default common export declare namespace common { export class Context extends BaseContext { cacheDir: string; diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.UIContext.ets b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.UIContext.ets index 7d286d5f27..60cba5b770 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.UIContext.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.UIContext.ets @@ -22,10 +22,10 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { ComponentContent } from "./../ComponentContent" import { PopupCommonOptions, MenuOptions, AnimateParam, SheetOptions } from "./../component/common" -import { drawing } from "./ohos.graphics.drawing" +import { default as drawing } from "./ohos.graphics.drawing" import { TextPickerDialogOptions } from "./../component/textPicker" import { FrameNode } from "./../FrameNode" -import { common } from "./ohos.app.ability.common" +import { default as common } from "./ohos.app.ability.common" import { WidthBreakpoint, HeightBreakpoint } from "./../component/enums" import { TextMenuOptions } from "./../component/textCommon" export declare interface TargetInfo { diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets index 7125ff1f72..0cf0634e2b 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { extractors } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" export declare class DrawableDescriptor { constructor() getPixelMap(): image.PixelMap diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets index 025465e43a..5b5757746a 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets @@ -24,6 +24,7 @@ import { ResourceStr } from "./../component/units" import { Resource } from "global.resource" import { NavPathStack, NavBar, NavigationOperation } from "./../component/navigation" import { UIContext } from "./ohos.arkui.UIContext" +export default uiObserver export declare namespace uiObserver { export enum NavDestinationState { ON_SHOWN = 0, diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.curves.ets b/arkoala-arkts/arkui/sdk/framework/ohos.curves.ets index 677798a282..0bfc15c23c 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.curves.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.curves.ets @@ -20,6 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" +export default curves export declare namespace curves { export enum Curve { LINEAR = 0, diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.common2D.ets b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.common2D.ets index 08ef71ac8b..437211631c 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.common2D.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.common2D.ets @@ -20,6 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" +export default common2D export declare namespace common2D { export interface Color { alpha: number; diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets index 684fae34cb..044685a4ee 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets @@ -20,9 +20,10 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { common2D } from "./ohos.graphics.common2D" +import { default as common2D } from "./ohos.graphics.common2D" import { extractors } from "./../handwritten" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" +export default drawing export declare namespace drawing { export enum BlendMode { CLEAR = 0, diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets index 759530c10c..5972e27e87 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets @@ -20,9 +20,10 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { common2D } from "./ohos.graphics.common2D" +import { default as common2D } from "./ohos.graphics.common2D" import { Resource } from "global.resource" -import { drawing } from "./ohos.graphics.drawing" +import { default as drawing } from "./ohos.graphics.drawing" +export default text export declare namespace text { export enum TextAlign { LEFT = 0, diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.uiEffect.ets b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.uiEffect.ets index ea138626ab..d3c21272d4 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.uiEffect.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.uiEffect.ets @@ -20,6 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" +export default uiEffect export declare namespace uiEffect { export interface Filter { } diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.intl.ets b/arkoala-arkts/arkui/sdk/framework/ohos.intl.ets index 02700bd621..98139034df 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.intl.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.intl.ets @@ -20,6 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" +export default intl export declare namespace intl { export interface DateTimeOptions { locale?: string; diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.matrix4.ets b/arkoala-arkts/arkui/sdk/framework/ohos.matrix4.ets index 712f7c418e..021fe7a318 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.matrix4.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.matrix4.ets @@ -20,8 +20,9 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { common2D } from "./ohos.graphics.common2D" +import { default as common2D } from "./ohos.graphics.common2D" import { TranslateOptions, ScaleOptions, RotateOptions } from "./../component/common" +export default matrix4 export declare namespace matrix4 { export interface PolyToPolyOptions { src: Array; diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets b/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets index 927635eb99..1b1948c375 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" import { FontStyle, FontWeight, TextOverflow, TextCase } from "./../component/enums" -import { text } from "./ohos.graphics.text" +import { default as text } from "./ohos.graphics.text" export declare interface MeasureOptions { textContent: string | Resource; constraintWidth?: number | string | Resource; diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.multimodalInput.pointer.ets b/arkoala-arkts/arkui/sdk/framework/ohos.multimodalInput.pointer.ets index 13c524d801..6351eac0e5 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.multimodalInput.pointer.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.multimodalInput.pointer.ets @@ -20,6 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" +export default pointer export declare namespace pointer { export enum PointerStyle { DEFAULT = 0, diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.promptAction.ets b/arkoala-arkts/arkui/sdk/framework/ohos.promptAction.ets index 5474e60656..e2bd00273e 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.promptAction.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.promptAction.ets @@ -32,6 +32,7 @@ export declare class LevelOrder { static clamp(order: number): LevelOrder getOrder(): number } +export default promptAction export declare namespace promptAction { export interface DialogController { } diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.web.webview.ets b/arkoala-arkts/arkui/sdk/framework/ohos.web.webview.ets index 27e0f171c3..b004ec27b9 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.web.webview.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.web.webview.ets @@ -21,6 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" +export default webview export declare namespace webview { export interface WebHeader { headerKey: string; diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.window.ets b/arkoala-arkts/arkui/sdk/framework/ohos.window.ets index 8bc85e1c93..80045d03ad 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.window.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.window.ets @@ -20,6 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" +export default window export declare namespace window { export enum WindowStatusType { UNDEFINED = 0, diff --git a/arkoala-arkts/framework/native/src/generated/Serializers.h b/arkoala-arkts/framework/native/src/generated/Serializers.h index 603cb55608..85eab24b95 100644 --- a/arkoala-arkts/framework/native/src/generated/Serializers.h +++ b/arkoala-arkts/framework/native/src/generated/Serializers.h @@ -1725,6 +1725,34 @@ inline Ark_RuntimeType runtimeType(const Opt_ColorMetrics& value) return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> +inline Ark_RuntimeType runtimeType(const Ark_CommonMethod& value) +{ + return INTEROP_RUNTIME_OBJECT; +} +template <> +inline void WriteToString(std::string* result, const Ark_CommonMethod* value) { + result->append("{"); + result->append("}"); +} +template <> +inline void WriteToString(std::string* result, const Opt_CommonMethod* value) { + result->append("{.tag="); + result->append(tagNameExact(reinterpret_cast(value->tag))); + result->append(", .value="); + if (value->tag != INTEROP_TAG_UNDEFINED) { + WriteToString(result, &value->value); + } else { + Ark_Undefined undefined = { 0 }; + WriteToString(result, undefined); + } + result->append("}"); +} +template <> +inline Ark_RuntimeType runtimeType(const Opt_CommonMethod& value) +{ + return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); +} +template <> inline Ark_RuntimeType runtimeType(const Ark_CommonShape& value) { return INTEROP_RUNTIME_OBJECT; @@ -33064,6 +33092,37 @@ inline Ark_RuntimeType runtimeType(const Opt_ColorFilterType& value) return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> +inline Ark_RuntimeType runtimeType(const Ark_ColumnOptions& value) +{ + return INTEROP_RUNTIME_OBJECT; +} +template <> +inline void WriteToString(std::string* result, const Ark_ColumnOptions* value) { + result->append("{"); + // Ark_Union_String_Number space + result->append(".space="); + WriteToString(result, &value->space); + result->append("}"); +} +template <> +inline void WriteToString(std::string* result, const Opt_ColumnOptions* value) { + result->append("{.tag="); + result->append(tagNameExact(reinterpret_cast(value->tag))); + result->append(", .value="); + if (value->tag != INTEROP_TAG_UNDEFINED) { + WriteToString(result, &value->value); + } else { + Ark_Undefined undefined = { 0 }; + WriteToString(result, undefined); + } + result->append("}"); +} +template <> +inline Ark_RuntimeType runtimeType(const Opt_ColumnOptions& value) +{ + return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); +} +template <> inline Ark_RuntimeType runtimeType(const Ark_ColumnOptionsV2& value) { return INTEROP_RUNTIME_OBJECT; @@ -41046,57 +41105,6 @@ inline Ark_RuntimeType runtimeType(const Opt_SnapshotOptions& value) return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> -inline Ark_RuntimeType runtimeType(const Ark_SpaceType& value) -{ - switch (value.selector) { - case 0: return runtimeType(value.value0); - case 1: return runtimeType(value.value1); - case 2: return runtimeType(value.value2); - default: INTEROP_FATAL("Bad selector in Ark_SpaceType: %d", value.selector); - } -} -template <> -inline void WriteToString(std::string* result, const Ark_SpaceType* value) { - result->append("{"); - result->append(".selector="); - result->append(std::to_string(value->selector)); - result->append(", "); - // Ark_String - if (value->selector == 0) { - result->append(".value0="); - WriteToString(result, &value->value0); - } - // Ark_Number - if (value->selector == 1) { - result->append(".value1="); - WriteToString(result, &value->value1); - } - // Ark_Resource - if (value->selector == 2) { - result->append(".value2="); - WriteToString(result, &value->value2); - } - result->append("}"); -} -template <> -inline void WriteToString(std::string* result, const Opt_SpaceType* value) { - result->append("{.tag="); - result->append(tagNameExact(reinterpret_cast(value->tag))); - result->append(", .value="); - if (value->tag != INTEROP_TAG_UNDEFINED) { - WriteToString(result, &value->value); - } else { - Ark_Undefined undefined = { 0 }; - WriteToString(result, undefined); - } - result->append("}"); -} -template <> -inline Ark_RuntimeType runtimeType(const Opt_SpaceType& value) -{ - return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); -} -template <> inline Ark_RuntimeType runtimeType(const Ark_SpringBackAction& value) { return INTEROP_RUNTIME_OBJECT; @@ -43708,6 +43716,51 @@ inline Ark_RuntimeType runtimeType(const Opt_Union_Color_String_Resource_Number& return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> +inline Ark_RuntimeType runtimeType(const Ark_Union_ColumnOptions_ColumnOptionsV2& value) +{ + switch (value.selector) { + case 0: return runtimeType(value.value0); + case 1: return runtimeType(value.value1); + default: INTEROP_FATAL("Bad selector in Ark_Union_ColumnOptions_ColumnOptionsV2: %d", value.selector); + } +} +template <> +inline void WriteToString(std::string* result, const Ark_Union_ColumnOptions_ColumnOptionsV2* value) { + result->append("{"); + result->append(".selector="); + result->append(std::to_string(value->selector)); + result->append(", "); + // Ark_ColumnOptions + if (value->selector == 0) { + result->append(".value0="); + WriteToString(result, &value->value0); + } + // Ark_ColumnOptionsV2 + if (value->selector == 1) { + result->append(".value1="); + WriteToString(result, &value->value1); + } + result->append("}"); +} +template <> +inline void WriteToString(std::string* result, const Opt_Union_ColumnOptions_ColumnOptionsV2* value) { + result->append("{.tag="); + result->append(tagNameExact(reinterpret_cast(value->tag))); + result->append(", .value="); + if (value->tag != INTEROP_TAG_UNDEFINED) { + WriteToString(result, &value->value); + } else { + Ark_Undefined undefined = { 0 }; + WriteToString(result, undefined); + } + result->append("}"); +} +template <> +inline Ark_RuntimeType runtimeType(const Opt_Union_ColumnOptions_ColumnOptionsV2& value) +{ + return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); +} +template <> inline Ark_RuntimeType runtimeType(const Ark_Union_CustomBuilder_DragItemInfo& value) { switch (value.selector) { @@ -47696,37 +47749,6 @@ inline Ark_RuntimeType runtimeType(const Opt_Colors& value) return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> -inline Ark_RuntimeType runtimeType(const Ark_ColumnOptions& value) -{ - return INTEROP_RUNTIME_OBJECT; -} -template <> -inline void WriteToString(std::string* result, const Ark_ColumnOptions* value) { - result->append("{"); - // Ark_SpaceType space - result->append(".space="); - WriteToString(result, &value->space); - result->append("}"); -} -template <> -inline void WriteToString(std::string* result, const Opt_ColumnOptions* value) { - result->append("{.tag="); - result->append(tagNameExact(reinterpret_cast(value->tag))); - result->append(", .value="); - if (value->tag != INTEROP_TAG_UNDEFINED) { - WriteToString(result, &value->value); - } else { - Ark_Undefined undefined = { 0 }; - WriteToString(result, undefined); - } - result->append("}"); -} -template <> -inline Ark_RuntimeType runtimeType(const Opt_ColumnOptions& value) -{ - return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); -} -template <> inline Ark_RuntimeType runtimeType(const Ark_ComponentInfo& value) { return INTEROP_RUNTIME_OBJECT; @@ -51970,51 +51992,6 @@ inline Ark_RuntimeType runtimeType(const Opt_Union_CanvasRenderingContext2D_Draw return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); } template <> -inline Ark_RuntimeType runtimeType(const Ark_Union_ColumnOptions_ColumnOptionsV2& value) -{ - switch (value.selector) { - case 0: return runtimeType(value.value0); - case 1: return runtimeType(value.value1); - default: INTEROP_FATAL("Bad selector in Ark_Union_ColumnOptions_ColumnOptionsV2: %d", value.selector); - } -} -template <> -inline void WriteToString(std::string* result, const Ark_Union_ColumnOptions_ColumnOptionsV2* value) { - result->append("{"); - result->append(".selector="); - result->append(std::to_string(value->selector)); - result->append(", "); - // Ark_ColumnOptions - if (value->selector == 0) { - result->append(".value0="); - WriteToString(result, &value->value0); - } - // Ark_ColumnOptionsV2 - if (value->selector == 1) { - result->append(".value1="); - WriteToString(result, &value->value1); - } - result->append("}"); -} -template <> -inline void WriteToString(std::string* result, const Opt_Union_ColumnOptions_ColumnOptionsV2* value) { - result->append("{.tag="); - result->append(tagNameExact(reinterpret_cast(value->tag))); - result->append(", .value="); - if (value->tag != INTEROP_TAG_UNDEFINED) { - WriteToString(result, &value->value); - } else { - Ark_Undefined undefined = { 0 }; - WriteToString(result, undefined); - } - result->append("}"); -} -template <> -inline Ark_RuntimeType runtimeType(const Opt_Union_ColumnOptions_ColumnOptionsV2& value) -{ - return (value.tag != INTEROP_TAG_UNDEFINED) ? (INTEROP_RUNTIME_OBJECT) : (INTEROP_RUNTIME_UNDEFINED); -} -template <> inline Ark_RuntimeType runtimeType(const Ark_Union_Dimension_Array_Dimension& value) { switch (value.selector) { @@ -64414,6 +64391,11 @@ class CloseSwipeActionOptions_serializer { static void write(SerializerBase& buffer, Ark_CloseSwipeActionOptions value); static Ark_CloseSwipeActionOptions read(DeserializerBase& buffer); }; +class ColumnOptions_serializer { + public: + static void write(SerializerBase& buffer, Ark_ColumnOptions value); + static Ark_ColumnOptions read(DeserializerBase& buffer); +}; class ColumnOptionsV2_serializer { public: static void write(SerializerBase& buffer, Ark_ColumnOptionsV2 value); @@ -65734,11 +65716,6 @@ class Colors_serializer { static void write(SerializerBase& buffer, Ark_Colors value); static Ark_Colors read(DeserializerBase& buffer); }; -class ColumnOptions_serializer { - public: - static void write(SerializerBase& buffer, Ark_ColumnOptions value); - static Ark_ColumnOptions read(DeserializerBase& buffer); -}; class ComponentInfo_serializer { public: static void write(SerializerBase& buffer, Ark_ComponentInfo value); @@ -70844,6 +70821,51 @@ inline Ark_CloseSwipeActionOptions CloseSwipeActionOptions_serializer::read(Dese value.onFinish = onFinishTmpBuf; return value; } +inline void ColumnOptions_serializer::write(SerializerBase& buffer, Ark_ColumnOptions value) +{ + SerializerBase& valueSerializer = buffer; + const auto valueHolderForSpace = value.space; + if (runtimeType(valueHolderForSpace) != INTEROP_RUNTIME_UNDEFINED) { + valueSerializer.writeInt8(INTEROP_RUNTIME_OBJECT); + const auto valueHolderForSpaceTmpValue = valueHolderForSpace.value; + if (valueHolderForSpaceTmpValue.selector == 0) { + valueSerializer.writeInt8(0); + const auto valueHolderForSpaceTmpValueForIdx0 = valueHolderForSpaceTmpValue.value0; + valueSerializer.writeString(valueHolderForSpaceTmpValueForIdx0); + } else if (valueHolderForSpaceTmpValue.selector == 1) { + valueSerializer.writeInt8(1); + const auto valueHolderForSpaceTmpValueForIdx1 = valueHolderForSpaceTmpValue.value1; + valueSerializer.writeNumber(valueHolderForSpaceTmpValueForIdx1); + } + } else { + valueSerializer.writeInt8(INTEROP_RUNTIME_UNDEFINED); + } +} +inline Ark_ColumnOptions ColumnOptions_serializer::read(DeserializerBase& buffer) +{ + Ark_ColumnOptions value = {}; + DeserializerBase& valueDeserializer = buffer; + const auto spaceTmpBuf_runtimeType = static_cast(valueDeserializer.readInt8()); + Opt_Union_String_Number spaceTmpBuf = {}; + spaceTmpBuf.tag = spaceTmpBuf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; + if ((spaceTmpBuf_runtimeType) != (INTEROP_RUNTIME_UNDEFINED)) { + const Ark_Int8 spaceTmpBuf_UnionSelector = valueDeserializer.readInt8(); + Ark_Union_String_Number spaceTmpBuf_ = {}; + spaceTmpBuf_.selector = spaceTmpBuf_UnionSelector; + if (spaceTmpBuf_UnionSelector == 0) { + spaceTmpBuf_.selector = 0; + spaceTmpBuf_.value0 = static_cast(valueDeserializer.readString()); + } else if (spaceTmpBuf_UnionSelector == 1) { + spaceTmpBuf_.selector = 1; + spaceTmpBuf_.value1 = static_cast(valueDeserializer.readNumber()); + } else { + INTEROP_FATAL("One of the branches for spaceTmpBuf_ has to be chosen through deserialisation."); + } + spaceTmpBuf.value = static_cast(spaceTmpBuf_); + } + value.space = spaceTmpBuf; + return value; +} inline void ColumnOptionsV2_serializer::write(SerializerBase& buffer, Ark_ColumnOptionsV2 value) { SerializerBase& valueSerializer = buffer; @@ -84299,58 +84321,6 @@ inline Ark_Colors Colors_serializer::read(DeserializerBase& buffer) value.interactiveClick = static_cast(interactiveClickTmpBuf); return value; } -inline void ColumnOptions_serializer::write(SerializerBase& buffer, Ark_ColumnOptions value) -{ - SerializerBase& valueSerializer = buffer; - const auto valueHolderForSpace = value.space; - if (runtimeType(valueHolderForSpace) != INTEROP_RUNTIME_UNDEFINED) { - valueSerializer.writeInt8(INTEROP_RUNTIME_OBJECT); - const auto valueHolderForSpaceTmpValue = valueHolderForSpace.value; - if (valueHolderForSpaceTmpValue.selector == 0) { - valueSerializer.writeInt8(0); - const auto valueHolderForSpaceTmpValueForIdx0 = valueHolderForSpaceTmpValue.value0; - valueSerializer.writeString(valueHolderForSpaceTmpValueForIdx0); - } else if (valueHolderForSpaceTmpValue.selector == 1) { - valueSerializer.writeInt8(1); - const auto valueHolderForSpaceTmpValueForIdx1 = valueHolderForSpaceTmpValue.value1; - valueSerializer.writeNumber(valueHolderForSpaceTmpValueForIdx1); - } else if (valueHolderForSpaceTmpValue.selector == 2) { - valueSerializer.writeInt8(2); - const auto valueHolderForSpaceTmpValueForIdx2 = valueHolderForSpaceTmpValue.value2; - Resource_serializer::write(valueSerializer, valueHolderForSpaceTmpValueForIdx2); - } - } else { - valueSerializer.writeInt8(INTEROP_RUNTIME_UNDEFINED); - } -} -inline Ark_ColumnOptions ColumnOptions_serializer::read(DeserializerBase& buffer) -{ - Ark_ColumnOptions value = {}; - DeserializerBase& valueDeserializer = buffer; - const auto spaceTmpBuf_runtimeType = static_cast(valueDeserializer.readInt8()); - Opt_SpaceType spaceTmpBuf = {}; - spaceTmpBuf.tag = spaceTmpBuf_runtimeType == INTEROP_RUNTIME_UNDEFINED ? INTEROP_TAG_UNDEFINED : INTEROP_TAG_OBJECT; - if ((spaceTmpBuf_runtimeType) != (INTEROP_RUNTIME_UNDEFINED)) { - const Ark_Int8 spaceTmpBuf_UnionSelector = valueDeserializer.readInt8(); - Ark_SpaceType spaceTmpBuf_ = {}; - spaceTmpBuf_.selector = spaceTmpBuf_UnionSelector; - if (spaceTmpBuf_UnionSelector == 0) { - spaceTmpBuf_.selector = 0; - spaceTmpBuf_.value0 = static_cast(valueDeserializer.readString()); - } else if (spaceTmpBuf_UnionSelector == 1) { - spaceTmpBuf_.selector = 1; - spaceTmpBuf_.value1 = static_cast(valueDeserializer.readNumber()); - } else if (spaceTmpBuf_UnionSelector == 2) { - spaceTmpBuf_.selector = 2; - spaceTmpBuf_.value2 = Resource_serializer::read(valueDeserializer); - } else { - INTEROP_FATAL("One of the branches for spaceTmpBuf_ has to be chosen through deserialisation."); - } - spaceTmpBuf.value = static_cast(spaceTmpBuf_); - } - value.space = spaceTmpBuf; - return value; -} inline void ComponentInfo_serializer::write(SerializerBase& buffer, Ark_ComponentInfo value) { SerializerBase& valueSerializer = buffer; diff --git a/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h b/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h index fd2ebdb8b8..c41e6c0026 100644 --- a/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h +++ b/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h @@ -315,6 +315,8 @@ typedef struct Opt_ColorFilter Opt_ColorFilter; typedef struct ColorMetricsPeer ColorMetricsPeer; typedef struct ColorMetricsPeer* Ark_ColorMetrics; typedef struct Opt_ColorMetrics Opt_ColorMetrics; +typedef struct Ark_CommonMethod Ark_CommonMethod; +typedef struct Opt_CommonMethod Opt_CommonMethod; typedef struct CommonShapePeer CommonShapePeer; typedef struct CommonShapePeer* Ark_CommonShape; typedef struct Opt_CommonShape Opt_CommonShape; @@ -1825,6 +1827,8 @@ typedef struct Ark_CloseSwipeActionOptions Ark_CloseSwipeActionOptions; typedef struct Opt_CloseSwipeActionOptions Opt_CloseSwipeActionOptions; typedef struct Ark_ColorFilterType Ark_ColorFilterType; typedef struct Opt_ColorFilterType Opt_ColorFilterType; +typedef struct Ark_ColumnOptions Ark_ColumnOptions; +typedef struct Opt_ColumnOptions Opt_ColumnOptions; typedef struct Ark_ColumnOptionsV2 Ark_ColumnOptionsV2; typedef struct Opt_ColumnOptionsV2 Opt_ColumnOptionsV2; typedef struct Ark_CommandPath Ark_CommandPath; @@ -2259,8 +2263,6 @@ typedef struct Ark_SliderConfiguration Ark_SliderConfiguration; typedef struct Opt_SliderConfiguration Opt_SliderConfiguration; typedef struct Ark_SnapshotOptions Ark_SnapshotOptions; typedef struct Opt_SnapshotOptions Opt_SnapshotOptions; -typedef struct Ark_SpaceType Ark_SpaceType; -typedef struct Opt_SpaceType Opt_SpaceType; typedef struct Ark_SpringBackAction Ark_SpringBackAction; typedef struct Opt_SpringBackAction Opt_SpringBackAction; typedef struct Ark_SslErrorEvent Ark_SslErrorEvent; @@ -2382,6 +2384,8 @@ typedef struct Ark_Union_Color_String_Resource_ColoringStrategy Ark_Union_Color_ typedef struct Opt_Union_Color_String_Resource_ColoringStrategy Opt_Union_Color_String_Resource_ColoringStrategy; typedef struct Ark_Union_Color_String_Resource_Number Ark_Union_Color_String_Resource_Number; typedef struct Opt_Union_Color_String_Resource_Number Opt_Union_Color_String_Resource_Number; +typedef struct Ark_Union_ColumnOptions_ColumnOptionsV2 Ark_Union_ColumnOptions_ColumnOptionsV2; +typedef struct Opt_Union_ColumnOptions_ColumnOptionsV2 Opt_Union_ColumnOptions_ColumnOptionsV2; typedef struct Ark_Union_CustomBuilder_DragItemInfo Ark_Union_CustomBuilder_DragItemInfo; typedef struct Opt_Union_CustomBuilder_DragItemInfo Opt_Union_CustomBuilder_DragItemInfo; typedef struct Ark_Union_CustomBuilder_DragItemInfo_String Ark_Union_CustomBuilder_DragItemInfo_String; @@ -2549,8 +2553,6 @@ typedef struct Ark_CircleStyleOptions Ark_CircleStyleOptions; typedef struct Opt_CircleStyleOptions Opt_CircleStyleOptions; typedef struct Ark_Colors Ark_Colors; typedef struct Opt_Colors Opt_Colors; -typedef struct Ark_ColumnOptions Ark_ColumnOptions; -typedef struct Opt_ColumnOptions Opt_ColumnOptions; typedef struct Ark_ComponentInfo Ark_ComponentInfo; typedef struct Opt_ComponentInfo Opt_ComponentInfo; typedef struct Ark_ContentCoverOptions Ark_ContentCoverOptions; @@ -2768,8 +2770,6 @@ typedef struct Ark_Union_Boolean_PopupMaskType Ark_Union_Boolean_PopupMaskType; typedef struct Opt_Union_Boolean_PopupMaskType Opt_Union_Boolean_PopupMaskType; typedef struct Ark_Union_CanvasRenderingContext2D_DrawingRenderingContext Ark_Union_CanvasRenderingContext2D_DrawingRenderingContext; typedef struct Opt_Union_CanvasRenderingContext2D_DrawingRenderingContext Opt_Union_CanvasRenderingContext2D_DrawingRenderingContext; -typedef struct Ark_Union_ColumnOptions_ColumnOptionsV2 Ark_Union_ColumnOptions_ColumnOptionsV2; -typedef struct Opt_Union_ColumnOptions_ColumnOptionsV2 Opt_Union_ColumnOptions_ColumnOptionsV2; typedef struct Ark_Union_Dimension_Array_Dimension Ark_Union_Dimension_Array_Dimension; typedef struct Opt_Union_Dimension_Array_Dimension Opt_Union_Dimension_Array_Dimension; typedef struct Ark_Union_Dimension_OptionWidthMode Ark_Union_Dimension_OptionWidthMode; @@ -7149,6 +7149,14 @@ typedef struct Opt_ColorMetrics { Ark_Tag tag; Ark_ColorMetrics value; } Opt_ColorMetrics; +typedef struct Ark_CommonMethod { + /* kind: Interface */ + void *handle; +} Ark_CommonMethod; +typedef struct Opt_CommonMethod { + Ark_Tag tag; + Ark_CommonMethod value; +} Opt_CommonMethod; typedef struct Opt_CommonShape { Ark_Tag tag; Ark_CommonShape value; @@ -11388,8 +11396,8 @@ typedef struct Opt_CustomNodeBuilder { typedef struct CustomStyles { /* kind: Callback */ Ark_CallbackResource resource; - void (*call)(const Ark_Int32 resourceId, const Ark_String instance); - void (*callSync)(Ark_VMContext vmContext, const Ark_Int32 resourceId, const Ark_String instance); + void (*call)(const Ark_Int32 resourceId, const Ark_CommonMethod instance); + void (*callSync)(Ark_VMContext vmContext, const Ark_Int32 resourceId, const Ark_CommonMethod instance); } CustomStyles; typedef struct Opt_CustomStyles { Ark_Tag tag; @@ -12998,6 +13006,14 @@ typedef struct Opt_ColorFilterType { Ark_Tag tag; Ark_ColorFilterType value; } Opt_ColorFilterType; +typedef struct Ark_ColumnOptions { + /* kind: Interface */ + Opt_Union_String_Number space; +} Ark_ColumnOptions; +typedef struct Opt_ColumnOptions { + Ark_Tag tag; + Ark_ColumnOptions value; +} Opt_ColumnOptions; typedef struct Ark_ColumnOptionsV2 { /* kind: Interface */ Ark_Int32 _stub; @@ -14979,19 +14995,6 @@ typedef struct Opt_SnapshotOptions { Ark_Tag tag; Ark_SnapshotOptions value; } Opt_SnapshotOptions; -typedef struct Ark_SpaceType { - /* kind: UnionType */ - Ark_Int32 selector; - union { - Ark_String value0; - Ark_Number value1; - Ark_Resource value2; - }; -} Ark_SpaceType; -typedef struct Opt_SpaceType { - Ark_Tag tag; - Ark_SpaceType value; -} Opt_SpaceType; typedef struct Ark_SpringBackAction { /* kind: Interface */ VoidCallback springBack; @@ -15654,6 +15657,18 @@ typedef struct Opt_Union_Color_String_Resource_Number { Ark_Tag tag; Ark_Union_Color_String_Resource_Number value; } Opt_Union_Color_String_Resource_Number; +typedef struct Ark_Union_ColumnOptions_ColumnOptionsV2 { + /* kind: UnionType */ + Ark_Int32 selector; + union { + Ark_ColumnOptions value0; + Ark_ColumnOptionsV2 value1; + }; +} Ark_Union_ColumnOptions_ColumnOptionsV2; +typedef struct Opt_Union_ColumnOptions_ColumnOptionsV2 { + Ark_Tag tag; + Ark_Union_ColumnOptions_ColumnOptionsV2 value; +} Opt_Union_ColumnOptions_ColumnOptionsV2; typedef struct Ark_Union_CustomBuilder_DragItemInfo { /* kind: UnionType */ Ark_Int32 selector; @@ -16675,14 +16690,6 @@ typedef struct Opt_Colors { Ark_Tag tag; Ark_Colors value; } Opt_Colors; -typedef struct Ark_ColumnOptions { - /* kind: Interface */ - Opt_SpaceType space; -} Ark_ColumnOptions; -typedef struct Opt_ColumnOptions { - Ark_Tag tag; - Ark_ColumnOptions value; -} Opt_ColumnOptions; typedef struct Ark_ComponentInfo { /* kind: Interface */ Ark_Size size; @@ -17750,18 +17757,6 @@ typedef struct Opt_Union_CanvasRenderingContext2D_DrawingRenderingContext { Ark_Tag tag; Ark_Union_CanvasRenderingContext2D_DrawingRenderingContext value; } Opt_Union_CanvasRenderingContext2D_DrawingRenderingContext; -typedef struct Ark_Union_ColumnOptions_ColumnOptionsV2 { - /* kind: UnionType */ - Ark_Int32 selector; - union { - Ark_ColumnOptions value0; - Ark_ColumnOptionsV2 value1; - }; -} Ark_Union_ColumnOptions_ColumnOptionsV2; -typedef struct Opt_Union_ColumnOptions_ColumnOptionsV2 { - Ark_Tag tag; - Ark_Union_ColumnOptions_ColumnOptionsV2 value; -} Opt_Union_ColumnOptions_ColumnOptionsV2; typedef struct Ark_Union_Dimension_Array_Dimension { /* kind: UnionType */ Ark_Int32 selector; -- Gitee From d4f9a5be246c92ff551d7ad872a1e4f6306504a1 Mon Sep 17 00:00:00 2001 From: platonovvladislav Date: Wed, 20 Aug 2025 16:48:56 +0300 Subject: [PATCH 2/2] Add default exports into modules --- arkoala-arkts/modules/ohos/src/data.unifiedDataChannel.ets | 2 ++ arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor.ets | 2 ++ arkoala-arkts/modules/ohos/src/multimedia.image.ets | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arkoala-arkts/modules/ohos/src/data.unifiedDataChannel.ets b/arkoala-arkts/modules/ohos/src/data.unifiedDataChannel.ets index 717c494dfb..c3c84c9fd2 100644 --- a/arkoala-arkts/modules/ohos/src/data.unifiedDataChannel.ets +++ b/arkoala-arkts/modules/ohos/src/data.unifiedDataChannel.ets @@ -34,3 +34,5 @@ export namespace unifiedDataChannel { destUri?: string; } } + +export default unifiedDataChannel; diff --git a/arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor.ets b/arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor.ets index 900314be26..18459847b6 100644 --- a/arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor.ets +++ b/arkoala-arkts/modules/ohos/src/data.uniformTypeDescriptor.ets @@ -22,3 +22,5 @@ export namespace uniformTypeDescriptor { TEXT = "general.text", } } + +export default uniformTypeDescriptor; diff --git a/arkoala-arkts/modules/ohos/src/multimedia.image.ets b/arkoala-arkts/modules/ohos/src/multimedia.image.ets index aef8628528..5332f46427 100644 --- a/arkoala-arkts/modules/ohos/src/multimedia.image.ets +++ b/arkoala-arkts/modules/ohos/src/multimedia.image.ets @@ -53,4 +53,6 @@ export namespace image { console.log(`call PixelMapInner.writeBufferToPixels(...)`) } } -} \ No newline at end of file +} + +export default image; -- Gitee