@idlizer/arktscgen 2.1.10-arktscgen-7 → 2.1.10-arktscgen-10

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,34 +106,23 @@
 
                     // 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",
+                    "CreateDiagnosticKind", // no const suffix in idl
                     "GetSemanticErrors",
                     "GetSyntaxErrors",
                     "GetPluginErrors",
                     "GetWarnings",
                     "NumberLiteralStrConst",
-                    "MemInitialize",
-                    "MemFinalize",
                 ],
             },
             {
                 interface: "MethodDefinition",
                 methods: [
-                    "GetOverloadInfo",  // return type is wrong
+                    "GetOverloadInfo",  // returns es2panda_OverloadInfo which is data class
                 ]
             },
             {
-                interface: "Decl", // handwritten bridge
-                methods: [
-                    "Node"
-                ]
-            },
-            {
-                interface: "ETSParser", // handwritten bridge
+                interface: "ETSParser", // handwritten bridge, fully ignored above.
                 methods: [
                     "BuildImportDeclaration",
                     "CreateExpression",
@@ -109,37 +130,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 +139,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 +156,79 @@
                     "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", // TODO: implement in compiler some time
                 ]
             },
         ]
     },
+    globalAliases: {
+        classes: [
+            "parser.Program",
+            "es2panda.ArkTsConfig",
+        ],
+        functions: [
+            "compiler.*",
+            "compiler.ProceedToState!",
+            "compiler.Is*!",
+        ]
+    },
     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: "CreateDiagnosticInfo",
+                    types: ["returnType"],
+                },
+                {
+                    name: "CreateSuggestionInfo",
+                    types: ["returnType"],
+                },
+            ],
+        },
         {
             name: "ArrowFunctionExpression",
             methods: [
@@ -601,6 +606,9 @@
                 {
                     name: "annotations",
                 },
+                {
+                    name: "modifierFlags",
+                },
             ],
         },
     ],

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

@@ -28,7 +28,6 @@ sources = [
     './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',
     get_option('interop_src_dir') / 'napi' / 'convertors-napi.cpp',
 ]
@@ -40,19 +39,11 @@ cflags = [
     '-DKOALA_NAPI',
 ]
 
-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'
-    ]
-else
-    cflags += ['-DKOALA_LINUX']
-endif
+ldflags = []
 
 arch = target_machine.cpu()
 
-oses = { 'darwin': 'macos' }  # rename meson default names to convenient ones
+oses = { 'darwin': 'macos', 'windows': 'win32' }  # rename meson default names to convenient ones
 archs = { 'x86_64': 'x64', 'aarch64': 'arm64', 'armv7-a': 'arm32', 'wasm32': 'wasm' }
 
 os = target_machine.system()
@@ -60,8 +51,24 @@ os = oses.get(os, os)
 arch = target_machine.cpu()
 arch = archs.get(arch, arch)
 
+if os == 'win32'
+    cflags += ['-DKOALA_WINDOWS']
+    # apply node.exe symbol loading hook
+    sources += [
+        get_option('interop_src_dir') / 'napi/win-dynamic-node.cpp'
+    ]
+    ldflags += ['-static']
+endif
+
+if os == 'linux'
+    cflags += ['-DKOALA_LINUX']
+endif
+
+if os == 'macos'
+    cflags += ['-DKOALA_MACOS']
+endif
+
 cflags_cross = []
-cflags_host = []
 suffix_host = '_' + os + '_' + arch
 suffix_cross = ''
 
@@ -99,6 +106,7 @@ shared_library(
         'b_lundef=false',
     ],
     install: true,
+    install_dir: meson.current_source_dir() + '/../build/native/build',
     name_prefix: '',
     name_suffix: 'node',
     include_directories: [
@@ -111,8 +119,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

@@ -25,5 +25,5 @@ cpu_family = 'x86_64'
 cpu = 'x86_64'
 endian = 'little'
 
-[properties]
+[built-in options]
 cpp_link_args = ['-lpsapi']