@idlizer/arktscgen 2.1.10-arktscgen-2 → 2.1.10-arktscgen-3a

package/build/libarkts-copy/generator/options.json5

@@ -87,7 +87,25 @@
                 interface: "es2panda_Impl",
                 methods: [
                     "LogSyntaxError", "LogWarning", "LogTypeError", // wrong idl
-                    "DestroyContext", // cleanup arena (Improve: move this cleanup to another method) 
+                    "DestroyContext", // cleanup arena (Improve: move this cleanup to another method)
+
+                    // Handwritten bridges
+                    "AstNodeRebind",
+                    "ConfigGetOptions",
+                    "CreateCacheContextFromFile",
+                    "CreateContextFromFile",
+                    "CreateContextFromString",
+                    "CreateContextGenerateAbcForExternalSourceFiles",
+                    "CreateDiagnosticInfo",
+                    "CreateDiagnosticKind",
+                    "CreateGlobalContext",
+                    "CreateSuggestionInfo",
+                    "DestroyGlobalContext",
+                    "SourcePositionCol",
+                    "ExternalSourceName",
+                    "ExternalSourcePrograms",
+                    "GenerateTsDeclarationsFromContext",
+                    "LogDiagnostic",
                 ],
             },
             {
@@ -96,6 +114,46 @@
                     "GetOverloadInfo",  // return type is wrong
                 ]
             },
+            {
+                interface: "Decl", // handwritten bridge
+                methods: [
+                    "Node"
+                ]
+            },
+            {
+                interface: "ETSParser", // handwritten bridge
+                methods: [
+                    "BuildImportDeclaration",
+                    "CreateExpression",
+                    "GetGlobalProgramAbsName",
+                    "GetImportPathManager",
+                ]
+            },
+            {
+                interface: "Program", // handwritten bridge
+                methods: [
+                    "DirectExternalSources",
+                    "ExternalSources",
+                ]
+            },
+            {
+                interface: "Scope", // handwritten bridge
+                methods: [
+                    "SetParent",
+                ]
+            },
+            {
+                interface: "Signature", // handwritten bridge
+                methods: [
+                    "Function",
+                ]
+            },
+            {
+                interface: "TSInterfaceBody", // handwritten bridge
+                methods: [
+                    "BodyPtr",
+                ]
+            },
             {
                 interface: "AnnotationDeclaration",
                 methods: [
@@ -192,10 +250,14 @@
         {
             name: "ArrowFunctionExpression",
             methods: [
+                {
+                    name: "Function",
+                    types: ["returnType"]
+                },
                 {
                     name: "FunctionConst",
                     types: ["returnType"]
-                }
+                },
             ]
         },
         {
@@ -281,6 +343,10 @@
         {
             name: "MethodDefinition",
             methods: [
+                {
+                    name: "Function",
+                    types: ["returnType"]
+                },
                 {
                     name: "FunctionConst",
                     types: ["returnType"]
@@ -358,6 +424,10 @@
                     name: "setSignaturePointer",
                     definition: "extension_ScriptFunctionSetSignaturePointer",
                 },
+                {
+                    name: "getParamsCasted",
+                    definition: "extension_ScriptFunctionGetParamsCasted",
+                },
                 {
                     name: "getPreferredReturnTypePointer",
                     definition: "extension_ScriptFunctionGetPreferredReturnTypePointer",
@@ -366,10 +436,6 @@
                     name: "setPreferredReturnTypePointer",
                     definition: "extension_ScriptFunctionSetPreferredReturnTypePointer",
                 },
-                {
-                    name: "setParams",
-                    definition: "extension_ScriptFunctionSetParams",
-                },
             ]
         },
         {
@@ -397,6 +463,10 @@
         {
             interface: "Program",
             methods: [
+                {
+                    name: "getAstCasted",
+                    definition: "extension_ProgramGetAstCasted",
+                },
                 {
                     name: "getExternalSources",
                     definition: "extension_ProgramGetExternalSources",
@@ -414,6 +484,10 @@
                     name: "getCol",
                     definition: "extension_SourcePositionGetCol",
                 },
+                {
+                    name: "getIndex",
+                    definition: "extension_SourcePositionGetIndex",
+                },
                 {
                     name: "toString",
                     definition: "extension_SourcePositionToString",
@@ -429,6 +503,15 @@
                 },
             ],
         },
+        {
+            interface: "ETSFunctionType",
+            methods: [
+                {
+                    name: "getParamsCasted",
+                    definition: "extension_ETSFunctionTypeGetParamsCasted",
+                },
+            ],
+        },
     ],
     parameters: [
         {

package/build/libarkts-copy/native/meson.build

@@ -24,6 +24,7 @@ is_cross = get_option('cross_compile')
 
 sources = [
     './src/common.cc',
+    './src/memoryTracker.cc',
     './src/bridges.cc',
     './src/generated/bridges.cc',
     get_option('interop_src_dir') / 'common-interop.cc',

package/build/libarkts-copy/native/src/bridges.cc

@@ -19,6 +19,10 @@
 #include <string>
 #include <mutex>
 
+/** XXX: If you add or remove methods that exist in C API,
+ * please change generator/options.json5 accordingly.
+ */
+
 KNativePointer impl_AstNodeRebind(KNativePointer contextPtr, KNativePointer nodePtr)
 {
     auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
@@ -433,10 +437,11 @@ KOALA_INTEROP_5(CreateDiagnosticInfo, KNativePointer, KNativePointer, KNativePoi
                 KStringArray, KInt, KNativePointer)
 
 KNativePointer impl_CreateSuggestionInfo(KNativePointer context, KNativePointer kind, KStringArray argsPtr,
-                                         KInt argc, KStringPtr& substitutionCode, KNativePointer range)
+                                         KInt argc, KStringPtr& substitutionCode, KStringPtr& title, KNativePointer range)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);
     const auto _kind = reinterpret_cast<es2panda_DiagnosticKind *>(kind);
+    const auto _title = getStringCopy(title);
     const auto _range = reinterpret_cast<es2panda_SourceRange *>(range);
     const std::size_t headerLen = 4;
     const char** _args = new const char*[argc];
@@ -449,9 +454,10 @@ KNativePointer impl_CreateSuggestionInfo(KNativePointer context, KNativePointer
         position += strLen;
     }
     const auto _substitutionCode = getStringCopy(substitutionCode);
-    return GetImpl()->CreateSuggestionInfo(_context, _kind, _args, argc, _substitutionCode, _range);
+    return GetImpl()->CreateSuggestionInfo(_context, _kind, _args, argc, _substitutionCode, _title, _range);
 }
-KOALA_INTEROP_6(CreateSuggestionInfo, KNativePointer, KNativePointer, KNativePointer, KStringArray, KInt, KStringPtr, KNativePointer)
+KOALA_INTEROP_7(CreateSuggestionInfo, KNativePointer, KNativePointer, KNativePointer, KStringArray, KInt,
+                KStringPtr, KStringPtr, KNativePointer)
 
 void impl_LogDiagnostic(KNativePointer context, KNativePointer kind, KStringArray argvPtr,
                         KInt argc, KNativePointer pos)
@@ -538,4 +544,4 @@ KNativePointer impl_CreateTypeNodeFromTsType(KNativePointer context, KNativePoin
     auto _typeAnnotation = GetImpl()->CreateOpaqueTypeNode(_context, _nodeTsType);
     return _typeAnnotation;
 }
-KOALA_INTEROP_2(CreateTypeNodeFromTsType, KNativePointer, KNativePointer, KNativePointer);
+KOALA_INTEROP_2(CreateTypeNodeFromTsType, KNativePointer, KNativePointer, KNativePointer);

package/build/libarkts-copy/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<es2panda_Context*>(context);
-    const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
-    const auto _paramsList = reinterpret_cast<es2panda_AstNode**>(paramsList);
-    const auto _paramsListLength = static_cast<KUInt>(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<es2panda_Context*>(context);
     const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);