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

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

@@ -17,7 +17,7 @@
 
 /*
  * THIS FILE IS AUTOGENERATED BY arktscgen v2.1.10+devel. DO NOT EDIT MANUALLY!
- * es2panda bb0d61379a95a80fffec85824dc465e3cf3b321e(2025-08-20) sdk v1.5.0-dev.42382
+ * es2panda b90198c15c97a5627fa1a69ab5f061ef4e54921e(2025-08-25) sdk v1.5.0-dev.42899
  */
 
 KNativePointer impl_GetAllErrorMessages(KNativePointer context)
@@ -16362,6 +16362,15 @@ KNativePointer impl_ArkTsConfigOutDirConst(KNativePointer context, KNativePointe
 }
 KOALA_INTEROP_2(ArkTsConfigOutDirConst, KNativePointer, KNativePointer, KNativePointer);
 
+KNativePointer impl_ArkTsConfigCacheDirConst(KNativePointer context, KNativePointer receiver)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _receiver = reinterpret_cast<es2panda_ArkTsConfig*>(receiver);
+    auto result = GetImpl()->ArkTsConfigCacheDirConst(_context, _receiver);
+    return StageArena::strdup(result);
+}
+KOALA_INTEROP_2(ArkTsConfigCacheDirConst, KNativePointer, KNativePointer, KNativePointer);
+
 KBoolean impl_ArkTsConfigUseUrlConst(KNativePointer context, KNativePointer receiver)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);

package/build/libarkts-copy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@koalaui/libarkts",
-    "version": "1.7.9+devel",
+    "version": "1.7.10+devel",
     "bin": "./lib/es2panda",
     "typesVersions": {
         "*": {
@@ -28,13 +28,13 @@
     },
     "dependencies": {
         "@koalaui/ets-tsc": "4.9.5-r6",
-        "@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",
+        "@koalaui/build-common": "1.7.10+devel",
+        "@koalaui/compat": "1.7.10+devel",
+        "@koalaui/common": "1.7.10+devel",
+        "@koalaui/harness": "1.7.10+devel",
+        "@koalaui/interop": "1.7.10+devel",
+        "@koalaui/fast-arktsc": "1.7.10+devel",
+        "@idlizer/arktscgen": "2.1.10-arktscgen-3",
         "@types/mocha": "^9.1.0",
         "mocha": "^9.2.2",
         "node-addon-api": "8.0.0",

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

@@ -15,25 +15,29 @@
 
 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) {
-        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)
-        }
+        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/utilities/public.ts

@@ -16,10 +16,10 @@
 import { global } from "../static/global"
 import { isNumber, throwError, withWarning } from "../../utils"
 import { KNativePointer, nullptr, KInt, KUInt} from "@koalaui/interop"
-import { passNode, unpackNodeArray, unpackNonNullableNode, passString, unpackString, passStringArray } from "./private"
+import { passNode, unpackNodeArray, unpackNonNullableNode, passString, unpackString, passStringArray, unpackNode } from "./private"
 import { Es2pandaContextState, Es2pandaModifierFlags, Es2pandaMethodDefinitionKind, Es2pandaAstNodeType, Es2pandaPluginDiagnosticType } from "../../generated/Es2pandaEnums"
 import type { AstNode } from "../peers/AstNode"
-import { DiagnosticInfo, SourcePosition, SourceRange, SuggestionInfo } from "../../generated"
+import { DiagnosticInfo, Identifier, isConditionalExpression, SourcePosition, SourceRange, SuggestionInfo, VariableDeclarator } from "../../generated"
 import {
     type AnnotationUsage,
     ClassDefinition,
@@ -230,6 +230,26 @@ export function getPeerDecl(peer: KNativePointer): AstNode | undefined {
     return unpackNonNullableNode(decl)
 }
 
+export function declarationFromIdentifier(node: Identifier): AstNode | undefined {
+    return unpackNode(global.generatedEs2panda._DeclarationFromIdentifier(global.context, node.peer))
+}
+
+export function resolveGensymVariableDeclaratorForDefaultParam(node: VariableDeclarator): Identifier | undefined {
+    const init = node.init
+    if (isConditionalExpression(init) && isIdentifier(init.consequent) && init.consequent.name.startsWith("gensym%%_")) {
+        return init.consequent
+    }
+    return undefined
+}
+
+export function resolveGensymVariableDeclaratorForOptionalCall(node: VariableDeclarator): Identifier | undefined {
+    const init = node.init
+    if (isIdentifier(node.id) && node.id.name.startsWith("gensym%%_") && isIdentifier(init)) {
+        return init
+    }
+    return undefined
+}
+
 export function getPeerObjectDecl(peer: KNativePointer): AstNode | undefined {
     const decl = global.es2panda._ClassVariableDeclaration(global.context, peer);
     if (decl === nullptr) {

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

@@ -5186,6 +5186,9 @@ export class Es2pandaNativeModule {
     _ArkTsConfigOutDirConst(context: KNativePointer, receiver: KNativePointer): KStringPtr {
         throw new Error("This methods was not overloaded by native module initialization")
     }
+    _ArkTsConfigCacheDirConst(context: KNativePointer, receiver: KNativePointer): KStringPtr {
+        throw new Error("This methods was not overloaded by native module initialization")
+    }
     _ArkTsConfigUseUrlConst(context: KNativePointer, receiver: KNativePointer): KBoolean {
         throw new Error("This methods was not overloaded by native module initialization")
     }

package/build/libarkts-copy/src/generated/peers/ArkTsConfig.ts

@@ -60,6 +60,9 @@ export class ArkTsConfig extends ArktsObject {
     get outDir(): string {
         return unpackString(global.generatedEs2panda._ArkTsConfigOutDirConst(global.context, this.peer))
     }
+    get cacheDir(): string {
+        return unpackString(global.generatedEs2panda._ArkTsConfigCacheDirConst(global.context, this.peer))
+    }
     get useUrl(): boolean {
         return global.generatedEs2panda._ArkTsConfigUseUrlConst(global.context, this.peer)
     }

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

@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-export class Es2pandaError extends Error { }
-export class EarlyExitError extends Error { }
-
 export function throwError(error: string): never {
     throw new Error(error)
 }

package/lib/index.js

@@ -3834,6 +3834,8 @@ var IDLExtendedAttributes;
     IDLExtendedAttributes["Interfaces"] = "Interfaces";
     IDLExtendedAttributes["NativeModule"] = "NativeModule";
     IDLExtendedAttributes["Optional"] = "Optional";
+    IDLExtendedAttributes["UnionOnlyNull"] = "OptionalOnlyNull";
+    IDLExtendedAttributes["UnionWithNull"] = "OptionalWithNull";
     IDLExtendedAttributes["OriginalEnumMemberName"] = "OriginalEnumMemberName";
     IDLExtendedAttributes["OriginalGenericName"] = "OriginalGenericName";
     IDLExtendedAttributes["Predefined"] = "Predefined";
@@ -4905,10 +4907,22 @@ function linearizeNamespaceMembers(entries) {
 }
 
 const modulesCache = new Map();
+/**
+ * Is source submodule of target.
+ * Every source is submodule if target is empty string
+ * @example `isSubmodule("a.b.c", "a") === true`
+ * @example `isSubmodule("a", "a.b.c") === false`
+ * @example `isSubmodule("a.b.cd", "a.b.c") === false`
+ */
+function isSubmodule(source, target) {
+    return source === target
+        || target === ""
+        || source.startsWith(target + '.');
+}
 function isInModule(nodeOrPackage, module) {
     if (typeof nodeOrPackage === 'object')
         return isInModule(getPackageName(nodeOrPackage), module);
-    return module.packages.some(modulePackage => nodeOrPackage.startsWith(modulePackage));
+    return module.packages.some(modulePackage => isSubmodule(nodeOrPackage, modulePackage));
 }
 function isInExternalModule(node) {
     var _a;
@@ -5459,7 +5473,7 @@ class LanguageWriter {
     makeThis() {
         return new StringExpression("this");
     }
-    makeNull(value) {
+    makeNull(type) {
         return new StringExpression("null");
     }
     makeVoid() {
@@ -8227,7 +8241,7 @@ class CppLanguageWriter extends CLikeLanguageWriter {
     writePrintLog(message) {
         this.print(`printf("${message}\\n");`);
     }
-    makeDefinedCheck(value, isTag) {
+    makeDefinedCheck(value, type, isTag) {
         return this.makeString(isTag ? `${value} != ${PrimitiveTypeList.UndefinedTag}`
             : `runtimeType(${value}) != ${PrimitiveTypeList.UndefinedRuntime}`);
     }
@@ -8655,7 +8669,9 @@ class TSLanguageWriter extends LanguageWriter {
         const normalizedArgs = signature.args.map((it, i) => isOptionalType(it) && signature.isArgOptional(i) ? maybeUnwrapOptionalType(it) : it);
         this.printer.print(`${prefix}${name}${typeParams}(${normalizedArgs.map((it, index) => `${this.escapeKeyword(signature.argName(index))}${signature.isArgOptional(index) ? "?" : ``}: ${this.getNodeName(it)}${signature.argDefault(index) ? ' = ' + signature.argDefault(index) : ""}`).join(", ")})${needReturn ? ": " + this.getNodeName(signature.returnType) : ""}${needBracket ? " {" : ""}`);
     }
-    makeNull() {
+    makeNull(type) {
+        if (type && hasExtAttribute(type, IDLExtendedAttributes.UnionOnlyNull))
+            return new StringExpression("null");
         return new StringExpression("undefined");
     }
     makeAssign(variableName, type, expr, isDeclared = true, isConst = true, options) {
@@ -8712,7 +8728,15 @@ class TSLanguageWriter extends LanguageWriter {
     makeRuntimeType(rt) {
         return this.makeString(`RuntimeType.${RuntimeType[rt]}`);
     }
-    makeDefinedCheck(value) {
+    makeDefinedCheck(value, type) {
+        if (type) {
+            if (hasExtAttribute(type, IDLExtendedAttributes.UnionWithNull)) {
+                return this.makeString(`${value} !== undefined && ${value} !== null`);
+            }
+            else if (hasExtAttribute(type, IDLExtendedAttributes.UnionOnlyNull)) {
+                return this.makeString(`${value} !== null`);
+            }
+        }
         return this.makeString(`${value} !== undefined`);
     }
     makeTupleAlloc(option) {
@@ -12434,6 +12458,32 @@ class Typechecker {
         }
         return ancestor === Config.defaultAncestor;
     }
+    hasDescendants(ref) {
+        const iface = isReferenceType(ref) ? this.resolveReference(ref) : ref;
+        if (!iface || !isInterface$1(iface)) {
+            return false;
+        }
+        const lookupScopes = [];
+        const parent = iface.parent;
+        if (parent && isNamespace(parent)) {
+            lookupScopes.push(...this.namespaces.filter(ns => ns.name === parent.name));
+        }
+        else {
+            lookupScopes.push(this.file);
+        }
+        const visitInterfaces = (node, cb) => {
+            switch (node.kind) {
+                case IDLKind.File:
+                    return node.entries.some((value) => visitInterfaces(value, cb));
+                case IDLKind.Namespace:
+                    return node.members.some((value) => visitInterfaces(value, cb));
+                case IDLKind.Interface:
+                    return cb(node);
+            }
+            return false;
+        };
+        return lookupScopes.some(scope => visitInterfaces(scope, (node) => node.name !== iface.name && this.isHeir(node, iface.name)));
+    }
     isPeer(node) {
         if (node.name === Config.astNodeCommonAncestor)
             return false; // TODO: is handwritten
@@ -13477,21 +13527,35 @@ class BindingParameterTypeConvertor extends TopLevelTypeConvertor {
  * limitations under the License.
  */
 class BindingReturnValueTypeConvertor extends TopLevelTypeConvertor {
-    constructor(typechecker) {
+    constructor(typechecker, importer) {
         const plain = (type) => (writer, call) => call;
-        const wrap = (wrapWith) => (writer, call) => writer.makeFunctionCall(wrapWith, [call]);
+        const wrap = (wrapWith, ...args) => (writer, call) => writer.makeFunctionCall(wrapWith, [call, ...args.map(a => writer.makeString(a))]);
+        const isAstNode = (ref) => (isReferenceType(ref) || isInterface$1(ref)) && this.typechecker.isHeir(ref, Config.astNodeCommonAncestor);
+        const makeArgs = (type) => {
+            const iface = isReferenceType(type)
+                ? this.typechecker.resolveReference(type)
+                : undefined;
+            if (iface && isAstNode(iface) && !this.typechecker.hasDescendants(iface)) {
+                const astNodeTypeName = this.typechecker.nodeTypeName(iface);
+                if (astNodeTypeName) {
+                    importer.withEnumImport(Config.nodeTypeAttribute);
+                    return [astNodeTypeName];
+                }
+            }
+            return [];
+        };
         super(typechecker, {
-            sequence: (type) => wrap(PeersConstructions.arrayOfPointersToArrayOfPeers),
+            sequence: (type) => wrap(PeersConstructions.arrayOfPointersToArrayOfPeers, ...makeArgs(type.elementType[0])),
             string: (type) => wrap(PeersConstructions.receiveString),
-            reference: (type) => this.typechecker.isHeir(type, Config.astNodeCommonAncestor)
-                ? wrap(PeersConstructions.unpackNonNullable)
+            reference: (type) => isAstNode(type)
+                ? wrap(PeersConstructions.unpackNonNullable, ...makeArgs(type))
                 : wrap(baseNameString(type.name)),
             optional: (type) => {
-                if (isReferenceType(type.type)) {
-                    if (this.typechecker.isHeir(type.type, Config.astNodeCommonAncestor)) {
-                        return wrap(PeersConstructions.unpackNullable);
-                    }
-                    return wrap(PeersConstructions.newOf(baseNameString(type.type.name)));
+                const innerType = type.type;
+                if (isReferenceType(innerType)) {
+                    return isAstNode(innerType)
+                        ? wrap(PeersConstructions.unpackNullable, ...makeArgs(innerType))
+                        : wrap(PeersConstructions.newOf(baseNameString(innerType.name)));
                 }
                 throwException(`unexpected optional of non-reference type`);
             },
@@ -13502,6 +13566,7 @@ class BindingReturnValueTypeConvertor extends TopLevelTypeConvertor {
             boolean: plain,
             undefined: plain
         });
+        this.importer = importer;
     }
 }
 
@@ -13542,7 +13607,7 @@ class PeerPrinter extends SingleFilePrinter {
         this.typechecker = new Typechecker(this.idl);
         this.importer = new Importer(this.typechecker, `.`, this.node.name);
         this.bindingParameterTypeConvertor = new BindingParameterTypeConvertor(this.typechecker);
-        this.bindingReturnValueTypeConvertor = new BindingReturnValueTypeConvertor(this.typechecker);
+        this.bindingReturnValueTypeConvertor = new BindingReturnValueTypeConvertor(this.typechecker, this.importer);
         this.parent = (_a = parent(this.node)) !== null && _a !== void 0 ? _a : Config.defaultAncestor;
         this.writer = new TSLanguageWriter(new IndentedPrinter(), createEmptyReferenceResolver(), { convert: (node) => convertAndImport(this.importer, new class extends LibraryTypeConvertor {
                 convertTypeReference(type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idlizer/arktscgen",
-  "version": "2.1.10-arktscgen-3",
+  "version": "2.1.10-arktscgen-3a",
   "description": "",
   "main": "lib/index.js",
   "bin": "lib/index.js",
@@ -19,7 +19,7 @@
   "license": "Apache-2.0",
   "keywords": [],
   "dependencies": {
-    "@idlizer/core": "2.1.10-arktscgen-3",
+    "@idlizer/core": "2.1.10-arktscgen-3a",
     "@types/node": "^18.0.0",
     "commander": "^10.0.0",
     "typescript": "^4.9.5"