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

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

@@ -18,29 +18,29 @@
 #include <cstdint>
 #include <fstream>
 #include <iostream>
-#include <regex>
 #include <sstream>
 #include <system_error>
 #include <vector>
+#include <regex>
 
 #ifdef _WIN32
-#include <psapi.h>
-#include <windows.h>
+    #include <windows.h>
+    #include <psapi.h>
 #elif defined(__APPLE__)
-#include <mach/mach.h>
-#include <sys/resource.h>
+    #include <mach/mach.h>
+    #include <sys/resource.h>
 #elif defined(__linux__)
-#include <sys/resource.h>
-#include <unistd.h>
+    #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);
+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;
@@ -49,9 +49,10 @@ constexpr int MATCH_GROUP_SIZE = 3;
 #if defined(_WIN32)
 MemoryStats GetMemoryStats()
 {
-    MemoryStats stats = { 0, 0, 0, 0, 0 };
+    MemoryStats stats = {0, 0, 0, 0, 0};
     PROCESS_MEMORY_COUNTERS_EX pmc;
-    if (GetProcessMemoryInfo(GetCurrentProcess(), reinterpret_cast<PROCESS_MEMORY_COUNTERS*>(&pmc), sizeof(pmc))) {
+    if (GetProcessMemoryInfo(GetCurrentProcess(),
+        reinterpret_cast<PROCESS_MEMORY_COUNTERS*>(&pmc), sizeof(pmc))) {
         stats.currentRss = pmc.WorkingSetSize;
         stats.peakRss = pmc.PeakWorkingSetSize;
         stats.currentVss = pmc.PrivateUsage; // 私有内存使用量
@@ -65,18 +66,19 @@ MemoryStats GetMemoryStats()
 #elif defined(__APPLE__)
 MemoryStats GetMemoryStats()
 {
-    MemoryStats stats = { 0, 0, 0, 0, 0 };
+    MemoryStats stats = {0, 0, 0, 0, 0};
     struct rusage ru;
     if (getrusage(RUSAGE_SELF, &ru) == 0) {
-        stats.currentRss = 0;         // macOS需要专用API获取当前内存
+        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) {
+        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;  // 虚拟内存总量
         }
@@ -87,7 +89,7 @@ MemoryStats GetMemoryStats()
 #elif defined(__linux__)
 MemoryStats GetMemoryStats()
 {
-    MemoryStats stats = { 0, 0, 0, 0, 0 };
+    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 -> 字节
@@ -127,9 +129,13 @@ void MemoryTracker::Reset()
 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 };
+    MemoryStats delta = {
+        current.currentRss - baseline.currentRss,
+        current.peakRss - baseline.peakRss,
+        current.currentVss - baseline.currentVss,
+        current.pageFaultsMinor - baseline.pageFaultsMinor,
+        current.pageFaultsMajor - baseline.pageFaultsMajor
+    };
     return delta;
 }
 
@@ -141,9 +147,13 @@ MemoryStats MemoryTracker::MeasureMemory(Func&& func)
     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 };
+    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)
@@ -153,19 +163,16 @@ void MemoryTracker::Report(MemoryStats stats)
         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";
+        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";
+    std::cout << "Current RSS: " << formatBytes(stats.currentRss) << "\n" << std::endl;
+    std::cout << "Peak RSS   : " << formatBytes(stats.peakRss) << "\n" << std::endl;
+    std::cout << "VSS        : " << formatBytes(stats.currentVss) << "\n" << std::endl;
+    std::cout << "FaultsMinor: " << stats.pageFaultsMinor << "\n" << std::endl;
+    std::cout << "FaultsMajor: " << stats.pageFaultsMajor << "\n" << std::endl;
     return;
 }

package/build/libarkts-copy/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@koalaui/libarkts",
     "version": "1.7.10+devel",
-    "bin": "./lib/es2panda",
+    "main": "./lib/libarkts.js",
     "typesVersions": {
         "*": {
             "./compat/*": [
@@ -23,7 +23,7 @@
         "./plugins/build/src/**/*"
     ],
     "config": {
-        "panda_sdk_path": "../../incremental/tools/panda/node_modules/@panda/sdk",
+        "panda_sdk_path": "../incremental/tools/panda/node_modules/@panda/sdk",
         "panda_sdk_version": "next"
     },
     "dependencies": {
@@ -33,14 +33,16 @@
         "commander": "10.0.1"
     },
     "devDependencies": {
+        "tslib": "^2.3.1",
         "rollup": "^4.13.0",
         "@rollup/plugin-commonjs": "^26.0.1",
         "@rollup/plugin-node-resolve": "^15.3.0",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.6",
+        "tsconfig-paths": "^4.2.0",
         "rimraf": "^6.0.1",
         "@koalaui/fast-arktsc": "1.7.10+devel",
-        "@idlizer/arktscgen": "2.1.10-arktscgen-4",
+        "@idlizer/arktscgen": "2.1.10-arktscgen-5",
         "mocha": "^9.2.2",
         "@koalaui/harness": "1.7.10+devel",
         "@koalaui/ets-tsc": "4.9.5-r6",
@@ -51,7 +53,7 @@
     "scripts": {
         "clean": "rimraf generated build native/build* ./.rollup.cache tsconfig.tsbuildinfo lib",
         "clean:plugins": "rimraf plugins/build",
-        "compile:koala:interop": "npm run --prefix ../../interop compile",
+        "compile:koala:interop": "npm run --prefix ../interop compile",
         "compile:meson": "cd native && meson setup build && meson compile -C build",
         "compile:meson:mingw": "cd native && meson setup --cross-file ./mingw.cross mingw_build && meson compile -C mingw_build",
         "crosscompile:meson": "cd native && CXX=clang++ meson setup -D cross_compile=true build && CXX=clang++ meson compile -C build",
@@ -63,8 +65,8 @@
         "compile:release": "npm run regenerate && npm run crosscompile:native && npm run compile:js",
         "compile:js": "rm -rf lib/ && rollup -c rollup.lib.mjs && rollup -c rollup.es2panda.mjs",
         "compile:plugins": "rollup -c ./rollup.printer-plugin.mjs",
-        "direct": "fast-arktsc --config arktsconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/abc/main.abc && ninja -f build/abc/build.ninja",
-        "simultaneous": "mkdir -p build/abc && bash ../../incremental/tools/panda/arkts/ui2abc --simultaneous --arktsconfig arktsconfig.json --output ./build/abc/main.abc:./build/abc/library.abc plugins/input/main.ets:plugins/input/library.ets",
+        "direct": "fast-arktsc --config arktsconfig.json --compiler ../incremental/tools/panda/arkts/ui2abc --link-name ./build/abc/main.abc && ninja -f build/abc/build.ninja",
+        "simultaneous": "mkdir -p build/abc && bash ../incremental/tools/panda/arkts/ui2abc --simultaneous --arktsconfig arktsconfig.json --output ./build/abc/main.abc:./build/abc/library.abc plugins/input/main.ets:plugins/input/library.ets",
         "run": "npm run compile && npm run compile:plugins && npm run simultaneous",
         "run:current": "npm run compile:current && npm run compile:plugins && npm run simultaneous",
         "run:memo": "npm run compile && npm run compile:plugins && npm run compile --prefix ../memo-plugin-ng && npm run memo",
@@ -74,11 +76,11 @@
         "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 && 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",
+        "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 ./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:current": "rimraf -rf ./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 ./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",
         "format:src:ts": "npx prettier --config .prettierrc --write \"./src/**/*.ts\"",

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

@@ -58,37 +58,12 @@ export class Es2pandaNativeModule {
     _DestroyConfig(peer: KNativePointer): void {
         throw new Error('Not implemented');
     }
-    _CreateContextFromString(config: KPtr, source: String, filename: String): KPtr {
-        throw new Error('Not implemented');
-    }
-    _CreateContextFromFile(config: KPtr, filename: String): KPtr {
-        throw new Error('Not implemented');
-    }
-    _CreateCacheContextFromFile(
-        config: KNativePointer,
-        sourceFileName: String,
-        globalContext: KNativePointer,
-        isExternal: KBoolean
-    ): KNativePointer {
-        throw new Error('Not implemented');
-    }
     _InsertGlobalStructInfo(context: KNativePointer, str: String): void {
         throw new Error('Not implemented');
     }
     _HasGlobalStructInfo(context: KNativePointer, str: String): KBoolean {
         throw new Error('Not implemented');
     }
-    _CreateGlobalContext(
-        config: KNativePointer,
-        externalFileList: KStringArrayPtr,
-        fileNum: KUInt,
-        lspUsage: KBoolean
-    ): KNativePointer {
-        throw new Error('Not implemented');
-    }
-    _DestroyGlobalContext(context: KNativePointer): void {
-        throw new Error('Not implemented');
-    }
     _DestroyContext(context: KPtr): void {
         throw new Error('Not implemented');
     }
@@ -157,10 +132,10 @@ export class Es2pandaNativeModule {
     _ETSParserGetImportPathManager(context: KNativePointer): KPtr {
         throw new Error('Not implemented');
     }
-    _SourcePositionCol(context: KNativePointer, instance: KNativePointer): KUInt {
+    _ConfigGetOptions(config: KNativePointer): KNativePointer {
         throw new Error('Not implemented');
     }
-    _ConfigGetOptions(config: KNativePointer): KNativePointer {
+    _SourcePositionCol(context: KNativePointer, instance: KNativePointer): KUInt {
         throw new Error('Not implemented');
     }
     _OptionsArkTsConfig(context: KNativePointer, options: KNativePointer): KNativePointer {
@@ -223,7 +198,13 @@ export class Es2pandaNativeModule {
     ): void {
         throw new Error('Not implemented');
     }
-    _FilterNodes(context: KNativePointer, root: KNativePointer, filters: KStringPtr): KNativePointer {
+    _FilterNodes(context: KNativePointer, root: KNativePointer, filters: KStringPtr, deeperAfterMatch: KBoolean): KNativePointer {
+        throw new Error('Not implemented');
+    }
+    _FilterNodes2(context: KNativePointer, root: KNativePointer, type: KInt): KNativePointer {
+        throw new Error('Not implemented');
+    }
+    _FilterNodes3(context: KNativePointer, root: KNativePointer, types: Int32Array, typesSize: KInt): KNativePointer {
         throw new Error('Not implemented');
     }
 
@@ -241,26 +222,6 @@ export class Es2pandaNativeModule {
     ): KNativePointer {
         throw new Error('Not implemented');
     }
-    _CreateDiagnosticInfo(
-        context: KNativePointer,
-        kind: KNativePointer,
-        args: string[],
-        argc: number,
-        pos: KNativePointer
-    ): KNativePointer {
-        throw new Error('Not implemented');
-    }
-    _CreateSuggestionInfo(
-        context: KNativePointer,
-        kind: KNativePointer,
-        args: string[],
-        argc: number,
-        substitutionCode: string,
-        title: string,
-        range: KNativePointer
-    ): KNativePointer {
-        throw new Error('Not implemented');
-    }
     _LogDiagnostic(
         context: KNativePointer,
         kind: KNativePointer,
@@ -279,26 +240,12 @@ export class Es2pandaNativeModule {
     _MemFinalize(): void {
         throw new Error('Not implemented');
     }
-    _ProgramCanSkipPhases(context: KNativePointer, program: KNativePointer): boolean {
-        throw new Error('Not implemented');
-    }
-    _GenerateTsDeclarationsFromContext(
-        config: KPtr,
-        outputDeclEts: String,
-        outputEts: String,
-        exportAll: KBoolean,
-        isolated: KBoolean,
-        recordFile: String,
-        genAnnotations: KBoolean
-    ): KPtr {
+    _ProgramCanSkipPhases(context: KNativePointer, program: KNativePointer): KBoolean {
         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');

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

@@ -37,13 +37,19 @@ export abstract class AbstractVisitor {
         return result;
     }
 
-    process(node: AstNode, options?: object): AstNode {
+    process(node: AstNode, options?: any): AstNode {
         return this.visitor(node, options);
     }
 
-    abstract visitor(node: AstNode, options?: object): AstNode;
+    init(): void {}
 
-    visitEachChild(node: AstNode, options?: object): AstNode {
+    reset(): void {
+        this.indentation = 0;
+    }
+
+    abstract visitor(node: AstNode, options?: any): AstNode;
+
+    visitEachChild(node: AstNode, options?: any): AstNode {
         return this.withIndentation((): AstNode => visitEachChild(node, (it): AstNode => this.visitor(it, options)));
     }
 }

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

@@ -77,9 +77,7 @@ export class ImportStorage {
         }
 
         // Drop import statements generated by compiler in the beginning of the ETSModule
-        const module = this.program.ast as ETSModule;
-        this.program.setAst(
-            factory.updateETSModule(module, newStatements, module.ident, module.getNamespaceFlag(), module.program)
-        );
+        const module = this.program.getAstCasted()
+        module.setStatements(newStatements)
     }
 }

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

@@ -18,16 +18,24 @@ import { defaultFilter, listPrograms } from './plugins';
 import { Program } from '../../generated';
 
 export class ProgramProvider {
-    // Improve: migrate to wrappers instead of pointers
+    static programListCache: Map<string, Program[]> = new Map();
+    programListFromCache?: Program[];
     seenPrograms: Set<KNativePointer> = new Set<KNativePointer>();
     queue: Program[] = [];
 
     constructor(
-        private mainProgram: Program,
-        private readonly filter: (name: string) => boolean = defaultFilter
+        private readonly mainProgram: Program,
+        private readonly stableDeps: boolean = false,
+        private readonly filter: (name: string) => boolean = defaultFilter,
     ) {
         this.seenPrograms.add(mainProgram.peer);
-        this.queue = [mainProgram];
+        if (!stableDeps || !ProgramProvider.programListCache.has(mainProgram.absoluteName)) {
+            this.programListFromCache = [mainProgram]
+            ProgramProvider.programListCache.set(mainProgram.absoluteName, this.programListFromCache)
+        } else {
+            this.programListFromCache = ProgramProvider.programListCache.get(mainProgram.absoluteName)
+        }
+        this.queue = [...this.programListFromCache!]
     }
 
     updateQueue(): void {
@@ -35,13 +43,14 @@ export class ProgramProvider {
         for (const program of listed) {
             if (!this.seenPrograms.has(program.peer)) {
                 this.seenPrograms.add(program.peer);
+                this.programListFromCache?.push(program)
                 this.queue.push(program);
             }
         }
     }
 
     next(): Program | undefined {
-        if (this.queue.length === 0) {
+        if (this.queue.length === 0 && (!this.stableDeps || this.programListFromCache?.length == 1)) {
             this.updateQueue();
             if (this.queue.length === 0) {
                 // console.log("PROGRAMS:", this.seenPrograms.size)

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

@@ -22,12 +22,30 @@ import { NodeCache } from './node-cache';
 
 export const nodeByType = new Map<Es2pandaAstNodeType, (peer: KNativePointer) => AstNode>([]);
 
+// TODO: These node types are "specially mapped" in the compiler, they don't have C++ classes
+// See AST_NODE_REINTERPRET_MAPPING in the compiler source
+// Do we need managed wrappers for them? Need to investigate.
+export function nodeTypeFilter(type: Es2pandaAstNodeType): Es2pandaAstNodeType {
+    switch (type) {
+        case Es2pandaAstNodeType.AST_NODE_TYPE_REST_ELEMENT:
+            return Es2pandaAstNodeType.AST_NODE_TYPE_SPREAD_ELEMENT
+        case Es2pandaAstNodeType.AST_NODE_TYPE_OBJECT_PATTERN:
+            return Es2pandaAstNodeType.AST_NODE_TYPE_OBJECT_EXPRESSION
+        case Es2pandaAstNodeType.AST_NODE_TYPE_ASSIGNMENT_PATTERN:
+            return Es2pandaAstNodeType.AST_NODE_TYPE_ASSIGNMENT_EXPRESSION
+        case Es2pandaAstNodeType.AST_NODE_TYPE_ARRAY_PATTERN:
+            return Es2pandaAstNodeType.AST_NODE_TYPE_ARRAY_EXPRESSION
+    }
+    return type
+}
+
 export function nodeFrom<T extends AstNode>(peer: KNativePointer, typeHint?: Es2pandaAstNodeType): T {
     const fromCache = NodeCache.get<T>(peer);
     if (fromCache) {
         return fromCache;
     }
-    const type = typeHint ?? global.generatedEs2panda._AstNodeTypeConst(global.context, peer);
+
+    const type = nodeTypeFilter(typeHint ?? global.generatedEs2panda._AstNodeTypeConst(global.context, peer))
     const create = nodeByType.get(type) ?? throwError(`unknown node type: ${type}`);
     return create(peer) as T;
 }

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

@@ -32,7 +32,6 @@ 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

@@ -16,12 +16,17 @@
 import { KNativePointer } from '@koalaui/interop';
 import { AstNode } from './peers/AstNode';
 
+const useCache = false;
+
 export class NodeCache {
     private static cache = new Map<KNativePointer, AstNode>();
 
     static cached<T extends AstNode>(pointer: KNativePointer, factory: (pointer: KNativePointer) => AstNode): T {
+        if (!useCache) {
+            return factory(pointer) as T;
+        }
         const cached = NodeCache.cache.get(pointer);
-        if (cached !== undefined) {
+        if (!!cached) {
             return cached as T;
         }
         const node = factory(pointer);
@@ -34,10 +39,14 @@ export class NodeCache {
     }
 
     public static addToCache(pointer: KNativePointer, node: AstNode): void {
-        NodeCache.cache.set(pointer, node);
+        if (useCache) {
+            NodeCache.cache.set(pointer, node);
+        }
     }
 
     public static clear(): void {
-        NodeCache.cache.clear();
+        if (useCache) {
+            NodeCache.cache.clear();
+        }
     }
 }

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

@@ -41,7 +41,7 @@ export function updateObjectExpression(
 ): ObjectExpression {
     if (
         isSameNativeObject(properties, original.properties) &&
-        preferredReturnType == original.getPreferredTypePointer()
+        preferredReturnType === original.getPreferredTypePointer()
     ) {
         return original;
     }

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

@@ -83,8 +83,8 @@ export function updateScriptFunction(
         isSameNativeObject(dataflags, original.modifierFlags) &&
         isSameNativeObject(ident, original.id) &&
         isSameNativeObject(annotations, original.annotations) &&
-        signaturePointer == original.getSignaturePointer() &&
-        preferredReturnTypePointer == original.getPreferredReturnTypePointer()
+        signaturePointer === original.getSignaturePointer() &&
+        preferredReturnTypePointer === original.getPreferredReturnTypePointer()
     ) {
         return original;
     }
@@ -121,7 +121,6 @@ export function inplaceUpdateScriptFunction(
     preferredReturnTypePointer?: KNativePointer
 ) {
     if (
-        !isSameNativeObject(typeParams, original.typeParams) ||
         !isSameNativeObject(hasReceiver, original.hasReceiver) ||
         !isSameNativeObject(datafuncFlags, original.flags)
     ) {
@@ -145,9 +144,10 @@ export function inplaceUpdateScriptFunction(
     }
     original.setBody(databody);
     original.setParams(params);
+    original.setTypeParams(typeParams);
     original.setReturnTypeAnnotation(returnTypeAnnotation);
     original.modifierFlags = dataflags;
-    if (ident) original.setIdent(ident);
+    original.setIdent(ident);
     if (annotations) original.setAnnotations(annotations);
     if (signaturePointer) original.setSignaturePointer(signaturePointer);
     if (preferredReturnTypePointer) original.setPreferredReturnTypePointer(preferredReturnTypePointer);

package/build/libarkts-copy/src/arkts-api/peers/AstNode.ts

@@ -97,22 +97,6 @@ export abstract class AstNode extends ArktsObject {
         return unpackString(global.es2panda._AstNodeDumpModifiers(global.context, this.peer));
     }
 
-    // public clone(): this {
-    //     return unpackNonNullableNode(global.generatedEs2panda._AstNodeClone(global.context, this.peer, this.parent.peer));
-    // }
-
-    // public get parent(): AstNode {
-    //     const parent = global.generatedEs2panda._AstNodeParent(global.context, this.peer)
-    //     if (parent === nullptr) {
-    //         throwError(`no parent`)
-    //     }
-    //     return unpackNonNullableNode(parent)
-    // }
-
-    // public set parent(node: AstNode) {
-    //     global.generatedEs2panda._AstNodeSetParent(global.context, this.peer, node.peer)
-    // }
-
     public clone(): this {
         const clonedNode = unpackNonNullableNode(
             global.generatedEs2panda._AstNodeClone(global.context, this.peer, this.parent?.peer ?? nullptr)

package/build/libarkts-copy/src/arkts-api/peers/Config.ts

@@ -44,7 +44,7 @@ export class Config extends ArktsObject {
     }
 
     destroy() {
-        if (this.peer != nullptr) {
+        if (this.peer !== nullptr) {
             global.es2panda._DestroyConfig(this.peer);
             this.peer = nullptr;
         }

package/build/libarkts-copy/src/arkts-api/peers/Context.ts

@@ -32,7 +32,7 @@ export class Context extends ArktsObject {
             throw new Error(`Config not initialized`);
         }
         return new Context(
-            global.es2panda._CreateContextFromString(global.config, passString(source), passString(global.filePath))
+            global.generatedEs2panda._CreateContextFromString(global.config, passString(source), passString(global.filePath))
         );
     }
 
@@ -44,17 +44,18 @@ export class Context extends ArktsObject {
         isExternal: KBoolean
     ): Context {
         return new Context(
-            global.es2panda._CreateCacheContextFromFile(configPtr, passString(fileName), globalContextPtr, isExternal)
+            global.generatedEs2panda._CreateCacheContextFromFile(configPtr, passString(fileName), globalContextPtr, isExternal)
         );
     }
 
     static createFromFile(filePath: string): Context {
-        return new Context(global.es2panda._CreateContextFromFile(global.config, passString(filePath)));
+        return new Context(global.generatedEs2panda._CreateContextFromStringWithHistory(global.config, passString(filePath), passString(filePath)));
+        return new Context(global.generatedEs2panda._CreateContextFromFile(global.config, passString(filePath)));
     }
 
     static createCacheFromFile(filePath: string, config: Config, globalContext: GlobalContext, isExternal: boolean) {
         return new Context(
-            global.es2panda._CreateCacheContextFromFile(
+            global.generatedEs2panda._CreateCacheContextFromFile(
                 config.peer,
                 passString(filePath),
                 globalContext.peer,
@@ -68,7 +69,7 @@ export class Context extends ArktsObject {
             throwError(`Config not initialized`);
         }
         return new Context(
-            global.es2panda._CreateContextGenerateAbcForExternalSourceFiles(
+            global.generatedEs2panda._CreateContextGenerateAbcForExternalSourceFiles(
                 global.config,
                 filenames.length,
                 passStringArray(filenames)
@@ -77,7 +78,7 @@ export class Context extends ArktsObject {
     }
 
     destroy() {
-        if (this.peer != nullptr) {
+        if (this.peer !== nullptr) {
             global.es2panda._DestroyContext(this.peer);
             this.peer = nullptr;
         }
@@ -101,7 +102,7 @@ export class Context extends ArktsObject {
 export class GlobalContext extends ArktsObject {
     static create(config: Config, externalFileList: string[]): GlobalContext {
         return new GlobalContext(
-            global.es2panda._CreateGlobalContext(
+            global.generatedEs2panda._CreateGlobalContext(
                 config.peer,
                 passStringArray(externalFileList),
                 externalFileList.length,
@@ -115,8 +116,8 @@ export class GlobalContext extends ArktsObject {
     }
 
     destroy() {
-        if (this.peer != nullptr) {
-            global.es2panda._DestroyGlobalContext(this.peer);
+        if (this.peer !== nullptr) {
+            global.generatedEs2panda._DestroyGlobalContext(this.peer);
             this.peer = nullptr;
         }
     }