diff --git a/arkoala-arkts/libarkts/native/src/bridges.cc b/arkoala-arkts/libarkts/native/src/bridges.cc index 2b994c0d7cfa38f29d4ba4c743cec731865d9a3d..1900f813733d455b6ed730955632f580e6ced15c 100644 --- a/arkoala-arkts/libarkts/native/src/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/bridges.cc @@ -43,29 +43,6 @@ KNativePointer impl_CreateTSTypeParameterInstantiation( } KOALA_INTEROP_3(CreateTSTypeParameterInstantiation, KNativePointer, KNativePointer, KNativePointerArray, KInt) -KNativePointer impl_ClassElementKey(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - return GetImpl()->ClassElementKey(context, node); -} -KOALA_INTEROP_2(ClassElementKey, KNativePointer, KNativePointer, KNativePointer) - -KNativePointer impl_ClassElementValue(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - return GetImpl()->ClassElementValue(context, node); -} -KOALA_INTEROP_2(ClassElementValue, KNativePointer, KNativePointer, KNativePointer) - -KNativePointer impl_CallExpressionArguments(KNativePointer contextPtr, KNativePointer nodePtr, KNativePointer returnLen) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - std::size_t params_len = 0; - auto params = GetImpl()->CallExpressionArguments(context, node, ¶ms_len); - return new std::vector(params, params + params_len); -} -KOALA_INTEROP_3(CallExpressionArguments, KNativePointer, KNativePointer, KNativePointer, KNativePointer) - KNativePointer impl_AstNodeRecheck(KNativePointer contextPtr, KNativePointer nodePtr) { auto context = reinterpret_cast(contextPtr); auto node = reinterpret_cast(nodePtr); @@ -169,21 +146,6 @@ KNativePointer impl_ScopeSetParent(KNativePointer contextPtr, KNativePointer nod } KOALA_INTEROP_3(ScopeSetParent, KNativePointer, KNativePointer, KNativePointer, KNativePointer) -KNativePointer impl_BlockStatementSetStatements( - KNativePointer contextPtr, - KNativePointer nodePtr, - KNativePointerArray statementsPtr, - KInt statementsLen -) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - auto statements = reinterpret_cast(statementsPtr); - - GetImpl()->BlockStatementSetStatements(context, node, statements, statementsLen); - return node; -} -KOALA_INTEROP_4(BlockStatementSetStatements, KNativePointer, KNativePointer, KNativePointer, KNativePointerArray, KInt) - KNativePointer impl_CreateClassDeclaration(KNativePointer contextPtr, KNativePointer defPtr) { auto context = reinterpret_cast(contextPtr); auto def = reinterpret_cast(defPtr); @@ -1334,13 +1296,6 @@ KBoolean impl_IsIdentifier(KNativePointer nodePtr) { } KOALA_INTEROP_1(IsIdentifier, KBoolean, KNativePointer) -KNativePointer impl_IdentifierName(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - return new string(GetImpl()->IdentifierName(context, node)); -} -KOALA_INTEROP_2(IdentifierName, KNativePointer, KNativePointer, KNativePointer) - KNativePointer impl_CreateIdentifier1(KNativePointer contextPtr, KStringPtr& namePtr) { auto context = reinterpret_cast(contextPtr); return GetImpl()->CreateIdentifier1(context, getStringCopy(namePtr)); diff --git a/arkoala-arkts/libarkts/native/src/common.cc b/arkoala-arkts/libarkts/native/src/common.cc index 1760cc5a674887c31aad4cca0d28cb02768434c4..cbf46c2a717f27284d9ce27c31feb944fd7d4392 100644 --- a/arkoala-arkts/libarkts/native/src/common.cc +++ b/arkoala-arkts/libarkts/native/src/common.cc @@ -122,15 +122,6 @@ KNativePointer impl_IdentifierSetName(KNativePointer contextPtr, KNativePointer } KOALA_INTEROP_3(IdentifierSetName, KNativePointer, KNativePointer, KNativePointer, KStringPtr) -KNativePointer impl_BlockStatementStatements(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - size_t n; - auto statements = GetImpl()->BlockStatementStatements(context, node, &n); - return new vector(statements, statements + n); -} -KOALA_INTEROP_2(BlockStatementStatements, KNativePointer, KNativePointer, KNativePointer) - KNativePointer impl_VariableDeclarationDeclaratorsConst(KNativePointer contextPtr, KNativePointer nodePtr) { auto context = reinterpret_cast(contextPtr); auto node = reinterpret_cast(nodePtr); @@ -140,15 +131,6 @@ KNativePointer impl_VariableDeclarationDeclaratorsConst(KNativePointer contextPt } KOALA_INTEROP_2(VariableDeclarationDeclaratorsConst, KNativePointer, KNativePointer, KNativePointer) -KNativePointer impl_ClassDefinitionBody(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - size_t n; - auto body = GetImpl()->ClassDefinitionBody(context, node, &n); - return new std::vector(body, body + n); -} -KOALA_INTEROP_2(ClassDefinitionBody, KNativePointer, KNativePointer, KNativePointer) - KNativePointer impl_ScriptFunctionParams(KNativePointer contextPtr, KNativePointer nodePtr) { auto context = reinterpret_cast(contextPtr); auto node = reinterpret_cast(nodePtr); diff --git a/arkoala-arkts/libarkts/native/src/generated/bridges.cc b/arkoala-arkts/libarkts/native/src/generated/bridges.cc index 8fe9429f209beeec2e8d2a0f477541272680487e..3f7fa2304bbe27893159d11b0c21d5dd1f6f28f2 100644 --- a/arkoala-arkts/libarkts/native/src/generated/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/generated/bridges.cc @@ -24,3 +24,70 @@ KNativePointer impl_FunctionSignatureParamsConst(KNativePointer context, KNative return new std::vector(result, result + length); } KOALA_INTEROP_2(FunctionSignatureParamsConst, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_IdentifierName(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto result = GetImpl()->IdentifierName(_context, _receiver); + return new std::string(result); +} +KOALA_INTEROP_2(IdentifierName, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_BlockStatementStatements(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + std::size_t length; + const auto result = GetImpl()->BlockStatementStatements(_context, _receiver, &length); + return new std::vector(result, result + length); +} +KOALA_INTEROP_2(BlockStatementStatements, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_ClassDefinitionBody(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + std::size_t length; + const auto result = GetImpl()->ClassDefinitionBody(_context, _receiver, &length); + return new std::vector(result, result + length); +} +KOALA_INTEROP_2(ClassDefinitionBody, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_ClassElementKey(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto result = GetImpl()->ClassElementKey(_context, _receiver); + return result; +} +KOALA_INTEROP_2(ClassElementKey, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_ClassElementValue(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto result = GetImpl()->ClassElementValue(_context, _receiver); + return result; +} +KOALA_INTEROP_2(ClassElementValue, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_CallExpressionArguments(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + std::size_t length; + const auto result = GetImpl()->CallExpressionArguments(_context, _receiver, &length); + return new std::vector(result, result + length); +} +KOALA_INTEROP_2(CallExpressionArguments, KNativePointer, KNativePointer, KNativePointer); + +void impl_BlockStatementSetStatements(KNativePointer context, KNativePointer receiver, KNativePointerArray statementList, KUInt statementListLen) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto _statementList = reinterpret_cast(statementList); + const auto _statementListLen = static_cast(statementListLen); + GetImpl()->BlockStatementSetStatements(_context, _receiver, _statementList, _statementListLen); +} +KOALA_INTEROP_V4(BlockStatementSetStatements, KNativePointer, KNativePointer, KNativePointerArray, KUInt); diff --git a/arkoala-arkts/libarkts/src/arkts-api/index.ts b/arkoala-arkts/libarkts/src/arkts-api/index.ts index 479f63dcf8c0aa9a0f610f9dda6cc5375541ab67..34254affbb02ca2b888df48edd2b5dbf48f3dca7 100644 --- a/arkoala-arkts/libarkts/src/arkts-api/index.ts +++ b/arkoala-arkts/libarkts/src/arkts-api/index.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -export * from "../handwritten/enums" +export * from "../handwritten/Es2pandaEnums" export * from "../generated/Es2pandaEnums" export * from "./types" diff --git a/arkoala-arkts/libarkts/src/arkts-api/static/global.ts b/arkoala-arkts/libarkts/src/arkts-api/static/global.ts index b8179537fbcc6e4aa0b3bb208c634f8f99f1acde..3b581fd75097d68ff6dde1a448beeb143ab5702e 100644 --- a/arkoala-arkts/libarkts/src/arkts-api/static/global.ts +++ b/arkoala-arkts/libarkts/src/arkts-api/static/global.ts @@ -15,7 +15,7 @@ import { throwError } from "../../utils" import { KNativePointer } from "@koalaui/interop" -import { initEs2panda, Es2pandaNativeModule } from "../../Es2pandaNativeModule" +import { initEs2panda, Es2pandaNativeModule } from "../../handwritten/Es2pandaNativeModule" import { initInterop, InteropNativeModule } from "../../InteropNativeModule" export default class global { diff --git a/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts new file mode 100644 index 0000000000000000000000000000000000000000..fdea831528c306d0511d291e029b282986687b9d --- /dev/null +++ b/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022-2023 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. + */ + +// TODO: diff --git a/arkoala-arkts/libarkts/src/handwritten/enums.ts b/arkoala-arkts/libarkts/src/handwritten/Es2pandaEnums.ts similarity index 100% rename from arkoala-arkts/libarkts/src/handwritten/enums.ts rename to arkoala-arkts/libarkts/src/handwritten/Es2pandaEnums.ts diff --git a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/handwritten/Es2pandaNativeModule.ts similarity index 99% rename from arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts rename to arkoala-arkts/libarkts/src/handwritten/Es2pandaNativeModule.ts index f81a62c5493194a7f1af24f37d195dcd860aeedf..504b2dd562a0b835dd3ca4244c71af43c66b9268 100644 --- a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts +++ b/arkoala-arkts/libarkts/src/handwritten/Es2pandaNativeModule.ts @@ -539,7 +539,7 @@ export class Es2pandaNativeModule { } export function initEs2panda(): Es2pandaNativeModule { - registerLoadedLibrary(require("../native/build/es2panda.node")) + registerLoadedLibrary(require("../../native/build/es2panda.node")) const instance = new Es2pandaNativeModule() // registerNativeModule("InteropNativeModule", NativeModule) registerNativeModule("NativeModule", instance) diff --git a/arkoala-arkts/libarkts/test/test-util.ts b/arkoala-arkts/libarkts/test/test-util.ts index 1cc2e55d45dd9da325aa53519a605f5879bbdad3..10b12ed93353446190643988ae200d654cce814d 100644 --- a/arkoala-arkts/libarkts/test/test-util.ts +++ b/arkoala-arkts/libarkts/test/test-util.ts @@ -21,7 +21,7 @@ import * as pth from "path" import { assert } from "chai" import { exec, execSync } from "child_process" -export { Es2pandaNativeModule } from "../src/Es2pandaNativeModule" +export { Es2pandaNativeModule } from "../src/handwritten/Es2pandaNativeModule" export { assert } from "chai" class defaultTransformationContext implements ts.TransformationContext {