@idlizer/arktscgen 2.1.9-arktscgen-9 → 2.1.10-arktscgen-3

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

@@ -0,0 +1,178 @@
+/**
+ * Copyright (c) 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 "memoryTracker.h"
+
+#include <cstdint>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <system_error>
+#include <vector>
+#include <regex>
+
+#ifdef _WIN32
+    #include <windows.h>
+    #include <psapi.h>
+#elif defined(__APPLE__)
+    #include <mach/mach.h>
+    #include <sys/resource.h>
+#elif defined(__linux__)
+    #include <sys/resource.h>
+    #include <unistd.h>
+#endif
+
+constexpr const char* UNIT_K = "kB";
+constexpr size_t BYTES_PER_KB = 1024;
+constexpr const char* MEMORY_STATUS_FILE = "/proc/self/status";
+const std::regex VM_RSS_REGEX(R"#(VmRSS:\s*(\d+)\s*([kKmMgG]?B))#",
+    std::regex_constants::ECMAScript | std::regex_constants::icase);
+const std::regex VM_SIZE_REGEX(R"#(VmSize:\s*(\d+)\s*([kKmMgG]?B))#",
+    std::regex_constants::ECMAScript | std::regex_constants::icase);
+
+constexpr int MATCH_GROUP_VALUE = 1;
+constexpr int MATCH_GROUP_UNIT = 2;
+constexpr int MATCH_GROUP_SIZE = 3;
+
+#if defined(_WIN32)
+MemoryStats GetMemoryStats()
+{
+    MemoryStats stats = {0, 0, 0, 0, 0};
+    PROCESS_MEMORY_COUNTERS_EX pmc;
+    if (GetProcessMemoryInfo(GetCurrentProcess(),
+        reinterpret_cast<PROCESS_MEMORY_COUNTERS*>(&pmc), sizeof(pmc))) {
+        stats.currentRss = pmc.WorkingSetSize;
+        stats.peakRss = pmc.PeakWorkingSetSize;
+        stats.currentVss = pmc.PrivateUsage; // 私有内存使用量
+        stats.pageFaultsMinor = pmc.PageFaultCount;
+        // Windows API不直接提供主缺页错误计数
+        stats.pageFaultsMajor = 0;
+    }
+    return stats;
+}
+
+#elif defined(__APPLE__)
+MemoryStats GetMemoryStats()
+{
+    MemoryStats stats = {0, 0, 0, 0, 0};
+    struct rusage ru;
+    if (getrusage(RUSAGE_SELF, &ru) == 0) {
+        stats.currentRss = 0; // macOS需要专用API获取当前内存
+        stats.peakRss = ru.ru_maxrss; // macOS返回字节
+        stats.pageFaultsMinor = ru.ru_minflt;
+        stats.pageFaultsMajor = ru.ru_majflt;
+        
+        // 获取当前内存使用 (macOS专用API)
+        task_basic_info info;
+        mach_msg_type_number_t count = TASK_BASIC_INFO_64_COUNT;
+        if (task_info(mach_task_self(), TASK_BASIC_INFO_64,
+            (task_info_t)&info, &count) == KERN_SUCCESS) {
+            stats.currentRss = info.resident_size; // 物理内存使用量
+            stats.currentVss = info.virtual_size;  // 虚拟内存总量
+        }
+    }
+    return stats;
+}
+
+#elif defined(__linux__)
+MemoryStats GetMemoryStats()
+{
+    MemoryStats stats = {0, 0, 0, 0, 0};
+    struct rusage ru;
+    if (getrusage(RUSAGE_SELF, &ru) == 0) {
+        stats.peakRss = static_cast<size_t>(ru.ru_maxrss) * BYTES_PER_KB; // KB -> 字节
+        stats.pageFaultsMinor = ru.ru_minflt;
+        stats.pageFaultsMajor = ru.ru_majflt;
+    }
+    std::ifstream statusFile(MEMORY_STATUS_FILE);
+    if (!statusFile) {
+        return stats;
+    }
+    std::string line;
+    std::smatch matches;
+    while (std::getline(statusFile, line)) {
+        if (std::regex_match(line, matches, VM_RSS_REGEX) && matches.size() >= MATCH_GROUP_SIZE) {
+            stats.currentRss = std::stoull(matches[MATCH_GROUP_VALUE].str());
+            std::string unit = matches[MATCH_GROUP_UNIT].str();
+            if (unit == UNIT_K) {
+                stats.currentRss *= BYTES_PER_KB;
+            }
+        } else if (std::regex_match(line, matches, VM_SIZE_REGEX) && matches.size() >= MATCH_GROUP_SIZE) {
+            stats.currentVss = std::stoull(matches[MATCH_GROUP_VALUE].str());
+            std::string unit = matches[MATCH_GROUP_UNIT].str();
+            if (unit == UNIT_K) {
+                stats.currentVss *= BYTES_PER_KB;
+            }
+        }
+    }
+    return stats;
+}
+#endif
+
+void MemoryTracker::Reset()
+{
+    baseline = GetMemoryStats();
+}
+
+MemoryStats MemoryTracker::GetDelta()
+{
+    MemoryStats current = GetMemoryStats();
+    MemoryStats delta = {
+        current.currentRss - baseline.currentRss,
+        current.peakRss - baseline.peakRss,
+        current.currentVss - baseline.currentVss,
+        current.pageFaultsMinor - baseline.pageFaultsMinor,
+        current.pageFaultsMajor - baseline.pageFaultsMajor
+    };
+    return delta;
+}
+
+template<typename Func>
+MemoryStats MemoryTracker::MeasureMemory(Func&& func)
+{
+    Reset();
+    auto preStats = GetMemoryStats();
+    func();
+    auto postStats = GetMemoryStats();
+
+    return {
+        postStats.currentRss - preStats.currentRss,
+        postStats.peakRss - preStats.peakRss,
+        postStats.currentVss - preStats.currentVss,
+        postStats.pageFaultsMinor - preStats.pageFaultsMinor,
+        postStats.pageFaultsMajor - preStats.pageFaultsMajor
+    };
+}
+
+void MemoryTracker::Report(MemoryStats stats)
+{
+    auto formatBytes = [](size_t bytes) -> std::string {
+        const double kb = BYTES_PER_KB;
+        const double mb = kb * BYTES_PER_KB;
+        const double gb = mb * BYTES_PER_KB;
+
+        if (bytes > gb) return std::to_string(bytes / gb) + " GB";
+        if (bytes > mb) return std::to_string(bytes / mb) + " MB";
+        if (bytes > kb) return std::to_string(bytes / kb) + " KB";
+        return std::to_string(bytes) + " B";
+    };
+
+    std::cout << "Current RSS: " << formatBytes(stats.currentRss) << "\n";
+    std::cout << "Peak RSS   : " << formatBytes(stats.peakRss) << "\n";
+    std::cout << "VSS        : " << formatBytes(stats.currentVss) << "\n";
+    std::cout << "FaultsMinor: " << stats.pageFaultsMinor << "\n";
+    std::cout << "FaultsMajor: " << stats.pageFaultsMajor << "\n";
+    return;
+}

package/build/libarkts-copy/native/src/memoryTracker.h

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 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.
+ */
+
+#ifndef KOALA_MEMORY_TRACKER
+#define KOALA_MEMORY_TRACKER
+
+#include <cstddef>
+#include <string>
+
+// 内存统计结构体
+struct MemoryStats {
+    size_t currentRss = 0;    // 当前驻留集大小 (字节)
+    size_t peakRss = 0;       // 峰值驻留集大小 (字节)
+    size_t currentVss = 0;    // 当前虚拟内存大小 (字节)
+    size_t pageFaultsMinor = 0;  // 小页错误次数
+    size_t pageFaultsMajor = 0;  // 大页错误次数
+};
+
+class MemoryTracker {
+public:
+    MemoryTracker()
+    {
+        Reset();
+    }
+
+    void Reset();
+    MemoryStats GetDelta();
+
+    template<typename Func>
+    MemoryStats MeasureMemory(Func&& func);
+
+    void Report(MemoryStats stats);
+
+private:
+    MemoryStats baseline;
+};
+
+MemoryStats GetMemoryStats();
+
+#endif

package/build/libarkts-copy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@koalaui/libarkts",
-    "version": "1.7.6+devel",
+    "version": "1.7.9+devel",
     "bin": "./lib/es2panda",
     "typesVersions": {
         "*": {
@@ -23,19 +23,18 @@
         "./plugins/build/src/**/*"
     ],
     "config": {
-        "gen_version": "2.1.9-arktscgen-8",
         "panda_sdk_path": "../../incremental/tools/panda/node_modules/@panda/sdk",
-        "ohos_panda_sdk_path": "../build/sdk",
         "panda_sdk_version": "next"
     },
     "dependencies": {
         "@koalaui/ets-tsc": "4.9.5-r6",
-        "@koalaui/build-common": "1.7.6+devel",
-        "@koalaui/compat": "1.7.6+devel",
-        "@koalaui/common": "1.7.6+devel",
-        "@koalaui/harness": "1.7.6+devel",
-        "@koalaui/interop": "1.7.6+devel",
-        "@koalaui/fast-arktsc": "file:../fast-arktsc",
+        "@koalaui/build-common": "1.7.9+devel",
+        "@koalaui/compat": "1.7.9+devel",
+        "@koalaui/common": "1.7.9+devel",
+        "@koalaui/harness": "1.7.9+devel",
+        "@koalaui/interop": "1.7.9+devel",
+        "@koalaui/fast-arktsc": "1.7.9+devel",
+        "@idlizer/arktscgen": "2.1.10-arktscgen-2",
         "@types/mocha": "^9.1.0",
         "mocha": "^9.2.2",
         "node-addon-api": "8.0.0",
@@ -70,18 +69,16 @@
         "run:memo": "npm run compile && npm run compile:plugins && npm run compile --prefix ../memo-plugin && npm run memo",
         "run:abc": "$npm_package_config_panda_sdk_path/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=$npm_package_config_panda_sdk_path/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main",
         "mocha": "PANDA_SDK_PATH=${PANDA_SDK_PATH:=$npm_package_config_panda_sdk_path} TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0",
-        "mocha:ohos": "PANDA_SDK_PATH=${PANDA_SDK_PATH:=$npm_package_config_ohos_panda_sdk_path} TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0",
         "test:light": "npm run mocha",
         "test": "npm run compile:native && npm run test:light",
         "test:golden": "npm run compile:native && TEST_GOLDEN=1 npm run test:light",
         "compile:playground": "cd playground && meson setup build && meson compile -C build",
-        "run:playground": "npm run compile:playground && ./playground/build/playground.out",
+        "run:playground": "npm run compile:playground && mkdir -p build && ./playground/build/playground _ --extension ets --stdlib ../../incremental/tools/panda/node_modules/@panda/sdk/ets/stdlib --output build/playground.abc ./playground/src/main.ets",
         "panda:sdk:clean": "cd ../../incremental/tools/panda && rimraf node_modules",
         "panda:sdk:install": "cd ../../incremental/tools/panda && echo \"Installing panda sdk $npm_package_config_panda_sdk_version\" && PANDA_SDK_VERSION=$npm_package_config_panda_sdk_version npm run panda:sdk:install",
         "panda:sdk:reinstall": "npm run panda:sdk:clean && npm run panda:sdk:install",
         "regenerate:current": "rimraf -rf src/generated && npm run compile -C ../../../arktscgen && node ../../../arktscgen --panda-sdk-path $npm_package_config_panda_sdk_path --output-dir ../ --options-file ./generator/options.json5 --no-initialize --debug",
-        "regenerate": "rimraf -rf src/generated && npx --yes @idlizer/arktscgen@$npm_package_config_gen_version --panda-sdk-path $npm_package_config_panda_sdk_path --output-dir ../ --options-file ./generator/options.json5 --no-initialize",
-        "regenerate:ohos": "npx --yes @idlizer/arktscgen@$npm_package_config_gen_version --panda-sdk-path ${PANDA_SDK_PATH:=$npm_package_config_ohos_panda_sdk_path} --output-dir ../ --options-file ./generator/options.json5 --no-initialize",
+        "regenerate": "rimraf -rf src/generated && arktscgen --panda-sdk-path ${PANDA_SDK_PATH:=$npm_package_config_panda_sdk_path} --output-dir ../ --options-file ./generator/options.json5 --no-initialize",
         "reinstall:regenerate": "npm run panda:sdk:reinstall && npm run regenerate && git diff --shortstat"
     }
-}
+}

package/build/libarkts-copy/src/Es2pandaNativeModule.ts

@@ -39,18 +39,9 @@ export class Es2pandaNativeModule {
     _AstNodeRebind(context: KPtr, node: KPtr): void {
         throw new Error("Not implemented")
     }
-    _AstNodeRecheck(context: KPtr, node: KPtr): void {
-        throw new Error("Not implemented")
-    }
     _ContextState(context: KPtr): KInt {
         throw new Error("Not implemented")
     }
-    _ContextErrorMessage(context: KPtr): KPtr {
-        throw new Error("Not implemented")
-    }
-    _GetAllErrorMessages(context: KPtr): KPtr {
-        throw new Error("Not implemented")
-    }
     _AstNodeChildren(context: KPtr, node: KPtr): KPtr {
         throw new Error("Not implemented")
     }
@@ -90,12 +81,6 @@ export class Es2pandaNativeModule {
     _ProceedToState(context: KPtr, state: number): void {
         throw new Error("Not implemented")
     }
-    _ContextProgram(context: KPtr): KPtr {
-        throw new Error("Not implemented")
-    }
-    _ProgramAst(context: KPtr, program: KPtr): KPtr {
-        throw new Error("Not implemented")
-    }
     _CheckerStartChecker(context: KPtr): KBoolean {
         throw new Error("Not implemented")
     }
@@ -108,6 +93,9 @@ export class Es2pandaNativeModule {
     _AstNodeSetChildrenParentPtr(context: KPtr, node: KPtr): void {
         throw new Error("Not implemented")
     }
+    _AstNodeOnUpdate(context: KPtr, newNode: KPtr, replacedNode: KPtr): void {
+        throw new Error("Not implemented")
+    }
     _AstNodeUpdateAll(context: KPtr, node: KPtr): void {
         throw new Error("Not implemented")
     }
@@ -117,9 +105,6 @@ export class Es2pandaNativeModule {
     _DeclNode(context: KPtr, decl: KPtr): KPtr {
         throw new Error("Not implemented")
     }
-    _DeclarationFromIdentifier(context: KPtr, identifier: KPtr): KPtr {
-        throw new Error("Not implemented")
-    }
     _ProgramSourceFilePath(context: KNativePointer, instance: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
@@ -138,22 +123,13 @@ export class Es2pandaNativeModule {
     _ETSParserBuildImportDeclaration(context: KNativePointer, importKinds: KInt, specifiers: KNativePointerArray, specifiersSequenceLength: KUInt, source: KNativePointer, program: KNativePointer, flags: KInt): KNativePointer {
         throw new Error("Not implemented");
     }
-    _InsertETSImportDeclarationAndParse(context: KNativePointer, program: KNativePointer, importDeclaration: KNativePointer): void {
-        throw new Error("Not implemented");
-    }
     _ImportPathManagerResolvePathConst(context: KNativePointer, importPathManager: KNativePointer, currentModulePath: String, importPath: String, sourcePosition: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
     _ETSParserGetImportPathManager(context: KNativePointer): KPtr {
         throw new Error("Not implemented");
     }
-    _CreateSourcePosition(context: KNativePointer, index: KInt, line: KInt): KNativePointer {
-        throw new Error("Not implemented");
-    }
-    _SourcePositionIndex(context: KNativePointer, instance: KNativePointer): KInt {
-        throw new Error("Not implemented");
-    }
-    _SourcePositionLine(context: KNativePointer, instance: KNativePointer): KInt {
+    _SourcePositionCol(context: KNativePointer, instance: KNativePointer): KUInt {
         throw new Error("Not implemented");
     }
     _ConfigGetOptions(config: KNativePointer): KNativePointer {
@@ -162,6 +138,9 @@ export class Es2pandaNativeModule {
     _OptionsArkTsConfig(context: KNativePointer, options: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
+    _Checker_CreateOpaqueTypeNode(context: KNativePointer, type: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
+    }
     _Checker_ScriptFunctionSignature(context: KNativePointer, node: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
@@ -177,33 +156,30 @@ export class Es2pandaNativeModule {
     _Checker_ScriptFunctionSetPreferredReturnType(context: KNativePointer, node: KNativePointer, type: KNativePointer): void {
         throw new Error("Not implemented");
     }
-    _Checker_TypeToString(context: KNativePointer, type: KNativePointer): KNativePointer {
+    _Checker_ExpressionGetPreferredType(context: KNativePointer, node: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
-    _Checker_TypeNodeGetType(context: KNativePointer, node: KNativePointer): KNativePointer {
+    _Checker_ExpressionSetPreferredType(context: KNativePointer, node: KNativePointer, type: KNativePointer): void {
         throw new Error("Not implemented");
     }
-    _JsdocStringFromDeclaration(context: KPtr, node: KPtr): KPtr {
-        throw new Error("Not implemented")
-    }
-
-    // From koala-wrapper
-    _ClassVariableDeclaration(context: KNativePointer, classInstance: KNativePointer): KNativePointer {
-        throw new Error("Not implemented")
+    _Checker_TypeToString(context: KNativePointer, type: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
     }
-    _IsMethodDefinition(node: KPtr): KBoolean {
-        throw new Error("Not implemented")
+    _Checker_TypeClone(context: KNativePointer, type: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
     }
-    _SourceRangeStart(context: KNativePointer, range: KNativePointer): KNativePointer {
-        throw new Error("Not implemented")
+    _Checker_TypeNodeGetType(context: KNativePointer, node: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
     }
-    _SourceRangeEnd(context: KNativePointer, range: KNativePointer): KNativePointer {
+    _ScriptFunctionSetParams(context: KNativePointer, receiver: KNativePointer, paramsList: BigUint64Array, paramsListLength: KUInt): void {
         throw new Error("Not implemented")
     }
-    _CreateSourceRange(context: KNativePointer, start: KNativePointer, end: KNativePointer): KNativePointer {
+    _ClassDefinitionSetBody(context: KNativePointer, receiver: KNativePointer, body: BigUint64Array, bodyLength: KUInt): void {
         throw new Error("Not implemented")
     }
-    _IsArrayExpression(node: KPtr): KBoolean {
+
+    // From koala-wrapper
+    _ClassVariableDeclaration(context: KNativePointer, classInstance: KNativePointer): KNativePointer {
         throw new Error("Not implemented")
     }
     _ETSParserGetGlobalProgramAbsName(context: KNativePointer): KNativePointer {
@@ -216,16 +192,12 @@ export class Es2pandaNativeModule {
         throw new Error("Not implemented")
     }
     _CreateSuggestionInfo(context: KNativePointer, kind: KNativePointer, args: string[],
-        argc: number, substitutionCode: string, range: KNativePointer): KNativePointer {
+        argc: number, substitutionCode: string, title: string, range: KNativePointer): KNativePointer {
         throw new Error("Not implemented")
     }
     _LogDiagnostic(context: KNativePointer, kind: KNativePointer, argv: string[], argc: number, pos: KNativePointer): void {
         throw new Error("Not implemented")
     }
-    _LogDiagnosticWithSuggestion(context: KNativePointer, diagnosticInfo: KNativePointer,
-        suggestionInfo?: KNativePointer): void {
-        throw new Error("Not implemented")
-    }
     _SetUpSoPath(soPath: string): void {
         throw new Error("Not implemented")
     }
@@ -241,15 +213,32 @@ export class Es2pandaNativeModule {
     _GenerateTsDeclarationsFromContext(config: KPtr, outputDeclEts: String, outputEts: String, exportAll: KBoolean, isolated: KBoolean, recordFile: String): KPtr {
         throw new Error("Not implemented")
     }
-    _GenerateStaticDeclarationsFromContext(config: KPtr, outputPath: String): KPtr {
-        throw new Error("Not implemented")
-    }
     _AstNodeProgram(context: KNativePointer, instance: KNativePointer): KNativePointer {
         throw new Error("Not implemented")
     }
     _CreateContextGenerateAbcForExternalSourceFiles(config: KPtr, fileCount: KInt, filenames: string[]): KPtr {
         throw new Error('Not implemented');
     }
+
+    _GetCompilationMode(config: KNativePointer): KInt {
+        throw new Error('Not implemented');
+    }
+
+    _CreateTypeNodeFromTsType(context: KNativePointer, classInstance: KNativePointer): KNativePointer {
+        throw new Error('Not implemented');
+    }
+
+    _MemoryTrackerReset(context: KNativePointer): void {
+        throw new Error('Not implemented');
+    }
+
+    _MemoryTrackerGetDelta(context: KNativePointer): void {
+        throw new Error('Not implemented');
+    }
+
+    _MemoryTrackerPrintCurrent(context: KNativePointer): void {
+        throw new Error('Not implemented');
+    }
 }
 
 export function findNativeModule(): string {

package/build/libarkts-copy/src/arkts-api/ImportStorage.ts

@@ -62,7 +62,7 @@ export class ImportStorage {
                         Es2pandaImportFlags.IMPORT_FLAGS_NONE, // Improve: where to get it?
                     )
                 )
-                global.es2panda._InsertETSImportDeclarationAndParse(global.context, this.program.peer, importDeclaration.peer)
+                global.generatedEs2panda._InsertETSImportDeclarationAndParse(global.context, this.program.peer, importDeclaration.peer)
                 newStatements.push(importDeclaration)
             } else {
                 newStatements.push(statement)

package/build/libarkts-copy/src/arkts-api/class-by-peer.ts

@@ -16,17 +16,18 @@
 import { Es2pandaAstNodeType } from "../generated/Es2pandaEnums"
 import { throwError } from "../utils"
 import { global } from "./static/global"
-import { KNativePointer, nullptr } from "@koalaui/interop"
+import { KNativePointer } from "@koalaui/interop"
 import { AstNode } from "./peers/AstNode"
 import { NodeCache } from "./node-cache"
 
 export const nodeByType = new Map<Es2pandaAstNodeType, (peer: KNativePointer) => AstNode>([])
 
-export function classByPeer<T extends AstNode>(peer: KNativePointer): T {
-    if (peer === nullptr) {
-        throwError('classByPeer: peer is NULLPTR')
+export function nodeFrom<T extends AstNode>(peer: KNativePointer, typeHint?: Es2pandaAstNodeType): T {
+    const fromCache = NodeCache.get<T>(peer)
+    if (fromCache) {
+        return fromCache
     }
-    const type = global.generatedEs2panda._AstNodeTypeConst(global.context, peer)
+    const type = typeHint ?? global.generatedEs2panda._AstNodeTypeConst(global.context, peer)
     const create = nodeByType.get(type) ?? throwError(`unknown node type: ${type}`)
-    return NodeCache.cached(peer, create)
+    return create(peer) as T
 }

package/build/libarkts-copy/src/arkts-api/factory/nodeFactory.ts

@@ -47,11 +47,12 @@ import { createMethodDefinition, updateMethodDefinition } from "../node-utilitie
 import { createTSInterfaceDeclaration, updateTSInterfaceDeclaration } from "../node-utilities/TSInterfaceDeclaration"
 import { updateTryStatement } from "../node-utilities/TryStatement"
 import { createAssignmentExpression, updateAssignmentExpression } from "../node-utilities/AssignmentExpression"
-import { updateObjectExpression } from "../node-utilities/ObjectExpression"
+import { createObjectExpression, updateObjectExpression } from "../node-utilities/ObjectExpression"
 import { updateETSTuple } from "../node-utilities/ETSTuple"
 import { createArrayExpression, updateArrayExpression } from "../node-utilities/ArrayExpression"
 import { updateBlockStatement } from "../node-utilities/BlockStatement"
 import { updateETSModule } from "../node-utilities/ETSModule"
+import { createOpaqueTypeNode } from "../node-utilities/OpaqueTypeNode"
 
 export const factory = {
     ...generatedFactory,
@@ -110,7 +111,7 @@ export const factory = {
     createAssignmentExpression,
     updateAssignmentExpression,
 
-    createObjectExpression: ObjectExpression.createObjectExpression,
+    createObjectExpression,
     updateObjectExpression,
 
     createETSTuple: ETSTuple.create2ETSTuple,
@@ -123,4 +124,6 @@ export const factory = {
     updateBlockStatement,
 
     updateInterfaceBody : generatedFactory.updateTSInterfaceBody,
+
+    createOpaqueTypeNode,
 }

package/build/libarkts-copy/src/arkts-api/index.ts

@@ -16,12 +16,12 @@
 export * from "../generated/Es2pandaEnums"
 export * from "../generated"
 
+export * from "./utilities/performance"
 export * from "./utilities/private"
 export * from "./utilities/public"
 export * from "./factory/nodeFactory"
 export * from "./visitor"
 export * from "./AbstractVisitor"
-export * from "./ChainExpressionFilter"
 export * from "./plugins"
 export * from "./ImportStorage"
 export * from "./ProgramProvider"
@@ -32,6 +32,7 @@ export * from "./peers/Context"
 export { GlobalContext } from "./peers/Context"
 export * from "./peers/ExternalSource"
 export * from "./peers/Options"
+export * from "./peers/DiagnosticKind"
 export * from "./node-utilities/ArkTsConfig"
 export * from "./node-utilities/Program"
 export * from "./peers/ImportPathManager"

package/build/libarkts-copy/src/arkts-api/node-cache.ts

@@ -15,25 +15,25 @@
 
 import { KNativePointer } from "@koalaui/interop"
 import { AstNode } from "./peers/AstNode"
+import { Es2pandaAstNodeType } from "src/generated/Es2pandaEnums"
 
 export class NodeCache {
     private static cache = new Map<KNativePointer, AstNode>()
 
-    static cached<T extends AstNode>(pointer: KNativePointer, factory: (pointer: KNativePointer) => AstNode): T {
-        const cached = NodeCache.cache.get(pointer)
-        if (cached !== undefined) {
-            return cached as T
-        }
-        const node = factory(pointer)
-        NodeCache.addToCache(pointer, node)
-        return node as T
+    static get<T extends AstNode>(pointer: KNativePointer): T | undefined {
+        return NodeCache.cache.get(pointer) as T | undefined
     }
 
     public static addToCache(pointer: KNativePointer, node: AstNode) {
-        NodeCache.cache.set(pointer, node)
+        if (node.astNodeType == Es2pandaAstNodeType.AST_NODE_TYPE_SCRIPT_FUNCTION
+            || node.astNodeType == Es2pandaAstNodeType.AST_NODE_TYPE_ETS_FUNCTION_TYPE
+            || node.astNodeType == Es2pandaAstNodeType.AST_NODE_TYPE_CALL_EXPRESSION) {
+            NodeCache.cache.set(pointer, node)
+        }
     }
 
     public static clear(): void {
+        console.log("SIZE WAS", NodeCache.cache.size, "ON CLEAR")
         NodeCache.cache.clear()
     }
 }

package/build/libarkts-copy/src/arkts-api/node-utilities/ArkTsConfig.ts

@@ -14,12 +14,13 @@
  */
 
 import { ArkTsConfig } from "../../generated"
+import { traceGlobal } from "../../tracer"
 
 export function dumpArkTsConfigInfo(arkTsConfig: ArkTsConfig) {
-    console.log(`ArkTsConfig info:`)
-    console.log(`\tBaseUrl:          ${arkTsConfig.baseUrl}`)
-    console.log(`\tConfigPath:       ${arkTsConfig.configPath}`)
-    console.log(`\tOutDir:           ${arkTsConfig.outDir}`)
-    console.log(`\tPackage:          ${arkTsConfig.package}`)
-    console.log(`\tRootDir:          ${arkTsConfig.rootDir}`)
+    traceGlobal(() => `ArkTsConfig info:`)
+    traceGlobal(() => `\tBaseUrl:          ${arkTsConfig.baseUrl}`)
+    traceGlobal(() => `\tConfigPath:       ${arkTsConfig.configPath}`)
+    traceGlobal(() => `\tOutDir:           ${arkTsConfig.outDir}`)
+    traceGlobal(() => `\tPackage:          ${arkTsConfig.package}`)
+    traceGlobal(() => `\tRootDir:          ${arkTsConfig.rootDir}`)
 }

package/build/libarkts-copy/src/arkts-api/node-utilities/NumberLiteral.ts

@@ -17,6 +17,7 @@ import { global } from "../static/global"
 import { NumberLiteral } from "../../generated"
 import { isSameNativeObject } from "../peers/ArktsObject"
 import { updateNodeByNode } from "../utilities/private"
+import { Es2pandaAstNodeType } from "../../generated/Es2pandaEnums"
 
 export function createNumberLiteral(
     value: number
@@ -25,7 +26,8 @@ export function createNumberLiteral(
         global.es2panda._CreateNumberLiteral(
             global.context,
             value
-        )
+        ),
+        Es2pandaAstNodeType.AST_NODE_TYPE_NUMBER_LITERAL,
     )
 }