From 667e365034c0e8c9881cdafa565a2650bed81f22 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 22 Aug 2024 18:35:22 +0300 Subject: [PATCH 1/4] build params content, initializers --- arkoala/ets-plugin/src/StructTransformer.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arkoala/ets-plugin/src/StructTransformer.ts b/arkoala/ets-plugin/src/StructTransformer.ts index 729a97031..32fef5757 100644 --- a/arkoala/ets-plugin/src/StructTransformer.ts +++ b/arkoala/ets-plugin/src/StructTransformer.ts @@ -264,7 +264,7 @@ export class StructTransformer extends AbstractVisitor { const className = adaptorClassName(structure.name!)! - const stateParameters = isMainBuild ? [ + const stateParameters = !isMainBuild ? [] : [ prependDoubleLineMemoComment( parameter( "builder", @@ -281,8 +281,22 @@ export class StructTransformer extends AbstractVisitor { ) ) ) + ), + prependMemoComment( + optionalParameter( + "content", + ts.factory.createFunctionTypeNode( + [], + [], + ts.factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword) + ) + ) + ), + optionalParameter( + "initializers", + ts.factory.createTypeReferenceNode(adaptorClassName(structure.name)!) ) - ] : [] + ] const newMethod = ts.factory.updateMethodDeclaration( member, -- Gitee From 3b6a6d9b9872c1863ebf37cd6803424e4c40d51f Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Fri, 23 Aug 2024 13:46:46 +0300 Subject: [PATCH 2/4] golden --- arkoala/ets-plugin/src/StructTransformer.ts | 4 +- .../ets-plugin/test/golden/PropertyDeps.ts | 243 ++++++++++++------ arkoala/ets-plugin/test/golden/Rewrite.ts | 75 ++++-- arkoala/ets-plugin/test/golden/Rewrite2.ts | 3 +- arkoala/ets-plugin/test/golden/Rewrite3.ts | 3 +- .../user-function-declaration.ts | 6 +- .../test/golden/specification/@builder.ts | 3 +- .../golden/specification/@builderParam.ts | 9 +- .../specification/@builderWithComponent.ts | 6 +- .../specification/@builderWithForEach.ts | 6 +- .../specification/@builderWithLinkData.ts | 6 +- .../golden/specification/@consume_@provide.ts | 9 +- .../golden/specification/@customDialog.ts | 6 +- .../test/golden/specification/@link.ts | 6 +- .../test/golden/specification/@objectLink.ts | 6 +- .../specification/@observed_@objectLink.ts | 6 +- .../test/golden/specification/@preview.ts | 6 +- .../test/golden/specification/@prop.ts | 6 +- .../golden/specification/@propComplexType.ts | 6 +- .../test/golden/specification/@state.ts | 3 +- .../test/golden/specification/@storageLink.ts | 3 +- .../test/golden/specification/@storageProp.ts | 3 +- .../test/golden/specification/@styles.ts | 3 +- .../golden/specification/@stylesExport.ts | 3 +- .../test/golden/specification/@watch.ts | 3 +- .../test/golden/specification/GridItem.ts | 3 +- .../test/golden/specification/ListItem.ts | 3 +- .../specification/XComponentContainer.ts | 3 +- .../golden/specification/animatableExtend.ts | 3 +- .../test/golden/specification/animateTo.ts | 3 +- .../test/golden/specification/appStorage.ts | 3 +- .../test/golden/specification/button.ts | 3 +- .../golden/specification/component_object.ts | 9 +- .../golden/specification/custom_component.ts | 6 +- .../golden/specification/decoratorKeyCheck.ts | 3 +- .../specification/forEachSecondFunction.ts | 3 +- .../test/golden/specification/forEachTwo.ts | 3 +- .../test/golden/specification/foreach.ts | 18 +- .../specification/handleCustomBuilder.ts | 3 +- .../test/golden/specification/id_if.ts | 6 +- .../test/golden/specification/if.ts | 3 +- .../specification/import@CustomDialog.ts | 3 +- .../golden/specification/import@Observed.ts | 6 +- .../test/golden/specification/importAllEts.ts | 3 +- .../test/golden/specification/importEts.ts | 3 +- .../golden/specification/importExportEts.ts | 3 +- .../golden/specification/importExportNest.ts | 3 +- .../test/golden/specification/importTs.ts | 3 +- .../test/golden/specification/lazyforeach.ts | 3 +- .../test/golden/specification/localStorage.ts | 3 +- .../specification/localStorageForBoth.ts | 3 +- .../specification/localStorageForRoute.ts | 3 +- .../specification/localStorageForStorage.ts | 3 +- .../golden/specification/longPressGesture.ts | 3 +- .../golden/specification/pageTransition.ts | 3 +- .../test/golden/specification/panGestrue.ts | 3 +- .../test/golden/specification/pinchGesture.ts | 3 +- .../test/golden/specification/recycle.ts | 12 +- .../specification/recycle_extend_styles.ts | 6 +- .../specification/recycle_function_array.ts | 6 +- .../golden/specification/recycle_gesture.ts | 3 +- .../golden/specification/recycle_reuseId.ts | 6 +- .../golden/specification/rotationGesture.ts | 3 +- .../test/golden/specification/swipeGesture.ts | 3 +- .../test/golden/specification/tab.ts | 3 +- .../test/golden/specification/tapGesture.ts | 3 +- .../specification/test/pages/AMDComponent.ts | 3 +- .../specification/test/pages/BaseComponent.ts | 3 +- .../test/pages/DefaultComponent.ts | 3 +- .../test/pages/DivideComponent.ts | 3 +- .../test/pages/ExportComponent.ts | 12 +- .../specification/test/pages/LinkComponent.ts | 12 +- .../test/pages/NamespaceComponent.ts | 9 +- .../specification/test/pages/TestComponent.ts | 6 +- .../test/pages/import@CustomDialog.ts | 3 +- .../ets-plugin/test/golden/trailing-block.ts | 6 +- 76 files changed, 442 insertions(+), 222 deletions(-) diff --git a/arkoala/ets-plugin/src/StructTransformer.ts b/arkoala/ets-plugin/src/StructTransformer.ts index 32fef5757..e7bdd202c 100644 --- a/arkoala/ets-plugin/src/StructTransformer.ts +++ b/arkoala/ets-plugin/src/StructTransformer.ts @@ -264,7 +264,7 @@ export class StructTransformer extends AbstractVisitor { const className = adaptorClassName(structure.name!)! - const stateParameters = !isMainBuild ? [] : [ + const stateParameters = isMainBuild ? [ prependDoubleLineMemoComment( parameter( "builder", @@ -296,7 +296,7 @@ export class StructTransformer extends AbstractVisitor { "initializers", ts.factory.createTypeReferenceNode(adaptorClassName(structure.name)!) ) - ] + ] : [] const newMethod = ts.factory.updateMethodDeclaration( member, diff --git a/arkoala/ets-plugin/test/golden/PropertyDeps.ts b/arkoala/ets-plugin/test/golden/PropertyDeps.ts index 8426fe12f..fb3528c72 100644 --- a/arkoala/ets-plugin/test/golden/PropertyDeps.ts +++ b/arkoala/ets-plugin/test/golden/PropertyDeps.ts @@ -24,7 +24,8 @@ class ArkStateToStateComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateToStateComponent) => void) | undefined) { + builder: ((instance: ArkStateToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -57,7 +58,8 @@ class ArkStateToPropComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateToPropComponent) => void) | undefined) { + builder: ((instance: ArkStateToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -86,7 +88,8 @@ class ArkStateToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStateToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -115,7 +118,8 @@ class ArkStateToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStateToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -144,7 +148,8 @@ class ArkStateToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStateToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -177,7 +182,8 @@ class ArkStateToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStateToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -210,7 +216,8 @@ class ArkStateToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStateToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -245,7 +252,8 @@ class ArkStateToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStateToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -274,7 +282,8 @@ class ArkStateToPlainComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateToPlainComponent) => void) | undefined) { + builder: ((instance: ArkStateToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -307,7 +316,8 @@ class ArkPropToStateComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToStateComponent) => void) | undefined) { + builder: ((instance: ArkPropToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -341,7 +351,8 @@ class ArkPropToPropComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToPropComponent) => void) | undefined) { + builder: ((instance: ArkPropToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -374,7 +385,8 @@ class ArkPropToProvideComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToProvideComponent) => void) | undefined) { + builder: ((instance: ArkPropToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -407,7 +419,8 @@ class ArkPropToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPropToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -440,7 +453,8 @@ class ArkPropToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPropToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -474,7 +488,8 @@ class ArkPropToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPropToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -508,7 +523,8 @@ class ArkPropToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPropToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -547,7 +563,8 @@ class ArkPropToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPropToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -580,7 +597,8 @@ class ArkPropToPlainComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToPlainComponent) => void) | undefined) { + builder: ((instance: ArkPropToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -609,7 +627,8 @@ class ArkProvideToStateComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -642,7 +661,8 @@ class ArkProvideToPropComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkProvideToPropComponent) => void) | undefined) { + builder: ((instance: ArkProvideToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -671,7 +691,8 @@ class ArkProvideToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -700,7 +721,8 @@ class ArkProvideToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -729,7 +751,8 @@ class ArkProvideToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -762,7 +785,8 @@ class ArkProvideToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -795,7 +819,8 @@ class ArkProvideToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -830,7 +855,8 @@ class ArkProvideToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -859,7 +885,8 @@ class ArkProvideToPlainComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -888,7 +915,8 @@ class ArkStorageLinkToStateComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -921,7 +949,8 @@ class ArkStorageLinkToPropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -950,7 +979,8 @@ class ArkStorageLinkToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -979,7 +1009,8 @@ class ArkStorageLinkToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1008,7 +1039,8 @@ class ArkStorageLinkToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1041,7 +1073,8 @@ class ArkStorageLinkToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1074,7 +1107,8 @@ class ArkStorageLinkToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1109,7 +1143,8 @@ class ArkStorageLinkToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -1138,7 +1173,8 @@ class ArkStorageLinkToPlainComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -1167,7 +1203,8 @@ class ArkLocalStorageLinkToStateComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -1200,7 +1237,8 @@ class ArkLocalStorageLinkToPropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1229,7 +1267,8 @@ class ArkLocalStorageLinkToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -1258,7 +1297,8 @@ class ArkLocalStorageLinkToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1287,7 +1327,8 @@ class ArkLocalStorageLinkToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1320,7 +1361,8 @@ class ArkLocalStorageLinkToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1353,7 +1395,8 @@ class ArkLocalStorageLinkToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1388,7 +1431,8 @@ class ArkLocalStorageLinkToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -1417,7 +1461,8 @@ class ArkLocalStorageLinkToPlainComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -1450,7 +1495,8 @@ class ArkStoragePropToStateComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -1484,7 +1530,8 @@ class ArkStoragePropToPropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1517,7 +1564,8 @@ class ArkStoragePropToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -1550,7 +1598,8 @@ class ArkStoragePropToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1583,7 +1632,8 @@ class ArkStoragePropToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1617,7 +1667,8 @@ class ArkStoragePropToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1651,7 +1702,8 @@ class ArkStoragePropToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1690,7 +1742,8 @@ class ArkStoragePropToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -1723,7 +1776,8 @@ class ArkStoragePropToPlainComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -1756,7 +1810,8 @@ class ArkLocalStoragePropToStateComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -1790,7 +1845,8 @@ class ArkLocalStoragePropToPropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1823,7 +1879,8 @@ class ArkLocalStoragePropToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -1856,7 +1913,8 @@ class ArkLocalStoragePropToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1889,7 +1947,8 @@ class ArkLocalStoragePropToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -1923,7 +1982,8 @@ class ArkLocalStoragePropToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1957,7 +2017,8 @@ class ArkLocalStoragePropToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -1996,7 +2057,8 @@ class ArkLocalStoragePropToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -2029,7 +2091,8 @@ class ArkLocalStoragePropToPlainComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -2064,7 +2127,8 @@ class ArkBuilderParamToStateComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -2103,7 +2167,8 @@ class ArkBuilderParamToPropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -2138,7 +2203,8 @@ class ArkBuilderParamToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -2173,7 +2239,8 @@ class ArkBuilderParamToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -2208,7 +2275,8 @@ class ArkBuilderParamToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -2247,7 +2315,8 @@ class ArkBuilderParamToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -2286,7 +2355,8 @@ class ArkBuilderParamToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -2325,7 +2395,8 @@ class ArkBuilderParamToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -2360,7 +2431,8 @@ class ArkBuilderParamToPlainComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamToPlainComponent) { ArkText(undefined, undefined, this.test); } } @@ -2389,7 +2461,8 @@ class ArkPlainToStateComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPlainToStateComponent) => void) | undefined) { + builder: ((instance: ArkPlainToStateComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToStateComponent) { ArkText(undefined, undefined, this.test); } } @@ -2422,7 +2495,8 @@ class ArkPlainToPropComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPlainToPropComponent) => void) | undefined) { + builder: ((instance: ArkPlainToPropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToPropComponent) { ArkText(undefined, undefined, this.test); } } @@ -2451,7 +2525,8 @@ class ArkPlainToProvideComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPlainToProvideComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToProvideComponent) { ArkText(undefined, undefined, this.test); } } @@ -2480,7 +2555,8 @@ class ArkPlainToStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPlainToStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -2509,7 +2585,8 @@ class ArkPlainToLocalStorageLinkComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPlainToLocalStorageLinkComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } } @@ -2542,7 +2619,8 @@ class ArkPlainToStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPlainToStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -2575,7 +2653,8 @@ class ArkPlainToLocalStoragePropComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPlainToLocalStoragePropComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } } @@ -2610,7 +2689,8 @@ class ArkPlainToBuilderParamComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPlainToBuilderParamComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } } @@ -2639,7 +2719,8 @@ class ArkPlainToPlainComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPlainToPlainComponent) => void) | undefined) { + builder: ((instance: ArkPlainToPlainComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPlainToPlainComponent) { ArkText(undefined, undefined, this.test); } } diff --git a/arkoala/ets-plugin/test/golden/Rewrite.ts b/arkoala/ets-plugin/test/golden/Rewrite.ts index f4e2612e0..be380ce20 100644 --- a/arkoala/ets-plugin/test/golden/Rewrite.ts +++ b/arkoala/ets-plugin/test/golden/Rewrite.ts @@ -9,7 +9,8 @@ export class ArkEntryExampleComponent extends ArkStructBase void) | undefined) { } + builder: ((instance: ArkEntryExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkEntryExampleComponent) { } } class ArkComponentExampleComponent extends ArkStructBase { private _entry_local_storage_ = new LocalStorage(); @@ -20,7 +21,8 @@ class ArkComponentExampleComponent extends ArkStructBase void) | undefined) { } + builder: ((instance: ArkComponentExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkComponentExampleComponent) { } } class ArkBuildExampleComponent extends ArkStructBase { private _entry_local_storage_ = new LocalStorage(); @@ -31,7 +33,8 @@ class ArkBuildExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkBuildExampleComponent) => void) | undefined) { + builder: ((instance: ArkBuildExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuildExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.fontColor(Color.Red) .width(100); @@ -55,7 +58,8 @@ class ArkStateExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateExampleComponent) => void) | undefined) { + builder: ((instance: ArkStateExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStateExampleComponent) { ArkText(undefined, undefined, this.x); } } @@ -76,7 +80,8 @@ class ArkLinkExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkLinkExampleComponent) => void) | undefined) { + builder: ((instance: ArkLinkExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLinkExampleComponent) { ArkText(undefined, undefined, this.x); } } @@ -101,7 +106,8 @@ class ArkPropExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropExampleComponent) => void) | undefined) { + builder: ((instance: ArkPropExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropExampleComponent) { ArkText(undefined, undefined, this.x); } } @@ -126,7 +132,8 @@ class ArkPropInitializedExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPropInitializedExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPropInitializedExampleComponent) { ArkText(undefined, undefined, this.x); } } @@ -147,7 +154,8 @@ class ArkProvideExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkProvideExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkProvideExampleComponent) { ArkText(undefined, undefined, this.x); } } @@ -168,7 +176,8 @@ class ArkConsumeExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkConsumeExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkConsumeExampleComponent) { ArkText(undefined, undefined, this.x); } } @@ -185,7 +194,8 @@ class ArkBuilderExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderExampleComponent) { this.foo(); } } @@ -202,7 +212,8 @@ class ArkGlobalBuilderExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkGlobalBuilderExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkGlobalBuilderExampleComponent) { bar(); } } @@ -231,7 +242,8 @@ class ArkBuilderParamExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkBuilderParamExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBuilderParamExampleComponent) { this.foo(); } } @@ -250,7 +262,8 @@ class ArkStylesExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStylesExampleComponent) => void) | undefined) { + builder: ((instance: ArkStylesExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStylesExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.width(17).__applyStyle(looks); }, undefined); @@ -271,7 +284,8 @@ class ArkStylesMethodExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStylesMethodExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStylesMethodExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.width(17).__applyStyle(this.nice.bind(this)); }, undefined); @@ -292,7 +306,8 @@ class ArkExtendExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkExtendExampleComponent) => void) | undefined) { + builder: ((instance: ArkExtendExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkExtendExampleComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width(17).__applyStyle(clown__Column); }, undefined); @@ -311,7 +326,8 @@ class ArkAnimatableExtendExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkAnimatableExtendExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkAnimatableExtendExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.width(17).__applyAnimatableExtend(attributeExtend__Text, 50, "unused"); }, undefined); @@ -341,7 +357,8 @@ class ArkWatchExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkWatchExampleComponent) => void) | undefined) { + builder: ((instance: ArkWatchExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkWatchExampleComponent) { } } class ArkStorageLinkExampleComponent extends ArkStructBase { @@ -361,7 +378,8 @@ class ArkStorageLinkExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStorageLinkExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStorageLinkExampleComponent) { } } class ArkStoragePropExampleComponent extends ArkStructBase { @@ -385,7 +403,8 @@ class ArkStoragePropExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStoragePropExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStoragePropExampleComponent) { } } class ArkCustomDialogExampleComponent extends ArkStructBase { @@ -407,7 +426,8 @@ class ArkCustomDialogExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomDialogExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomDialogExampleComponent) { } } export class ArkCustomDialogControllerExampleComponent extends ArkStructBase { @@ -440,7 +460,8 @@ export class ArkCustomDialogControllerExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomDialogControllerExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomDialogControllerExampleComponent) { } } // ObjectLink and Observed @@ -472,7 +493,8 @@ class ArkObjectLinkExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkObjectLinkExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkObjectLinkExampleComponent) { ArkButton((instance: ArkButtonComponent) => { instance.onClick(() => { this.a.c += 1; @@ -497,7 +519,8 @@ class ArkObjectLinkExampleParentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkObjectLinkExampleParentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkObjectLinkExampleParentComponent) { ObjectLinkExample(undefined, undefined); } } @@ -533,7 +556,8 @@ class ArkCallExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCallExampleComponent) => void) | undefined) { + builder: ((instance: ArkCallExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCallExampleComponent) { Child(undefined, undefined, { _counter: this._state }); } } @@ -554,7 +578,8 @@ class ArkChildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildComponent) => void) | undefined) { } + builder: ((instance: ArkChildComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkChildComponent) { } } /** @memo */ export function EntryExample(/**/ diff --git a/arkoala/ets-plugin/test/golden/Rewrite2.ts b/arkoala/ets-plugin/test/golden/Rewrite2.ts index 7fc3b1b0b..643125dac 100644 --- a/arkoala/ets-plugin/test/golden/Rewrite2.ts +++ b/arkoala/ets-plugin/test/golden/Rewrite2.ts @@ -32,7 +32,8 @@ class ArkLocalStorageLinkExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageLinkExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageLinkExampleComponent) { ArkText(undefined, undefined, "LocalStorage entry = " + storage.get("storage")); } } diff --git a/arkoala/ets-plugin/test/golden/Rewrite3.ts b/arkoala/ets-plugin/test/golden/Rewrite3.ts index c8d24a6ae..10b4f7950 100644 --- a/arkoala/ets-plugin/test/golden/Rewrite3.ts +++ b/arkoala/ets-plugin/test/golden/Rewrite3.ts @@ -36,7 +36,8 @@ class ArkLocalStoragePropExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStoragePropExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStoragePropExampleComponent) { } } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts b/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts index 503ff2c3e..1adf5e2b6 100644 --- a/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts +++ b/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts @@ -36,7 +36,8 @@ export class ArkStructComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStructComponent) => void) | undefined) { } + builder: ((instance: ArkStructComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStructComponent) { } } export class ArkStructWithContentComponent extends ArkStructBase { private _entry_local_storage_ = new LocalStorage(); @@ -71,7 +72,8 @@ export class ArkStructWithContentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStructWithContentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStructWithContentComponent) { this.content(); } } diff --git a/arkoala/ets-plugin/test/golden/specification/@builder.ts b/arkoala/ets-plugin/test/golden/specification/@builder.ts index 831f057b5..0a3fb6c19 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builder.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builder.ts @@ -78,7 +78,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined) { + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn(undefined, () => { ArkRow((instance: ArkRowComponent) => { instance.padding(10) diff --git a/arkoala/ets-plugin/test/golden/specification/@builderParam.ts b/arkoala/ets-plugin/test/golden/specification/@builderParam.ts index 39ef5a847..c689bee82 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderParam.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderParam.ts @@ -57,7 +57,8 @@ class ArkCustomContainerComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomContainerComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomContainerComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.header); this.content(); @@ -99,7 +100,8 @@ class ArkCustomContainer2Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomContainer2Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomContainer2Component) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.header); this.content(); @@ -153,7 +155,8 @@ class ArkCustomContainerUserComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomContainerUserComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomContainerUserComponent) { ArkColumn(undefined, () => { CustomContainerExport(undefined, () => { ArkColumn((instance: ArkColumnComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts b/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts index 5731b27e7..0e0a5bd6a 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts @@ -17,7 +17,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined) { + builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, () => { myBuilder(); this.Builder1(); @@ -34,7 +35,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined) { + builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkchildComponent) { ArkText(undefined, undefined, 'Hello'); } } diff --git a/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts b/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts index c86b5ad86..55aa6da21 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts @@ -24,7 +24,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined) { + builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIndexComponent) { ArkColumn(undefined, () => { ComB(this.arr); }); @@ -39,7 +40,8 @@ class ArkComAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkComAComponent) => void) | undefined) { + builder: ((instance: ArkComAComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkComAComponent) { ArkRow(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(30); diff --git a/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts b/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts index 13d9b734b..d8913a95a 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts @@ -18,7 +18,8 @@ class ArkTitleCompComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTitleCompComponent) => void) | undefined) { + builder: ((instance: ArkTitleCompComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkTitleCompComponent) { ArkText(undefined, undefined, this.title); } } @@ -43,7 +44,8 @@ class ArkTestPageComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTestPageComponent) => void) | undefined) { + builder: ((instance: ArkTestPageComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkTestPageComponent) { ArkFlex(undefined, () => { this.TitleCompView(); }); diff --git a/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts b/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts index fab4a76ac..ef44caf2b 100644 --- a/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts +++ b/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts @@ -18,7 +18,8 @@ class ArkCompAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompAComponent) => void) | undefined) { + builder: ((instance: ArkCompAComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCompAComponent) { ArkColumn(undefined, () => { CompB(undefined, undefined); ArkButton((instance: ArkButtonComponent) => { @@ -42,7 +43,8 @@ class ArkCompBComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompBComponent) => void) | undefined) { + builder: ((instance: ArkCompBComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCompBComponent) { ArkColumn(undefined, () => { CompC(undefined, undefined); }); @@ -65,7 +67,8 @@ class ArkCompCComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompCComponent) => void) | undefined) { + builder: ((instance: ArkCompCComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCompCComponent) { ArkColumn(undefined, () => { ArkButton((instance: ArkButtonComponent) => { instance.onClick(() => { diff --git a/arkoala/ets-plugin/test/golden/specification/@customDialog.ts b/arkoala/ets-plugin/test/golden/specification/@customDialog.ts index 70e1d8cef..d638038a1 100644 --- a/arkoala/ets-plugin/test/golden/specification/@customDialog.ts +++ b/arkoala/ets-plugin/test/golden/specification/@customDialog.ts @@ -68,7 +68,8 @@ class ArkDialogExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkDialogExampleComponent) => void) | undefined) { + builder: ((instance: ArkDialogExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkDialogExampleComponent) { ArkColumn(undefined, () => { ArkRow(undefined, () => { ArkButton((instance: ArkButtonComponent) => { @@ -150,7 +151,8 @@ class ArkCustomDialogUserComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomDialogUserComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomDialogUserComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); diff --git a/arkoala/ets-plugin/test/golden/specification/@link.ts b/arkoala/ets-plugin/test/golden/specification/@link.ts index 655af1f35..c4103e1e2 100644 --- a/arkoala/ets-plugin/test/golden/specification/@link.ts +++ b/arkoala/ets-plugin/test/golden/specification/@link.ts @@ -18,7 +18,8 @@ class ArkLinkComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkLinkComponentComponent) => void) | undefined) { + builder: ((instance: ArkLinkComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLinkComponentComponent) { ArkText(undefined, undefined, this.counter); } } @@ -39,7 +40,8 @@ class ArkParentComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkParentComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentComponentComponent) { ArkColumn(undefined, () => { LinkComponent(undefined, undefined, { _counter: this._value }); }); diff --git a/arkoala/ets-plugin/test/golden/specification/@objectLink.ts b/arkoala/ets-plugin/test/golden/specification/@objectLink.ts index c738067b3..fcbf233c7 100644 --- a/arkoala/ets-plugin/test/golden/specification/@objectLink.ts +++ b/arkoala/ets-plugin/test/golden/specification/@objectLink.ts @@ -32,7 +32,8 @@ class ArkCustomTextComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomTextComponent) => void) | undefined) { + builder: ((instance: ArkCustomTextComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomTextComponent) { ArkRow(undefined, () => { ArkText(undefined, undefined, this.model.text); }); @@ -63,7 +64,8 @@ class ArkParentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentComponent) => void) | undefined) { + builder: ((instance: ArkParentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentComponent) { ArkColumn(undefined, () => { ForEach(this.models, (item) => { CustomText(undefined, undefined, { model: item }); diff --git a/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts b/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts index 392fb1e07..28d8b19a3 100644 --- a/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts +++ b/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts @@ -39,7 +39,8 @@ class ArkViewAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewAComponent) => void) | undefined) { + builder: ((instance: ArkViewAComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkViewAComponent) { ArkRow(undefined, () => { ArkText(undefined, undefined, 'ViewA-' + this.varA.id); }); @@ -62,7 +63,8 @@ class ArkViewBComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewBComponent) => void) | undefined) { + builder: ((instance: ArkViewBComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkViewBComponent) { ArkColumn(undefined, () => { ArkRow(undefined, () => { ViewA(undefined, undefined, { varA: this.varB.a }); diff --git a/arkoala/ets-plugin/test/golden/specification/@preview.ts b/arkoala/ets-plugin/test/golden/specification/@preview.ts index 19cec86fc..fc11a363c 100644 --- a/arkoala/ets-plugin/test/golden/specification/@preview.ts +++ b/arkoala/ets-plugin/test/golden/specification/@preview.ts @@ -17,7 +17,8 @@ class ArkHomePreviewComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkHomePreviewComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkHomePreviewComponentComponent) { ArkText((instance: ArkTextComponent) => { instance.fontSize(50); }, undefined, this.value); @@ -32,7 +33,8 @@ class ArkHomePreviewComponent_PreviewComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkHomePreviewComponent_PreviewComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkHomePreviewComponent_PreviewComponent) { ArkColumn(undefined, () => { HomePreviewComponent(undefined, undefined); }); diff --git a/arkoala/ets-plugin/test/golden/specification/@prop.ts b/arkoala/ets-plugin/test/golden/specification/@prop.ts index 2d8259606..83026546c 100644 --- a/arkoala/ets-plugin/test/golden/specification/@prop.ts +++ b/arkoala/ets-plugin/test/golden/specification/@prop.ts @@ -22,7 +22,8 @@ class ArkCustomXComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomXComponent) => void) | undefined) { + builder: ((instance: ArkCustomXComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomXComponent) { } } class ArkCustomYComponent extends ArkStructBase { @@ -42,7 +43,8 @@ class ArkCustomYComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomYComponent) => void) | undefined) { + builder: ((instance: ArkCustomYComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomYComponent) { ArkRow(undefined, () => { CustomX(undefined, undefined, { fruit: this.parentFruit }); CustomX(undefined, undefined, {}); diff --git a/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts b/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts index 0dd593834..5c525ffbc 100644 --- a/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts +++ b/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts @@ -34,7 +34,8 @@ class ArkCustomXComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomXComponent) => void) | undefined) { + builder: ((instance: ArkCustomXComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomXComponent) { ArkRow(undefined, () => { ArkText(undefined, undefined, JSON.stringify(this.fruit.c)); }); @@ -57,7 +58,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined) { + builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, () => { CustomX(undefined, undefined, { fruit: this.arrA[0] }); CustomX(undefined, undefined, {}); diff --git a/arkoala/ets-plugin/test/golden/specification/@state.ts b/arkoala/ets-plugin/test/golden/specification/@state.ts index 98902d6aa..aaf49142e 100644 --- a/arkoala/ets-plugin/test/golden/specification/@state.ts +++ b/arkoala/ets-plugin/test/golden/specification/@state.ts @@ -18,7 +18,8 @@ class ArkStatePageComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStatePageComponent) => void) | undefined) { + builder: ((instance: ArkStatePageComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStatePageComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, "counter:" + this.counter); }); diff --git a/arkoala/ets-plugin/test/golden/specification/@storageLink.ts b/arkoala/ets-plugin/test/golden/specification/@storageLink.ts index 95423834c..434aa6ae7 100644 --- a/arkoala/ets-plugin/test/golden/specification/@storageLink.ts +++ b/arkoala/ets-plugin/test/golden/specification/@storageLink.ts @@ -43,7 +43,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined) { + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkMyComponentComponent) { ArkRow(undefined, () => { ArkButton((instance: ArkButtonComponent) => { instance.onClick(() => { diff --git a/arkoala/ets-plugin/test/golden/specification/@storageProp.ts b/arkoala/ets-plugin/test/golden/specification/@storageProp.ts index 34bea19dd..fc95f33e5 100644 --- a/arkoala/ets-plugin/test/golden/specification/@storageProp.ts +++ b/arkoala/ets-plugin/test/golden/specification/@storageProp.ts @@ -43,7 +43,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined) { + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkMyComponentComponent) { ArkRow(undefined, () => { ArkButton((instance: ArkButtonComponent) => { instance.onClick(() => { diff --git a/arkoala/ets-plugin/test/golden/specification/@styles.ts b/arkoala/ets-plugin/test/golden/specification/@styles.ts index c60b2723c..f9c291a3f 100644 --- a/arkoala/ets-plugin/test/golden/specification/@styles.ts +++ b/arkoala/ets-plugin/test/golden/specification/@styles.ts @@ -24,7 +24,8 @@ class ArkFancyUseComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkFancyUseComponent) => void) | undefined) { + builder: ((instance: ArkFancyUseComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkFancyUseComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.__applyStyle(globalFancy) diff --git a/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts b/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts index 887b77f53..f0b45c6d8 100644 --- a/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts +++ b/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts @@ -24,7 +24,8 @@ export class ArkFancyUseExpComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkFancyUseExpComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkFancyUseExpComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.__applyStyle(globalFancy) diff --git a/arkoala/ets-plugin/test/golden/specification/@watch.ts b/arkoala/ets-plugin/test/golden/specification/@watch.ts index 4be6fea87..5d9dc7db0 100644 --- a/arkoala/ets-plugin/test/golden/specification/@watch.ts +++ b/arkoala/ets-plugin/test/golden/specification/@watch.ts @@ -69,7 +69,8 @@ class ArkCompAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompAComponent) => void) | undefined) { + builder: ((instance: ArkCompAComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCompAComponent) { ArkColumn(undefined, () => { ArkButton((instance: ArkButtonComponent) => { instance.onClick(() => { diff --git a/arkoala/ets-plugin/test/golden/specification/GridItem.ts b/arkoala/ets-plugin/test/golden/specification/GridItem.ts index d0cafd42f..622fbb5ff 100644 --- a/arkoala/ets-plugin/test/golden/specification/GridItem.ts +++ b/arkoala/ets-plugin/test/golden/specification/GridItem.ts @@ -9,7 +9,8 @@ class ArkParentViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentViewComponent) => void) | undefined) { + builder: ((instance: ArkParentViewComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentViewComponent) { ArkGrid(undefined, () => { ArkGridItem((instance: ArkGridItemComponent) => { instance.width(200).height(100); diff --git a/arkoala/ets-plugin/test/golden/specification/ListItem.ts b/arkoala/ets-plugin/test/golden/specification/ListItem.ts index d06de6876..77eb05f4b 100644 --- a/arkoala/ets-plugin/test/golden/specification/ListItem.ts +++ b/arkoala/ets-plugin/test/golden/specification/ListItem.ts @@ -9,7 +9,8 @@ class ArkParentViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentViewComponent) => void) | undefined) { + builder: ((instance: ArkParentViewComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentViewComponent) { ArkList(undefined, () => { ArkListItem((instance: ArkListItemComponent) => { instance.width(200).height(100); diff --git a/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts b/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts index 69773611f..c3260678a 100644 --- a/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts +++ b/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts @@ -9,7 +9,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined) { + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { ArkXComponent(undefined, undefined, { id: '1', type: 'component' }); ArkXComponent(undefined, undefined, { id: '2', type: 1 }); diff --git a/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts b/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts index 987b21fb6..c72c9d6b5 100644 --- a/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts +++ b/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts @@ -24,7 +24,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined) { + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { ArkPolyline((instance: ArkPolylineComponent) => { instance.__applyAnimatableExtend(animatablePoints__Polyline, this.points) diff --git a/arkoala/ets-plugin/test/golden/specification/animateTo.ts b/arkoala/ets-plugin/test/golden/specification/animateTo.ts index bcb227a08..f79fe8f06 100644 --- a/arkoala/ets-plugin/test/golden/specification/animateTo.ts +++ b/arkoala/ets-plugin/test/golden/specification/animateTo.ts @@ -82,7 +82,8 @@ class ArkTransitionExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkTransitionExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkTransitionExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(400).width("100%").padding({ top: 100 }); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/appStorage.ts b/arkoala/ets-plugin/test/golden/specification/appStorage.ts index e7ce5166e..fcc2d9016 100644 --- a/arkoala/ets-plugin/test/golden/specification/appStorage.ts +++ b/arkoala/ets-plugin/test/golden/specification/appStorage.ts @@ -43,7 +43,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined) { + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkMyComponentComponent) { ArkRow(undefined, () => { ArkButton((instance: ArkButtonComponent) => { instance.onClick(() => { diff --git a/arkoala/ets-plugin/test/golden/specification/button.ts b/arkoala/ets-plugin/test/golden/specification/button.ts index 8aa20636d..233d36de0 100644 --- a/arkoala/ets-plugin/test/golden/specification/button.ts +++ b/arkoala/ets-plugin/test/golden/specification/button.ts @@ -9,7 +9,8 @@ class ArkButtonExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkButtonExampleComponent) => void) | undefined) { + builder: ((instance: ArkButtonExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkButtonExampleComponent) { ArkFlex(undefined, () => { ArkFlex(undefined, () => { ArkButton((instance: ArkButtonComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/component_object.ts b/arkoala/ets-plugin/test/golden/specification/component_object.ts index d320a0769..6a36c435a 100644 --- a/arkoala/ets-plugin/test/golden/specification/component_object.ts +++ b/arkoala/ets-plugin/test/golden/specification/component_object.ts @@ -30,7 +30,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined) { + builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, () => { Child(undefined, undefined, { options, message1: this.message1, message2: this.message2 }); Child2(undefined, undefined, options); @@ -76,7 +77,8 @@ class ArkChildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildComponent) => void) | undefined) { + builder: ((instance: ArkChildComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkChildComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.message1); }); @@ -101,7 +103,8 @@ class ArkChild2Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChild2Component) => void) | undefined) { + builder: ((instance: ArkChild2Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkChild2Component) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.message); }); diff --git a/arkoala/ets-plugin/test/golden/specification/custom_component.ts b/arkoala/ets-plugin/test/golden/specification/custom_component.ts index e917da2f3..6e1da1508 100644 --- a/arkoala/ets-plugin/test/golden/specification/custom_component.ts +++ b/arkoala/ets-plugin/test/golden/specification/custom_component.ts @@ -9,7 +9,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined) { + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn(undefined, () => { Banner(undefined, undefined); Banner(undefined, undefined) @@ -43,7 +44,8 @@ class ArkBannerComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkBannerComponent) => void) | undefined) { + builder: ((instance: ArkBannerComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBannerComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.value); }); diff --git a/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts b/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts index 997530151..0a64c4516 100644 --- a/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts +++ b/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts @@ -200,7 +200,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined) { + builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, undefined); } } diff --git a/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts b/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts index 5b4714624..a6f9523f1 100644 --- a/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts +++ b/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts @@ -18,7 +18,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined) { + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width("100%").height("100%"); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts b/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts index 341905bc8..2056ee5b3 100644 --- a/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts +++ b/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts @@ -36,7 +36,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined) { + builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIndexComponent) { ArkRow((instance: ArkRowComponent) => { instance.height('100%'); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/foreach.ts b/arkoala/ets-plugin/test/golden/specification/foreach.ts index 288a6593c..1bb8ceab9 100644 --- a/arkoala/ets-plugin/test/golden/specification/foreach.ts +++ b/arkoala/ets-plugin/test/golden/specification/foreach.ts @@ -18,7 +18,8 @@ class ArkParentViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentViewComponent) => void) | undefined) { + builder: ((instance: ArkParentViewComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentViewComponent) { ArkList(undefined, () => { ForEach(this.arr, item => { ArkText(undefined, undefined, item); @@ -43,7 +44,8 @@ class ArkParentView1Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView1Component) => void) | undefined) { + builder: ((instance: ArkParentView1Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentView1Component) { ArkList(undefined, () => { ForEach(this.arr, (item, index) => { ArkText(undefined, undefined, item); @@ -68,7 +70,8 @@ class ArkParentView2Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView2Component) => void) | undefined) { + builder: ((instance: ArkParentView2Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentView2Component) { ArkList(undefined, () => { ForEach(this.arr, (item, index) => { ArkText(undefined, undefined, item); @@ -93,7 +96,8 @@ class ArkParentView3Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView3Component) => void) | undefined) { + builder: ((instance: ArkParentView3Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentView3Component) { ArkList(undefined, () => { ForEach(this.arr, (item, index) => { ArkText(undefined, undefined, item); @@ -118,7 +122,8 @@ class ArkParentView4Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView4Component) => void) | undefined) { + builder: ((instance: ArkParentView4Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentView4Component) { ArkList(undefined, () => { ForEach(this.arr, item => { ArkText(undefined, undefined, item); @@ -143,7 +148,8 @@ class ArkParentView5Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView5Component) => void) | undefined) { + builder: ((instance: ArkParentView5Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentView5Component) { ArkList(undefined, () => { ForEach(this.arr, item => { ArkText(undefined, undefined, item); diff --git a/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts b/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts index e8e694637..a1222f7ce 100644 --- a/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts +++ b/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts @@ -38,7 +38,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined) { + builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIndexComponent) { ArkColumn(undefined, () => { ArkRow((instance: ArkRowComponent) => { instance.bindMenu(/* */ diff --git a/arkoala/ets-plugin/test/golden/specification/id_if.ts b/arkoala/ets-plugin/test/golden/specification/id_if.ts index eede9bc60..4f28b00a7 100644 --- a/arkoala/ets-plugin/test/golden/specification/id_if.ts +++ b/arkoala/ets-plugin/test/golden/specification/id_if.ts @@ -33,7 +33,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined) { + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn(undefined, () => { if (this.pass) { if (this.count < 0) { @@ -137,7 +138,8 @@ class ArkChildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildComponent) => void) | undefined) { + builder: ((instance: ArkChildComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkChildComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(50); diff --git a/arkoala/ets-plugin/test/golden/specification/if.ts b/arkoala/ets-plugin/test/golden/specification/if.ts index 269218d4c..eb5233612 100644 --- a/arkoala/ets-plugin/test/golden/specification/if.ts +++ b/arkoala/ets-plugin/test/golden/specification/if.ts @@ -34,7 +34,8 @@ class ArkIFViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIFViewComponent) => void) | undefined) { + builder: ((instance: ArkIFViewComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkIFViewComponent) { ArkColumn(undefined, () => { if (this.toggle1) { ArkText(undefined, undefined, 'toggle1'); diff --git a/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts b/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts index 970092080..00c9bb3da 100644 --- a/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts +++ b/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts @@ -57,7 +57,8 @@ class ArkCustomDialogUserComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomDialogUserComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomDialogUserComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width('100%').margin({ top: 5 }); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/import@Observed.ts b/arkoala/ets-plugin/test/golden/specification/import@Observed.ts index f2246930b..1706ba348 100644 --- a/arkoala/ets-plugin/test/golden/specification/import@Observed.ts +++ b/arkoala/ets-plugin/test/golden/specification/import@Observed.ts @@ -31,7 +31,8 @@ class ArkViewAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewAComponent) => void) | undefined) { + builder: ((instance: ArkViewAComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkViewAComponent) { ArkRow((instance: ArkRowComponent) => { instance.margin({ top: 10 }); }, () => { @@ -60,7 +61,8 @@ class ArkViewBComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewBComponent) => void) | undefined) { + builder: ((instance: ArkViewBComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkViewBComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width('100%'); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/importAllEts.ts b/arkoala/ets-plugin/test/golden/specification/importAllEts.ts index 4b74e11ce..c4b2531af 100644 --- a/arkoala/ets-plugin/test/golden/specification/importAllEts.ts +++ b/arkoala/ets-plugin/test/golden/specification/importAllEts.ts @@ -44,7 +44,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined) { + builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { AllComponent.NamespaceComponent1({ _NamespaceComponent1Link1: this._myState1, diff --git a/arkoala/ets-plugin/test/golden/specification/importEts.ts b/arkoala/ets-plugin/test/golden/specification/importEts.ts index 2d11d0105..dd826d22d 100644 --- a/arkoala/ets-plugin/test/golden/specification/importEts.ts +++ b/arkoala/ets-plugin/test/golden/specification/importEts.ts @@ -46,7 +46,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined) { + builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { LinkComponent2Ref({ _LinkComponent2Link1: this._myState1, diff --git a/arkoala/ets-plugin/test/golden/specification/importExportEts.ts b/arkoala/ets-plugin/test/golden/specification/importExportEts.ts index cf15e5eca..f843de62c 100644 --- a/arkoala/ets-plugin/test/golden/specification/importExportEts.ts +++ b/arkoala/ets-plugin/test/golden/specification/importExportEts.ts @@ -44,7 +44,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined) { + builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { AllStarComponent.ExportComponent({ _ExportComponent1Link1: this._myState1, diff --git a/arkoala/ets-plugin/test/golden/specification/importExportNest.ts b/arkoala/ets-plugin/test/golden/specification/importExportNest.ts index ef395a4b6..c4d3a915e 100644 --- a/arkoala/ets-plugin/test/golden/specification/importExportNest.ts +++ b/arkoala/ets-plugin/test/golden/specification/importExportNest.ts @@ -83,7 +83,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined) { + builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(50); diff --git a/arkoala/ets-plugin/test/golden/specification/importTs.ts b/arkoala/ets-plugin/test/golden/specification/importTs.ts index d78d6a83c..4a58bfb92 100644 --- a/arkoala/ets-plugin/test/golden/specification/importTs.ts +++ b/arkoala/ets-plugin/test/golden/specification/importTs.ts @@ -44,7 +44,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined) { + builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { AllStarComponent.ExportComponent({ _ExportComponent1Link1: this._myState1, diff --git a/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts b/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts index e624e3caf..0a192e9aa 100644 --- a/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts +++ b/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts @@ -81,7 +81,8 @@ class ArkTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTestComponent) => void) | undefined) { + builder: ((instance: ArkTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkTestComponent) { ArkLazyGrid(undefined, () => { LazyForEach(this.data, (row) => { ArkGridItem(undefined, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/localStorage.ts b/arkoala/ets-plugin/test/golden/specification/localStorage.ts index d8cdf2d79..456d57720 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorage.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorage.ts @@ -39,7 +39,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts b/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts index e17b117e3..d1d30e5ed 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts @@ -43,7 +43,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts b/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts index a5ae5593c..d86084196 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts @@ -12,7 +12,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); }, undefined); diff --git a/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts b/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts index abe10a56c..9d58ed017 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts @@ -41,7 +41,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts b/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts index 26ec6e930..28fb408a0 100644 --- a/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts @@ -18,7 +18,8 @@ class ArkLongPressGestureExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLongPressGestureExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLongPressGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(200).width(300).padding(60).border({ width: 1 }).margin(30) .gesture(LongPressGesture({ repeat: true }) diff --git a/arkoala/ets-plugin/test/golden/specification/pageTransition.ts b/arkoala/ets-plugin/test/golden/specification/pageTransition.ts index 990ea2256..34a1a5890 100644 --- a/arkoala/ets-plugin/test/golden/specification/pageTransition.ts +++ b/arkoala/ets-plugin/test/golden/specification/pageTransition.ts @@ -34,7 +34,8 @@ class ArkPageTransitionExample1Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPageTransitionExample1Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPageTransitionExample1Component) { ArkColumn((instance: ArkColumnComponent) => { instance.scale({ x: this.scale2 }).opacity(this.opacity2); }, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/panGestrue.ts b/arkoala/ets-plugin/test/golden/specification/panGestrue.ts index fadf1d391..f14d13bef 100644 --- a/arkoala/ets-plugin/test/golden/specification/panGestrue.ts +++ b/arkoala/ets-plugin/test/golden/specification/panGestrue.ts @@ -26,7 +26,8 @@ class ArkPanGestureExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPanGestureExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPanGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(200).padding(20).border({ width: 1 }).margin(80) .translate({ x: this.offsetX, y: this.offsetY, z: 5 }) diff --git a/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts b/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts index b886b7d19..a2a52ad8f 100644 --- a/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts @@ -18,7 +18,8 @@ class ArkPinchGestureExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkPinchGestureExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkPinchGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(200).padding(20).border({ width: 1 }).margin(80) .scale({ x: this.scale2, y: this.scale2, z: this.scale2 }) diff --git a/arkoala/ets-plugin/test/golden/specification/recycle.ts b/arkoala/ets-plugin/test/golden/specification/recycle.ts index fd065861d..bad62baa8 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle.ts @@ -26,7 +26,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined) { + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width(this.state_value) .height(100); @@ -110,7 +111,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined) { + builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkchildComponent) { ArkColumn(undefined, () => { AnimationTest(undefined, undefined) .border({ width: 3, color: Color.Red }) @@ -202,7 +204,8 @@ class ArkNormalComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkNormalComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkNormalComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.width(this.width_value) @@ -228,7 +231,8 @@ class ArkAnimationTestComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkAnimationTestComponent) => void) | undefined) { + builder: ((instance: ArkAnimationTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkAnimationTestComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.height(100) diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts b/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts index 657ae27ed..61be6da9e 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts @@ -22,7 +22,8 @@ class ArkExtendComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkExtendComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkExtendComponentComponent) { ArkColumn(undefined, () => { ArkButton((instance: ArkButtonComponent) => { instance.__applyStyle(fancybut__Button, Color.Green); @@ -73,7 +74,8 @@ class ArkStylesComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkStylesComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkStylesComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.__applyStyle(globalFancy) diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts b/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts index eaee7aa40..1bab3fc9c 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts @@ -18,7 +18,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined) { + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { child(undefined, undefined); }); @@ -49,7 +50,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined) { + builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkchildComponent) { ArkColumn(undefined, () => { ArkCircle((instance: ArkCircleComponent) => { instance.onClick(() => { diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts b/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts index d19e893c8..4a3a0f4c3 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts @@ -25,7 +25,8 @@ class ArkGestureTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkGestureTestComponent) => void) | undefined) { + builder: ((instance: ArkGestureTestComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkGestureTestComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(this.width_value).padding(60).border({ width: 1 }).margin(30) .gesture(LongPressGesture({ repeat: true }) diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts b/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts index 78b01e144..7c1b4a781 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts @@ -27,7 +27,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined) { + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { child(undefined, undefined, { propvalue: this.value, linkvalue: this.value }) .border({ width: 3, color: Color.Red }) @@ -75,7 +76,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined) { + builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkchildComponent) { ArkColumn(undefined, undefined); } } diff --git a/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts b/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts index ff869d0b1..c3a37b022 100644 --- a/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts @@ -18,7 +18,8 @@ class ArkRotationGestureExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkRotationGestureExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkRotationGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(200).padding(20).border({ width: 1 }) .margin(80).rotate({ x: 1, y: 2, z: 3, angle: this.angle }) diff --git a/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts b/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts index 9cff2c52a..2f0d7df59 100644 --- a/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts @@ -26,7 +26,8 @@ class ArkSwipeGestureExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkSwipeGestureExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkSwipeGestureExampleComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.border({ width: 2 }) .width(260).height(260) diff --git a/arkoala/ets-plugin/test/golden/specification/tab.ts b/arkoala/ets-plugin/test/golden/specification/tab.ts index 3dd70c889..4c281c70d 100644 --- a/arkoala/ets-plugin/test/golden/specification/tab.ts +++ b/arkoala/ets-plugin/test/golden/specification/tab.ts @@ -17,7 +17,8 @@ class ArkTabSimpleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTabSimpleComponent) => void) | undefined) { + builder: ((instance: ArkTabSimpleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkTabSimpleComponent) { ArkColumn(undefined, () => { ArkTabs(undefined, () => { ArkTabContent((instance: ArkTabContentComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/tapGesture.ts b/arkoala/ets-plugin/test/golden/specification/tapGesture.ts index 73f3f0993..39ee1b5e1 100644 --- a/arkoala/ets-plugin/test/golden/specification/tapGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/tapGesture.ts @@ -18,7 +18,8 @@ class ArkTapGestureExampleComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkTapGestureExampleComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkTapGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(200).width(300).padding(60).border({ width: 1 }).margin(30) .gesture(TapGesture({ count: 2 }) diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts index a1c97603f..e606de26c 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts @@ -59,7 +59,8 @@ class ArkAMDComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkAMDComponentComponent) => void) | undefined) { + builder: ((instance: ArkAMDComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkAMDComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts index f4519c4ea..04c92c1f4 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts @@ -39,7 +39,8 @@ class ArkBaseComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkBaseComponentComponent) => void) | undefined) { + builder: ((instance: ArkBaseComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkBaseComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts index 85161f135..33fc89ea8 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts @@ -59,7 +59,8 @@ class ArkDefaultComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkDefaultComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkDefaultComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts index 6088d5fb5..5f1e500f7 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts @@ -31,7 +31,8 @@ class ArkDivideComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkDivideComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkDivideComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts index c0106b54e..1097a2c0c 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts @@ -88,7 +88,8 @@ class ArkExportComponent1Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkExportComponent1Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkExportComponent1Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, @@ -174,7 +175,8 @@ class ArkExportComponent2Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkExportComponent2Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkExportComponent2Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, @@ -260,7 +262,8 @@ class ArkExportComponent3Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkExportComponent3Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkExportComponent3Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, @@ -346,7 +349,8 @@ export default class ArkExportComponent4Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkExportComponent4Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkExportComponent4Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts index f08092113..2ed9c7107 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts @@ -88,7 +88,8 @@ class ArkLinkComponent1Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLinkComponent1Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLinkComponent1Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, @@ -174,7 +175,8 @@ class ArkLinkComponent2Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLinkComponent2Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLinkComponent2Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, @@ -260,7 +262,8 @@ class ArkLinkComponent3Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLinkComponent3Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLinkComponent3Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, @@ -346,7 +349,8 @@ class ArkLinkComponent4Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkLinkComponent4Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkLinkComponent4Component) { ArkRow(undefined, () => { DefaultComponent({ _DefaultComponentLink1: this._indexState1, diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts index 02f25f4c3..63a013d60 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts @@ -59,7 +59,8 @@ class ArkNamespaceComponent1Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkNamespaceComponent1Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkNamespaceComponent1Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); @@ -144,7 +145,8 @@ class ArkNamespaceComponent2Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkNamespaceComponent2Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkNamespaceComponent2Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); @@ -229,7 +231,8 @@ class ArkNamespaceComponent3Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkNamespaceComponent3Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkNamespaceComponent3Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20); diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts index ba2eeee27..38be26233 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts @@ -16,7 +16,8 @@ export class ArkTestComponentComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkTestComponentComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkTestComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(32); @@ -57,7 +58,8 @@ export class ArkCustomContainerExportComponent extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomContainerExportComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomContainerExportComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(50); diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts index 3f9af7ab5..19c199031 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts @@ -55,7 +55,8 @@ export class ArkCustomDialogExample1Component extends ArkStructBase void) | undefined) { + builder: ((instance: ArkCustomDialogExample1Component) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkCustomDialogExample1Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { instance.fontSize(20).margin({ top: 10, bottom: 10 }); diff --git a/arkoala/ets-plugin/test/golden/trailing-block.ts b/arkoala/ets-plugin/test/golden/trailing-block.ts index 659f00e52..264cd1468 100644 --- a/arkoala/ets-plugin/test/golden/trailing-block.ts +++ b/arkoala/ets-plugin/test/golden/trailing-block.ts @@ -8,7 +8,8 @@ class ArkParentStructComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentStructComponent) => void) | undefined) { + builder: ((instance: ArkParentStructComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkParentStructComponent) { ArkColumn(undefined, () => { ChildStruct(undefined, () => { ArkText(undefined, undefined, "xxx"); @@ -41,7 +42,8 @@ class ArkChildStructComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildStructComponent) => void) | undefined) { + builder: ((instance: ArkChildStructComponent) => void) | undefined, /** @memo */ + content?: () => void, initializers?: ArkChildStructComponent) { this.content(); } } -- Gitee From 055438906d9dcd82e20c7749641b4586b30cba25 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Tue, 27 Aug 2024 17:51:19 +0300 Subject: [PATCH 3/4] double line --- arkoala/ets-plugin/src/StructTransformer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala/ets-plugin/src/StructTransformer.ts b/arkoala/ets-plugin/src/StructTransformer.ts index e7bdd202c..74f6f9e7b 100644 --- a/arkoala/ets-plugin/src/StructTransformer.ts +++ b/arkoala/ets-plugin/src/StructTransformer.ts @@ -282,7 +282,7 @@ export class StructTransformer extends AbstractVisitor { ) ) ), - prependMemoComment( + prependDoubleLineMemoComment( optionalParameter( "content", ts.factory.createFunctionTypeNode( -- Gitee From 001e7cd6cf17f929e7f4adba91b42f2025e00893 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Wed, 28 Aug 2024 13:08:28 +0300 Subject: [PATCH 4/4] golden --- .../ets-plugin/test/golden/PropertyDeps.ts | 243 ++++++++++++------ arkoala/ets-plugin/test/golden/Rewrite.ts | 75 ++++-- arkoala/ets-plugin/test/golden/Rewrite2.ts | 3 +- arkoala/ets-plugin/test/golden/Rewrite3.ts | 3 +- .../user-function-declaration.ts | 6 +- .../test/golden/specification/@builder.ts | 3 +- .../golden/specification/@builderParam.ts | 9 +- .../specification/@builderWithComponent.ts | 6 +- .../specification/@builderWithForEach.ts | 6 +- .../specification/@builderWithLinkData.ts | 6 +- .../golden/specification/@consume_@provide.ts | 9 +- .../golden/specification/@customDialog.ts | 6 +- .../test/golden/specification/@link.ts | 6 +- .../test/golden/specification/@objectLink.ts | 6 +- .../specification/@observed_@objectLink.ts | 6 +- .../test/golden/specification/@preview.ts | 6 +- .../test/golden/specification/@prop.ts | 6 +- .../golden/specification/@propComplexType.ts | 6 +- .../test/golden/specification/@state.ts | 3 +- .../test/golden/specification/@storageLink.ts | 3 +- .../test/golden/specification/@storageProp.ts | 3 +- .../test/golden/specification/@styles.ts | 3 +- .../golden/specification/@stylesExport.ts | 3 +- .../test/golden/specification/@watch.ts | 3 +- .../test/golden/specification/GridItem.ts | 3 +- .../test/golden/specification/ListItem.ts | 3 +- .../specification/XComponentContainer.ts | 3 +- .../golden/specification/animatableExtend.ts | 3 +- .../test/golden/specification/animateTo.ts | 3 +- .../test/golden/specification/appStorage.ts | 3 +- .../test/golden/specification/button.ts | 3 +- .../golden/specification/component_object.ts | 9 +- .../golden/specification/custom_component.ts | 6 +- .../golden/specification/decoratorKeyCheck.ts | 3 +- .../specification/forEachSecondFunction.ts | 3 +- .../test/golden/specification/forEachTwo.ts | 3 +- .../test/golden/specification/foreach.ts | 18 +- .../specification/handleCustomBuilder.ts | 3 +- .../test/golden/specification/id_if.ts | 6 +- .../test/golden/specification/if.ts | 3 +- .../specification/import@CustomDialog.ts | 3 +- .../golden/specification/import@Observed.ts | 6 +- .../test/golden/specification/importAllEts.ts | 3 +- .../test/golden/specification/importEts.ts | 3 +- .../golden/specification/importExportEts.ts | 3 +- .../golden/specification/importExportNest.ts | 3 +- .../test/golden/specification/importTs.ts | 3 +- .../test/golden/specification/lazyforeach.ts | 3 +- .../test/golden/specification/localStorage.ts | 3 +- .../specification/localStorageForBoth.ts | 3 +- .../specification/localStorageForRoute.ts | 3 +- .../specification/localStorageForStorage.ts | 3 +- .../golden/specification/longPressGesture.ts | 3 +- .../golden/specification/pageTransition.ts | 3 +- .../test/golden/specification/panGestrue.ts | 3 +- .../test/golden/specification/pinchGesture.ts | 3 +- .../test/golden/specification/recycle.ts | 12 +- .../specification/recycle_extend_styles.ts | 6 +- .../specification/recycle_function_array.ts | 6 +- .../golden/specification/recycle_gesture.ts | 3 +- .../golden/specification/recycle_reuseId.ts | 6 +- .../golden/specification/rotationGesture.ts | 3 +- .../test/golden/specification/swipeGesture.ts | 3 +- .../test/golden/specification/tab.ts | 3 +- .../test/golden/specification/tapGesture.ts | 3 +- .../specification/test/pages/AMDComponent.ts | 3 +- .../specification/test/pages/BaseComponent.ts | 3 +- .../test/pages/DefaultComponent.ts | 3 +- .../test/pages/DivideComponent.ts | 3 +- .../test/pages/ExportComponent.ts | 12 +- .../specification/test/pages/LinkComponent.ts | 12 +- .../test/pages/NamespaceComponent.ts | 9 +- .../specification/test/pages/TestComponent.ts | 6 +- .../test/pages/import@CustomDialog.ts | 3 +- .../ets-plugin/test/golden/trailing-block.ts | 6 +- 75 files changed, 440 insertions(+), 220 deletions(-) diff --git a/arkoala/ets-plugin/test/golden/PropertyDeps.ts b/arkoala/ets-plugin/test/golden/PropertyDeps.ts index fb3528c72..9218a9134 100644 --- a/arkoala/ets-plugin/test/golden/PropertyDeps.ts +++ b/arkoala/ets-plugin/test/golden/PropertyDeps.ts @@ -24,7 +24,8 @@ class ArkStateToStateComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateToStateComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkStateToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -58,7 +59,8 @@ class ArkStateToPropComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateToPropComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkStateToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -88,7 +90,8 @@ class ArkStateToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStateToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -118,7 +121,8 @@ class ArkStateToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStateToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -148,7 +152,8 @@ class ArkStateToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStateToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -182,7 +187,8 @@ class ArkStateToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStateToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -216,7 +222,8 @@ class ArkStateToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStateToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -252,7 +259,8 @@ class ArkStateToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStateToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -282,7 +290,8 @@ class ArkStateToPlainComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateToPlainComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkStateToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -316,7 +325,8 @@ class ArkPropToStateComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToStateComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPropToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -351,7 +361,8 @@ class ArkPropToPropComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToPropComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPropToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -385,7 +396,8 @@ class ArkPropToProvideComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToProvideComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPropToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -419,7 +431,8 @@ class ArkPropToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPropToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -453,7 +466,8 @@ class ArkPropToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPropToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -488,7 +502,8 @@ class ArkPropToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPropToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -523,7 +538,8 @@ class ArkPropToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPropToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -563,7 +579,8 @@ class ArkPropToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPropToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -597,7 +614,8 @@ class ArkPropToPlainComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropToPlainComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPropToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -627,7 +645,8 @@ class ArkProvideToStateComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -661,7 +680,8 @@ class ArkProvideToPropComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkProvideToPropComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -691,7 +711,8 @@ class ArkProvideToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -721,7 +742,8 @@ class ArkProvideToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -751,7 +773,8 @@ class ArkProvideToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -785,7 +808,8 @@ class ArkProvideToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -819,7 +843,8 @@ class ArkProvideToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -855,7 +880,8 @@ class ArkProvideToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -885,7 +911,8 @@ class ArkProvideToPlainComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -915,7 +942,8 @@ class ArkStorageLinkToStateComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -949,7 +977,8 @@ class ArkStorageLinkToPropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -979,7 +1008,8 @@ class ArkStorageLinkToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -1009,7 +1039,8 @@ class ArkStorageLinkToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1039,7 +1070,8 @@ class ArkStorageLinkToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1073,7 +1105,8 @@ class ArkStorageLinkToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -1107,7 +1140,8 @@ class ArkStorageLinkToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -1143,7 +1177,8 @@ class ArkStorageLinkToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -1173,7 +1208,8 @@ class ArkStorageLinkToPlainComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -1203,7 +1239,8 @@ class ArkLocalStorageLinkToStateComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -1237,7 +1274,8 @@ class ArkLocalStorageLinkToPropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -1267,7 +1305,8 @@ class ArkLocalStorageLinkToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -1297,7 +1336,8 @@ class ArkLocalStorageLinkToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1327,7 +1367,8 @@ class ArkLocalStorageLinkToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1361,7 +1402,8 @@ class ArkLocalStorageLinkToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -1395,7 +1437,8 @@ class ArkLocalStorageLinkToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -1431,7 +1474,8 @@ class ArkLocalStorageLinkToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -1461,7 +1505,8 @@ class ArkLocalStorageLinkToPlainComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -1495,7 +1540,8 @@ class ArkStoragePropToStateComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -1530,7 +1576,8 @@ class ArkStoragePropToPropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -1564,7 +1611,8 @@ class ArkStoragePropToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -1598,7 +1646,8 @@ class ArkStoragePropToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1632,7 +1681,8 @@ class ArkStoragePropToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1667,7 +1717,8 @@ class ArkStoragePropToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -1702,7 +1753,8 @@ class ArkStoragePropToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -1742,7 +1794,8 @@ class ArkStoragePropToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -1776,7 +1829,8 @@ class ArkStoragePropToPlainComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -1810,7 +1864,8 @@ class ArkLocalStoragePropToStateComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -1845,7 +1900,8 @@ class ArkLocalStoragePropToPropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -1879,7 +1935,8 @@ class ArkLocalStoragePropToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -1913,7 +1970,8 @@ class ArkLocalStoragePropToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1947,7 +2005,8 @@ class ArkLocalStoragePropToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -1982,7 +2041,8 @@ class ArkLocalStoragePropToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -2017,7 +2077,8 @@ class ArkLocalStoragePropToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -2057,7 +2118,8 @@ class ArkLocalStoragePropToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -2091,7 +2153,8 @@ class ArkLocalStoragePropToPlainComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -2127,7 +2190,8 @@ class ArkBuilderParamToStateComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -2167,7 +2231,8 @@ class ArkBuilderParamToPropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -2203,7 +2268,8 @@ class ArkBuilderParamToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -2239,7 +2305,8 @@ class ArkBuilderParamToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -2275,7 +2342,8 @@ class ArkBuilderParamToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -2315,7 +2383,8 @@ class ArkBuilderParamToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -2355,7 +2424,8 @@ class ArkBuilderParamToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -2395,7 +2465,8 @@ class ArkBuilderParamToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -2431,7 +2502,8 @@ class ArkBuilderParamToPlainComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamToPlainComponent) { ArkText(undefined, undefined, this.test); } @@ -2461,7 +2533,8 @@ class ArkPlainToStateComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPlainToStateComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToStateComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToStateComponent) { ArkText(undefined, undefined, this.test); } @@ -2495,7 +2568,8 @@ class ArkPlainToPropComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPlainToPropComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToPropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToPropComponent) { ArkText(undefined, undefined, this.test); } @@ -2525,7 +2599,8 @@ class ArkPlainToProvideComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToProvideComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToProvideComponent) { ArkText(undefined, undefined, this.test); } @@ -2555,7 +2630,8 @@ class ArkPlainToStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -2585,7 +2661,8 @@ class ArkPlainToLocalStorageLinkComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToLocalStorageLinkComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToLocalStorageLinkComponent) { ArkText(undefined, undefined, this.test); } @@ -2619,7 +2696,8 @@ class ArkPlainToStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -2653,7 +2731,8 @@ class ArkPlainToLocalStoragePropComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToLocalStoragePropComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToLocalStoragePropComponent) { ArkText(undefined, undefined, this.test); } @@ -2689,7 +2768,8 @@ class ArkPlainToBuilderParamComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToBuilderParamComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToBuilderParamComponent) { ArkText(undefined, undefined, this.test); } @@ -2719,7 +2799,8 @@ class ArkPlainToPlainComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPlainToPlainComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPlainToPlainComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPlainToPlainComponent) { ArkText(undefined, undefined, this.test); } diff --git a/arkoala/ets-plugin/test/golden/Rewrite.ts b/arkoala/ets-plugin/test/golden/Rewrite.ts index be380ce20..20ca57688 100644 --- a/arkoala/ets-plugin/test/golden/Rewrite.ts +++ b/arkoala/ets-plugin/test/golden/Rewrite.ts @@ -9,7 +9,8 @@ export class ArkEntryExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkEntryExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkEntryExampleComponent) { } } class ArkComponentExampleComponent extends ArkStructBase { @@ -21,7 +22,8 @@ class ArkComponentExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkComponentExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkComponentExampleComponent) { } } class ArkBuildExampleComponent extends ArkStructBase { @@ -33,7 +35,8 @@ class ArkBuildExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkBuildExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkBuildExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuildExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.fontColor(Color.Red) @@ -58,7 +61,8 @@ class ArkStateExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStateExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkStateExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStateExampleComponent) { ArkText(undefined, undefined, this.x); } @@ -80,7 +84,8 @@ class ArkLinkExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkLinkExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkLinkExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLinkExampleComponent) { ArkText(undefined, undefined, this.x); } @@ -106,7 +111,8 @@ class ArkPropExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkPropExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkPropExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropExampleComponent) { ArkText(undefined, undefined, this.x); } @@ -132,7 +138,8 @@ class ArkPropInitializedExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPropInitializedExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPropInitializedExampleComponent) { ArkText(undefined, undefined, this.x); } @@ -154,7 +161,8 @@ class ArkProvideExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkProvideExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkProvideExampleComponent) { ArkText(undefined, undefined, this.x); } @@ -176,7 +184,8 @@ class ArkConsumeExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkConsumeExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkConsumeExampleComponent) { ArkText(undefined, undefined, this.x); } @@ -194,7 +203,8 @@ class ArkBuilderExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderExampleComponent) { this.foo(); } @@ -212,7 +222,8 @@ class ArkGlobalBuilderExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkGlobalBuilderExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkGlobalBuilderExampleComponent) { bar(); } @@ -242,7 +253,8 @@ class ArkBuilderParamExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkBuilderParamExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBuilderParamExampleComponent) { this.foo(); } @@ -262,7 +274,8 @@ class ArkStylesExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStylesExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkStylesExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStylesExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.width(17).__applyStyle(looks); @@ -284,7 +297,8 @@ class ArkStylesMethodExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStylesMethodExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStylesMethodExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.width(17).__applyStyle(this.nice.bind(this)); @@ -306,7 +320,8 @@ class ArkExtendExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkExtendExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkExtendExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkExtendExampleComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width(17).__applyStyle(clown__Column); @@ -326,7 +341,8 @@ class ArkAnimatableExtendExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkAnimatableExtendExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkAnimatableExtendExampleComponent) { ArkText((instance: ArkTextComponent) => { instance.width(17).__applyAnimatableExtend(attributeExtend__Text, 50, "unused"); @@ -357,7 +373,8 @@ class ArkWatchExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkWatchExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkWatchExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkWatchExampleComponent) { } } @@ -378,7 +395,8 @@ class ArkStorageLinkExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStorageLinkExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStorageLinkExampleComponent) { } } @@ -403,7 +421,8 @@ class ArkStoragePropExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStoragePropExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStoragePropExampleComponent) { } } @@ -426,7 +445,8 @@ class ArkCustomDialogExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomDialogExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomDialogExampleComponent) { } } @@ -460,7 +480,8 @@ export class ArkCustomDialogControllerExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomDialogControllerExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomDialogControllerExampleComponent) { } } @@ -493,7 +514,8 @@ class ArkObjectLinkExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkObjectLinkExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkObjectLinkExampleComponent) { ArkButton((instance: ArkButtonComponent) => { instance.onClick(() => { @@ -519,7 +541,8 @@ class ArkObjectLinkExampleParentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkObjectLinkExampleParentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkObjectLinkExampleParentComponent) { ObjectLinkExample(undefined, undefined); } @@ -556,7 +579,8 @@ class ArkCallExampleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCallExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCallExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCallExampleComponent) { Child(undefined, undefined, { _counter: this._state }); } @@ -578,7 +602,8 @@ class ArkChildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkChildComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkChildComponent) { } } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/Rewrite2.ts b/arkoala/ets-plugin/test/golden/Rewrite2.ts index 643125dac..42ff60970 100644 --- a/arkoala/ets-plugin/test/golden/Rewrite2.ts +++ b/arkoala/ets-plugin/test/golden/Rewrite2.ts @@ -32,7 +32,8 @@ class ArkLocalStorageLinkExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageLinkExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageLinkExampleComponent) { ArkText(undefined, undefined, "LocalStorage entry = " + storage.get("storage")); } diff --git a/arkoala/ets-plugin/test/golden/Rewrite3.ts b/arkoala/ets-plugin/test/golden/Rewrite3.ts index 10b4f7950..f5d76e8e5 100644 --- a/arkoala/ets-plugin/test/golden/Rewrite3.ts +++ b/arkoala/ets-plugin/test/golden/Rewrite3.ts @@ -36,7 +36,8 @@ class ArkLocalStoragePropExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStoragePropExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStoragePropExampleComponent) { } } diff --git a/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts b/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts index 1adf5e2b6..04e771aae 100644 --- a/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts +++ b/arkoala/ets-plugin/test/golden/ets-component-call/user-function-declaration.ts @@ -36,7 +36,8 @@ export class ArkStructComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStructComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkStructComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStructComponent) { } } export class ArkStructWithContentComponent extends ArkStructBase { @@ -72,7 +73,8 @@ export class ArkStructWithContentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStructWithContentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStructWithContentComponent) { this.content(); } diff --git a/arkoala/ets-plugin/test/golden/specification/@builder.ts b/arkoala/ets-plugin/test/golden/specification/@builder.ts index 0a3fb6c19..09dfc523a 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builder.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builder.ts @@ -78,7 +78,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn(undefined, () => { ArkRow((instance: ArkRowComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@builderParam.ts b/arkoala/ets-plugin/test/golden/specification/@builderParam.ts index c689bee82..e8350baf2 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderParam.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderParam.ts @@ -57,7 +57,8 @@ class ArkCustomContainerComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomContainerComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomContainerComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.header); @@ -100,7 +101,8 @@ class ArkCustomContainer2Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomContainer2Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomContainer2Component) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.header); @@ -155,7 +157,8 @@ class ArkCustomContainerUserComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomContainerUserComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomContainerUserComponent) { ArkColumn(undefined, () => { CustomContainerExport(undefined, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts b/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts index 0e0a5bd6a..2519da28b 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderWithComponent.ts @@ -17,7 +17,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIndexComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, () => { myBuilder(); @@ -35,7 +36,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkchildComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkchildComponent) { ArkText(undefined, undefined, 'Hello'); } diff --git a/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts b/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts index 55aa6da21..a33dbbe97 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderWithForEach.ts @@ -24,7 +24,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIndexComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIndexComponent) { ArkColumn(undefined, () => { ComB(this.arr); @@ -40,7 +41,8 @@ class ArkComAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkComAComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkComAComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkComAComponent) { ArkRow(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts b/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts index d8913a95a..03306d469 100644 --- a/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts +++ b/arkoala/ets-plugin/test/golden/specification/@builderWithLinkData.ts @@ -18,7 +18,8 @@ class ArkTitleCompComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTitleCompComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkTitleCompComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkTitleCompComponent) { ArkText(undefined, undefined, this.title); } @@ -44,7 +45,8 @@ class ArkTestPageComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTestPageComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkTestPageComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkTestPageComponent) { ArkFlex(undefined, () => { this.TitleCompView(); diff --git a/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts b/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts index ef44caf2b..49fa024c1 100644 --- a/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts +++ b/arkoala/ets-plugin/test/golden/specification/@consume_@provide.ts @@ -18,7 +18,8 @@ class ArkCompAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompAComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCompAComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCompAComponent) { ArkColumn(undefined, () => { CompB(undefined, undefined); @@ -43,7 +44,8 @@ class ArkCompBComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompBComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCompBComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCompBComponent) { ArkColumn(undefined, () => { CompC(undefined, undefined); @@ -67,7 +69,8 @@ class ArkCompCComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompCComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCompCComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCompCComponent) { ArkColumn(undefined, () => { ArkButton((instance: ArkButtonComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@customDialog.ts b/arkoala/ets-plugin/test/golden/specification/@customDialog.ts index d638038a1..113cd55ce 100644 --- a/arkoala/ets-plugin/test/golden/specification/@customDialog.ts +++ b/arkoala/ets-plugin/test/golden/specification/@customDialog.ts @@ -68,7 +68,8 @@ class ArkDialogExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkDialogExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkDialogExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkDialogExampleComponent) { ArkColumn(undefined, () => { ArkRow(undefined, () => { @@ -151,7 +152,8 @@ class ArkCustomDialogUserComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomDialogUserComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomDialogUserComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@link.ts b/arkoala/ets-plugin/test/golden/specification/@link.ts index c4103e1e2..a435fe1cc 100644 --- a/arkoala/ets-plugin/test/golden/specification/@link.ts +++ b/arkoala/ets-plugin/test/golden/specification/@link.ts @@ -18,7 +18,8 @@ class ArkLinkComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkLinkComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkLinkComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLinkComponentComponent) { ArkText(undefined, undefined, this.counter); } @@ -40,7 +41,8 @@ class ArkParentComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkParentComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentComponentComponent) { ArkColumn(undefined, () => { LinkComponent(undefined, undefined, { _counter: this._value }); diff --git a/arkoala/ets-plugin/test/golden/specification/@objectLink.ts b/arkoala/ets-plugin/test/golden/specification/@objectLink.ts index fcbf233c7..f7762f562 100644 --- a/arkoala/ets-plugin/test/golden/specification/@objectLink.ts +++ b/arkoala/ets-plugin/test/golden/specification/@objectLink.ts @@ -32,7 +32,8 @@ class ArkCustomTextComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomTextComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCustomTextComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomTextComponent) { ArkRow(undefined, () => { ArkText(undefined, undefined, this.model.text); @@ -64,7 +65,8 @@ class ArkParentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentComponent) { ArkColumn(undefined, () => { ForEach(this.models, (item) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts b/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts index 28d8b19a3..10ae0fed8 100644 --- a/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts +++ b/arkoala/ets-plugin/test/golden/specification/@observed_@objectLink.ts @@ -39,7 +39,8 @@ class ArkViewAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewAComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkViewAComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkViewAComponent) { ArkRow(undefined, () => { ArkText(undefined, undefined, 'ViewA-' + this.varA.id); @@ -63,7 +64,8 @@ class ArkViewBComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewBComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkViewBComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkViewBComponent) { ArkColumn(undefined, () => { ArkRow(undefined, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/@preview.ts b/arkoala/ets-plugin/test/golden/specification/@preview.ts index fc11a363c..b72052e23 100644 --- a/arkoala/ets-plugin/test/golden/specification/@preview.ts +++ b/arkoala/ets-plugin/test/golden/specification/@preview.ts @@ -17,7 +17,8 @@ class ArkHomePreviewComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkHomePreviewComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkHomePreviewComponentComponent) { ArkText((instance: ArkTextComponent) => { instance.fontSize(50); @@ -33,7 +34,8 @@ class ArkHomePreviewComponent_PreviewComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkHomePreviewComponent_PreviewComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkHomePreviewComponent_PreviewComponent) { ArkColumn(undefined, () => { HomePreviewComponent(undefined, undefined); diff --git a/arkoala/ets-plugin/test/golden/specification/@prop.ts b/arkoala/ets-plugin/test/golden/specification/@prop.ts index 83026546c..f5a7bf213 100644 --- a/arkoala/ets-plugin/test/golden/specification/@prop.ts +++ b/arkoala/ets-plugin/test/golden/specification/@prop.ts @@ -22,7 +22,8 @@ class ArkCustomXComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomXComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCustomXComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomXComponent) { } } @@ -43,7 +44,8 @@ class ArkCustomYComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomYComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCustomYComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomYComponent) { ArkRow(undefined, () => { CustomX(undefined, undefined, { fruit: this.parentFruit }); diff --git a/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts b/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts index 5c525ffbc..1ffa7b478 100644 --- a/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts +++ b/arkoala/ets-plugin/test/golden/specification/@propComplexType.ts @@ -34,7 +34,8 @@ class ArkCustomXComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCustomXComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCustomXComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomXComponent) { ArkRow(undefined, () => { ArkText(undefined, undefined, JSON.stringify(this.fruit.c)); @@ -58,7 +59,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIndexComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, () => { CustomX(undefined, undefined, { fruit: this.arrA[0] }); diff --git a/arkoala/ets-plugin/test/golden/specification/@state.ts b/arkoala/ets-plugin/test/golden/specification/@state.ts index aaf49142e..617b58ded 100644 --- a/arkoala/ets-plugin/test/golden/specification/@state.ts +++ b/arkoala/ets-plugin/test/golden/specification/@state.ts @@ -18,7 +18,8 @@ class ArkStatePageComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkStatePageComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkStatePageComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStatePageComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, "counter:" + this.counter); diff --git a/arkoala/ets-plugin/test/golden/specification/@storageLink.ts b/arkoala/ets-plugin/test/golden/specification/@storageLink.ts index 434aa6ae7..a5210daf8 100644 --- a/arkoala/ets-plugin/test/golden/specification/@storageLink.ts +++ b/arkoala/ets-plugin/test/golden/specification/@storageLink.ts @@ -43,7 +43,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkMyComponentComponent) { ArkRow(undefined, () => { ArkButton((instance: ArkButtonComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@storageProp.ts b/arkoala/ets-plugin/test/golden/specification/@storageProp.ts index fc95f33e5..44ef9a30e 100644 --- a/arkoala/ets-plugin/test/golden/specification/@storageProp.ts +++ b/arkoala/ets-plugin/test/golden/specification/@storageProp.ts @@ -43,7 +43,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkMyComponentComponent) { ArkRow(undefined, () => { ArkButton((instance: ArkButtonComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@styles.ts b/arkoala/ets-plugin/test/golden/specification/@styles.ts index f9c291a3f..81ab0ddff 100644 --- a/arkoala/ets-plugin/test/golden/specification/@styles.ts +++ b/arkoala/ets-plugin/test/golden/specification/@styles.ts @@ -24,7 +24,8 @@ class ArkFancyUseComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkFancyUseComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkFancyUseComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkFancyUseComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts b/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts index f0b45c6d8..50b31b663 100644 --- a/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts +++ b/arkoala/ets-plugin/test/golden/specification/@stylesExport.ts @@ -24,7 +24,8 @@ export class ArkFancyUseExpComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkFancyUseExpComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkFancyUseExpComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/@watch.ts b/arkoala/ets-plugin/test/golden/specification/@watch.ts index 5d9dc7db0..cf1843cc8 100644 --- a/arkoala/ets-plugin/test/golden/specification/@watch.ts +++ b/arkoala/ets-plugin/test/golden/specification/@watch.ts @@ -69,7 +69,8 @@ class ArkCompAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkCompAComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkCompAComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCompAComponent) { ArkColumn(undefined, () => { ArkButton((instance: ArkButtonComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/GridItem.ts b/arkoala/ets-plugin/test/golden/specification/GridItem.ts index 622fbb5ff..bd4226e46 100644 --- a/arkoala/ets-plugin/test/golden/specification/GridItem.ts +++ b/arkoala/ets-plugin/test/golden/specification/GridItem.ts @@ -9,7 +9,8 @@ class ArkParentViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentViewComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentViewComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentViewComponent) { ArkGrid(undefined, () => { ArkGridItem((instance: ArkGridItemComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/ListItem.ts b/arkoala/ets-plugin/test/golden/specification/ListItem.ts index 77eb05f4b..a0a801bc2 100644 --- a/arkoala/ets-plugin/test/golden/specification/ListItem.ts +++ b/arkoala/ets-plugin/test/golden/specification/ListItem.ts @@ -9,7 +9,8 @@ class ArkParentViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentViewComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentViewComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentViewComponent) { ArkList(undefined, () => { ArkListItem((instance: ArkListItemComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts b/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts index c3260678a..f9a6aa44a 100644 --- a/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts +++ b/arkoala/ets-plugin/test/golden/specification/XComponentContainer.ts @@ -9,7 +9,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { ArkXComponent(undefined, undefined, { id: '1', type: 'component' }); diff --git a/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts b/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts index c72c9d6b5..bdfabb254 100644 --- a/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts +++ b/arkoala/ets-plugin/test/golden/specification/animatableExtend.ts @@ -24,7 +24,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { ArkPolyline((instance: ArkPolylineComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/animateTo.ts b/arkoala/ets-plugin/test/golden/specification/animateTo.ts index f79fe8f06..1dd1200a3 100644 --- a/arkoala/ets-plugin/test/golden/specification/animateTo.ts +++ b/arkoala/ets-plugin/test/golden/specification/animateTo.ts @@ -82,7 +82,8 @@ class ArkTransitionExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkTransitionExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkTransitionExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(400).width("100%").padding({ top: 100 }); diff --git a/arkoala/ets-plugin/test/golden/specification/appStorage.ts b/arkoala/ets-plugin/test/golden/specification/appStorage.ts index fcc2d9016..dd19540df 100644 --- a/arkoala/ets-plugin/test/golden/specification/appStorage.ts +++ b/arkoala/ets-plugin/test/golden/specification/appStorage.ts @@ -43,7 +43,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkMyComponentComponent) { ArkRow(undefined, () => { ArkButton((instance: ArkButtonComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/button.ts b/arkoala/ets-plugin/test/golden/specification/button.ts index 233d36de0..465659395 100644 --- a/arkoala/ets-plugin/test/golden/specification/button.ts +++ b/arkoala/ets-plugin/test/golden/specification/button.ts @@ -9,7 +9,8 @@ class ArkButtonExampleComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkButtonExampleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkButtonExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkButtonExampleComponent) { ArkFlex(undefined, () => { ArkFlex(undefined, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/component_object.ts b/arkoala/ets-plugin/test/golden/specification/component_object.ts index 6a36c435a..dc77d6265 100644 --- a/arkoala/ets-plugin/test/golden/specification/component_object.ts +++ b/arkoala/ets-plugin/test/golden/specification/component_object.ts @@ -30,7 +30,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIndexComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, () => { Child(undefined, undefined, { options, message1: this.message1, message2: this.message2 }); @@ -77,7 +78,8 @@ class ArkChildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkChildComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkChildComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.message1); @@ -103,7 +105,8 @@ class ArkChild2Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChild2Component) => void) | undefined, /** @memo */ + builder: ((instance: ArkChild2Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkChild2Component) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.message); diff --git a/arkoala/ets-plugin/test/golden/specification/custom_component.ts b/arkoala/ets-plugin/test/golden/specification/custom_component.ts index 6e1da1508..d394cdca6 100644 --- a/arkoala/ets-plugin/test/golden/specification/custom_component.ts +++ b/arkoala/ets-plugin/test/golden/specification/custom_component.ts @@ -9,7 +9,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn(undefined, () => { Banner(undefined, undefined); @@ -44,7 +45,8 @@ class ArkBannerComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkBannerComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkBannerComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBannerComponent) { ArkColumn(undefined, () => { ArkText(undefined, undefined, this.value); diff --git a/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts b/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts index 0a64c4516..252cb5b42 100644 --- a/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts +++ b/arkoala/ets-plugin/test/golden/specification/decoratorKeyCheck.ts @@ -200,7 +200,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIndexComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIndexComponent) { ArkRow(undefined, undefined); } diff --git a/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts b/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts index a6f9523f1..316b8c318 100644 --- a/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts +++ b/arkoala/ets-plugin/test/golden/specification/forEachSecondFunction.ts @@ -18,7 +18,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width("100%").height("100%"); diff --git a/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts b/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts index 2056ee5b3..61f5d1a77 100644 --- a/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts +++ b/arkoala/ets-plugin/test/golden/specification/forEachTwo.ts @@ -36,7 +36,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIndexComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIndexComponent) { ArkRow((instance: ArkRowComponent) => { instance.height('100%'); diff --git a/arkoala/ets-plugin/test/golden/specification/foreach.ts b/arkoala/ets-plugin/test/golden/specification/foreach.ts index 1bb8ceab9..fe1eabbb7 100644 --- a/arkoala/ets-plugin/test/golden/specification/foreach.ts +++ b/arkoala/ets-plugin/test/golden/specification/foreach.ts @@ -18,7 +18,8 @@ class ArkParentViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentViewComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentViewComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentViewComponent) { ArkList(undefined, () => { ForEach(this.arr, item => { @@ -44,7 +45,8 @@ class ArkParentView1Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView1Component) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentView1Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentView1Component) { ArkList(undefined, () => { ForEach(this.arr, (item, index) => { @@ -70,7 +72,8 @@ class ArkParentView2Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView2Component) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentView2Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentView2Component) { ArkList(undefined, () => { ForEach(this.arr, (item, index) => { @@ -96,7 +99,8 @@ class ArkParentView3Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView3Component) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentView3Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentView3Component) { ArkList(undefined, () => { ForEach(this.arr, (item, index) => { @@ -122,7 +126,8 @@ class ArkParentView4Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView4Component) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentView4Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentView4Component) { ArkList(undefined, () => { ForEach(this.arr, item => { @@ -148,7 +153,8 @@ class ArkParentView5Component extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentView5Component) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentView5Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentView5Component) { ArkList(undefined, () => { ForEach(this.arr, item => { diff --git a/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts b/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts index a1222f7ce..9617f7ffe 100644 --- a/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts +++ b/arkoala/ets-plugin/test/golden/specification/handleCustomBuilder.ts @@ -38,7 +38,8 @@ class ArkIndexComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIndexComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIndexComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIndexComponent) { ArkColumn(undefined, () => { ArkRow((instance: ArkRowComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/id_if.ts b/arkoala/ets-plugin/test/golden/specification/id_if.ts index 4f28b00a7..d684f403e 100644 --- a/arkoala/ets-plugin/test/golden/specification/id_if.ts +++ b/arkoala/ets-plugin/test/golden/specification/id_if.ts @@ -33,7 +33,8 @@ class ArkMyComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkMyComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkMyComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkMyComponentComponent) { ArkColumn(undefined, () => { if (this.pass) { @@ -138,7 +139,8 @@ class ArkChildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkChildComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkChildComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/if.ts b/arkoala/ets-plugin/test/golden/specification/if.ts index eb5233612..5a97b2ac8 100644 --- a/arkoala/ets-plugin/test/golden/specification/if.ts +++ b/arkoala/ets-plugin/test/golden/specification/if.ts @@ -34,7 +34,8 @@ class ArkIFViewComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkIFViewComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkIFViewComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkIFViewComponent) { ArkColumn(undefined, () => { if (this.toggle1) { diff --git a/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts b/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts index 00c9bb3da..a20a9b13d 100644 --- a/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts +++ b/arkoala/ets-plugin/test/golden/specification/import@CustomDialog.ts @@ -57,7 +57,8 @@ class ArkCustomDialogUserComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomDialogUserComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomDialogUserComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width('100%').margin({ top: 5 }); diff --git a/arkoala/ets-plugin/test/golden/specification/import@Observed.ts b/arkoala/ets-plugin/test/golden/specification/import@Observed.ts index 1706ba348..d6061fa3a 100644 --- a/arkoala/ets-plugin/test/golden/specification/import@Observed.ts +++ b/arkoala/ets-plugin/test/golden/specification/import@Observed.ts @@ -31,7 +31,8 @@ class ArkViewAComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewAComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkViewAComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkViewAComponent) { ArkRow((instance: ArkRowComponent) => { instance.margin({ top: 10 }); @@ -61,7 +62,8 @@ class ArkViewBComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkViewBComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkViewBComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkViewBComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width('100%'); diff --git a/arkoala/ets-plugin/test/golden/specification/importAllEts.ts b/arkoala/ets-plugin/test/golden/specification/importAllEts.ts index c4b2531af..78d8d454e 100644 --- a/arkoala/ets-plugin/test/golden/specification/importAllEts.ts +++ b/arkoala/ets-plugin/test/golden/specification/importAllEts.ts @@ -44,7 +44,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkImportTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { AllComponent.NamespaceComponent1({ diff --git a/arkoala/ets-plugin/test/golden/specification/importEts.ts b/arkoala/ets-plugin/test/golden/specification/importEts.ts index dd826d22d..4dbd618d6 100644 --- a/arkoala/ets-plugin/test/golden/specification/importEts.ts +++ b/arkoala/ets-plugin/test/golden/specification/importEts.ts @@ -46,7 +46,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkImportTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { LinkComponent2Ref({ diff --git a/arkoala/ets-plugin/test/golden/specification/importExportEts.ts b/arkoala/ets-plugin/test/golden/specification/importExportEts.ts index f843de62c..08d11be74 100644 --- a/arkoala/ets-plugin/test/golden/specification/importExportEts.ts +++ b/arkoala/ets-plugin/test/golden/specification/importExportEts.ts @@ -44,7 +44,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkImportTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { AllStarComponent.ExportComponent({ diff --git a/arkoala/ets-plugin/test/golden/specification/importExportNest.ts b/arkoala/ets-plugin/test/golden/specification/importExportNest.ts index c4d3a915e..997c4122c 100644 --- a/arkoala/ets-plugin/test/golden/specification/importExportNest.ts +++ b/arkoala/ets-plugin/test/golden/specification/importExportNest.ts @@ -83,7 +83,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkImportTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/importTs.ts b/arkoala/ets-plugin/test/golden/specification/importTs.ts index 4a58bfb92..a703ed48c 100644 --- a/arkoala/ets-plugin/test/golden/specification/importTs.ts +++ b/arkoala/ets-plugin/test/golden/specification/importTs.ts @@ -44,7 +44,8 @@ class ArkImportTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkImportTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkImportTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkImportTestComponent) { ArkColumn(undefined, () => { AllStarComponent.ExportComponent({ diff --git a/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts b/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts index 0a192e9aa..5ccbb766d 100644 --- a/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts +++ b/arkoala/ets-plugin/test/golden/specification/lazyforeach.ts @@ -81,7 +81,8 @@ class ArkTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkTestComponent) { ArkLazyGrid(undefined, () => { LazyForEach(this.data, (row) => { diff --git a/arkoala/ets-plugin/test/golden/specification/localStorage.ts b/arkoala/ets-plugin/test/golden/specification/localStorage.ts index 456d57720..81111b8b0 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorage.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorage.ts @@ -39,7 +39,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); diff --git a/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts b/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts index d1d30e5ed..10908ce33 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorageForBoth.ts @@ -43,7 +43,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); diff --git a/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts b/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts index d86084196..13f54a333 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorageForRoute.ts @@ -12,7 +12,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); diff --git a/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts b/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts index 9d58ed017..9814b9e1a 100644 --- a/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts +++ b/arkoala/ets-plugin/test/golden/specification/localStorageForStorage.ts @@ -41,7 +41,8 @@ class ArkLocalStorageComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLocalStorageComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLocalStorageComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.height(500); diff --git a/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts b/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts index 28fb408a0..6080331c7 100644 --- a/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/longPressGesture.ts @@ -18,7 +18,8 @@ class ArkLongPressGestureExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLongPressGestureExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLongPressGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(200).width(300).padding(60).border({ width: 1 }).margin(30) diff --git a/arkoala/ets-plugin/test/golden/specification/pageTransition.ts b/arkoala/ets-plugin/test/golden/specification/pageTransition.ts index 34a1a5890..d92c7c454 100644 --- a/arkoala/ets-plugin/test/golden/specification/pageTransition.ts +++ b/arkoala/ets-plugin/test/golden/specification/pageTransition.ts @@ -34,7 +34,8 @@ class ArkPageTransitionExample1Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPageTransitionExample1Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPageTransitionExample1Component) { ArkColumn((instance: ArkColumnComponent) => { instance.scale({ x: this.scale2 }).opacity(this.opacity2); diff --git a/arkoala/ets-plugin/test/golden/specification/panGestrue.ts b/arkoala/ets-plugin/test/golden/specification/panGestrue.ts index f14d13bef..a7a743e4f 100644 --- a/arkoala/ets-plugin/test/golden/specification/panGestrue.ts +++ b/arkoala/ets-plugin/test/golden/specification/panGestrue.ts @@ -26,7 +26,8 @@ class ArkPanGestureExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPanGestureExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPanGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(200).padding(20).border({ width: 1 }).margin(80) diff --git a/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts b/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts index a2a52ad8f..d3b432176 100644 --- a/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/pinchGesture.ts @@ -18,7 +18,8 @@ class ArkPinchGestureExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkPinchGestureExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkPinchGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(200).padding(20).border({ width: 1 }).margin(80) diff --git a/arkoala/ets-plugin/test/golden/specification/recycle.ts b/arkoala/ets-plugin/test/golden/specification/recycle.ts index bad62baa8..a89dcf814 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle.ts @@ -26,7 +26,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.width(this.state_value) @@ -111,7 +112,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkchildComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkchildComponent) { ArkColumn(undefined, () => { AnimationTest(undefined, undefined) @@ -204,7 +206,8 @@ class ArkNormalComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkNormalComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkNormalComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { @@ -231,7 +234,8 @@ class ArkAnimationTestComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkAnimationTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkAnimationTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkAnimationTestComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts b/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts index 61be6da9e..dea765cc9 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_extend_styles.ts @@ -22,7 +22,8 @@ class ArkExtendComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkExtendComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkExtendComponentComponent) { ArkColumn(undefined, () => { ArkButton((instance: ArkButtonComponent) => { @@ -74,7 +75,8 @@ class ArkStylesComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkStylesComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkStylesComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts b/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts index 1bab3fc9c..1cca216f2 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_function_array.ts @@ -18,7 +18,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { child(undefined, undefined); @@ -50,7 +51,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkchildComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkchildComponent) { ArkColumn(undefined, () => { ArkCircle((instance: ArkCircleComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts b/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts index 4a3a0f4c3..d9d0aaf08 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_gesture.ts @@ -25,7 +25,8 @@ class ArkGestureTestComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkGestureTestComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkGestureTestComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkGestureTestComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(this.width_value).padding(60).border({ width: 1 }).margin(30) diff --git a/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts b/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts index 7c1b4a781..36ff0f999 100644 --- a/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts +++ b/arkoala/ets-plugin/test/golden/specification/recycle_reuseId.ts @@ -27,7 +27,8 @@ class ArkHomeComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkHomeComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkHomeComponentComponent) { ArkColumn(undefined, () => { child(undefined, undefined, { propvalue: this.value, linkvalue: this.value }) @@ -76,7 +77,8 @@ class ArkchildComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkchildComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkchildComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkchildComponent) { ArkColumn(undefined, undefined); } diff --git a/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts b/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts index c3a37b022..e98228195 100644 --- a/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/rotationGesture.ts @@ -18,7 +18,8 @@ class ArkRotationGestureExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkRotationGestureExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkRotationGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(100).width(200).padding(20).border({ width: 1 }) diff --git a/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts b/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts index 2f0d7df59..5befb316e 100644 --- a/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/swipeGesture.ts @@ -26,7 +26,8 @@ class ArkSwipeGestureExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkSwipeGestureExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkSwipeGestureExampleComponent) { ArkColumn((instance: ArkColumnComponent) => { instance.border({ width: 2 }) diff --git a/arkoala/ets-plugin/test/golden/specification/tab.ts b/arkoala/ets-plugin/test/golden/specification/tab.ts index 4c281c70d..89cc07f47 100644 --- a/arkoala/ets-plugin/test/golden/specification/tab.ts +++ b/arkoala/ets-plugin/test/golden/specification/tab.ts @@ -17,7 +17,8 @@ class ArkTabSimpleComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkTabSimpleComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkTabSimpleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkTabSimpleComponent) { ArkColumn(undefined, () => { ArkTabs(undefined, () => { diff --git a/arkoala/ets-plugin/test/golden/specification/tapGesture.ts b/arkoala/ets-plugin/test/golden/specification/tapGesture.ts index 39ee1b5e1..ed550ff19 100644 --- a/arkoala/ets-plugin/test/golden/specification/tapGesture.ts +++ b/arkoala/ets-plugin/test/golden/specification/tapGesture.ts @@ -18,7 +18,8 @@ class ArkTapGestureExampleComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkTapGestureExampleComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkTapGestureExampleComponent) { ArkFlex((instance: ArkFlexComponent) => { instance.height(200).width(300).padding(60).border({ width: 1 }).margin(30) diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts index e606de26c..c9e667c16 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/AMDComponent.ts @@ -59,7 +59,8 @@ class ArkAMDComponentComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkAMDComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkAMDComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkAMDComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts index 04c92c1f4..0628dfb3f 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/BaseComponent.ts @@ -39,7 +39,8 @@ class ArkBaseComponentComponent extends ArkStructBase /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkBaseComponentComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkBaseComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkBaseComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts index 33fc89ea8..268790ba1 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/DefaultComponent.ts @@ -59,7 +59,8 @@ class ArkDefaultComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkDefaultComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkDefaultComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts index 5f1e500f7..9665fe7c0 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/DivideComponent.ts @@ -31,7 +31,8 @@ class ArkDivideComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkDivideComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkDivideComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts index 1097a2c0c..8608f4e75 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/ExportComponent.ts @@ -88,7 +88,8 @@ class ArkExportComponent1Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkExportComponent1Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkExportComponent1Component) { ArkRow(undefined, () => { DefaultComponent({ @@ -175,7 +176,8 @@ class ArkExportComponent2Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkExportComponent2Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkExportComponent2Component) { ArkRow(undefined, () => { DefaultComponent({ @@ -262,7 +264,8 @@ class ArkExportComponent3Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkExportComponent3Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkExportComponent3Component) { ArkRow(undefined, () => { DefaultComponent({ @@ -349,7 +352,8 @@ export default class ArkExportComponent4Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkExportComponent4Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkExportComponent4Component) { ArkRow(undefined, () => { DefaultComponent({ diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts index 2ed9c7107..f8f979558 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/LinkComponent.ts @@ -88,7 +88,8 @@ class ArkLinkComponent1Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLinkComponent1Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLinkComponent1Component) { ArkRow(undefined, () => { DefaultComponent({ @@ -175,7 +176,8 @@ class ArkLinkComponent2Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLinkComponent2Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLinkComponent2Component) { ArkRow(undefined, () => { DefaultComponent({ @@ -262,7 +264,8 @@ class ArkLinkComponent3Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLinkComponent3Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLinkComponent3Component) { ArkRow(undefined, () => { DefaultComponent({ @@ -349,7 +352,8 @@ class ArkLinkComponent4Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkLinkComponent4Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkLinkComponent4Component) { ArkRow(undefined, () => { DefaultComponent({ diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts index 63a013d60..542e6829c 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/NamespaceComponent.ts @@ -59,7 +59,8 @@ class ArkNamespaceComponent1Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkNamespaceComponent1Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkNamespaceComponent1Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { @@ -145,7 +146,8 @@ class ArkNamespaceComponent2Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkNamespaceComponent2Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkNamespaceComponent2Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { @@ -231,7 +233,8 @@ class ArkNamespaceComponent3Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkNamespaceComponent3Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkNamespaceComponent3Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts index 38be26233..9b1e33581 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/TestComponent.ts @@ -16,7 +16,8 @@ export class ArkTestComponentComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkTestComponentComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkTestComponentComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { @@ -58,7 +59,8 @@ export class ArkCustomContainerExportComponent extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomContainerExportComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomContainerExportComponent) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts b/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts index 19c199031..1bc5df046 100644 --- a/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts +++ b/arkoala/ets-plugin/test/golden/specification/test/pages/import@CustomDialog.ts @@ -55,7 +55,8 @@ export class ArkCustomDialogExample1Component extends ArkStructBase void) | undefined, /** @memo */ + builder: ((instance: ArkCustomDialogExample1Component) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkCustomDialogExample1Component) { ArkColumn(undefined, () => { ArkText((instance: ArkTextComponent) => { diff --git a/arkoala/ets-plugin/test/golden/trailing-block.ts b/arkoala/ets-plugin/test/golden/trailing-block.ts index 264cd1468..f79616060 100644 --- a/arkoala/ets-plugin/test/golden/trailing-block.ts +++ b/arkoala/ets-plugin/test/golden/trailing-block.ts @@ -8,7 +8,8 @@ class ArkParentStructComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkParentStructComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkParentStructComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkParentStructComponent) { ArkColumn(undefined, () => { ChildStruct(undefined, () => { @@ -42,7 +43,8 @@ class ArkChildStructComponent extends ArkStructBase { /** @memo */ _build(/**/ /** @memo */ - builder: ((instance: ArkChildStructComponent) => void) | undefined, /** @memo */ + builder: ((instance: ArkChildStructComponent) => void) | undefined, /**/ + /** @memo */ content?: () => void, initializers?: ArkChildStructComponent) { this.content(); } -- Gitee