diff --git a/arkoala/ets-plugin/src/ApiUtils.ts b/arkoala/ets-plugin/src/ApiUtils.ts index b469a9d12752177b97e78c8ecd24d9e01cdb9bba..b461bbaf489044b1dfe2463505664abb81cd6562 100644 --- a/arkoala/ets-plugin/src/ApiUtils.ts +++ b/arkoala/ets-plugin/src/ApiUtils.ts @@ -104,24 +104,6 @@ export function undefinedValue(): ts.Expression { return ts.factory.createIdentifier("undefined") } -export function partialForName(className: string) { - return ts.factory.createTypeReferenceNode( - "Partial", - [ - ts.factory.createTypeReferenceNode(className) - ] - ) -} - -export function partial(className: ts.Identifier) { - return ts.factory.createTypeReferenceNode( - "Partial", - [ - ts.factory.createTypeReferenceNode(ts.idText(className)) - ] - ) -} - export function anyIfNoType(type: ts.TypeNode | undefined): ts.TypeNode { if (!type) return Any() return type diff --git a/arkoala/ets-plugin/src/StructTransformer.ts b/arkoala/ets-plugin/src/StructTransformer.ts index 289e041a33357ad80b8b4d7b4aaab8f5e93454ce..7f93de0d332f9614dfbc1077e62fd3138627ece2 100644 --- a/arkoala/ets-plugin/src/StructTransformer.ts +++ b/arkoala/ets-plugin/src/StructTransformer.ts @@ -667,13 +667,7 @@ export class StructTransformer extends AbstractVisitor { [ parameter( id("initializer"), - ts.factory.createTypeReferenceNode( - ts.factory.createIdentifier("Partial"), - [ts.factory.createTypeReferenceNode( - this.translateComponentName(adaptorClassName(node.name))!, - undefined - )] - ), + this.structOptions.createTypeReference(node), ts.factory.createObjectLiteralExpression() ) ], diff --git a/arkoala/ets-plugin/test/golden/arkoala/ets/Rewrite.ts b/arkoala/ets-plugin/test/golden/arkoala/ets/Rewrite.ts index 3e171348bcc6d7aad5b97f2d0a0ac85ba6d2245c..92e7c274d22106486ac85e8590355716c591784b 100644 --- a/arkoala/ets-plugin/test/golden/arkoala/ets/Rewrite.ts +++ b/arkoala/ets-plugin/test/golden/arkoala/ets/Rewrite.ts @@ -875,7 +875,7 @@ export function CustomDialogExampleImpl(initializers?: CustomDialogExampleOption }; ArkCustomDialogExampleComponent._instantiate(undefined, () => new ArkCustomDialogExampleComponent, undefined, updatedInitializers); } -export function CustomDialogExample(initializer: Partial = {}) { +export function CustomDialogExample(initializer: CustomDialogExampleOptions = {}) { return { build: bindCustomDialog(CustomDialogExampleImpl, initializer), buildOptions: initializer }; } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/arkoala/spec/@customDialog.ts b/arkoala/ets-plugin/test/golden/arkoala/spec/@customDialog.ts index 4180f4500a2955db7883e09c860a07a5d1d3a9b5..4efc825ebe93c38d258b3470bc97f21db9417b8c 100644 --- a/arkoala/ets-plugin/test/golden/arkoala/spec/@customDialog.ts +++ b/arkoala/ets-plugin/test/golden/arkoala/spec/@customDialog.ts @@ -190,7 +190,7 @@ export function DialogExampleImpl(initializers?: DialogExampleOptions): void { }; ArkDialogExampleComponent._instantiate(undefined, () => new ArkDialogExampleComponent, undefined, updatedInitializers); } -export function DialogExample(initializer: Partial = {}) { +export function DialogExample(initializer: DialogExampleOptions = {}) { return { build: bindCustomDialog(DialogExampleImpl, initializer), buildOptions: initializer }; } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/arkoala/spec/test/pages/import@CustomDialog.ts b/arkoala/ets-plugin/test/golden/arkoala/spec/test/pages/import@CustomDialog.ts index 54ca1c411dec6a52e084e8bc7e732397826f7ca9..62189f28913a6fdbae51a4d97be2c103929ea352 100644 --- a/arkoala/ets-plugin/test/golden/arkoala/spec/test/pages/import@CustomDialog.ts +++ b/arkoala/ets-plugin/test/golden/arkoala/spec/test/pages/import@CustomDialog.ts @@ -102,7 +102,7 @@ export function CustomDialogExample1Impl(initializers?: CustomDialogExample1Opti }; ArkCustomDialogExample1Component._instantiate(undefined, () => new ArkCustomDialogExample1Component, undefined, updatedInitializers); } -export function CustomDialogExample1(initializer: Partial = {}) { +export function CustomDialogExample1(initializer: CustomDialogExample1Options = {}) { return { build: bindCustomDialog(CustomDialogExample1Impl, initializer), buildOptions: initializer }; } export interface CustomDialogExample1Options { diff --git a/arkoala/ets-plugin/test/golden/arkts/ets/Rewrite.ts b/arkoala/ets-plugin/test/golden/arkts/ets/Rewrite.ts index 093fc0dce2464b25b84dd29c7afbc16756d9bdc0..c8b81391f8f3495f357f6833029a4312a5f71d7f 100644 --- a/arkoala/ets-plugin/test/golden/arkts/ets/Rewrite.ts +++ b/arkoala/ets-plugin/test/golden/arkts/ets/Rewrite.ts @@ -876,7 +876,7 @@ export function CustomDialogExampleImpl(initializers?: CustomDialogExampleOption }; ArkCustomDialogExampleComponent._instantiate(undefined, () => new ArkCustomDialogExampleComponent, undefined, updatedInitializers); } -export function CustomDialogExample(initializer: Partial = {}) { +export function CustomDialogExample(initializer: CustomDialogExampleOptions = {}) { return { build: bindCustomDialog(CustomDialogExampleImpl, initializer), buildOptions: initializer }; } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/arkts/spec/@customDialog.ts b/arkoala/ets-plugin/test/golden/arkts/spec/@customDialog.ts index 32f190e275573b59bfe082b2b1a999cf52d05c4f..2ee1bfc8f62d45320eeae4c96b46085af9dd21a6 100644 --- a/arkoala/ets-plugin/test/golden/arkts/spec/@customDialog.ts +++ b/arkoala/ets-plugin/test/golden/arkts/spec/@customDialog.ts @@ -192,7 +192,7 @@ export function DialogExampleImpl(initializers?: DialogExampleOptions): void { }; ArkDialogExampleComponent._instantiate(undefined, () => new ArkDialogExampleComponent, undefined, updatedInitializers); } -export function DialogExample(initializer: Partial = {}) { +export function DialogExample(initializer: DialogExampleOptions = {}) { return { build: bindCustomDialog(DialogExampleImpl, initializer), buildOptions: initializer }; } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/arkts/spec/test/pages/import@CustomDialog.ts b/arkoala/ets-plugin/test/golden/arkts/spec/test/pages/import@CustomDialog.ts index 22be2c938c0036d1bcfc2964937b6122f2d35e43..a5c169cc6ca4a545d970d7786786acba976adc38 100644 --- a/arkoala/ets-plugin/test/golden/arkts/spec/test/pages/import@CustomDialog.ts +++ b/arkoala/ets-plugin/test/golden/arkts/spec/test/pages/import@CustomDialog.ts @@ -105,7 +105,7 @@ export function CustomDialogExample1Impl(initializers?: CustomDialogExample1Opti }; ArkCustomDialogExample1Component._instantiate(undefined, () => new ArkCustomDialogExample1Component, undefined, updatedInitializers); } -export function CustomDialogExample1(initializer: Partial = {}) { +export function CustomDialogExample1(initializer: CustomDialogExample1Options = {}) { return { build: bindCustomDialog(CustomDialogExample1Impl, initializer), buildOptions: initializer }; } export interface CustomDialogExample1Options { diff --git a/arkoala/ets-plugin/test/golden/koala/ets/Rewrite.ts b/arkoala/ets-plugin/test/golden/koala/ets/Rewrite.ts index c05169dbb15491227888c502a0d341858d4990b8..86c02fb02c3b90d78d78345531e72115e3e3f585 100644 --- a/arkoala/ets-plugin/test/golden/koala/ets/Rewrite.ts +++ b/arkoala/ets-plugin/test/golden/koala/ets/Rewrite.ts @@ -873,7 +873,7 @@ export function CustomDialogExampleImpl(initializers?: CustomDialogExampleOption }; ArkCustomDialogExampleComponent._instantiate(undefined, () => new ArkCustomDialogExampleComponent, undefined, updatedInitializers); } -export function CustomDialogExample(initializer: Partial = {}) { +export function CustomDialogExample(initializer: CustomDialogExampleOptions = {}) { return { build: bindCustomDialog(CustomDialogExampleImpl, initializer), buildOptions: initializer }; } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/koala/spec/@customDialog.ts b/arkoala/ets-plugin/test/golden/koala/spec/@customDialog.ts index 6421236b7940feda68fdd849790d49cf113dde52..e7de33702e333c159fbbcc5208d19594520f2017 100644 --- a/arkoala/ets-plugin/test/golden/koala/spec/@customDialog.ts +++ b/arkoala/ets-plugin/test/golden/koala/spec/@customDialog.ts @@ -192,7 +192,7 @@ export function DialogExampleImpl(initializers?: DialogExampleOptions): void { }; ArkDialogExampleComponent._instantiate(undefined, () => new ArkDialogExampleComponent, undefined, updatedInitializers); } -export function DialogExample(initializer: Partial = {}) { +export function DialogExample(initializer: DialogExampleOptions = {}) { return { build: bindCustomDialog(DialogExampleImpl, initializer), buildOptions: initializer }; } /** @memo */ diff --git a/arkoala/ets-plugin/test/golden/koala/spec/test/pages/import@CustomDialog.ts b/arkoala/ets-plugin/test/golden/koala/spec/test/pages/import@CustomDialog.ts index 3f0441a650839b1929c26d5a0cf8a982d9d95884..0e5828e7ee2591110987fe9536ee4aab752446c1 100644 --- a/arkoala/ets-plugin/test/golden/koala/spec/test/pages/import@CustomDialog.ts +++ b/arkoala/ets-plugin/test/golden/koala/spec/test/pages/import@CustomDialog.ts @@ -104,7 +104,7 @@ export function CustomDialogExample1Impl(initializers?: CustomDialogExample1Opti }; ArkCustomDialogExample1Component._instantiate(undefined, () => new ArkCustomDialogExample1Component, undefined, updatedInitializers); } -export function CustomDialogExample1(initializer: Partial = {}) { +export function CustomDialogExample1(initializer: CustomDialogExample1Options = {}) { return { build: bindCustomDialog(CustomDialogExample1Impl, initializer), buildOptions: initializer }; } export interface CustomDialogExample1Options {