diff --git a/arkui-plugins/common/debug.ts b/arkui-plugins/common/debug.ts index 4675725602d7f27589789677fa841ae3ad924ca7..5be9e280c18f04c0abb94051e2990bea76169610 100644 --- a/arkui-plugins/common/debug.ts +++ b/arkui-plugins/common/debug.ts @@ -47,7 +47,7 @@ export function debugDump( const outputDir: string = cachePath ? path.resolve(currentDirectory, cachePath, modifiedFileName) : path.resolve(currentDirectory, 'dist', 'cache', modifiedFileName); - const filePath: string = path.resolve(outputDir, fileName); + const filePath: string = path.resolve(outputDir, fileName.replaceAll('\/', '_')); if (!fs.existsSync(outputDir)) { mkDir(outputDir); } diff --git a/arkui-plugins/test/ut/memo-plugins/function-declarations/declare-and-call.test.ts b/arkui-plugins/test/ut/memo-plugins/function-declarations/declare-and-call.test.ts index b4d2d21c4e4376797b78044103e26192daa60794..99fba4a09dabbb50bf34e9e9232a20a0090d82cb 100644 --- a/arkui-plugins/test/ut/memo-plugins/function-declarations/declare-and-call.test.ts +++ b/arkui-plugins/test/ut/memo-plugins/function-declarations/declare-and-call.test.ts @@ -34,6 +34,33 @@ const expectedScript: string = ` import { __memo_context_type as __memo_context_type, __memo_id_type as __memo_id_type } from \"arkui.stateManagement.runtime\"; import { memo as memo } from \"arkui.stateManagement.runtime\"; function main() {} +@memo() function funcA(__memo_context: __memo_context_type, __memo_id: __memo_id_type): void +@memo() function funcB(__memo_context: __memo_context_type, __memo_id: __memo_id_type): void { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 0); + if (__memo_scope.unchanged) { + __memo_scope.cached; + return; + } + funcA(__memo_context, ((__memo_id) + ())); + { + __memo_scope.recache(); + return; + } +} +@memo() function funcWithMemoBuilder(__memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() memo_arg: MemoBuilder): void { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); + const __memo_parameter_memo_arg = __memo_scope.param(0, memo_arg); + if (__memo_scope.unchanged) { + __memo_scope.cached; + return; + } + { + __memo_scope.recache(); + return; + } +} +function funcWithArg(arg: (()=> void)): void {} +function func(): void {} @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type) => { const __memo_scope = __memo_context.scope(((__memo_id) + ()), 0); if (__memo_scope.unchanged) { @@ -63,33 +90,6 @@ function main() {} return; } }); -@memo() function funcA(__memo_context: __memo_context_type, __memo_id: __memo_id_type): void -@memo() function funcB(__memo_context: __memo_context_type, __memo_id: __memo_id_type): void { - const __memo_scope = __memo_context.scope(((__memo_id) + ()), 0); - if (__memo_scope.unchanged) { - __memo_scope.cached; - return; - } - funcA(__memo_context, ((__memo_id) + ())); - { - __memo_scope.recache(); - return; - } -} -@memo() function funcWithMemoBuilder(__memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() memo_arg: MemoBuilder): void { - const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); - const __memo_parameter_memo_arg = __memo_scope.param(0, memo_arg); - if (__memo_scope.unchanged) { - __memo_scope.cached; - return; - } - { - __memo_scope.recache(); - return; - } -} -function funcWithArg(arg: (()=> void)): void {} -function func(): void {} class A { @memo() public foo(__memo_context: __memo_context_type, __memo_id: __memo_id_type) { const __memo_scope = __memo_context.scope(((__memo_id) + ()), 0); diff --git a/arkui-plugins/test/ut/memo-plugins/lambda-literals/trailing-lambdas.test.ts b/arkui-plugins/test/ut/memo-plugins/lambda-literals/trailing-lambdas.test.ts index b2465acc7af6249c504a615323acf7e4e6e429a0..47a14d9545c946b8be810eef71b7d3628db00f68 100644 --- a/arkui-plugins/test/ut/memo-plugins/lambda-literals/trailing-lambdas.test.ts +++ b/arkui-plugins/test/ut/memo-plugins/lambda-literals/trailing-lambdas.test.ts @@ -34,6 +34,31 @@ const expectedScript: string = ` import { __memo_context_type as __memo_context_type, __memo_id_type as __memo_id_type } from \"arkui.stateManagement.runtime\"; import { memo as memo } from \"arkui.stateManagement.runtime\"; function main() {} +@memo() function bar(__memo_context: __memo_context_type, __memo_id: __memo_id_type, f?: (()=> void)): void { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); + const __memo_parameter_f = __memo_scope.param(0, f); + if (__memo_scope.unchanged) { + __memo_scope.cached; + return; + } + { + __memo_scope.recache(); + return; + } +} +function par(f?: @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void {} +@memo() function kar(__memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() f?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); + const __memo_parameter_f = __memo_scope.param(0, f); + if (__memo_scope.unchanged) { + __memo_scope.cached; + return; + } + { + __memo_scope.recache(); + return; + } +} @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type) => { const __memo_scope = __memo_context.scope(((__memo_id) + ()), 0); if (__memo_scope.unchanged) { @@ -100,31 +125,6 @@ function main() {} return; } }); -@memo() function bar(__memo_context: __memo_context_type, __memo_id: __memo_id_type, f?: (()=> void)): void { - const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); - const __memo_parameter_f = __memo_scope.param(0, f); - if (__memo_scope.unchanged) { - __memo_scope.cached; - return; - } - { - __memo_scope.recache(); - return; - } -} -function par(f?: @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void {} -@memo() function kar(__memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() f?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { - const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); - const __memo_parameter_f = __memo_scope.param(0, f); - if (__memo_scope.unchanged) { - __memo_scope.cached; - return; - } - { - __memo_scope.recache(); - return; - } -} class A { @memo() public foo(__memo_context: __memo_context_type, __memo_id: __memo_id_type, p?: (()=> void)): void { const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); diff --git a/arkui-plugins/test/ut/memo-plugins/lambda-literals/with-receiver.test.ts b/arkui-plugins/test/ut/memo-plugins/lambda-literals/with-receiver.test.ts index 748b1dd4b520b4881721b271ec8c6fedc6884833..1cb3c4d175421f97fe2b9d20033a35c988f2ab8d 100644 --- a/arkui-plugins/test/ut/memo-plugins/lambda-literals/with-receiver.test.ts +++ b/arkui-plugins/test/ut/memo-plugins/lambda-literals/with-receiver.test.ts @@ -36,6 +36,45 @@ import { memo as memo } from \"arkui.stateManagement.runtime\"; function main() {} +@memo() function fullName(this: Person, __memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() arg?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); + const __memo_parameter_this = __memo_scope.param(0, this), __memo_parameter_arg = __memo_scope.param(1, arg); + if (__memo_scope.unchanged) { + __memo_scope.cached; + return; + } + { + __memo_scope.recache(); + return; + } +} + +@memo() function foo(this: A, __memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() arg?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); + const __memo_parameter_this = __memo_scope.param(0, this), __memo_parameter_arg = __memo_scope.param(1, arg); + if (__memo_scope.unchanged) { + __memo_scope.cached; + return; + } + { + __memo_scope.recache(); + return; + } +} + +@memo() function goo(__memo_context: __memo_context_type, __memo_id: __memo_id_type, a: A, @memo() arg?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); + const __memo_parameter_a = __memo_scope.param(0, a), __memo_parameter_arg = __memo_scope.param(1, arg); + if (__memo_scope.unchanged) { + __memo_scope.cached; + return; + } + { + __memo_scope.recache(); + return; + } +} + @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type) => { const __memo_scope = __memo_context.scope(((__memo_id) + ()), 0); if (__memo_scope.unchanged) { @@ -96,45 +135,6 @@ function main() {} } }); -@memo() function fullName(this: Person, __memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() arg?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { - const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); - const __memo_parameter_this = __memo_scope.param(0, this), __memo_parameter_arg = __memo_scope.param(1, arg); - if (__memo_scope.unchanged) { - __memo_scope.cached; - return; - } - { - __memo_scope.recache(); - return; - } -} - -@memo() function foo(this: A, __memo_context: __memo_context_type, __memo_id: __memo_id_type, @memo() arg?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { - const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); - const __memo_parameter_this = __memo_scope.param(0, this), __memo_parameter_arg = __memo_scope.param(1, arg); - if (__memo_scope.unchanged) { - __memo_scope.cached; - return; - } - { - __memo_scope.recache(); - return; - } -} - -@memo() function goo(__memo_context: __memo_context_type, __memo_id: __memo_id_type, a: A, @memo() arg?: ((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void)): void { - const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); - const __memo_parameter_a = __memo_scope.param(0, a), __memo_parameter_arg = __memo_scope.param(1, arg); - if (__memo_scope.unchanged) { - __memo_scope.cached; - return; - } - { - __memo_scope.recache(); - return; - } -} - class Person { public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/animation/animatable-extend-basic.test.ts b/arkui-plugins/test/ut/ui-plugins/animation/animatable-extend-basic.test.ts index e1ab7ae03588781a74096445021c1056b476712b..f921f5f4ac9b3d87d369245aeb0a41e18d557017 100644 --- a/arkui-plugins/test/ut/ui-plugins/animation/animatable-extend-basic.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/animation/animatable-extend-basic.test.ts @@ -93,7 +93,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/animation/animation-basic.test.ts b/arkui-plugins/test/ut/ui-plugins/animation/animation-basic.test.ts index 9eeeb0fd7f8293e9353e45c078b22743138ccc8d..51d4f1b7641c68841dbf3c2750393f69208705f6 100644 --- a/arkui-plugins/test/ut/ui-plugins/animation/animation-basic.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/animation/animation-basic.test.ts @@ -92,7 +92,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/block-in-switch-case.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/block-in-switch-case.test.ts index 0c2b3d7c002207d1768944f0c797e12542ba550c..b38eeb4a638446262bd99177d5bb1f613e2ffdf7 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/block-in-switch-case.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/block-in-switch-case.test.ts @@ -167,7 +167,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -221,8 +221,8 @@ function main() {} __memo_scope.cached; return; } - ColumnImpl(__memo_context, ((__memo_id) + (112404751)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: ColumnAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (9185155)), 1); + ColumnImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: ColumnAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -256,8 +256,8 @@ function main() {} __memo_scope.cached; return; } - TextImpl(__memo_context, ((__memo_id) + (235279187)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (246501778)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -283,8 +283,8 @@ function main() {} return; } { - TextImpl(__memo_context, ((__memo_id) + (241855776)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (222088696)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -311,8 +311,8 @@ function main() {} return; } { - TextImpl(__memo_context, ((__memo_id) + (225601197)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (240873793)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -331,8 +331,8 @@ function main() {} } })); break; - TextImpl(__memo_context, ((__memo_id) + (220324446)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (5873742)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -353,8 +353,8 @@ function main() {} return; } { - TextImpl(__memo_context, ((__memo_id) + (72849900)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (10971338)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -379,8 +379,8 @@ function main() {} return; } { - TextImpl(__memo_context, ((__memo_id) + (264582197)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (138238536)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -422,8 +422,8 @@ function main() {} } { return; - TextImpl(__memo_context, ((__memo_id) + (123392926)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (181839521)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -452,8 +452,8 @@ function main() {} return; } })); - TextImpl(__memo_context, ((__memo_id) + (262734369)), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { - const __memo_scope = __memo_context.scope(((__memo_id) + (229820618)), 1); + TextImpl(__memo_context, ((__memo_id) + ()), @memo() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, instance: TextAttribute): void => { + const __memo_scope = __memo_context.scope(((__memo_id) + ()), 1); const __memo_parameter_instance = __memo_scope.param(0, instance); if (__memo_scope.unchanged) { __memo_scope.cached; @@ -476,7 +476,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/else-if-in-content.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/else-if-in-content.test.ts index efab344968e54afd393633ee10ee4746fe1975fe..3465c1c59a73fcc23bd5218792954930fb98e607 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/else-if-in-content.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/else-if-in-content.test.ts @@ -86,7 +86,7 @@ function main() {} })); })); } - private constructor() {} + public constructor() {} } @Component() export interface __Options_ElseIf { } @@ -255,7 +255,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() export interface __Options_ElseIf { } diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-break-in-nested-content.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-break-in-nested-content.test.ts index bea4b4bbd5a1da83c98f23564c594bdbfa42db47..d84aeb7853ffc90b4d341c2f7f542d9b0a2407d0 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-break-in-nested-content.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-break-in-nested-content.test.ts @@ -75,7 +75,7 @@ function main() {} })); })); } - private constructor() {} + public constructor() {} } @Component() export interface __Options_A { } @@ -205,7 +205,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() export interface __Options_A { } diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-else-in-content.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-else-in-content.test.ts index 876f9abd6ea6268fa70a77745991dc7f9661661c..98209c11ae8a68a3777e2faa169cd0386144cea1 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-else-in-content.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-else-in-content.test.ts @@ -87,7 +87,7 @@ function main() {} Text(undefined, \"hello world\", undefined, undefined); })); } - private constructor() {} + public constructor() {} } @Component() export interface __Options_IfElse { } @@ -238,7 +238,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() export interface __Options_IfElse { } diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-in-switch-in-content.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-in-switch-in-content.test.ts index 60d388a475985f9e548a2ba09745181669e259dd..66e215a5bef36835251384610f34520d0375e52f 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-in-switch-in-content.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/if-in-switch-in-content.test.ts @@ -100,7 +100,7 @@ function main() {} })); })); } - private constructor() {} + public constructor() {} } @Component() export interface __Options_IfInSwitch { set num(num: (string | undefined)) @@ -274,7 +274,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() export interface __Options_IfInSwitch { set num(num: (string | undefined)) diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-case-in-content.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-case-in-content.test.ts index 3960f47954ca42f2dfac20568f00500500a4eab9..5f4ac9e902691275846c4543a14157d43945220e 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-case-in-content.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-case-in-content.test.ts @@ -90,7 +90,7 @@ function main() {} Text(undefined, \"hello world\", undefined, undefined); })); } - private constructor() {} + public constructor() {} } @Component() export interface __Options_SwitchCase { set num(num: (string | undefined)) @@ -219,7 +219,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() export interface __Options_SwitchCase { set num(num: (string | undefined)) diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-in-if-in-content.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-in-if-in-content.test.ts index 889cc905f54fbbeb111e9e6379a348693dde7c53..588d255e396f05f1d65c4915417cb4a39ed6069c 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-in-if-in-content.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/switch-in-if-in-content.test.ts @@ -76,7 +76,7 @@ function main() {} })); })); } - private constructor() {} + public constructor() {} } @Component() export interface __Options_SwitchInIf { set num(num: (string | undefined)) @@ -182,7 +182,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() export interface __Options_SwitchInIf { set num(num: (string | undefined)) diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/with-builder.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/with-builder.test.ts index 9118dc865d253ca53d279b8a22ba80a198be2ad6..570c82a4beff068515ed2a9d92023d629f521632 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/with-builder.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/condition-scope/with-builder.test.ts @@ -66,6 +66,7 @@ function main() {} }) as (()=> void))); param(); } +wBuilder = wrapBuilder(ParamBuilder); @Component() final struct MyStruct extends CustomComponent { public __initializeStruct(initializers: (__Options_MyStruct | undefined), @memo() content: ((()=> void) | undefined)): void {} public __updateStruct(initializers: (__Options_MyStruct | undefined)): void {} @@ -105,7 +106,7 @@ function main() {} }, undefined, undefined); })); } - private constructor() {} + public constructor() {} } @Component() final struct Child extends CustomComponent { public __initializeStruct(initializers: (__Options_Child | undefined), @memo() content: ((()=> void) | undefined)): void { @@ -137,7 +138,7 @@ function main() {} } })); } - private constructor() {} + public constructor() {} } @Component() export interface __Options_MyStruct { } @@ -245,6 +246,7 @@ function main() {} return; } } +wBuilder = wrapBuilder(ParamBuilder); @Component() final struct MyStruct extends CustomComponent { public __initializeStruct(initializers: (__Options_MyStruct | undefined), @memo() content: (((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void) | undefined)): void {} public __updateStruct(initializers: (__Options_MyStruct | undefined)): void {} @@ -383,7 +385,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() final struct Child extends CustomComponent { public __initializeStruct(initializers: (__Options_Child | undefined), @memo() content: (((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void) | undefined)): void { @@ -469,7 +471,7 @@ function main() {} return; } } - private constructor() {} + public constructor() {} } @Component() export interface __Options_MyStruct { } diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/custom-component/custom-component-call.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/custom-component/custom-component-call.test.ts index 751bfc0bed29b1b0b4e23ffaba44a9d0041c0929..3215144c70cbcc6cc9e953ae3c8b4c42167c26c5 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/custom-component/custom-component-call.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/custom-component/custom-component-call.test.ts @@ -131,7 +131,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } @@ -163,7 +163,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/builder-lambda/style-with-receiver.test.ts b/arkui-plugins/test/ut/ui-plugins/builder-lambda/style-with-receiver.test.ts index f9a77f155af46349aae606a2dd648745eaecfc50..e55e43771de8765654481ac179701454e6240003 100644 --- a/arkui-plugins/test/ut/ui-plugins/builder-lambda/style-with-receiver.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/builder-lambda/style-with-receiver.test.ts @@ -85,7 +85,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/component/for-each.test.ts b/arkui-plugins/test/ut/ui-plugins/component/for-each.test.ts index b828c2703ddeb76914ab9cbd6a2f053770afa0e0..52e9fd7b7c49db71da2ee588630d54098c043c69 100644 --- a/arkui-plugins/test/ut/ui-plugins/component/for-each.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/component/for-each.test.ts @@ -128,7 +128,7 @@ class AB { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/builder-param-passing.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/builder-param-passing.test.ts index bed12d063ca9608ec71fc5987e3bae456cc668bd..26590b874bc38d4685df10a36b88ed812dba11b9 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/builder-param-passing.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/builder-param-passing.test.ts @@ -70,7 +70,7 @@ function main() {} this.customBuilderParam(); } - private constructor() {} + public constructor() {} } @@ -105,7 +105,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -172,7 +172,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } @@ -252,7 +252,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/init-with-local-builder.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/init-with-local-builder.test.ts index 36276ba82f94353aa20e4c17b9d0da5d44b3f27c..b480c115489bc4484e8a36e36d7fe1b9d98ef800 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/init-with-local-builder.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/init-with-local-builder.test.ts @@ -82,7 +82,7 @@ function main() {} this.customBuilderParam2("hello"); } - private constructor() {} + public constructor() {} } @@ -174,7 +174,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/optional-builder-param.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/optional-builder-param.test.ts index 15ed194e37a315a72a295c5aa8cba878a3abef38..68b761ca7ba361ab6ed07f910ee8aed00ad5b032 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/optional-builder-param.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/builder-param/optional-builder-param.test.ts @@ -100,7 +100,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -125,7 +125,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -271,7 +271,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } @@ -332,7 +332,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/builder/global-builder.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/builder/global-builder.test.ts index 7ed01f7269ed4cbda36867d35d984a89494ac6fa..478bc834a5034aab34a6747da1b806626eae9e88 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/builder/global-builder.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/builder/global-builder.test.ts @@ -79,7 +79,7 @@ class Tmp { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/builder/local-builder.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/builder/local-builder.test.ts index 54c8ceac032b11d629a934ada58052a918064849..e4ece6f3a997bbddd84343021512d5d42b084f27 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/builder/local-builder.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/builder/local-builder.test.ts @@ -76,7 +76,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-in-struct.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-in-struct.test.ts index 7ce255df6bdbc5052ed91936586e1abf3ae94461..e904a0ed431c395c412c7807f1184501ee2d0ff6 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-in-struct.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-in-struct.test.ts @@ -125,7 +125,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-no-return-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-no-return-type.test.ts index ee4b721aee177f8d908966fb1f2a91b3a1ca5eb0..c592e5333227dab8155878136c325b9113c8a18e 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-no-return-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/computed/computed-no-return-type.test.ts @@ -201,7 +201,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/computed/static-computed.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/computed/static-computed.test.ts index 3471435a964c4d48b54e7625177189028ff340d6..ae6a0e38b82b94d40222450bcb69bc8378e3adfb 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/computed/static-computed.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/computed/static-computed.test.ts @@ -137,7 +137,7 @@ function main() {} public __updateStruct(initializers: (__Options_Parent | undefined)): void {} - public static __backing_localVar1: ILocalDecoratedVariable = STATE_MGMT_FACTORY.makeLocal(null, "localVar1", "stateVar1"); + public static __backing_localVar1: ILocalDecoratedVariable = STATE_MGMT_FACTORY.makeStaticLocal("localVar1", "stateVar1"); public static get localVar1(): string { return Parent.__backing_localVar1.get(); @@ -147,7 +147,7 @@ function main() {} Parent.__backing_localVar1.set(value); } - public static __backing_localVar2: ILocalDecoratedVariable = STATE_MGMT_FACTORY.makeLocal(null, "localVar2", 50); + public static __backing_localVar2: ILocalDecoratedVariable = STATE_MGMT_FACTORY.makeStaticLocal("localVar2", 50); public static get localVar2(): number { return Parent.__backing_localVar2.get(); @@ -167,7 +167,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} static { diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/base-custom-dialog.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/base-custom-dialog.test.ts index 28d4b35b1c37e7ac03bf450b771dc283a180bb86..0e22b1f8c853bbd17a5979b0ad19306cb3c52ba2 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/base-custom-dialog.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/base-custom-dialog.test.ts @@ -148,7 +148,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} public __setDialogController__(controller: CustomDialogController): void { this.__backing_aaController = controller; @@ -233,7 +233,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/builder-dialog-options.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/builder-dialog-options.test.ts index 32f6024036510467b129890a4bac4c787ecfa644..0d02a2478390192674a6beecf21db972795a4f56 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/builder-dialog-options.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/builder-dialog-options.test.ts @@ -135,7 +135,7 @@ function main() {} Column(undefined, undefined, @memo() (() => {})); } - private constructor() {} + public constructor() {} } @@ -166,7 +166,7 @@ function main() {} Column(undefined, undefined, @memo() (() => {})); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-build.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-build.test.ts index 55568990b957c32a9c087bd6bdf2aea283fce15e..ecad395ed4a54f40e9f52a70b7424daf6011c66d 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-build.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-build.test.ts @@ -113,7 +113,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} public __setDialogController__(controller: CustomDialogController): void { this.__backing_aaController = controller; @@ -147,7 +147,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-method.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-method.test.ts index 61084a04929771ca97d369cfc1445bbaf2ab1783..a5ae0dbe294e454667ac3292a52fead27a1171a0 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-method.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/controller-in-method.test.ts @@ -69,7 +69,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} public __setDialogController__(controller: CustomDialogController): void { this.__backing_aaController = controller; @@ -140,7 +140,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/declare-custom-dialog.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/declare-custom-dialog.test.ts index d8fb2bb4950ef1808f6d61802865e69a8965e092..bbbd0eb25dbfa475b8e28e00d12d14128013cf15 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/declare-custom-dialog.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/declare-custom-dialog.test.ts @@ -94,7 +94,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } @@ -129,7 +129,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/extends-dialog-controller.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/extends-dialog-controller.test.ts index e83754c45b64208421d5792898d064556455550b..f7ab1a6ec4d9a1dcc3edc47a6e03ad6d0a024f48 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/extends-dialog-controller.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/custom-dialog/extends-dialog-controller.test.ts @@ -77,7 +77,7 @@ function main() {} Column(undefined, undefined, @memo() (() => {})); } - private constructor() {} + public constructor() {} public __setDialogController__(controller: CustomDialogController): void { this.__backing_aaController = controller; @@ -148,7 +148,7 @@ class DialogControllerV3 extends DialogControllerV2 { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/decorator-no-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/decorator-no-type.test.ts index 173713c8c86d3f23d8427bc52c9c16e57cff708d..f726ecd68a44c8f99046d705f51033d4ed5ce62f 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/decorator-no-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/decorator-no-type.test.ts @@ -362,7 +362,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } @@ -513,7 +513,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } @@ -664,7 +664,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/event/event-initialize.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/event/event-initialize.test.ts index 783bcc981d0c1695a1c18d5f1924782e505d2801..e5e8c36a3612696f90f207bc94d554a04ffbdf4b 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/event/event-initialize.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/event/event-initialize.test.ts @@ -191,7 +191,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -226,7 +226,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/link/link-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/link/link-basic-type.test.ts index 62f3f08e27f76c430231a30a6d20cc892a51c2c8..2ce87652911deab846655a760e2f754395687344 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/link/link-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/link/link-basic-type.test.ts @@ -136,7 +136,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/link/link-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/link/link-complex-type.test.ts index bd0b32e4b72f4d01a753769b9853aa684b66ba16..f174a08a5e213ea3cc0616f62777199123fbcfac 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/link/link-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/link/link-complex-type.test.ts @@ -308,7 +308,7 @@ final class LinkType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/link/link-to-link-prop-state.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/link/link-to-link-prop-state.test.ts index 0e3f56d43115cfb37be93a9c3f17f9cd1dcaff34..88ca21cd4824894ffa11c226ae8c46492649898c 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/link/link-to-link-prop-state.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/link/link-to-link-prop-state.test.ts @@ -95,7 +95,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -169,7 +169,7 @@ function main() {} }, undefined); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/link/state-to-link.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/link/state-to-link.test.ts index 8f4d4fa0ed7fd3d1a10e5891a37b6dfbca88de74..c22a650babb3dbd6bdb5d6b62ebbd38b8d11432a 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/link/state-to-link.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/link/state-to-link.test.ts @@ -115,7 +115,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } @@ -164,7 +164,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/local/local-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/local/local-basic-type.test.ts index eeda2f5dca0c88481da1a85f83b3aacac5e6a1aa..fcfd6824a7a9f31fc325dc5cef14d5ac28dc85a8 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/local/local-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/local/local-basic-type.test.ts @@ -115,7 +115,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/local/local-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/local/local-complex-type.test.ts index 7ccf7f48e757eddc2d8e65fdcf9614d9e9e4bd83..ad39578d1170981602e56865f07133133151628e 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/local/local-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/local/local-complex-type.test.ts @@ -258,7 +258,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/local/static-local.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/local/static-local.test.ts index 894a5b5396858e98eb540d5a02e52fa0a5aa02a0..b85513d93e3025ae35a0aea25a08269683a755d2 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/local/static-local.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/local/static-local.test.ts @@ -94,7 +94,7 @@ class ABB { @memo() public build() {} - private constructor() {} + public constructor() {} static { diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-complex-type.test.ts index 668b7444396f9580a8f2e5f952fcd5a77c4a5012..d5e77e56caef6e0db9af39ba7c7f46bf3f65e6ac 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-complex-type.test.ts @@ -228,7 +228,7 @@ final class Status extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-primitive-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-primitive-type.test.ts index 3563e20ee7f5b6d0650b79b772c2e18fe82e9329..fea624d8dfba82ca82a499660ec0d7b428c21245 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-primitive-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/localstoragelink/localstoragelink-primitive-type.test.ts @@ -108,7 +108,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-complex-type.test.ts index f35b87f164485323c83cdb0b69fcc344dfe0ef24..8d6f9b383dd0a23eaf71b0361b1571be25b9218e 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-complex-type.test.ts @@ -212,7 +212,7 @@ final class Status extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-primitive-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-primitive-type.test.ts index c4a94e52c9b37bac51a576aee4f6943fba4db14d..407d8ea1233ee13d9dba68a8260940ac4c80a167 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-primitive-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/localstorageprop-ref/localstorageprop-ref-primitive-type.test.ts @@ -115,7 +115,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/enum-monitor-params.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/enum-monitor-params.test.ts index dc8b49e4728053bf6bad69939618bde3f0fab9aa..d7289b2b4b52a0c6fcb2c6eeb23234c5d519d91f 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/enum-monitor-params.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/enum-monitor-params.test.ts @@ -263,7 +263,7 @@ final class MonitorNames extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-before-state-variable.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-before-state-variable.test.ts index 547b817ccc182f09da39f6f3e3a7f90f1f306ff8..30dcef186ca41f79f038eb06cceba3a2436e1021 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-before-state-variable.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-before-state-variable.test.ts @@ -146,7 +146,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-observedv2-class.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-observedv2-class.test.ts index 54154004c1cff23b815873d426abe7c5eda14cce..b98dbc0ab3c4c505e233803b185a77bf9061f837 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-observedv2-class.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-observedv2-class.test.ts @@ -249,7 +249,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-struct.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-struct.test.ts index 773e41c3b8313eda9f1fd79cbc2b63f2181c8676..ecc359ecf977c6dca6e41c0d89d9315b6108d838 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-struct.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-in-struct.test.ts @@ -132,7 +132,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-params.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-params.test.ts index 815b95bd2bb22b4616e19c07f1ec82cfaa6c6053..5479104e5cff28e1eef7d1057279cdefa7d8e63d 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-params.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/monitor/monitor-params.test.ts @@ -313,7 +313,7 @@ class GGG { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-basic.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-basic.test.ts index 93377b14bca0bc8882b8cb74ecb4d0508a21ea96..60707178b77bdc482e570426c2f660f62b3c6f9a 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-basic.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-basic.test.ts @@ -151,7 +151,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } @@ -200,7 +200,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-observed.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-observed.test.ts index 79774185eaecbc99a8a06a1c4313490357dd1296..640a8e961b595b0705a6194f48f0e016f89843ee 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-observed.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/objectlink/objectlink-observed.test.ts @@ -210,7 +210,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } @@ -255,7 +255,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonrename.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonrename.test.ts index c06149a61b99a627200c512ce9d1ccd5a8b513a4..ce55069e0f757221fd12d01197ecb6356e5e6814 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonrename.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonrename.test.ts @@ -181,7 +181,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonstringifyignore.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonstringifyignore.test.ts index 19cf7c3109959b3204e976239e0d7bdd528fe995..9c398f8afe6f949253860e81c0812c9a3b762d46 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonstringifyignore.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-jsonstringifyignore.test.ts @@ -181,7 +181,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-only.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-only.test.ts index 2f0cc7eb41fca17282ac8add475d43bd5de7970e..c5f0105b6960bf6d898de3eb23e73914de640061 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-only.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-only.test.ts @@ -135,7 +135,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-class-property.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-class-property.test.ts index 8692b04ddd6124ea3fedf5c5b893921a88b001d4..61ae1b6c8a3403ac5b2c6d87057d6429a1615fd9 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-class-property.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-class-property.test.ts @@ -190,7 +190,7 @@ class E implements IObservedObject, ISubscribedWatches { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-complex-type.test.ts index 36cc3dd42e4f56fa2ce9a128e13ece5b0d3f49a7..e1ae3d003d969e6385ab4b810c435dde272bec38 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-complex-type.test.ts @@ -812,7 +812,7 @@ class mixed3 implements IObservedObject, ISubscribedWatches { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-extends.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-extends.test.ts index b01f4d7b33784a92d3ec1420b45c4359a782ad9f..90d7b3ebb44e6791f72b8020fc29851de115f96a 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-extends.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-extends.test.ts @@ -190,7 +190,7 @@ class G extends A { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-implements.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-implements.test.ts index cf679627fd287ac76c5ab541dd0a9abddcaf4738..067c357e0637dee7341febcef4c428397b74fbf9 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-implements.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track-implements.test.ts @@ -149,7 +149,7 @@ interface trackInterface { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track.test.ts index 087ae043d494f2d7f598d791e5ea2f263862ab99..15e871f58a2c783ef7fec910a4ff3252d0d30bfa 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/observed-track.test.ts @@ -139,7 +139,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/track-only.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/track-only.test.ts index 163b8d398a49078d216f3f24298b9e8386655100..574046a3cac56c5c34670df15b3c439b67871b5e 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/track-only.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/observed-track/track-only.test.ts @@ -122,7 +122,7 @@ class C implements IObservedObject, ISubscribedWatches { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-basic-type.test.ts index 1b5cc3d482ffeb64469978e0bafb4d98a38de3e3..9b2e68cca511a8e53f8603a9794b02441a9a6cba 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-basic-type.test.ts @@ -122,7 +122,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-complex-type.test.ts index 0b9a8561a908c5c8821d3185f5d0b210fd9f67a2..e044f9ed1d6b0a309e196ace8da84e83512b4b22 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-complex-type.test.ts @@ -281,7 +281,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-only.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-only.test.ts index 4212ed0b9e0c982989664be2f2b3652cc9ca8653..db04b7b652004f4aaf63e51d0c3ae4466c84251d 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-only.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-only.test.ts @@ -79,7 +79,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-with-require.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-with-require.test.ts index dade76adca247401e09905d05e3053683924150c..9dee701f476bbabd59ea7bdcaa52e603e7748f73 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/once/once-with-require.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/once/once-with-require.test.ts @@ -224,7 +224,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -269,7 +269,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/param/param-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/param/param-basic-type.test.ts index c53a65425498e372da06564039bb275670587b70..c02112576e43d7a643f5bd999cca5e60617b87be 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/param/param-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/param/param-basic-type.test.ts @@ -121,7 +121,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/param/param-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/param/param-complex-type.test.ts index b0209f191de22d940407cff017f9a43c3cc5d5dc..3639b125344f3716fc557533668f6dafb7d1a3e3 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/param/param-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/param/param-complex-type.test.ts @@ -284,7 +284,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/param/param-with-require.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/param/param-with-require.test.ts index 488decbf21500a31fb40407961d24a77d6b6521f..3ea06e80ed76fe1c6470f11a10fab775f53ffc63 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/param/param-with-require.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/param/param-with-require.test.ts @@ -229,7 +229,7 @@ class Info { })); } - private constructor() {} + public constructor() {} } @@ -263,7 +263,7 @@ class Info { })); } - private constructor() {} + public constructor() {} } @@ -291,7 +291,7 @@ class Info { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-basic-type.test.ts index b788197b52375dfc7b888c04c3bf777c92ffb7b7..e3b5e8f98bcd314703632ed433700712b5fea6d3 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-basic-type.test.ts @@ -143,7 +143,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-complex-type.test.ts index a0a73384ba5a422c16944bf920ff9a0709ed3e61..8dbc549f546a17c785299f5429fe65e05148ae7f 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-complex-type.test.ts @@ -330,7 +330,7 @@ final class PropType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-without-initialization.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-without-initialization.test.ts index c078ab4373e37272f532c1e466d895c6401f97ac..e176c96e9ec5f2b52d23b06dff88706fb6e3659a 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-without-initialization.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/prop-ref-without-initialization.test.ts @@ -213,7 +213,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/state-to-propref.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/state-to-propref.test.ts index 1cc5db07dcca3db2e1bb31c94c26132c2f6a81e7..93799cce2050e13aa62eec27a6fd10faaa0bed59 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/state-to-propref.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/prop-ref/state-to-propref.test.ts @@ -117,7 +117,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -163,7 +163,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-basic-type.test.ts index d8584fd5fed82a2855f1fbaea2bc803db8f927e9..9b58c22be8260da0b7ccc323b62f7aabeb65aee7 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-basic-type.test.ts @@ -144,7 +144,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-complex-type.test.ts index e108af26c0af2c409d0fb48666b3b6dbf4f23e15..c619e10ce290e731a8a5a2db4a4ec90274217eac 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/prop/prop-complex-type.test.ts @@ -331,7 +331,7 @@ final class PropType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/prop/state-to-prop.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/prop/state-to-prop.test.ts index fb8f9e78c63d3b888b90f3bcb1b9d8db75e7d78e..3166366c13b4deff4ce9e99030039c5e5fca1d86 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/prop/state-to-prop.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/prop/state-to-prop.test.ts @@ -117,7 +117,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -163,7 +163,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-basic-type.test.ts index d8245372fbca0097ae8215e1c4ba22717524966e..f0e7053e3a067934bba68078b6ee5d79d30da74c 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-basic-type.test.ts @@ -156,7 +156,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-complex-type.test.ts index b226ecbbdcb2482b046a9763fb64ebbe5399a02b..202edb7b0ec1bebb19401f90a3f1cbbc7b03980c 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/consume-complex-type.test.ts @@ -368,7 +368,7 @@ final class PropType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-annotation-usage.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-annotation-usage.test.ts index 453a2c24af11172158a83f10ca0347f518455853..195bb2726f284136c55af59e171f7baf0e25495a 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-annotation-usage.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-annotation-usage.test.ts @@ -157,7 +157,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-basic-type.test.ts index 30f9174a540fdee8b50f93f0e6622cfe413fc893..f0fefa008a5eea8e371c75f833f0bb7a0dd731df 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-basic-type.test.ts @@ -121,7 +121,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-complex-type.test.ts index a58210c096e6e497e3070ed491c15694f22d4d6a..15967cd3b6137333d3f93479961ee7d1baf90888 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-complex-type.test.ts @@ -282,7 +282,7 @@ final class PropType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-to-consume.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-to-consume.test.ts index e8293b0850962e81768187c46e8618535430bf13..3f01659b47fb9c3a5f348a576164543dcaf2a2a3 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-to-consume.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provide-and-consume/provide-to-consume.test.ts @@ -148,7 +148,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -192,7 +192,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-basic-type.test.ts index 477d67cb112c0504d4cf73ecbe86755ce66bf3d0..7c4e62f2d14c537b47084e553251f1421b37a07e 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-basic-type.test.ts @@ -117,7 +117,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-complex-type.test.ts index 559a912d3e382bc61456fbe21571365a0f7c7e42..809d7e3ceaa3ffb18937d406b9a528545549de57 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/consumer-complex-type.test.ts @@ -260,7 +260,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-basic-type.test.ts index 4727c0342ca2b0e9cb759c181b1119986235b63e..9943acaee83f7f67d0c7fb53e4f25bcbf98c386c 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-basic-type.test.ts @@ -117,7 +117,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-complex-type.test.ts index 8365360d0eb2f64cb1b1af3afcb77772658176c4..2a953691a71a49446d0df769073081cbee304b71 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-complex-type.test.ts @@ -260,7 +260,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-to-consumer.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-to-consumer.test.ts index d6e40550d2e43a4eac62bed3c970e85cea5f203d..89a5a701f9eb7a019ef1711eee2b086039e73c25 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-to-consumer.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/provider-and-consumer/provider-to-consumer.test.ts @@ -72,7 +72,7 @@ const data: Array = [new User("Json", 10), new User("Eric", 15)]; function main() {} - +data = [new User("Json", 10), new User("Eric", 15)]; @ObservedV2() class User implements IObservedObject, ISubscribedWatches { @JSONStringifyIgnore() private subscribedWatches: ISubscribedWatches = STATE_MGMT_FACTORY.makeSubscribedWatches(); @@ -179,7 +179,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -220,7 +220,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/require/basic-require.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/require/basic-require.test.ts index a4b93ab3eaadedffd491d5e21e3de99c892f8a85..a7892cf9f6c32f8652f69f650cce4c6091ccd0ea 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/require/basic-require.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/require/basic-require.test.ts @@ -239,7 +239,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } @@ -263,7 +263,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-build.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-build.test.ts index f083b5e9131ffa473742eb42e733f47819e6ad21..a0e46261746cfc5dd43c78990fe2785daf27d699 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-build.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-build.test.ts @@ -145,7 +145,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-property.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-property.test.ts index db246e5824ddc43c9c6dbe1120fdbe2ac408ca3f..8856ce40285a8d5f668d83a9c6439a564614d1e4 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-property.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/resource/resource-in-property.test.ts @@ -79,7 +79,7 @@ i = _r(16777216, 10003, "com.example.mock", "entry"); Image(undefined, this.icon, undefined, undefined); })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-basic.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-basic.test.ts index 6b65444af55b5a19ddc7fa6c158a723e361457b4..1414b3d22ba530e1e74cd4b4f29d6e62fb120e87 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-basic.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-basic.test.ts @@ -70,7 +70,7 @@ function main() {} }, "Child", undefined); } - private constructor() {} + public constructor() {} } @@ -119,7 +119,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-complex.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-complex.test.ts index f741b2deab05a38e4569d2a15348d2d6c7523ddb..8c3c455dcfeb61496b5271feba853cb28a79e65c 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-complex.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/reusable/reusable-complex.test.ts @@ -130,7 +130,7 @@ class Message { })); } - private constructor() {} + public constructor() {} } @@ -175,7 +175,7 @@ class Message { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/state/state-basic-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/state/state-basic-type.test.ts index 61b13a9fac382565a58d0e55742ebd9bb78ce567..b354198ae070d1e180cd0585b4ce56113dd6113d 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/state/state-basic-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/state/state-basic-type.test.ts @@ -124,7 +124,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/state/state-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/state/state-complex-type.test.ts index d53dcb99ec1b9b9138bf5503cb66896fc0433b26..40f1f71d93a8d5f551e308ecdef9da2bf22c4e5d 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/state/state-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/state/state-complex-type.test.ts @@ -282,7 +282,7 @@ final class StateType extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/state/state-to-state.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/state/state-to-state.test.ts index 09310a680a09e9e00d1b8cec60af3181d182e530..45f033642e618ebaa5f139698b9bc9b9f55473f5 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/state/state-to-state.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/state/state-to-state.test.ts @@ -93,7 +93,7 @@ class Per { })); } - private constructor() {} + public constructor() {} } @@ -119,7 +119,7 @@ class Per { Text(undefined, this.childVar1.str, undefined, undefined); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-appstorage.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-appstorage.test.ts index 86d9753b6a1272790a72dc1adbd967796e6568e8..42f22ac6e680a5a0daa68af6cbddaae223bcf8fb 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-appstorage.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-appstorage.test.ts @@ -114,7 +114,7 @@ class Data { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-complex-type.test.ts index b06d33445acef7d6db6035dfbc265479f40af6d0..f28433b8f357d47610992cb6d8b27c91f917febd 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-complex-type.test.ts @@ -218,7 +218,7 @@ final class Status extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-primitive-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-primitive-type.test.ts index 69da32ec53679af27b46809fe7e0c754c24b1949..923664b6c5c56e850494f828a1d110d0a2b3b28d 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-primitive-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storagelink/storagelink-primitive-type.test.ts @@ -99,7 +99,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-complex-type.test.ts index d1af8522f6b36febb72da7aaf5e822a5ccb027ab..c38a8280e284b45c1a66b934c21dab16ce6b7f82 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-complex-type.test.ts @@ -214,7 +214,7 @@ final class Status extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-primitive-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-primitive-type.test.ts index 23b506a830826be262b9539eb687067d1452c01e..31d27dd460e696ad5a4a97493c5ff99676f0280a 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-primitive-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop-ref/storageprop-ref-primitive-type.test.ts @@ -117,7 +117,7 @@ function main() {} @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-appstorage.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-appstorage.test.ts index 9563b17701f2574331f8e2e070d6555417b3e991..374e2187be4c66fdb21e1694899248389bafd1a1 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-appstorage.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-appstorage.test.ts @@ -126,7 +126,7 @@ class Data { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-complex-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-complex-type.test.ts index fd7863e3bcf273e3b03057e53a42625961cb2320..65aea99c9f412cc1e5eaf02e11704cacf08b8ae6 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-complex-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-complex-type.test.ts @@ -218,7 +218,7 @@ final class Status extends BaseEnum { @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-primitive-type.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-primitive-type.test.ts index 3012b51eead3b3e8e7e1711393a8c221ad6fe510..660a51361e77b1c811511ebda2b255bc1a66e897 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-primitive-type.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/storageprop/storageprop-primitive-type.test.ts @@ -108,7 +108,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/decorators/watch/watch-basic.test.ts b/arkui-plugins/test/ut/ui-plugins/decorators/watch/watch-basic.test.ts index f54b66794964502f3f77298e5cc76dc83eff4f31..f38b5f6d65e8686a9fb15aac64cde388132b597d 100644 --- a/arkui-plugins/test/ut/ui-plugins/decorators/watch/watch-basic.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/decorators/watch/watch-basic.test.ts @@ -276,7 +276,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } @@ -303,7 +303,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ @memo() public build() {} - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-griditem.test.ts b/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-griditem.test.ts index 216eb90861f4128ac63bcdff4ae070e5f258c70e..570b3cf1af5611e5e1600cef15109170acbc0adb 100644 --- a/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-griditem.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-griditem.test.ts @@ -121,7 +121,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-toggle.test.ts b/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-toggle.test.ts index 8387fe7ae19c14104dc85c11b38da36e3a6bffd1..2688f3be50a0aea1e0e0283a524bf46815e707e3 100644 --- a/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-toggle.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/double-dollar/double-dollar-toggle.test.ts @@ -127,7 +127,7 @@ class BooleanClass { })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/imports/import-struct.test.ts b/arkui-plugins/test/ut/ui-plugins/imports/import-struct.test.ts index 79e3668c532a79af6de4af9d53ea0f3508f9979c..f72ccb65e1f5ab8466a7e4c6365bf41744db5e65 100644 --- a/arkui-plugins/test/ut/ui-plugins/imports/import-struct.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/imports/import-struct.test.ts @@ -100,7 +100,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/imports/kit-import.test.ts b/arkui-plugins/test/ut/ui-plugins/imports/kit-import.test.ts index 0147ea48f9ced29fa9f9c1545289e25634dedd6c..62b772f7ad976b7d0b264043fa60cf0a61077d96 100644 --- a/arkui-plugins/test/ut/ui-plugins/imports/kit-import.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/imports/kit-import.test.ts @@ -186,7 +186,7 @@ __EntryWrapper.RegisterNamedRouter("", new __EntryWrapper(), ({ })); } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/wrap-builder/builder-in-generic.test.ts b/arkui-plugins/test/ut/ui-plugins/wrap-builder/builder-in-generic.test.ts index 4f7fc9dc54b685a163191f5e54ea64eb2f85de53..c8334a9c9c74fbcfc4c7c32757fdbb9435464c89 100644 --- a/arkui-plugins/test/ut/ui-plugins/wrap-builder/builder-in-generic.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/wrap-builder/builder-in-generic.test.ts @@ -52,15 +52,6 @@ import { State as State } from \"@ohos.arkui.stateManagement\"; @memo() let globalBuilder: @Builder() ((value: string, size: number)=> void); let builderArr: Array<@Builder() ((value: string, size: number)=> void)>; function main() {} -globalBuilder = MyBuilder; -builderArr = [MyBuilder, YourBuilder]; -__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ - bundleName: \"com.example.mock\", - moduleName: \"entry\", - pagePath: \"../../../wrap-builder/builder-in-generic\", - pageFullPath: \"test/demo/mock/wrap-builder/builder-in-generic\", - integratedHsp: \"false\", -} as NavInterface)); @memo() function MyBuilder(value: string, size: number) { Text(@memo() ((instance: TextAttribute): void => { instance.fontSize(size); @@ -73,6 +64,15 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ return; }), value, undefined, undefined); } +globalBuilder = MyBuilder; +builderArr = [MyBuilder, YourBuilder]; +__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ + bundleName: \"com.example.mock\", + moduleName: \"entry\", + pagePath: \"../../../wrap-builder/builder-in-generic\", + pageFullPath: \"test/demo/mock/wrap-builder/builder-in-generic\", + integratedHsp: \"false\", +} as NavInterface)); @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() final struct Index extends CustomComponent implements PageLifeCycle { public __initializeStruct(initializers: (__Options_Index | undefined), @memo() content: ((()=> void) | undefined)): void { this.__backing_message = STATE_MGMT_FACTORY.makeState(this, \"message\", ((({let gensym___ = initializers; @@ -99,7 +99,7 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ })); })); } - private constructor() {} + public constructor() {} } @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() export interface __Options_Index { set message(message: (string | undefined)) @@ -137,15 +137,6 @@ import { State as State } from \"@ohos.arkui.stateManagement\"; @memo() let globalBuilder: @Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void); let builderArr: Array<@Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void)>; function main() {} -globalBuilder = MyBuilder; -builderArr = [MyBuilder, YourBuilder]; -__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ - bundleName: \"com.example.mock\", - moduleName: \"entry\", - pagePath: \"../../../wrap-builder/builder-in-generic\", - pageFullPath: \"test/demo/mock/wrap-builder/builder-in-generic\", - integratedHsp: \"false\", -} as NavInterface)); @memo() function MyBuilder(__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number) { const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); const __memo_parameter_value = __memo_scope.param(0, value), __memo_parameter_size = __memo_scope.param(1, size); @@ -196,6 +187,15 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ return; } } +globalBuilder = MyBuilder; +builderArr = [MyBuilder, YourBuilder]; +__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ + bundleName: \"com.example.mock\", + moduleName: \"entry\", + pagePath: \"../../../wrap-builder/builder-in-generic\", + pageFullPath: \"test/demo/mock/wrap-builder/builder-in-generic\", + integratedHsp: \"false\", +} as NavInterface)); @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() final struct Index extends CustomComponent implements PageLifeCycle { public __initializeStruct(initializers: (__Options_Index | undefined), @memo() content: (((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void) | undefined)): void { this.__backing_message = STATE_MGMT_FACTORY.makeState(this, \"message\", ((({let gensym___ = initializers; @@ -259,7 +259,7 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ return; } } - private constructor() {} + public constructor() {} } @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() export interface __Options_Index { set message(message: (string | undefined)) diff --git a/arkui-plugins/test/ut/ui-plugins/wrap-builder/init-with-builder.test.ts b/arkui-plugins/test/ut/ui-plugins/wrap-builder/init-with-builder.test.ts index c3443baebc981a5bdd94c81d55d5e2b17df311b1..e1e714dba965928b30881d16be60af5ca6933bf4 100644 --- a/arkui-plugins/test/ut/ui-plugins/wrap-builder/init-with-builder.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/wrap-builder/init-with-builder.test.ts @@ -47,7 +47,6 @@ let globalBuilder: WrappedBuilder; function main() {} -globalBuilder = wrapBuilder(myBuilder); @memo() function myBuilder(value: string, size: number) { Text(@memo() ((instance: TextAttribute): void => { instance.fontSize(size); @@ -55,6 +54,7 @@ globalBuilder = wrapBuilder(myBuilder); }), value, undefined, undefined); } +globalBuilder = wrapBuilder(myBuilder); @memo() type MyBuilderFuncType = @Builder() ((value: string, size: number)=> void); @@ -69,7 +69,7 @@ globalBuilder = wrapBuilder(myBuilder); })); } - private constructor() {} + public constructor() {} } @@ -98,7 +98,6 @@ let globalBuilder: WrappedBuilder; function main() {} -globalBuilder = wrapBuilder(myBuilder); @memo() function myBuilder(__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number) { const __memo_scope = __memo_context.scope(((__memo_id) + (52041161)), 2); const __memo_parameter_value = __memo_scope.param(0, value), __memo_parameter_size = __memo_scope.param(1, size); @@ -125,6 +124,7 @@ globalBuilder = wrapBuilder(myBuilder); } } +globalBuilder = wrapBuilder(myBuilder); @memo() type MyBuilderFuncType = @Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void); @@ -157,7 +157,7 @@ globalBuilder = wrapBuilder(myBuilder); } } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-generic.test.ts b/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-generic.test.ts index 21668068ca15c824cb72cb7029bc426e1a069738..905a8dad5bc0412a5d4eadef1734cfc68c4d272d 100644 --- a/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-generic.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-generic.test.ts @@ -54,17 +54,6 @@ let builderArr: Array let wrappedBuilder1: WrappedBuilder<@Builder() ((value: string, size: number)=> void)>; let wrappedBuilder2: WrappedBuilder<@Builder() ((value: string, size: number)=> void)>; function main() {} -globalBuilder = wrapBuilder(MyBuilder); -builderArr = [wrapBuilder(MyBuilder), wrapBuilder(YourBuilder)]; -wrappedBuilder1 = wrapBuilder<@Builder() ((value: string, size: number)=> void)>(MyBuilder); -wrappedBuilder2 = new WrappedBuilder<@Builder() ((value: string, size: number)=> void)>(MyBuilder); -__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ - bundleName: \"com.example.mock\", - moduleName: \"entry\", - pagePath: \"../../../wrap-builder/wrap-builder-in-generic\", - pageFullPath: \"test/demo/mock/wrap-builder/wrap-builder-in-generic\", - integratedHsp: \"false\", -} as NavInterface)); @memo() function MyBuilder(value: string, size: number) { Text(@memo() ((instance: TextAttribute): void => { instance.fontSize(size); @@ -77,6 +66,17 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ return; }), value, undefined, undefined); } +globalBuilder = wrapBuilder(MyBuilder); +builderArr = [wrapBuilder(MyBuilder), wrapBuilder(YourBuilder)]; +wrappedBuilder1 = wrapBuilder<@Builder() ((value: string, size: number)=> void)>(MyBuilder); +wrappedBuilder2 = new WrappedBuilder<@Builder() ((value: string, size: number)=> void)>(MyBuilder); +__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ + bundleName: \"com.example.mock\", + moduleName: \"entry\", + pagePath: \"../../../wrap-builder/wrap-builder-in-generic\", + pageFullPath: \"test/demo/mock/wrap-builder/wrap-builder-in-generic\", + integratedHsp: \"false\", +} as NavInterface)); @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() final struct Index extends CustomComponent implements PageLifeCycle { public __initializeStruct(initializers: (__Options_Index | undefined), @memo() content: ((()=> void) | undefined)): void { this.__backing_message = STATE_MGMT_FACTORY.makeState(this, \"message\", ((({let gensym___ = initializers; @@ -103,7 +103,7 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ })); })); } - private constructor() {} + public constructor() {} } @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() export interface __Options_Index { set message(message: (string | undefined)) @@ -143,17 +143,6 @@ let builderArr: Array void)>; let wrappedBuilder2: WrappedBuilder<@Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void)>; function main() {} -globalBuilder = wrapBuilder(MyBuilder); -builderArr = [wrapBuilder(MyBuilder), wrapBuilder(YourBuilder)]; -wrappedBuilder1 = wrapBuilder<@Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void)>(MyBuilder); -wrappedBuilder2 = new WrappedBuilder<@Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void)>(MyBuilder); -__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ - bundleName: \"com.example.mock\", - moduleName: \"entry\", - pagePath: \"../../../wrap-builder/wrap-builder-in-generic\", - pageFullPath: \"test/demo/mock/wrap-builder/wrap-builder-in-generic\", - integratedHsp: \"false\", -} as NavInterface)); @memo() function MyBuilder(__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number) { const __memo_scope = __memo_context.scope(((__memo_id) + ()), 2); const __memo_parameter_value = __memo_scope.param(0, value), __memo_parameter_size = __memo_scope.param(1, size); @@ -204,6 +193,17 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ return; } } +globalBuilder = wrapBuilder(MyBuilder); +builderArr = [wrapBuilder(MyBuilder), wrapBuilder(YourBuilder)]; +wrappedBuilder1 = wrapBuilder<@Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void)>(MyBuilder); +wrappedBuilder2 = new WrappedBuilder<@Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void)>(MyBuilder); +__EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ + bundleName: \"com.example.mock\", + moduleName: \"entry\", + pagePath: \"../../../wrap-builder/wrap-builder-in-generic\", + pageFullPath: \"test/demo/mock/wrap-builder/wrap-builder-in-generic\", + integratedHsp: \"false\", +} as NavInterface)); @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() final struct Index extends CustomComponent implements PageLifeCycle { public __initializeStruct(initializers: (__Options_Index | undefined), @memo() content: (((__memo_context: __memo_context_type, __memo_id: __memo_id_type)=> void) | undefined)): void { this.__backing_message = STATE_MGMT_FACTORY.makeState(this, \"message\", ((({let gensym___ = initializers; @@ -267,7 +267,7 @@ __EntryWrapper.RegisterNamedRouter(\"\", new __EntryWrapper(), ({ return; } } - private constructor() {} + public constructor() {} } @Entry({useSharedStorage:false,storage:\"\",routeName:\"\"}) @Component() export interface __Options_Index { set message(message: (string | undefined)) diff --git a/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-ui.test.ts b/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-ui.test.ts index 0b6a8c4ebef6d279b560c4b4b6b64df244ba7d49..30038d9d3635e08418e7185e541dbb02a6d48865 100644 --- a/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-ui.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-in-ui.test.ts @@ -65,6 +65,7 @@ function main() {} }), value, undefined, undefined); } +globalBuilderArr = [wrapBuilder(myBuilder), wrapBuilder(yourBuilder)]; @memo() type MyBuilderFuncType = @Builder() ((value: string, size: number)=> void); @@ -87,7 +88,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -168,6 +169,7 @@ function main() {} } } +globalBuilderArr = [wrapBuilder(myBuilder), wrapBuilder(yourBuilder)]; @memo() type MyBuilderFuncType = @Builder() ((__memo_context: __memo_context_type, __memo_id: __memo_id_type, value: string, size: number)=> void); @@ -227,7 +229,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } diff --git a/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-with-lambda.test.ts b/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-with-lambda.test.ts index 38ef976e6db101c0c27258bd8a3de3cd83ea166f..ab0ee2fdf46d859c8475522f9ca9df932792a20d 100644 --- a/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-with-lambda.test.ts +++ b/arkui-plugins/test/ut/ui-plugins/wrap-builder/wrap-builder-with-lambda.test.ts @@ -78,6 +78,7 @@ function main() {} })); } +wBuilder = wrapBuilder(overBuilder); @Observed() class Tmp implements IObservedObject, ISubscribedWatches { @JSONStringifyIgnore() private subscribedWatches: ISubscribedWatches = STATE_MGMT_FACTORY.makeSubscribedWatches(); @@ -163,7 +164,7 @@ function main() {} })); } - private constructor() {} + public constructor() {} } @@ -244,6 +245,7 @@ function main() {} } } +wBuilder = wrapBuilder(overBuilder); @Observed() class Tmp implements IObservedObject, ISubscribedWatches { @JSONStringifyIgnore() private subscribedWatches: ISubscribedWatches = STATE_MGMT_FACTORY.makeSubscribedWatches(); @@ -356,7 +358,7 @@ function main() {} } } - private constructor() {} + public constructor() {} } diff --git a/koala-wrapper/src/arkts-api/factory/nodeFactory.ts b/koala-wrapper/src/arkts-api/factory/nodeFactory.ts index 7180f18310e1ca147342078b83fea5fdbcff7313..1d67b4fd5c10508d3a9bad72ecc048e2c68856b2 100644 --- a/koala-wrapper/src/arkts-api/factory/nodeFactory.ts +++ b/koala-wrapper/src/arkts-api/factory/nodeFactory.ts @@ -21,7 +21,6 @@ import { EtsScript, ExpressionStatement, FunctionDeclaration, - FunctionExpression, IfStatement, MethodDefinition, NumberLiteral, @@ -46,6 +45,7 @@ import { ETSTypeReferencePart, ETSUndefinedType, ETSUnionType, + FunctionExpression, FunctionSignature, Identifier, ImportSpecifier, @@ -83,6 +83,7 @@ import { SwitchCaseStatement, SpreadElement, BreakStatement, + ClassStaticBlock, } from '../../generated'; import { updateIdentifier } from '../node-utilities/Identifier'; import { updateCallExpression } from '../node-utilities/CallExpression'; @@ -146,6 +147,7 @@ import { updateSwitchStatement } from '../node-utilities/SwitchStatement'; import { updateSwitchCaseStatement } from '../node-utilities/SwitchCaseStatement'; import { updateSpreadElement } from '../node-utilities/SpreadElement'; import { updateBreakStatement } from '../node-utilities/BreakStatement'; +import { updateClassStaticBlock } from '../node-utilities/ClassStaticBlock'; export const factory = { get createIdentifier(): (...args: Parameters) => Identifier { @@ -360,8 +362,10 @@ export const factory = { get updateFunctionType(): (...args: Parameters) => ETSFunctionType { return updateETSFunctionType; }, - get createFunctionExpression(): (...args: Parameters) => FunctionExpression { - return FunctionExpression.create; + get createFunctionExpression(): ( + ...args: Parameters + ) => FunctionExpression { + return FunctionExpression.createFunctionExpression; }, get updateFunctionExpression(): (...args: Parameters) => FunctionExpression { return updateFunctionExpression; @@ -633,6 +637,14 @@ export const factory = { get updateBreakStatement(): (...args: Parameters) => BreakStatement { return updateBreakStatement; }, + get createClassStaticBlock(): ( + ...args: Parameters + ) => ClassStaticBlock { + return ClassStaticBlock.createClassStaticBlock; + }, + get updateClassStaticBlock(): (...args: Parameters) => ClassStaticBlock { + return updateClassStaticBlock; + }, /** @deprecated */ createTypeParameter1_(name: Identifier, constraint?: TypeNode, defaultType?: TypeNode) { return TSTypeParameter.createTSTypeParameter(Identifier.create1Identifier(name.name), constraint, defaultType); diff --git a/koala-wrapper/src/arkts-api/factory/nodeTests.ts b/koala-wrapper/src/arkts-api/factory/nodeTests.ts index 16b845726f0aeac29fa2ad29c76f272a8a04f7be..6b865346918d98f953647a9f0aca4297a319cdb0 100644 --- a/koala-wrapper/src/arkts-api/factory/nodeTests.ts +++ b/koala-wrapper/src/arkts-api/factory/nodeTests.ts @@ -21,7 +21,6 @@ import { EtsScript, ExpressionStatement, FunctionDeclaration, - FunctionExpression, IfStatement, MethodDefinition, StructDeclaration, @@ -65,10 +64,6 @@ export function isStructDeclaration(node: AstNode): node is StructDeclaration { return node instanceof StructDeclaration; } -export function isFunctionExpression(node: AstNode): node is FunctionExpression { - return node instanceof FunctionExpression; -} - export function isEtsParameterExpression(node: AstNode): node is ETSParameterExpression { return node instanceof ETSParameterExpression; } diff --git a/koala-wrapper/src/arkts-api/index.ts b/koala-wrapper/src/arkts-api/index.ts index f62d57430c29cfa15f498f5e6c48661f4f51a4a6..647c8e2ee7c2bfb863536a8d90c1c86cf0067e6a 100644 --- a/koala-wrapper/src/arkts-api/index.ts +++ b/koala-wrapper/src/arkts-api/index.ts @@ -70,6 +70,8 @@ export * from '../generated/peers/BreakStatement'; export * from '../generated/peers/ContinueStatement'; export * from '../generated/peers/SwitchCaseStatement'; export * from '../generated/peers/SwitchStatement'; +export * from '../generated/peers/ClassStaticBlock'; +export * from '../generated/peers/FunctionExpression'; export * from './types'; export * from './utilities/private'; diff --git a/koala-wrapper/src/arkts-api/node-utilities/ClassStaticBlock.ts b/koala-wrapper/src/arkts-api/node-utilities/ClassStaticBlock.ts new file mode 100644 index 0000000000000000000000000000000000000000..9a49d2274a17a34a3a7814241078d60118066fba --- /dev/null +++ b/koala-wrapper/src/arkts-api/node-utilities/ClassStaticBlock.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { ClassStaticBlock, Expression } from '../../generated'; +import { isSameNativeObject } from '../peers/ArktsObject'; +import { attachModifiers, updateThenAttach } from '../utilities/private'; + +export function updateClassStaticBlock(original: ClassStaticBlock, value?: Expression): ClassStaticBlock { + if (isSameNativeObject(value, original.value)) { + return original; + } + + const update = updateThenAttach(ClassStaticBlock.updateClassStaticBlock, attachModifiers); + const newNode = update(original, value); + return newNode; +} diff --git a/koala-wrapper/src/arkts-api/node-utilities/FunctionExpression.ts b/koala-wrapper/src/arkts-api/node-utilities/FunctionExpression.ts index ba213580140feac8c5b73169a164599e5714c915..b601e9f469e5e8cae44fab50a85334e1e7e9d500 100644 --- a/koala-wrapper/src/arkts-api/node-utilities/FunctionExpression.ts +++ b/koala-wrapper/src/arkts-api/node-utilities/FunctionExpression.ts @@ -13,16 +13,15 @@ * limitations under the License. */ -import { ScriptFunction } from '../../generated'; +import { ScriptFunction, FunctionExpression } from '../../generated'; import { isSameNativeObject } from '../peers/ArktsObject'; -import { FunctionExpression } from '../types'; import { attachModifiers, updateThenAttach } from '../utilities/private'; -export function updateFunctionExpression(original: FunctionExpression, expression: ScriptFunction): FunctionExpression { - if (isSameNativeObject(expression, original.scriptFunction)) { +export function updateFunctionExpression(original: FunctionExpression, func?: ScriptFunction): FunctionExpression { + if (isSameNativeObject(func, original.function)) { return original; } - const update = updateThenAttach(FunctionExpression.update, attachModifiers); - return update(original, expression); + const update = updateThenAttach(FunctionExpression.updateFunctionExpression, attachModifiers); + return update(original, func); } diff --git a/koala-wrapper/src/arkts-api/types.ts b/koala-wrapper/src/arkts-api/types.ts index 640493db9230ac2589f35e80dd0dbdf4c1154d24..fe5a2bbc4899cbc298a5324f07383d3d861d7e95 100644 --- a/koala-wrapper/src/arkts-api/types.ts +++ b/koala-wrapper/src/arkts-api/types.ts @@ -484,7 +484,7 @@ export class FunctionDeclaration extends AstNode { readonly isAnon: boolean; } -export class FunctionExpression extends AstNode { +class FunctionExpression extends AstNode { constructor(peer: KPtr) { assertValidPeer(peer, Es2pandaAstNodeType.AST_NODE_TYPE_FUNCTION_EXPRESSION); super(peer); diff --git a/koala-wrapper/src/arkts-api/visitor.ts b/koala-wrapper/src/arkts-api/visitor.ts index 766626e5928c15f7e63e490c487c1667a9e62ef0..7898501f2cdba9066a4bcc53da78d25bdea3786d 100644 --- a/koala-wrapper/src/arkts-api/visitor.ts +++ b/koala-wrapper/src/arkts-api/visitor.ts @@ -57,6 +57,9 @@ import { isSwitchStatement, isSwitchCaseStatement, isSpreadElement, + isClassStaticBlock, + isFunctionExpression, + FunctionExpression, } from '../generated'; import { isEtsScript, @@ -76,6 +79,7 @@ import { } from './factory/nodeTests'; import { classDefinitionFlags } from './utilities/public'; import { Es2pandaAstNodeType } from '../Es2pandaEnums'; +import { updateFunctionExpression } from './node-utilities/FunctionExpression'; type Visitor = (node: AstNode) => AstNode; @@ -463,6 +467,16 @@ function visitDefinitionBody(node: AstNode, visitor: Visitor): AstNode { node.isComputed ); } + if (isClassStaticBlock(node) && !!node.value) { + updated = true; + return factory.updateClassStaticBlock( + node, + updateFunctionExpression( + node.value as FunctionExpression, + nodeVisitor(node.function, visitor) + ) + ); + } // TODO return node; } diff --git a/koala-wrapper/src/generated/peers/ClassStaticBlock.ts b/koala-wrapper/src/generated/peers/ClassStaticBlock.ts index 5b2bef593b039d4915de3c85060394e62c60b6c2..eeb2a2a2d34331dc963664b7704c70d7d2315689 100644 --- a/koala-wrapper/src/generated/peers/ClassStaticBlock.ts +++ b/koala-wrapper/src/generated/peers/ClassStaticBlock.ts @@ -34,20 +34,27 @@ import { Expression } from "./Expression" import { ScriptFunction } from "./ScriptFunction" export class ClassStaticBlock extends ClassElement { constructor(pointer: KNativePointer) { - assertValidPeer(pointer, Es2pandaAstNodeType.AST_NODE_TYPE_CLASS_STATIC_BLOCK) - super(pointer) + assertValidPeer(pointer, Es2pandaAstNodeType.AST_NODE_TYPE_CLASS_STATIC_BLOCK); + super(pointer); } static createClassStaticBlock(value?: Expression): ClassStaticBlock { - return new ClassStaticBlock(global.generatedEs2panda._CreateClassStaticBlock(global.context, passNode(value))) + return new ClassStaticBlock(global.generatedEs2panda._CreateClassStaticBlock(global.context, passNode(value))); } static updateClassStaticBlock(original?: ClassStaticBlock, value?: Expression): ClassStaticBlock { - return new ClassStaticBlock(global.generatedEs2panda._UpdateClassStaticBlock(global.context, passNode(original), passNode(value))) + return new ClassStaticBlock(global.generatedEs2panda._UpdateClassStaticBlock(global.context, passNode(original), passNode(value))); } + get function(): ScriptFunction | undefined { + return unpackNode(global.generatedEs2panda._ClassStaticBlockFunction(global.context, this.peer)); + } + get name(): string { + return unpackString(global.generatedEs2panda._ClassStaticBlockNameConst(global.context, this.peer)); + } + protected readonly brandClassStaticBlock: undefined; } export function isClassStaticBlock(node: AstNode): node is ClassStaticBlock { - return node instanceof ClassStaticBlock + return node instanceof ClassStaticBlock; } if (!nodeByType.has(Es2pandaAstNodeType.AST_NODE_TYPE_CLASS_STATIC_BLOCK)) { - nodeByType.set(Es2pandaAstNodeType.AST_NODE_TYPE_CLASS_STATIC_BLOCK, ClassStaticBlock) + nodeByType.set(Es2pandaAstNodeType.AST_NODE_TYPE_CLASS_STATIC_BLOCK, ClassStaticBlock); }