diff --git a/ui2abc/libarkts/generator/options.json5 b/ui2abc/libarkts/generator/options.json5 index c2e74938015abcf089c9e89b95d53692012ad727..e8c2170976343b7789979863180ff8df8da1a5a0 100644 --- a/ui2abc/libarkts/generator/options.json5 +++ b/ui2abc/libarkts/generator/options.json5 @@ -366,10 +366,6 @@ name: "setPreferredReturnTypePointer", definition: "extension_ScriptFunctionSetPreferredReturnTypePointer", }, - { - name: "setParams", - definition: "extension_ScriptFunctionSetParams", - }, ] }, { diff --git a/ui2abc/libarkts/native/src/common.cc b/ui2abc/libarkts/native/src/common.cc index 8aa2441160e589456b1ed0eba303cd2cf0dc9c0f..6fea396a6952a7ea16624af4dde451f438b2b94b 100644 --- a/ui2abc/libarkts/native/src/common.cc +++ b/ui2abc/libarkts/native/src/common.cc @@ -268,18 +268,6 @@ KInt impl_IdentifierIdentifierFlags(KNativePointer contextPtr, KNativePointer no } KOALA_INTEROP_2(IdentifierIdentifierFlags, KInt, KNativePointer, KNativePointer) -void impl_ScriptFunctionSetParams(KNativePointer context, KNativePointer receiver, KNativePointerArray paramsList, KUInt paramsListLength) { - const auto _context = reinterpret_cast(context); - const auto _receiver = reinterpret_cast(receiver); - const auto _paramsList = reinterpret_cast(paramsList); - const auto _paramsListLength = static_cast(paramsListLength); - GetImpl()->ScriptFunctionClearParams(_context, _receiver); - for (size_t i = 0; i < _paramsListLength; i++) { - GetImpl()->ScriptFunctionEmplaceParams(_context, _receiver, _paramsList[i]); - } -} -KOALA_INTEROP_V4(ScriptFunctionSetParams, KNativePointer, KNativePointer, KNativePointerArray, KUInt) - void impl_ClassDefinitionSetBody(KNativePointer context, KNativePointer receiver, KNativePointerArray body, KUInt bodyLength) { const auto _context = reinterpret_cast(context); const auto _receiver = reinterpret_cast(receiver); diff --git a/ui2abc/libarkts/native/src/generated/bridges.cc b/ui2abc/libarkts/native/src/generated/bridges.cc index 13c2f8f47ec9c3a4230f0c26896f1fb2586e1f11..e6fc4f480fded70395899d7e5454ce62810d2457 100644 --- a/ui2abc/libarkts/native/src/generated/bridges.cc +++ b/ui2abc/libarkts/native/src/generated/bridges.cc @@ -17,7 +17,7 @@ /* * THIS FILE IS AUTOGENERATED BY arktscgen v2.1.10-arktscgen-2. DO NOT EDIT MANUALLY! - * es2panda 8950988a4162d5cf0fe7f8adc92c0ac5cb6852d7(2025-08-15) sdk v1.5.0-dev.41863 + * es2panda 45c3ccb2d02bd4cc1357a5dc4d17bf1c9f3de542(2025-08-15) sdk vlocal */ KNativePointer impl_GetAllErrorMessages(KNativePointer context) @@ -2057,6 +2057,17 @@ KNativePointer impl_ETSFunctionTypeParamsConst(KNativePointer context, KNativePo } KOALA_INTEROP_2(ETSFunctionTypeParamsConst, KNativePointer, KNativePointer, KNativePointer); +void impl_ETSFunctionTypeSetParams(KNativePointer context, KNativePointer receiver, KNativePointerArray paramsList, KUInt paramsListSequenceLength) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto _paramsList = reinterpret_cast(paramsList); + const auto _paramsListSequenceLength = static_cast(paramsListSequenceLength); + GetImpl()->ETSFunctionTypeIrSetParams(_context, _receiver, _paramsList, _paramsListSequenceLength); + return ; +} +KOALA_INTEROP_V4(ETSFunctionTypeSetParams, KNativePointer, KNativePointer, KNativePointerArray, KUInt); + KNativePointer impl_ETSFunctionTypeReturnTypeConst(KNativePointer context, KNativePointer receiver) { const auto _context = reinterpret_cast(context); @@ -3017,6 +3028,17 @@ KNativePointer impl_CallExpressionArguments(KNativePointer context, KNativePoint } KOALA_INTEROP_2(CallExpressionArguments, KNativePointer, KNativePointer, KNativePointer); +void impl_CallExpressionSetArguments(KNativePointer context, KNativePointer receiver, KNativePointerArray argumentsList, KUInt argumentsListSequenceLength) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto _argumentsList = reinterpret_cast(argumentsList); + const auto _argumentsListSequenceLength = static_cast(argumentsListSequenceLength); + GetImpl()->CallExpressionSetArguments(_context, _receiver, _argumentsList, _argumentsListSequenceLength); + return ; +} +KOALA_INTEROP_V4(CallExpressionSetArguments, KNativePointer, KNativePointer, KNativePointerArray, KUInt); + KBoolean impl_CallExpressionHasTrailingCommaConst(KNativePointer context, KNativePointer receiver) { const auto _context = reinterpret_cast(context); @@ -5676,6 +5698,17 @@ void impl_ScriptFunctionEmplaceParams(KNativePointer context, KNativePointer rec } KOALA_INTEROP_V3(ScriptFunctionEmplaceParams, KNativePointer, KNativePointer, KNativePointer); +void impl_ScriptFunctionSetParams(KNativePointer context, KNativePointer receiver, KNativePointerArray paramsList, KUInt paramsListSequenceLength) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto _paramsList = reinterpret_cast(paramsList); + const auto _paramsListSequenceLength = static_cast(paramsListSequenceLength); + GetImpl()->ScriptFunctionSetParams(_context, _receiver, _paramsList, _paramsListSequenceLength); + return ; +} +KOALA_INTEROP_V4(ScriptFunctionSetParams, KNativePointer, KNativePointer, KNativePointerArray, KUInt); + void impl_ScriptFunctionClearParams(KNativePointer context, KNativePointer receiver) { const auto _context = reinterpret_cast(context); diff --git a/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts b/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts index f51850accc94acbc6c2cd831b3726fe3d3bcc6d1..82737e0a000d01fea0b504c122b21fa91b4cc6ee 100644 --- a/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts +++ b/ui2abc/libarkts/src/generated/Es2pandaNativeModule.ts @@ -755,6 +755,9 @@ export class Es2pandaNativeModule { _ETSFunctionTypeParamsConst(context: KNativePointer, receiver: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } + _ETSFunctionTypeSetParams(context: KNativePointer, receiver: KNativePointer, paramsList: BigUint64Array, paramsListSequenceLength: KUInt): void { + throw new Error("This methods was not overloaded by native module initialization") + } _ETSFunctionTypeReturnTypeConst(context: KNativePointer, receiver: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } @@ -1049,6 +1052,9 @@ export class Es2pandaNativeModule { _CallExpressionArguments(context: KNativePointer, receiver: KNativePointer): KNativePointer { throw new Error("This methods was not overloaded by native module initialization") } + _CallExpressionSetArguments(context: KNativePointer, receiver: KNativePointer, argumentsList: BigUint64Array, argumentsListSequenceLength: KUInt): void { + throw new Error("This methods was not overloaded by native module initialization") + } _CallExpressionHasTrailingCommaConst(context: KNativePointer, receiver: KNativePointer): KBoolean { throw new Error("This methods was not overloaded by native module initialization") } @@ -1871,6 +1877,9 @@ export class Es2pandaNativeModule { _ScriptFunctionEmplaceParams(context: KNativePointer, receiver: KNativePointer, params: KNativePointer): void { throw new Error("This methods was not overloaded by native module initialization") } + _ScriptFunctionSetParams(context: KNativePointer, receiver: KNativePointer, paramsList: BigUint64Array, paramsListSequenceLength: KUInt): void { + throw new Error("This methods was not overloaded by native module initialization") + } _ScriptFunctionClearParams(context: KNativePointer, receiver: KNativePointer): void { throw new Error("This methods was not overloaded by native module initialization") } diff --git a/ui2abc/libarkts/src/generated/peers/CallExpression.ts b/ui2abc/libarkts/src/generated/peers/CallExpression.ts index 9173a492754c15d43e1ba8ea4ce63f5823f8e5db..34bc1619a5293745921aee81b7a19e880e6d95dd 100644 --- a/ui2abc/libarkts/src/generated/peers/CallExpression.ts +++ b/ui2abc/libarkts/src/generated/peers/CallExpression.ts @@ -74,6 +74,11 @@ export class CallExpression extends MaybeOptionalExpression { get arguments(): readonly Expression[] { return unpackNodeArray(global.generatedEs2panda._CallExpressionArguments(global.context, this.peer)) } + /** @deprecated */ + setArguments(argumentsList: readonly Expression[]): this { + global.generatedEs2panda._CallExpressionSetArguments(global.context, this.peer, passNodeArray(argumentsList), argumentsList.length) + return this + } get hasTrailingComma(): boolean { return global.generatedEs2panda._CallExpressionHasTrailingCommaConst(global.context, this.peer) } diff --git a/ui2abc/libarkts/src/generated/peers/ETSFunctionType.ts b/ui2abc/libarkts/src/generated/peers/ETSFunctionType.ts index 9298f1bf650a9b85690db4e75b4bcc873a023b82..2ad4075e630321be6a1d3cae605c3b7126d05fb1 100644 --- a/ui2abc/libarkts/src/generated/peers/ETSFunctionType.ts +++ b/ui2abc/libarkts/src/generated/peers/ETSFunctionType.ts @@ -69,6 +69,11 @@ export class ETSFunctionType extends TypeNode { get params(): readonly Expression[] { return unpackNodeArray(global.generatedEs2panda._ETSFunctionTypeParamsConst(global.context, this.peer)) } + /** @deprecated */ + setParams(paramsList: readonly Expression[]): this { + global.generatedEs2panda._ETSFunctionTypeSetParams(global.context, this.peer, passNodeArray(paramsList), paramsList.length) + return this + } get returnType(): TypeNode | undefined { return unpackNode(global.generatedEs2panda._ETSFunctionTypeReturnType(global.context, this.peer)) } diff --git a/ui2abc/libarkts/src/generated/peers/ScriptFunction.ts b/ui2abc/libarkts/src/generated/peers/ScriptFunction.ts index fc7b2bd3bdebe4bfbfdeeaf7b170ce44c9da2b75..6ca2070b5693cf1b4cbdc3bb807dca742037fbbb 100644 --- a/ui2abc/libarkts/src/generated/peers/ScriptFunction.ts +++ b/ui2abc/libarkts/src/generated/peers/ScriptFunction.ts @@ -43,7 +43,6 @@ import { TSTypeParameterDeclaration } from "./TSTypeParameterDeclaration" import { TypeNode } from "./TypeNode" import { extension_ScriptFunctionGetPreferredReturnTypePointer } from "./../../reexport-for-generated" import { extension_ScriptFunctionGetSignaturePointer } from "./../../reexport-for-generated" -import { extension_ScriptFunctionSetParams } from "./../../reexport-for-generated" import { extension_ScriptFunctionSetPreferredReturnTypePointer } from "./../../reexport-for-generated" import { extension_ScriptFunctionSetSignaturePointer } from "./../../reexport-for-generated" @@ -244,6 +243,11 @@ export class ScriptFunction extends AstNode { return this } /** @deprecated */ + setParams(paramsList: readonly Expression[]): this { + global.generatedEs2panda._ScriptFunctionSetParams(global.context, this.peer, passNodeArray(paramsList), paramsList.length) + return this + } + /** @deprecated */ clearParams(): this { global.generatedEs2panda._ScriptFunctionClearParams(global.context, this.peer) return this @@ -296,7 +300,6 @@ export class ScriptFunction extends AstNode { setSignaturePointer = extension_ScriptFunctionSetSignaturePointer getPreferredReturnTypePointer = extension_ScriptFunctionGetPreferredReturnTypePointer setPreferredReturnTypePointer = extension_ScriptFunctionSetPreferredReturnTypePointer - setParams = extension_ScriptFunctionSetParams protected readonly brandScriptFunction: undefined } export function isScriptFunction(node: object | undefined): node is ScriptFunction { diff --git a/ui2abc/memo-plugin/src/transform/FunctionTransformer.ts b/ui2abc/memo-plugin/src/transform/FunctionTransformer.ts index 648991f3be188dfb9f04d7cd35e184d9dca66832..67f6675ba78f56b2874a44c0d594c1f5f9f91bab 100644 --- a/ui2abc/memo-plugin/src/transform/FunctionTransformer.ts +++ b/ui2abc/memo-plugin/src/transform/FunctionTransformer.ts @@ -239,15 +239,8 @@ export class FunctionTransformer extends arkts.AbstractVisitor { if (callsiteHasReceiver(kind)) { newArgs = moveToFront(newArgs, 2) } - return arkts.factory.updateCallExpression( - node, - node.callee, - newArgs, - node.typeParams, - node.isOptional, - node.hasTrailingComma, - node.trailingBlock, - ) + node.setArguments(newArgs) + return node } transformETSFunctionType(node: arkts.ETSFunctionType): arkts.ETSFunctionType { diff --git a/ui2abc/memo-plugin/src/transform/SignatureTransformer.ts b/ui2abc/memo-plugin/src/transform/SignatureTransformer.ts index 9ac921491c00f8798918a11cbcd8e084582a636c..7d8b6ebdd20d153f36d56a3795ed7158b44f6efc 100644 --- a/ui2abc/memo-plugin/src/transform/SignatureTransformer.ts +++ b/ui2abc/memo-plugin/src/transform/SignatureTransformer.ts @@ -62,18 +62,13 @@ export class SignatureTransformer extends arkts.AbstractVisitor { if (!shouldTransform) { return node } - return arkts.factory.updateETSFunctionType( - node, - node.typeParams, + node.setParams( extendParameters( castParameters(node.params), kind == MemoFunctionKind.MEMO_WITH_RECEIVER || kind == MemoFunctionKind.INTRINSIC_WITH_RECEIVER - ), - node.returnType, - node.isExtensionFunction, - node.flags, - node.annotations, + ) ) + return node } return this.visitEachChild(node)