@idlizer/arktscgen 2.1.10-arktscgen-6 → 2.1.10-arktscgen-9

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

@@ -26,9 +26,9 @@
             "es2panda_Config",
             "es2panda_Context",
             "es2panda_GlobalContext",
+            "es2panda_ExternalSource",
         ],
         "full": [
-            "es2panda_ExternalSource",
             "es2panda_OverloadInfo",
 
             'NodeTransformer',
@@ -41,8 +41,14 @@
             'PropertyProcessor',
             'PropertyTraverser',
 
-            'checker.*',
-            'varbinder.*',
+            'checker.ETSFunctionType', // conflict with ir
+            'checker.ETSUnionType',
+            'checker.ETSNullType',
+            'checker.ETSUndefinedType',
+            'checker.TypeParameter', // invalid args for a bridge
+
+            // ETSParser has no classInstance(receiver) argument,
+            // may be fixed in generator.
             'parser.*',
             'util.*',
             'gen.*',
@@ -51,21 +57,47 @@
 
             'parser.Program!',
             'es2panda.ArkTsConfig!',
-            // Do not support node type
-            //'varbinder.FunctionDecl!',
-            //'varbinder.InterfaceDecl!',
-            // MemberExpression has checker.ETSFunctionType ExtensionAccessorTypeConst(es2panda_Context context);
-            //'checker.ETSFunctionType!',
-            //'ir.ETSFunctionType',
 
-            'ir.Annotated',
-            'ir.AnnotationAllowed',
+            "varbinder.EnumVariable", // use typedef to union
+            "varbinder.ETSBinder", // char**
+            "varbinder.AnnotationUsage", // duplicate bridge
+            // These classes are descendants of AstNode
+            // and has a astTypeNode hint parameter in ctor
+            // because they are in another namespace (classes
+            // that have descendants do not have this parameter).
+            // Changing this behaviour in generator may cause regression.
+            "varbinder.InterfaceDecl",
+            "varbinder.FunctionDecl",
+            "varbinder.RecordTable",
+
+            // C api needs AstNode descendant but it isn't.
+            // TypedAstNode is.
             'ir.Typed',
+            // These are empty.
+            'ir.Annotated',
             'ir.VectorIterationGuard',
 
             'VoidPtr',
         ],
         "partial": [
+            {
+                interface: "TypeNode",
+                methods: [
+                    "GetType", // overlap base
+                ]
+            },
+            {
+                interface: "Scope",
+                methods: [
+                    "MergeBindings", // char**
+                ]
+            },
+            {
+                interface: "ModuleScope",
+                methods: [
+                    "LocalExportsConst" // char**
+                ]
+            },
             {
                 interface: "es2panda_Impl",
                 methods: [
@@ -74,9 +106,7 @@
 
                     // Handwritten bridges
                     "ConfigGetOptions", // handwritten class
-                    "ExternalSourceName", // handwritten class and used in panda API
                     "SourcePositionCol", // not in idl
-                    "ExternalSourcePrograms", // Wrong args
                     "LogDiagnostic", // not in idl
                     "CreateDiagnosticKind",
                     "GetSemanticErrors",
@@ -84,24 +114,16 @@
                     "GetPluginErrors",
                     "GetWarnings",
                     "NumberLiteralStrConst",
-                    "MemInitialize",
-                    "MemFinalize",
                 ],
             },
             {
                 interface: "MethodDefinition",
                 methods: [
-                    "GetOverloadInfo",  // return type is wrong
-                ]
-            },
-            {
-                interface: "Decl", // handwritten bridge
-                methods: [
-                    "Node"
+                    "GetOverloadInfo",  // returns es2panda_OverloadInfo which is data class
                 ]
             },
             {
-                interface: "ETSParser", // handwritten bridge
+                interface: "ETSParser", // handwritten bridge, fully ignored above.
                 methods: [
                     "BuildImportDeclaration",
                     "CreateExpression",
@@ -109,37 +131,6 @@
                     "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: [
-                    "PropertiesPtrConst" // interfaces create-to-param matching
-                ]
-            },
             {
                 interface: "NumberLiteral",
                 methods: [
@@ -149,33 +140,16 @@
                     "SetFloat"
                 ]
             },
-            {
-                interface: "AnnotationUsage",
-                methods: [
-                    "PropertiesPtrConst" // interfaces create-to-param matching
-                ]
-            },
-            {
-                interface: "TSInterfaceBody",
-                methods: [
-                    "BodyPtr" // interfaces create-to-param matching
-                ]
-            },
-            {
-                interface: "Signature",
-                methods: [
-                    "ProtectionFlagConst" // u8
-                ]
-            },
             {
                 interface: "ETSReExportDeclaration",
                 methods: [
-                    "Create", // sequence<String>
-                    "Update", // sequence<String>
-                    "GetUserPathsConst" // sequence<String>
+                    "Create", // char**
+                    "Update", // char**
+                    "GetUserPathsConst" // returns sequence<String>
                 ]
             },
             {
+                // Unclear why it's ignored
                 interface: "CharLiteral",
                 methods: [
                     "Create1", // KShort,
@@ -183,47 +157,61 @@
                     "CharConst", // KShort
                 ]
             },
-            {
-                interface: "ForUpdateStatement",
-                methods: [
-                    "Update" // forbidden naming
-                ]
-            },
-            {
-                interface: "CallExpression",
-                methods: [
-                    "Update" // differs from handwritten
-                ]
-            },
             {
                 interface: "TryStatement",
                 methods: [
-                    "AddFinalizerInsertion" // idl missing const
-                ]
-            },
-            {
-                interface: "MemberExpression",
-                methods: [
-                    "SetExtensionAccessorType" // ETSFunction type ambiguity
+                    "AddFinalizerInsertion" // non-const to const return conversion
                 ]
             },
             {
                 interface: "ArkTsConfig",
                 methods: [
-                    "EntriesConst",
                     "FilesConst",
-                    "Parse",
                 ]
             },
             {
                 interface: "ClassDefinition",
                 methods: [
-                    "SetBody", // handwritten
+                    "SetBody", // handwritten, no such method in idl.
+                               // probably, an optimized version.
                 ]
             },
         ]
     },
     nonNullable: [
+        {
+           name: "es2panda_Impl",
+           methods: [
+                {
+                    name: "CreateContextFromString",
+                    types: ["returnType"],
+                },
+                {
+                    name: "CreateContextFromFile",
+                    types: ["returnType"],
+                },
+                {
+                    name: "CreateCacheContextFromFile",
+                    types: ["returnType"],
+                },
+                {
+                    name: "CreateContextGenerateAbcForExternalSourceFiles",
+                    types: ["returnType"],
+                },
+                {
+                    name: "CreateContextFromStringWithHistory",
+                    types: ["returnType"],
+                },
+                {
+                    name: "ContextProgram",
+                    types: ["returnType"],
+                },
+                {
+                    name: "CreateGlobalContext",
+                    types: ["returnType"],
+                },
+            ],
+        },
         {
             name: "ArrowFunctionExpression",
             methods: [
@@ -601,6 +589,9 @@
                 {
                     name: "annotations",
                 },
+                {
+                    name: "modifierFlags",
+                },
             ],
         },
     ],

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

@@ -23,10 +23,10 @@ project(
 is_cross = get_option('cross_compile')
 
 sources = [
-    './src/common.cc',
-    './src/memoryTracker.cc',
-    './src/bridges.cc',
-    '../generated/native/bridges.cc',
+    './src/common.cpp',
+    './src/memoryTracker.cpp',
+    './src/bridges.cpp',
+    '../generated/native/bridges.cpp',
     get_option('interop_src_dir') / 'common-interop.cpp',
     get_option('interop_src_dir') / 'callback-resource.cpp',
     get_option('interop_src_dir') / 'interop-logging.cpp',
@@ -40,12 +40,66 @@ cflags = [
     '-DKOALA_NAPI',
 ]
 
+ldflags = []
+
 if (host_machine.system() == 'windows')
     cflags += ['-DKOALA_WINDOWS']
     # apply node.exe symbol loading hook
     sources += [
         get_option('interop_src_dir') / 'napi/win-dynamic-node.cpp'
     ]
+
+    cflags += [
+        '-nostdinc++',
+        '-I/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/include/c++/v1',
+        '-I/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/include/x86_64-unknown-linux-gnu/c++/v1',
+        '-std=c++17',
+        '-Wall',
+        '-Werror',
+        '-Wno-unused-variable',
+        '-Wno-unused-command-line-argument',
+        '-fPIC',
+        '-Wno-error=deprecated-copy',
+        '-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang',
+        '-ftrivial-auto-var-init=zero',
+        '-fcolor-diagnostics',
+        '-fmerge-all-constants',
+        '-Xclang',
+        '-mllvm',
+        '-Xclang',
+        '-instcombine-lower-dbg-declare=0',
+        '-no-canonical-prefixes',
+        '-fuse-ld=lld',
+        '-fno-stack-protector',
+        '-fno-strict-aliasing',
+        '-Wno-builtin-macro-redefined',
+        '-fms-extensions',
+        '-static',
+        '-rtlib=compiler-rt',
+        '-stdlib=libc++',
+        '-lunwind',
+        '-lpthread',
+        '-Qunused-arguments',
+        '-D__CUSTOM_SECURITY_LIBRARY',
+        '-fno-exceptions',
+        '-fno-rtti',
+    ]
+
+    ldflags += [
+        '-Wl,--fatal-warnings',
+        '-fPIC',
+        '-Wl,--as-needed',
+        '-fuse-ld=lld',
+        '-Wl,--icf=all',
+        '-m64',
+        '-static',
+        '-rtlib=compiler-rt',
+        '-stdlib=libc++',
+        '-std=c++17',
+        '-lunwind',
+        '-lpthread',
+        '-Qunused-arguments',
+    ]
 else
     cflags += ['-DKOALA_LINUX']
 endif
@@ -61,7 +115,6 @@ arch = target_machine.cpu()
 arch = archs.get(arch, arch)
 
 cflags_cross = []
-cflags_host = []
 suffix_host = '_' + os + '_' + arch
 suffix_cross = ''
 
@@ -111,8 +164,8 @@ shared_library(
         node_api_headers_dir / 'node-api-headers/include',
         node_addon_api_dir / 'node-addon-api',
     ],
-    cpp_args: cflags + cflags_host,
-    link_args: [cflags_host],
+    cpp_args: cflags,
+    link_args: ldflags,
     dependencies: []
 )
 

package/build/libarkts-copy/native/mingw.cross

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 [binaries]
-c = 'x86_64-w64-mingw32-gcc'
-cpp = 'x86_64-w64-mingw32-g++'
+c = ['/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/bin/clang', '-target', 'x86_64-pc-windows-gnu']
+cpp = ['/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/bin/clang++', '-target', 'x86_64-pc-windows-gnu', '-fuse-ld=lld', '-Wl,--icf=all']
 ar = 'x86_64-w64-mingw32-ar'
 windres = 'x86_64-w64-mingw32-windres'
 strip = 'x86_64-w64-mingw32-strip'
@@ -24,6 +24,3 @@ system = 'windows'
 cpu_family = 'x86_64'
 cpu = 'x86_64'
 endian = 'little'
-
-[properties]
-cpp_link_args = ['-lpsapi']

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

@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2024-2025 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.
+ */
+
+#include <mutex>
+#include <set>
+#include <string>
+
+#include "common.h"
+
+/** XXX: If you add or remove methods that exist in C API,
+ * please change generator/options.json5 accordingly.
+ */
+
+KNativePointer impl_ETSParserCreateExpression(KNativePointer contextPtr, KStringPtr& sourceCodePtr, KInt flagsT)
+{
+    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    auto flags = static_cast<Es2pandaExpressionParseFlags>(flagsT);
+
+    return GetImpl()->ETSParserCreateExpression(context, getStringCopy(sourceCodePtr), flags);
+}
+KOALA_INTEROP_3(ETSParserCreateExpression, KNativePointer, KNativePointer, KStringPtr, KInt)
+
+static KNativePointer impl_ProgramSourceFilePath(KNativePointer contextPtr, KNativePointer instancePtr)
+{
+    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    auto&& instance = reinterpret_cast<es2panda_Program*>(instancePtr);
+    auto&& result = GetImpl()->ProgramSourceFilePathConst(context, instance);
+    return StageArena::Strdup(result);
+}
+KOALA_INTEROP_2(ProgramSourceFilePath, KNativePointer, KNativePointer, KNativePointer);
+
+KNativePointer impl_ETSParserBuildImportDeclaration(KNativePointer context, KInt importKinds,
+    KNativePointerArray specifiers, KUInt specifiersSequenceLength, KNativePointer source, KNativePointer program,
+    KInt importFlag)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _kinds = static_cast<Es2pandaImportKinds>(importKinds);
+    const auto _specifiers = reinterpret_cast<es2panda_AstNode**>(specifiers);
+    const auto _specifiersSequenceLength = static_cast<size_t>(specifiersSequenceLength);
+    const auto _source = reinterpret_cast<es2panda_AstNode*>(source);
+    const auto _program = reinterpret_cast<es2panda_Program*>(program);
+    const auto _importFlag = static_cast<Es2pandaImportFlags>(importFlag);
+
+    return GetImpl()->ETSParserBuildImportDeclaration(
+        _context, _kinds, _specifiers, _specifiersSequenceLength, _source, _program, _importFlag);
+}
+KOALA_INTEROP_7(ETSParserBuildImportDeclaration, KNativePointer, KNativePointer, KInt, KNativePointerArray, KUInt,
+    KNativePointer, KNativePointer, KInt)
+
+KNativePointer impl_ETSParserGetImportPathManager(KNativePointer contextPtr)
+{
+    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    return GetImpl()->ETSParserGetImportPathManager(context);
+}
+KOALA_INTEROP_1(ETSParserGetImportPathManager, KNativePointer, KNativePointer);
+
+KInt impl_SourcePositionCol(KNativePointer context, KNativePointer instance)
+{
+    auto&& _context_ = reinterpret_cast<es2panda_Context*>(context);
+    auto&& _instance_ = reinterpret_cast<es2panda_SourcePosition*>(instance);
+    return GetImpl()->SourcePositionCol(_context_, _instance_);
+}
+KOALA_INTEROP_2(SourcePositionCol, KInt, KNativePointer, KNativePointer);
+
+KNativePointer impl_ConfigGetOptions(KNativePointer config)
+{
+    const auto _config = reinterpret_cast<es2panda_Config*>(config);
+    auto result = GetImpl()->ConfigGetOptions(_config);
+    return (void*)result;
+}
+KOALA_INTEROP_1(ConfigGetOptions, KNativePointer, KNativePointer)
+
+KNativePointer impl_OptionsArkTsConfig(KNativePointer context, KNativePointer options)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _options = reinterpret_cast<es2panda_Options*>(options);
+    auto result = GetImpl()->OptionsUtilArkTSConfigConst(_context, _options);
+    return (void*)result;
+}
+KOALA_INTEROP_2(OptionsArkTsConfig, KNativePointer, KNativePointer, KNativePointer)
+
+// From koala-wrapper
+// Improve: check if some code should be generated
+
+std::set<std::string> globalStructInfo;
+#ifdef _GLIBCXX_HAS_GTHREADS
+std::mutex g_structMutex;
+#endif
+
+void impl_InsertGlobalStructInfo(KNativePointer contextPtr, KStringPtr& instancePtr)
+{
+#ifdef _GLIBCXX_HAS_GTHREADS
+    std::lock_guard<std::mutex> lock(g_structMutex);
+#endif
+    globalStructInfo.insert(getStringCopy(instancePtr));
+    return;
+}
+KOALA_INTEROP_V2(InsertGlobalStructInfo, KNativePointer, KStringPtr);
+
+KBoolean impl_HasGlobalStructInfo(KNativePointer contextPtr, KStringPtr& instancePtr)
+{
+#ifdef _GLIBCXX_HAS_GTHREADS
+    std::lock_guard<std::mutex> lock(g_structMutex);
+#endif
+    return globalStructInfo.count(getStringCopy(instancePtr));
+}
+KOALA_INTEROP_2(HasGlobalStructInfo, KBoolean, KNativePointer, KStringPtr);
+
+KNativePointer impl_ClassVariableDeclaration(KNativePointer context, KNativePointer classInstance)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _classInstance = reinterpret_cast<es2panda_AstNode*>(classInstance);
+    auto _typedTsType = GetImpl()->TypedTsType(_context, _classInstance);
+    if (_typedTsType == nullptr) {
+        return nullptr;
+    }
+    const auto _instanceType = reinterpret_cast<es2panda_Type*>(_typedTsType);
+    auto _typeVar = GetImpl()->TypeVariable(_context, _instanceType);
+    if (_typeVar == nullptr) {
+        return nullptr;
+    }
+    const auto result = reinterpret_cast<es2panda_Declaration*>(GetImpl()->VariableDeclaration(_context, _typeVar));
+    const auto declNode = GetImpl()->DeclNode(_context, result);
+    return declNode;
+}
+KOALA_INTEROP_2(ClassVariableDeclaration, KNativePointer, KNativePointer, KNativePointer)
+
+KNativePointer impl_ETSParserGetGlobalProgramAbsName(KNativePointer contextPtr)
+{
+    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    auto result = GetImpl()->ETSParserGetGlobalProgramAbsName(context);
+    return new std::string(result); // O_o
+}
+KOALA_INTEROP_1(ETSParserGetGlobalProgramAbsName, KNativePointer, KNativePointer)
+
+KNativePointer impl_CreateDiagnosticKind(KNativePointer context, KStringPtr& message, KInt type)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _message = getStringCopy(message);
+    const auto _type = static_cast<es2panda_PluginDiagnosticType>(type);
+    return const_cast<es2panda_DiagnosticKind*>(GetImpl()->CreateDiagnosticKind(_context, _message, _type));
+}
+KOALA_INTEROP_3(CreateDiagnosticKind, KNativePointer, KNativePointer, KStringPtr, KInt)
+
+void impl_LogDiagnostic(
+    KNativePointer context, KNativePointer kind, KStringArray& argvPtr, KInt argc, KNativePointer pos)
+{
+    auto&& _context_ = reinterpret_cast<es2panda_Context*>(context);
+    auto&& _kind_ = reinterpret_cast<es2panda_DiagnosticKind*>(kind);
+    auto&& _pos_ = reinterpret_cast<es2panda_SourcePosition*>(pos);
+    GetImpl()->LogDiagnostic(_context_, _kind_, getStringArray(argvPtr), argc, _pos_);
+}
+KOALA_INTEROP_V5(LogDiagnostic, KNativePointer, KNativePointer, KStringArray, KInt, KNativePointer)
+
+KNativePointer impl_AnnotationUsageIrPropertiesPtrConst(KNativePointer context, KNativePointer receiver)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
+    std::size_t length;
+    auto result = GetImpl()->AnnotationUsageIrPropertiesPtrConst(_context, _receiver, &length);
+    return StageArena::CloneVector(result, length);
+}
+KOALA_INTEROP_2(AnnotationUsageIrPropertiesPtrConst, KNativePointer, KNativePointer, KNativePointer);