From 5e2695380ef80b2c1dfde711a9d66567e50a1f62 Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Thu, 21 Aug 2025 14:17:50 +0300 Subject: [PATCH 01/10] Some adjustments --- .../arkui/generated/ComponentContent.ets | 15 +++++++++++++++ .../arkui/generated/framework/ohos.base | 15 +++++++++++++++ .../arkui/generated/handwritten/index.ets | 2 ++ subset/subset.json | 2 ++ 4 files changed, 34 insertions(+) create mode 100644 subset/arkoala-arkts/arkui/generated/ComponentContent.ets create mode 100644 subset/arkoala-arkts/arkui/generated/framework/ohos.base diff --git a/subset/arkoala-arkts/arkui/generated/ComponentContent.ets b/subset/arkoala-arkts/arkui/generated/ComponentContent.ets new file mode 100644 index 0000000000..dacd7afd98 --- /dev/null +++ b/subset/arkoala-arkts/arkui/generated/ComponentContent.ets @@ -0,0 +1,15 @@ +import { SerializerBase, DeserializerBase } from "@koalaui/interop" +import { ComponentContent } from "arkui.ComponentContent" + +export class ComponentContent_serializer { + public static write(buffer: SerializerBase, value: ComponentContent): void { + let valueSerializer : SerializerBase = buffer + valueSerializer.writePointer(123) + } + public static read(buffer: DeserializerBase): ComponentContent { + let valueDeserializer : DeserializerBase = buffer + let ptr = valueDeserializer.readPointer() + let x = {} as Object + return x as ComponentContent + } +} diff --git a/subset/arkoala-arkts/arkui/generated/framework/ohos.base b/subset/arkoala-arkts/arkui/generated/framework/ohos.base new file mode 100644 index 0000000000..48d6e8c620 --- /dev/null +++ b/subset/arkoala-arkts/arkui/generated/framework/ohos.base @@ -0,0 +1,15 @@ +import { SerializerBase, DeserializerBase } from "@koalaui/interop" +import { BusinessError } from "@ohos.base" + +export class BusinessError_serializer { + public static write(buffer: SerializerBase, value: BusinessError): void { + let valueSerializer : SerializerBase = buffer + valueSerializer.writePointer(123) + } + public static read(buffer: DeserializerBase): BusinessError { + let valueDeserializer : DeserializerBase = buffer + let ptr = valueDeserializer.readPointer() + let x = {} as Object + return x as BusinessError + } +} diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index bd21ea26bc..6ed0f67504 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -155,3 +155,5 @@ export interface CustomDialogControllerOptions {} export class CustomDialogController { constructor(value:CustomDialogControllerOptions) {} } + +export class LocalStorage {} diff --git a/subset/subset.json b/subset/subset.json index d4a816e83b..259be2d1df 100644 --- a/subset/subset.json +++ b/subset/subset.json @@ -11,9 +11,11 @@ "arkoala-arkts/arkui/generated/NativePeerNode.ets", "arkoala-arkts/arkui/generated/PeerNode.ets", "arkoala-arkts/arkui/generated/ReusablePool.ets", + "arkoala-arkts/arkui/generated/ComponentContent.ets", "arkoala-arkts/arkui/generated/UserView.ets", "arkoala-arkts/arkui/generated/framework/main.ets", "arkoala-arkts/arkui/generated/framework/test_utils.ets", + "arkoala-arkts/arkui/generated/framework/ohos.base.ets", "arkoala-arkts/arkui/generated/framework/arkts/index.ets", "arkoala-cj/framework/cangjie/src/CallbackTransformer.cj", "arkoala-cj/framework/cangjie/src/ComponentBase.cj", -- Gitee From 06aa4b70b53b63d09edb43f11159d369a032f060 Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Thu, 21 Aug 2025 18:46:23 +0300 Subject: [PATCH 02/10] extractors --- .../arkui/generated/handwritten/index.ets | 270 +++++++++++++++++- 1 file changed, 267 insertions(+), 3 deletions(-) diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index 6ed0f67504..b1ff2b7e30 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -13,7 +13,28 @@ * limitations under the License. */ import { KPointer } from "@koalaui/interop" -import { image } from "@ohos.multimedia.image" +import { default as image } from "@ohos.multimedia.image" +import { ColorMetrics, DrawContext, LengthMetrics } from "arkui.Graphics" +import { NodeController } from "arkui.NodeController" +import { default as curves } from "@ohos.curves" +import { default as matrix4 } from "@ohos.matrix4" +import { default as drawing } from "@ohos.graphics.drawing" +import { default as uiEffect } from "@ohos.graphics.uiEffect" +import { default as unifiedDataChannel } from "@ohos.data.unifiedDataChannel" +import { default as webview } from "@ohos.web.webview" +import { default as Want } from "@ohos.app.ability.Want" +import { default as window } from "@ohos.window" +import { default as uiObserver } from "@ohos.arkui.observer" +import { UIContext } from "@ohos.arkui.UIContext" +import { DrawableDescriptor } from "@ohos.arkui.drawableDescriptor" +import { RectShape, CircleShape, EllipseShape, PathShape } from "@ohos.arkui.shape" +import { FrameNode } from "arkui.FrameNode" +import { default as resourceManager } from "@ohos.resourceManager" +import { LevelOrder } from "@ohos.promptAction" +import { SymbolGlyphModifier } from "../SymbolGlyphModifier" +import { TextModifier } from "../TextModifier" +import { default as EventHub } from "application.EventHub" +import { default as UIAbilityContext } from "application.UIAbilityContext" import { CommonMethod, StateStyles } from "../framework" import { AnimateParam } from '../framework' @@ -115,9 +136,252 @@ export namespace extractors { export function toImagePixelMapPtr(value: image.PixelMap): KPointer { return 123 } - export function fromImagePixelMapPtr(ptr: KPointer): image.PixelMap { - return new image.PixelMapImpl(ptr) + const x: Object = {} + return x as image.PixelMap + } + + export function toColorMetricsPtr(value: ColorMetrics):KPointer { + return 123 + } + export function fromColorMetricsPtr(ptr: KPointer):ColorMetrics { + const x: Object = {} + return x as ColorMetrics + } + + export function toDrawContextPtr(ptr: DrawContext):KPointer { + return 123 + } + export function fromDrawContextPtr(ptr: KPointer):DrawContext { + const x: Object = {} + return x as DrawContext + } + + export function toLengthMetricsPtr(ptr: LengthMetrics):KPointer { + return 123 + } + export function fromLengthMetricsPtr(ptr: KPointer):LengthMetrics { + const x: Object = {} + return x as LengthMetrics + } + + export function toNodeControllerPtr(value:NodeController):KPointer { + return 123 + } + export function fromNodeControllerPtr(ptr:KPointer):NodeController { + const x: Object = {} + return x as NodeController + } + + export function toFrameNodePtr(value:FrameNode):KPointer { + return 123 + } + export function fromFrameNodePtr(ptr:KPointer):FrameNode { + const x: Object = {} + return x as FrameNode + } + + // should be investigated and removed + // begin + export function toSymbolGlyphModifierPtr(value:SymbolGlyphModifier):KPointer { + return 123 + } + export function fromSymbolGlyphModifierPtr(ptr:KPointer):SymbolGlyphModifier { + const x: Object = {} + return x as SymbolGlyphModifier + } + + export function toTextModifierPtr(value:TextModifier):KPointer { + return 123 + } + export function fromTextModifierPtr(ptr:KPointer):TextModifier { + const x: Object = {} + return x as TextModifier + } + // end + + export function toCurvesICurvePtr(value:curves.ICurve):KPointer { + return 123 + } + export function fromCurvesICurvePtr(ptr:KPointer):curves.ICurve { + const x: Object = {} + return x as curves.ICurve + } + + export function toMatrix4Matrix4TransitPtr(value:matrix4.Matrix4Transit):KPointer { + return 123 + } + export function fromMatrix4Matrix4TransitPtr(ptr:KPointer):matrix4.Matrix4Transit { + const x: Object = {} + return x as matrix4.Matrix4Transit + } + + export function toDrawingCanvasPtr(value:drawing.Canvas):KPointer { + return 123 + } + export function fromDrawingCanvasPtr(ptr:KPointer):drawing.Canvas { + const x: Object = {} + return x as drawing.Canvas + } + + export function toDrawingColorFilterPtr(value:drawing.ColorFilter):KPointer { + return 123 + } + export function fromDrawingColorFilterPtr(ptr:KPointer):drawing.ColorFilter { + const x: Object = {} + return x as drawing.ColorFilter + } + + export function toDrawingLatticePtr(value:drawing.Lattice):KPointer { + return 123 + } + export function fromDrawingLatticePtr(ptr:KPointer):drawing.Lattice { + const x: Object = {} + return x as drawing.Lattice + } + + export function toUiEffectFilterPtr(value:uiEffect.Filter):KPointer { + return 123 + } + export function fromUiEffectFilterPtr(ptr:KPointer):uiEffect.Filter { + const x: Object = {} + return x as uiEffect.Filter + } + + export function toUiEffectVisualEffectPtr(value:uiEffect.VisualEffect):KPointer { + return 123 + } + export function fromUiEffectVisualEffectPtr(ptr:KPointer):uiEffect.VisualEffect { + const x: Object = {} + return x as uiEffect.VisualEffect + } + + export function toUnifiedDataChannelUnifiedDataPtr(value:unifiedDataChannel.UnifiedData):KPointer { + return 123 + } + export function fromUnifiedDataChannelUnifiedDataPtr(ptr:KPointer):unifiedDataChannel.UnifiedData { + const x: Object = {} + return x as unifiedDataChannel.UnifiedData + } + + export function toUnifiedDataChannelSummaryPtr(value:unifiedDataChannel.Summary):KPointer { + return 123 + } + export function fromUnifiedDataChannelSummaryPtr(ptr:KPointer):unifiedDataChannel.Summary { + const x: Object = {} + return x as unifiedDataChannel.Summary + } + + export function toWantPtr(value:Want):KPointer { + return 123 + } + export function fromWantPtr(ptr:KPointer):Want { + const x: Object = {} + return x as Want + } + + export function toUIContextPtr(value:UIContext):KPointer { + return 123 + } + export function fromUIContextPtr(ptr:KPointer):UIContext { + const x: Object = {} + return x as UIContext + } + + export function toEventHubPtr(value:EventHub):KPointer { + return 123 + } + export function fromEventHubPtr(ptr:KPointer):EventHub { + const x: Object = {} + return x as EventHub + } + + export function toUIAbilityContextPtr(value:UIAbilityContext):KPointer { + return 123 + } + export function fromUIAbilityContextPtr(ptr:KPointer):UIAbilityContext { + const x: Object = {} + return x as UIAbilityContext + } + + export function toWebviewWebviewControllerPtr(value:webview.WebviewController):KPointer { + return 123 + } + export function fromWebviewWebviewControllerPtr(ptr:KPointer):webview.WebviewController { + const x: Object = {} + return x as webview.WebviewController + } + + export function toDrawableDescriptorPtr(value:DrawableDescriptor):KPointer { + return 123 + } + export function fromDrawableDescriptorPtr(ptr:KPointer):DrawableDescriptor { + const x: Object = {} + return x as DrawableDescriptor + } + + export function toRectShapePtr(value:RectShape):KPointer { + return 123 + } + export function fromRectShapePtr(ptr:KPointer):RectShape { + const x: Object = {} + return x as RectShape + } + + export function toCircleShapePtr(value:CircleShape):KPointer { + return 123 + } + export function fromCircleShapePtr(ptr:KPointer):CircleShape { + const x: Object = {} + return x as CircleShape + } + + export function toEllipseShapePtr(value:EllipseShape):KPointer { + return 123 + } + export function fromEllipseShapePtr(ptr:KPointer):EllipseShape { + const x: Object = {} + return x as EllipseShape + } + + export function toPathShapePtr(value:PathShape):KPointer { + return 123 + } + export function fromPathShapePtr(ptr:KPointer):PathShape { + const x: Object = {} + return x as PathShape + } + + export function toResourceManagerResourceManagerPtr(value:resourceManager.ResourceManager):KPointer { + return 123 + } + export function fromResourceManagerResourceManagerPtr(ptr:KPointer):resourceManager.ResourceManager { + const x: Object = {} + return x as resourceManager.ResourceManager + } + + export function toLevelOrderPtr(value:LevelOrder):KPointer { + return 123 + } + export function fromLevelOrderPtr(ptr:KPointer):LevelOrder { + const x: Object = {} + return x as LevelOrder + } + + export function toWindowWindowStagePtr(value:window.WindowStage):KPointer { + return 123 + } + export function fromWindowWindowStagePtr(ptr:KPointer):window.WindowStage { + const x: Object = {} + return x as window.WindowStage + } + + export function toUiObserverRouterPageInfoPtr(value:uiObserver.RouterPageInfo):KPointer { + return 123 + } + export function fromUiObserverRouterPageInfoPtr(ptr:KPointer):uiObserver.RouterPageInfo { + const x: Object = {} + return x as uiObserver.RouterPageInfo } export function transform_Ark_BusinessError_Void_to_Ark_BusinessErrorInterface_Void(from: BusinessError): BusinessErrorInterface { -- Gitee From 6d6b1dbacadb6164bc4fb23bd6d35a687c1fb749 Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Fri, 22 Aug 2025 16:38:13 +0300 Subject: [PATCH 03/10] New declarations to match sdk --- .../generated/framework/{ohos.base => ohos.base.ets} | 11 ++++++++--- .../arkui/generated/handwritten/index.ets | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) rename subset/arkoala-arkts/arkui/generated/framework/{ohos.base => ohos.base.ets} (48%) diff --git a/subset/arkoala-arkts/arkui/generated/framework/ohos.base b/subset/arkoala-arkts/arkui/generated/framework/ohos.base.ets similarity index 48% rename from subset/arkoala-arkts/arkui/generated/framework/ohos.base rename to subset/arkoala-arkts/arkui/generated/framework/ohos.base.ets index 48d6e8c620..9153dc3d19 100644 --- a/subset/arkoala-arkts/arkui/generated/framework/ohos.base +++ b/subset/arkoala-arkts/arkui/generated/framework/ohos.base.ets @@ -1,12 +1,17 @@ import { SerializerBase, DeserializerBase } from "@koalaui/interop" -import { BusinessError } from "@ohos.base" + +export interface BusinessError {} + +export type Callback = (data: T) => void; +export type ErrorCallback = (err: T)=> void; +export type AsyncCallback = (err: BusinessError | null, data: T | undefined) => void; export class BusinessError_serializer { - public static write(buffer: SerializerBase, value: BusinessError): void { + public static write(buffer: SerializerBase, value: BusinessError): void { let valueSerializer : SerializerBase = buffer valueSerializer.writePointer(123) } - public static read(buffer: DeserializerBase): BusinessError { + public static read(buffer: DeserializerBase): BusinessError { let valueDeserializer : DeserializerBase = buffer let ptr = valueDeserializer.readPointer() let x = {} as Object diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index b1ff2b7e30..3660cc81d7 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -421,3 +421,7 @@ export class CustomDialogController { } export class LocalStorage {} + +export class WrappedBuilder { + public constructor(builder: T) {} +} -- Gitee From 7763528a24bfd4ede47cd259bfeaa8e0baa7ae4e Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Fri, 22 Aug 2025 18:18:23 +0300 Subject: [PATCH 04/10] More extractors --- .../arkui/generated/handwritten/index.ets | 152 +++++++++++++++++- 1 file changed, 151 insertions(+), 1 deletion(-) diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index 3660cc81d7..be6dd3a387 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -14,7 +14,7 @@ */ import { KPointer } from "@koalaui/interop" import { default as image } from "@ohos.multimedia.image" -import { ColorMetrics, DrawContext, LengthMetrics } from "arkui.Graphics" +import { ColorMetrics, DrawContext, LengthMetrics, Size } from "arkui.Graphics" import { NodeController } from "arkui.NodeController" import { default as curves } from "@ohos.curves" import { default as matrix4 } from "@ohos.matrix4" @@ -26,6 +26,12 @@ import { default as Want } from "@ohos.app.ability.Want" import { default as window } from "@ohos.window" import { default as uiObserver } from "@ohos.arkui.observer" import { UIContext } from "@ohos.arkui.UIContext" +import { AbilityInfo, WindowSize } from "bundleManager.AbilityInfo" +import { ApplicationInfo, ModuleMetadata, MultiAppMode } from "bundleManager.ApplicationInfo" +import { DataItem, Dependency, HapModuleInfo, PreloadItem, RouterItem } from "bundleManager.HapModuleInfo" +import { ExtensionAbilityInfo } from "bundleManager.ExtensionAbilityInfo" +import { Metadata } from "bundleManager.Metadata" +import { Skill, SkillUri } from "bundleManager.Skill" import { DrawableDescriptor } from "@ohos.arkui.drawableDescriptor" import { RectShape, CircleShape, EllipseShape, PathShape } from "@ohos.arkui.shape" import { FrameNode } from "arkui.FrameNode" @@ -384,6 +390,150 @@ export namespace extractors { return x as uiObserver.RouterPageInfo } + export function toAbilityInfoPtr(value:AbilityInfo):KPointer { + return 123 + } + export function fromAbilityInfoPtr(ptr:KPointer):AbilityInfo { + const x:Object = {} + return x as AbilityInfo + } + + export function toApplicationInfoPtr(value:ApplicationInfo):KPointer { + return 123 + } + export function fromApplicationInfoPtr(ptr:KPointer):ApplicationInfo { + const x:Object = {} + return x as ApplicationInfo + } + + export function toDataItemPtr(value:DataItem):KPointer { + return 123 + } + export function fromDataItemPtr(ptr:KPointer):DataItem { + const x:Object = {} + return x as DataItem + } + + export function toDependencyPtr(value:Dependency):KPointer { + return 123 + } + export function fromDependencyPtr(ptr:KPointer):Dependency { + const x:Object = {} + return x as Dependency + } + + export function toExtensionAbilityInfoPtr(value:ExtensionAbilityInfo):KPointer { + return 123 + } + export function fromExtensionAbilityInfoPtr(ptr:KPointer):ExtensionAbilityInfo { + const x:Object = {} + return x as ExtensionAbilityInfo + } + + export function toHapModuleInfoPtr(value:HapModuleInfo):KPointer { + return 123 + } + export function fromHapModuleInfoPtr(ptr:KPointer):HapModuleInfo { + const x:Object = {} + return x as HapModuleInfo + } + + export function toMetadataPtr(value:Metadata):KPointer { + return 123 + } + export function fromMetadataPtr(ptr:KPointer):Metadata { + const x:Object = {} + return x as Metadata + } + + export function toModuleMetadataPtr(value:ModuleMetadata):KPointer { + return 123 + } + export function fromModuleMetadataPtr(ptr:KPointer):ModuleMetadata { + const x:Object = {} + return x as ModuleMetadata + } + + export function toMultiAppModePtr(value:MultiAppMode):KPointer { + return 123 + } + export function fromMultiAppModePtr(ptr:KPointer):MultiAppMode { + const x:Object = {} + return x as MultiAppMode + } + + export function toPreloadItemPtr(value:PreloadItem):KPointer { + return 123 + } + export function fromPreloadItemPtr(ptr:KPointer):PreloadItem { + const x:Object = {} + return x as PreloadItem + } + + export function toRouterItemPtr(value:RouterItem):KPointer { + return 123 + } + export function fromRouterItemPtr(ptr:KPointer):RouterItem { + const x:Object = {} + return x as RouterItem + } + + export function toSizePtr(value:Size):KPointer { + return 123 + } + export function fromSizePtr(ptr:KPointer):Size { + const x:Object = {} + return x as Size + } + + export function toSkillPtr(value:Skill):KPointer { + return 123 + } + export function fromSkillPtr(ptr:KPointer):Skill { + const x:Object = {} + return x as Skill + } + + export function toSkillUriPtr(value:SkillUri):KPointer { + return 123 + } + export function fromSkillUriPtr(ptr:KPointer):SkillUri { + const x:Object = {} + return x as SkillUri + } + + export function toUiObserverNavDestinationInfoPtr(value:uiObserver.NavDestinationInfo):KPointer { + return 123 + } + export function fromUiObserverNavDestinationInfoPtr(ptr:KPointer):uiObserver.NavDestinationInfo { + const x:Object = {} + return x as uiObserver.NavDestinationInfo + } + + export function toUiObserverNavigationInfoPtr(value:uiObserver.NavigationInfo):KPointer { + return 123 + } + export function fromUiObserverNavigationInfoPtr(ptr:KPointer):uiObserver.NavigationInfo { + const x:Object = {} + return x as uiObserver.NavigationInfo + } + + export function toWindowSizePtr(value:WindowSize):KPointer { + return 123 + } + export function fromWindowSizePtr(ptr:KPointer):WindowSize { + const x:Object = {} + return x as WindowSize + } + + export function toWindowSystemBarStylePtr(value:window.SystemBarStyle):KPointer { + return 123 + } + export function fromWindowSystemBarStylePtr(ptr:KPointer):window.SystemBarStyle { + const x:Object = {} + return x as window.SystemBarStyle + } + export function transform_Ark_BusinessError_Void_to_Ark_BusinessErrorInterface_Void(from: BusinessError): BusinessErrorInterface { return { name: from.name, -- Gitee From ac1742db78533c7344d7de47b3e046cd352e3119 Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Fri, 22 Aug 2025 18:36:25 +0300 Subject: [PATCH 05/10] Fixed InteropObject (added runtimeType) --- interop/src/cpp/SerializerBase.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interop/src/cpp/SerializerBase.h b/interop/src/cpp/SerializerBase.h index c501eb05e7..1d99e7d512 100644 --- a/interop/src/cpp/SerializerBase.h +++ b/interop/src/cpp/SerializerBase.h @@ -46,6 +46,11 @@ template <> inline InteropRuntimeType runtimeType(const InteropMaterialized& value) { return INTEROP_RUNTIME_OBJECT; } +template<> +inline InteropRuntimeType runtimeType(const InteropObject& value) +{ + return INTEROP_RUNTIME_OBJECT; +} static const std::size_t buffer_size = 1024 * 1024; // 1 MB static std::size_t offset = 0; -- Gitee From 6d8870ecd05bd8e3232b7102a2d5f8477e3fda5c Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Fri, 22 Aug 2025 19:03:22 +0300 Subject: [PATCH 06/10] One more extractor --- .../arkoala-arkts/arkui/generated/handwritten/index.ets | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index be6dd3a387..c690e46681 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -23,6 +23,7 @@ import { default as uiEffect } from "@ohos.graphics.uiEffect" import { default as unifiedDataChannel } from "@ohos.data.unifiedDataChannel" import { default as webview } from "@ohos.web.webview" import { default as Want } from "@ohos.app.ability.Want" +import { Configuration } from "@ohos.app.ability.Configuration" import { default as window } from "@ohos.window" import { default as uiObserver } from "@ohos.arkui.observer" import { UIContext } from "@ohos.arkui.UIContext" @@ -534,6 +535,14 @@ export namespace extractors { return x as window.SystemBarStyle } + export function toConfigurationPtr(value:Configuration):KPointer { + return 123 + } + export function fromConfigurationPtr(ptr:KPointer):Configuration { + const x:Object = {} + return x as Configuration + } + export function transform_Ark_BusinessError_Void_to_Ark_BusinessErrorInterface_Void(from: BusinessError): BusinessErrorInterface { return { name: from.name, -- Gitee From e75560d43172053a96409426f5a15792013d659f Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Sat, 23 Aug 2025 13:59:24 +0300 Subject: [PATCH 07/10] updated only integrated files --- subset/subset.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/subset/subset.json b/subset/subset.json index 259be2d1df..10d47521bb 100644 --- a/subset/subset.json +++ b/subset/subset.json @@ -98,6 +98,8 @@ ], "generatedSubset": [ "arkoala-arkts/arkui/generated/framework/arkts/index.ets", - "arkoala/arkui/src/framework/shared/generated-utils.ts" + "arkoala/arkui/src/framework/shared/generated-utils.ts", + "arkoala-arkts/arkui/generated/framework/ohos.base.ets", + "arkoala-arkts/arkui/generated/ComponentContent.ets" ] } -- Gitee From 32a8576f65fb227b46f8928dc4ca18c8bac9f1b2 Mon Sep 17 00:00:00 2001 From: Pavel Mironchik Date: Wed, 27 Aug 2025 17:31:48 +0300 Subject: [PATCH 08/10] remove BusinessError from stubs --- .../arkui/generated/framework/ohos.base.ets | 20 ------------------- .../arkui/generated/handwritten/index.ets | 10 +++------- subset/subset.json | 1 - 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 subset/arkoala-arkts/arkui/generated/framework/ohos.base.ets diff --git a/subset/arkoala-arkts/arkui/generated/framework/ohos.base.ets b/subset/arkoala-arkts/arkui/generated/framework/ohos.base.ets deleted file mode 100644 index 9153dc3d19..0000000000 --- a/subset/arkoala-arkts/arkui/generated/framework/ohos.base.ets +++ /dev/null @@ -1,20 +0,0 @@ -import { SerializerBase, DeserializerBase } from "@koalaui/interop" - -export interface BusinessError {} - -export type Callback = (data: T) => void; -export type ErrorCallback = (err: T)=> void; -export type AsyncCallback = (err: BusinessError | null, data: T | undefined) => void; - -export class BusinessError_serializer { - public static write(buffer: SerializerBase, value: BusinessError): void { - let valueSerializer : SerializerBase = buffer - valueSerializer.writePointer(123) - } - public static read(buffer: DeserializerBase): BusinessError { - let valueDeserializer : DeserializerBase = buffer - let ptr = valueDeserializer.readPointer() - let x = {} as Object - return x as BusinessError - } -} diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index c690e46681..9acc0f228e 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -37,12 +37,13 @@ import { DrawableDescriptor } from "@ohos.arkui.drawableDescriptor" import { RectShape, CircleShape, EllipseShape, PathShape } from "@ohos.arkui.shape" import { FrameNode } from "arkui.FrameNode" import { default as resourceManager } from "@ohos.resourceManager" +import { BusinessError } from "@ohos.base" import { LevelOrder } from "@ohos.promptAction" import { SymbolGlyphModifier } from "../SymbolGlyphModifier" import { TextModifier } from "../TextModifier" import { default as EventHub } from "application.EventHub" import { default as UIAbilityContext } from "application.UIAbilityContext" -import { CommonMethod, StateStyles } from "../framework" +import { CommonMethod, StateStyles, BusinessErrorInterface } from "../framework" import { AnimateParam } from '../framework' import { ArkButtonComponent, ButtonConfiguration} from "../framework" @@ -553,12 +554,7 @@ export namespace extractors { } export function transform_Ark_BusinessErrorInterface_Void_to_Ark_BusinessError_Void(from: BusinessErrorInterface): BusinessError { - return { - name: from.name, - message: from.message, - stack: from.stack, - code: from.code, - } + return new BusinessError(from.code, new Error()) // TODO how to construct error correctly? } } diff --git a/subset/subset.json b/subset/subset.json index 10d47521bb..e600a9f714 100644 --- a/subset/subset.json +++ b/subset/subset.json @@ -15,7 +15,6 @@ "arkoala-arkts/arkui/generated/UserView.ets", "arkoala-arkts/arkui/generated/framework/main.ets", "arkoala-arkts/arkui/generated/framework/test_utils.ets", - "arkoala-arkts/arkui/generated/framework/ohos.base.ets", "arkoala-arkts/arkui/generated/framework/arkts/index.ets", "arkoala-cj/framework/cangjie/src/CallbackTransformer.cj", "arkoala-cj/framework/cangjie/src/ComponentBase.cj", -- Gitee From eaa4d71202696430969134761d99f725bf8ca508 Mon Sep 17 00:00:00 2001 From: Pavel Mironchik Date: Wed, 27 Aug 2025 17:42:19 +0300 Subject: [PATCH 09/10] remove ohos.base from only-integrated --- subset/arkoala-arkts/arkui/generated/handwritten/index.ets | 1 - subset/subset.json | 1 - 2 files changed, 2 deletions(-) diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index 9acc0f228e..2c218b82f0 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -60,7 +60,6 @@ import { ArkTextClockComponent, TextClockConfiguration } from "../framework" import { ArkTextTimerComponent, TextTimerConfiguration } from "../framework" import { ArkToggleComponent, ToggleConfiguration } from "../framework" import { BusinessErrorInterface } from "../framework" -import { BusinessError } from "../framework/ohos.base" import { pointer } from "@koalaui/interop" export interface PageTransitionExitInterface {} diff --git a/subset/subset.json b/subset/subset.json index e600a9f714..7b23861220 100644 --- a/subset/subset.json +++ b/subset/subset.json @@ -98,7 +98,6 @@ "generatedSubset": [ "arkoala-arkts/arkui/generated/framework/arkts/index.ets", "arkoala/arkui/src/framework/shared/generated-utils.ts", - "arkoala-arkts/arkui/generated/framework/ohos.base.ets", "arkoala-arkts/arkui/generated/ComponentContent.ets" ] } -- Gitee From a887b7d27ebad9b33d15b9fe04226b3b05915efd Mon Sep 17 00:00:00 2001 From: kolegovilya Date: Thu, 28 Aug 2025 19:06:44 +0300 Subject: [PATCH 10/10] Restore handwritten and fix subset --- .../arkui/generated/handwritten/index.ets | 446 +----------------- subset/subset.json | 1 - 2 files changed, 12 insertions(+), 435 deletions(-) diff --git a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets index 2c218b82f0..88179df7a4 100644 --- a/subset/arkoala-arkts/arkui/generated/handwritten/index.ets +++ b/subset/arkoala-arkts/arkui/generated/handwritten/index.ets @@ -13,37 +13,8 @@ * limitations under the License. */ import { KPointer } from "@koalaui/interop" -import { default as image } from "@ohos.multimedia.image" -import { ColorMetrics, DrawContext, LengthMetrics, Size } from "arkui.Graphics" -import { NodeController } from "arkui.NodeController" -import { default as curves } from "@ohos.curves" -import { default as matrix4 } from "@ohos.matrix4" -import { default as drawing } from "@ohos.graphics.drawing" -import { default as uiEffect } from "@ohos.graphics.uiEffect" -import { default as unifiedDataChannel } from "@ohos.data.unifiedDataChannel" -import { default as webview } from "@ohos.web.webview" -import { default as Want } from "@ohos.app.ability.Want" -import { Configuration } from "@ohos.app.ability.Configuration" -import { default as window } from "@ohos.window" -import { default as uiObserver } from "@ohos.arkui.observer" -import { UIContext } from "@ohos.arkui.UIContext" -import { AbilityInfo, WindowSize } from "bundleManager.AbilityInfo" -import { ApplicationInfo, ModuleMetadata, MultiAppMode } from "bundleManager.ApplicationInfo" -import { DataItem, Dependency, HapModuleInfo, PreloadItem, RouterItem } from "bundleManager.HapModuleInfo" -import { ExtensionAbilityInfo } from "bundleManager.ExtensionAbilityInfo" -import { Metadata } from "bundleManager.Metadata" -import { Skill, SkillUri } from "bundleManager.Skill" -import { DrawableDescriptor } from "@ohos.arkui.drawableDescriptor" -import { RectShape, CircleShape, EllipseShape, PathShape } from "@ohos.arkui.shape" -import { FrameNode } from "arkui.FrameNode" -import { default as resourceManager } from "@ohos.resourceManager" -import { BusinessError } from "@ohos.base" -import { LevelOrder } from "@ohos.promptAction" -import { SymbolGlyphModifier } from "../SymbolGlyphModifier" -import { TextModifier } from "../TextModifier" -import { default as EventHub } from "application.EventHub" -import { default as UIAbilityContext } from "application.UIAbilityContext" -import { CommonMethod, StateStyles, BusinessErrorInterface } from "../framework" +import { image } from "@ohos.multimedia.image" +import { CommonMethod, StateStyles } from "../framework" import { AnimateParam } from '../framework' import { ArkButtonComponent, ButtonConfiguration} from "../framework" @@ -60,6 +31,7 @@ import { ArkTextClockComponent, TextClockConfiguration } from "../framework" import { ArkTextTimerComponent, TextTimerConfiguration } from "../framework" import { ArkToggleComponent, ToggleConfiguration } from "../framework" import { BusinessErrorInterface } from "../framework" +import { BusinessError } from "../framework/ohos.base" import { pointer } from "@koalaui/interop" export interface PageTransitionExitInterface {} @@ -143,404 +115,9 @@ export namespace extractors { export function toImagePixelMapPtr(value: image.PixelMap): KPointer { return 123 } - export function fromImagePixelMapPtr(ptr: KPointer): image.PixelMap { - const x: Object = {} - return x as image.PixelMap - } - - export function toColorMetricsPtr(value: ColorMetrics):KPointer { - return 123 - } - export function fromColorMetricsPtr(ptr: KPointer):ColorMetrics { - const x: Object = {} - return x as ColorMetrics - } - - export function toDrawContextPtr(ptr: DrawContext):KPointer { - return 123 - } - export function fromDrawContextPtr(ptr: KPointer):DrawContext { - const x: Object = {} - return x as DrawContext - } - - export function toLengthMetricsPtr(ptr: LengthMetrics):KPointer { - return 123 - } - export function fromLengthMetricsPtr(ptr: KPointer):LengthMetrics { - const x: Object = {} - return x as LengthMetrics - } - - export function toNodeControllerPtr(value:NodeController):KPointer { - return 123 - } - export function fromNodeControllerPtr(ptr:KPointer):NodeController { - const x: Object = {} - return x as NodeController - } - - export function toFrameNodePtr(value:FrameNode):KPointer { - return 123 - } - export function fromFrameNodePtr(ptr:KPointer):FrameNode { - const x: Object = {} - return x as FrameNode - } - - // should be investigated and removed - // begin - export function toSymbolGlyphModifierPtr(value:SymbolGlyphModifier):KPointer { - return 123 - } - export function fromSymbolGlyphModifierPtr(ptr:KPointer):SymbolGlyphModifier { - const x: Object = {} - return x as SymbolGlyphModifier - } - export function toTextModifierPtr(value:TextModifier):KPointer { - return 123 - } - export function fromTextModifierPtr(ptr:KPointer):TextModifier { - const x: Object = {} - return x as TextModifier - } - // end - - export function toCurvesICurvePtr(value:curves.ICurve):KPointer { - return 123 - } - export function fromCurvesICurvePtr(ptr:KPointer):curves.ICurve { - const x: Object = {} - return x as curves.ICurve - } - - export function toMatrix4Matrix4TransitPtr(value:matrix4.Matrix4Transit):KPointer { - return 123 - } - export function fromMatrix4Matrix4TransitPtr(ptr:KPointer):matrix4.Matrix4Transit { - const x: Object = {} - return x as matrix4.Matrix4Transit - } - - export function toDrawingCanvasPtr(value:drawing.Canvas):KPointer { - return 123 - } - export function fromDrawingCanvasPtr(ptr:KPointer):drawing.Canvas { - const x: Object = {} - return x as drawing.Canvas - } - - export function toDrawingColorFilterPtr(value:drawing.ColorFilter):KPointer { - return 123 - } - export function fromDrawingColorFilterPtr(ptr:KPointer):drawing.ColorFilter { - const x: Object = {} - return x as drawing.ColorFilter - } - - export function toDrawingLatticePtr(value:drawing.Lattice):KPointer { - return 123 - } - export function fromDrawingLatticePtr(ptr:KPointer):drawing.Lattice { - const x: Object = {} - return x as drawing.Lattice - } - - export function toUiEffectFilterPtr(value:uiEffect.Filter):KPointer { - return 123 - } - export function fromUiEffectFilterPtr(ptr:KPointer):uiEffect.Filter { - const x: Object = {} - return x as uiEffect.Filter - } - - export function toUiEffectVisualEffectPtr(value:uiEffect.VisualEffect):KPointer { - return 123 - } - export function fromUiEffectVisualEffectPtr(ptr:KPointer):uiEffect.VisualEffect { - const x: Object = {} - return x as uiEffect.VisualEffect - } - - export function toUnifiedDataChannelUnifiedDataPtr(value:unifiedDataChannel.UnifiedData):KPointer { - return 123 - } - export function fromUnifiedDataChannelUnifiedDataPtr(ptr:KPointer):unifiedDataChannel.UnifiedData { - const x: Object = {} - return x as unifiedDataChannel.UnifiedData - } - - export function toUnifiedDataChannelSummaryPtr(value:unifiedDataChannel.Summary):KPointer { - return 123 - } - export function fromUnifiedDataChannelSummaryPtr(ptr:KPointer):unifiedDataChannel.Summary { - const x: Object = {} - return x as unifiedDataChannel.Summary - } - - export function toWantPtr(value:Want):KPointer { - return 123 - } - export function fromWantPtr(ptr:KPointer):Want { - const x: Object = {} - return x as Want - } - - export function toUIContextPtr(value:UIContext):KPointer { - return 123 - } - export function fromUIContextPtr(ptr:KPointer):UIContext { - const x: Object = {} - return x as UIContext - } - - export function toEventHubPtr(value:EventHub):KPointer { - return 123 - } - export function fromEventHubPtr(ptr:KPointer):EventHub { - const x: Object = {} - return x as EventHub - } - - export function toUIAbilityContextPtr(value:UIAbilityContext):KPointer { - return 123 - } - export function fromUIAbilityContextPtr(ptr:KPointer):UIAbilityContext { - const x: Object = {} - return x as UIAbilityContext - } - - export function toWebviewWebviewControllerPtr(value:webview.WebviewController):KPointer { - return 123 - } - export function fromWebviewWebviewControllerPtr(ptr:KPointer):webview.WebviewController { - const x: Object = {} - return x as webview.WebviewController - } - - export function toDrawableDescriptorPtr(value:DrawableDescriptor):KPointer { - return 123 - } - export function fromDrawableDescriptorPtr(ptr:KPointer):DrawableDescriptor { - const x: Object = {} - return x as DrawableDescriptor - } - - export function toRectShapePtr(value:RectShape):KPointer { - return 123 - } - export function fromRectShapePtr(ptr:KPointer):RectShape { - const x: Object = {} - return x as RectShape - } - - export function toCircleShapePtr(value:CircleShape):KPointer { - return 123 - } - export function fromCircleShapePtr(ptr:KPointer):CircleShape { - const x: Object = {} - return x as CircleShape - } - - export function toEllipseShapePtr(value:EllipseShape):KPointer { - return 123 - } - export function fromEllipseShapePtr(ptr:KPointer):EllipseShape { - const x: Object = {} - return x as EllipseShape - } - - export function toPathShapePtr(value:PathShape):KPointer { - return 123 - } - export function fromPathShapePtr(ptr:KPointer):PathShape { - const x: Object = {} - return x as PathShape - } - - export function toResourceManagerResourceManagerPtr(value:resourceManager.ResourceManager):KPointer { - return 123 - } - export function fromResourceManagerResourceManagerPtr(ptr:KPointer):resourceManager.ResourceManager { - const x: Object = {} - return x as resourceManager.ResourceManager - } - - export function toLevelOrderPtr(value:LevelOrder):KPointer { - return 123 - } - export function fromLevelOrderPtr(ptr:KPointer):LevelOrder { - const x: Object = {} - return x as LevelOrder - } - - export function toWindowWindowStagePtr(value:window.WindowStage):KPointer { - return 123 - } - export function fromWindowWindowStagePtr(ptr:KPointer):window.WindowStage { - const x: Object = {} - return x as window.WindowStage - } - - export function toUiObserverRouterPageInfoPtr(value:uiObserver.RouterPageInfo):KPointer { - return 123 - } - export function fromUiObserverRouterPageInfoPtr(ptr:KPointer):uiObserver.RouterPageInfo { - const x: Object = {} - return x as uiObserver.RouterPageInfo - } - - export function toAbilityInfoPtr(value:AbilityInfo):KPointer { - return 123 - } - export function fromAbilityInfoPtr(ptr:KPointer):AbilityInfo { - const x:Object = {} - return x as AbilityInfo - } - - export function toApplicationInfoPtr(value:ApplicationInfo):KPointer { - return 123 - } - export function fromApplicationInfoPtr(ptr:KPointer):ApplicationInfo { - const x:Object = {} - return x as ApplicationInfo - } - - export function toDataItemPtr(value:DataItem):KPointer { - return 123 - } - export function fromDataItemPtr(ptr:KPointer):DataItem { - const x:Object = {} - return x as DataItem - } - - export function toDependencyPtr(value:Dependency):KPointer { - return 123 - } - export function fromDependencyPtr(ptr:KPointer):Dependency { - const x:Object = {} - return x as Dependency - } - - export function toExtensionAbilityInfoPtr(value:ExtensionAbilityInfo):KPointer { - return 123 - } - export function fromExtensionAbilityInfoPtr(ptr:KPointer):ExtensionAbilityInfo { - const x:Object = {} - return x as ExtensionAbilityInfo - } - - export function toHapModuleInfoPtr(value:HapModuleInfo):KPointer { - return 123 - } - export function fromHapModuleInfoPtr(ptr:KPointer):HapModuleInfo { - const x:Object = {} - return x as HapModuleInfo - } - - export function toMetadataPtr(value:Metadata):KPointer { - return 123 - } - export function fromMetadataPtr(ptr:KPointer):Metadata { - const x:Object = {} - return x as Metadata - } - - export function toModuleMetadataPtr(value:ModuleMetadata):KPointer { - return 123 - } - export function fromModuleMetadataPtr(ptr:KPointer):ModuleMetadata { - const x:Object = {} - return x as ModuleMetadata - } - - export function toMultiAppModePtr(value:MultiAppMode):KPointer { - return 123 - } - export function fromMultiAppModePtr(ptr:KPointer):MultiAppMode { - const x:Object = {} - return x as MultiAppMode - } - - export function toPreloadItemPtr(value:PreloadItem):KPointer { - return 123 - } - export function fromPreloadItemPtr(ptr:KPointer):PreloadItem { - const x:Object = {} - return x as PreloadItem - } - - export function toRouterItemPtr(value:RouterItem):KPointer { - return 123 - } - export function fromRouterItemPtr(ptr:KPointer):RouterItem { - const x:Object = {} - return x as RouterItem - } - - export function toSizePtr(value:Size):KPointer { - return 123 - } - export function fromSizePtr(ptr:KPointer):Size { - const x:Object = {} - return x as Size - } - - export function toSkillPtr(value:Skill):KPointer { - return 123 - } - export function fromSkillPtr(ptr:KPointer):Skill { - const x:Object = {} - return x as Skill - } - - export function toSkillUriPtr(value:SkillUri):KPointer { - return 123 - } - export function fromSkillUriPtr(ptr:KPointer):SkillUri { - const x:Object = {} - return x as SkillUri - } - - export function toUiObserverNavDestinationInfoPtr(value:uiObserver.NavDestinationInfo):KPointer { - return 123 - } - export function fromUiObserverNavDestinationInfoPtr(ptr:KPointer):uiObserver.NavDestinationInfo { - const x:Object = {} - return x as uiObserver.NavDestinationInfo - } - - export function toUiObserverNavigationInfoPtr(value:uiObserver.NavigationInfo):KPointer { - return 123 - } - export function fromUiObserverNavigationInfoPtr(ptr:KPointer):uiObserver.NavigationInfo { - const x:Object = {} - return x as uiObserver.NavigationInfo - } - - export function toWindowSizePtr(value:WindowSize):KPointer { - return 123 - } - export function fromWindowSizePtr(ptr:KPointer):WindowSize { - const x:Object = {} - return x as WindowSize - } - - export function toWindowSystemBarStylePtr(value:window.SystemBarStyle):KPointer { - return 123 - } - export function fromWindowSystemBarStylePtr(ptr:KPointer):window.SystemBarStyle { - const x:Object = {} - return x as window.SystemBarStyle - } - - export function toConfigurationPtr(value:Configuration):KPointer { - return 123 - } - export function fromConfigurationPtr(ptr:KPointer):Configuration { - const x:Object = {} - return x as Configuration + export function fromImagePixelMapPtr(ptr: KPointer): image.PixelMap { + return new image.PixelMapImpl(ptr) } export function transform_Ark_BusinessError_Void_to_Ark_BusinessErrorInterface_Void(from: BusinessError): BusinessErrorInterface { @@ -553,7 +130,12 @@ export namespace extractors { } export function transform_Ark_BusinessErrorInterface_Void_to_Ark_BusinessError_Void(from: BusinessErrorInterface): BusinessError { - return new BusinessError(from.code, new Error()) // TODO how to construct error correctly? + return { + name: from.name, + message: from.message, + stack: from.stack, + code: from.code, + } } } @@ -574,8 +156,4 @@ export class CustomDialogController { constructor(value:CustomDialogControllerOptions) {} } -export class LocalStorage {} - -export class WrappedBuilder { - public constructor(builder: T) {} -} +export class WrappedBuilder {} diff --git a/subset/subset.json b/subset/subset.json index 7b23861220..7e6b8cdb56 100644 --- a/subset/subset.json +++ b/subset/subset.json @@ -11,7 +11,6 @@ "arkoala-arkts/arkui/generated/NativePeerNode.ets", "arkoala-arkts/arkui/generated/PeerNode.ets", "arkoala-arkts/arkui/generated/ReusablePool.ets", - "arkoala-arkts/arkui/generated/ComponentContent.ets", "arkoala-arkts/arkui/generated/UserView.ets", "arkoala-arkts/arkui/generated/framework/main.ets", "arkoala-arkts/arkui/generated/framework/test_utils.ets", -- Gitee