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

package/lib/index.js

@@ -22,7 +22,6 @@
 var path$1 = require('node:path');
 var path = require('path');
 var fs = require('fs');
-var ts = require('typescript');
 require('console');
 require('node:os');
 var fs$1 = require('node:fs');
@@ -50,7 +49,6 @@ function _interopNamespaceDefault(e) {
 var path__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(path$1);
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
-var ts__namespace = /*#__PURE__*/_interopNamespaceDefault(ts);
 var fs__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(fs$1);
 var ps__namespace = /*#__PURE__*/_interopNamespaceDefault(ps);
 
@@ -3657,7 +3655,6 @@ class Language {
     static fromString(name) {
         switch (name) {
             case "arkts": return Language.ARKTS;
-            case "java": return Language.JAVA;
             case "ts": return Language.TS;
             case "cangjie": return Language.CJ;
             case "cpp": return Language.CPP;
@@ -3668,7 +3665,6 @@ class Language {
 }
 Language.TS = new Language("TS", ".ts");
 Language.ARKTS = new Language("ArkTS", ".ts"); // using .ts for ArkTS until we get rit of tsc preprocessing
-Language.JAVA = new Language("Java", ".java");
 Language.CPP = new Language("C++", ".cc");
 Language.CJ = new Language("CangJie", ".cj");
 Language.KOTLIN = new Language("Kotlin", ".kt");
@@ -4140,6 +4136,10 @@ function isEntry(node) {
 function isNamespace(node) {
     return node.kind === IDLKind.Namespace;
 }
+function isSyntheticEntry(node) {
+    var _a;
+    return isDefined((_a = node.extendedAttributes) === null || _a === void 0 ? void 0 : _a.find(it => it.name === IDLExtendedAttributes.Synthetic));
+}
 function isOptionalType(type) {
     return type.kind === IDLKind.OptionalType;
 }
@@ -4229,6 +4229,7 @@ function getNamespacesPathFor(node) {
     }
     return result;
 }
+const nodesWithoutIDLFiles = new Set();
 function getFileFor(node) {
     let iterator = node;
     while (iterator) {
@@ -4236,7 +4237,11 @@ function getFileFor(node) {
             return iterator;
         iterator = iterator.parent;
     }
-    console.warn(`Node ${getQualifiedName(node, "namespace.name")} does not have IDLFile in parents`);
+    const name = getQualifiedName(node, "namespace.name");
+    if (!nodesWithoutIDLFiles.has(name)) {
+        console.warn(`Node ${name} does not have IDLFile in parents`);
+        nodesWithoutIDLFiles.add(name);
+    }
     return undefined;
 }
 function getPackageClause(node) {
@@ -5340,6 +5345,8 @@ var FieldModifier;
     FieldModifier[FieldModifier["VOLATILE"] = 6] = "VOLATILE";
     FieldModifier[FieldModifier["INTERNAL"] = 7] = "INTERNAL";
     FieldModifier[FieldModifier["OVERRIDE"] = 8] = "OVERRIDE";
+    FieldModifier[FieldModifier["GET"] = 9] = "GET";
+    FieldModifier[FieldModifier["SET"] = 10] = "SET";
 })(FieldModifier || (FieldModifier = {}));
 var MethodModifier;
 (function (MethodModifier) {
@@ -5940,6 +5947,70 @@ function convertDeclaration(convertor, decl) {
     throw new Error(`Unknown declaration type ${decl.kind ? IDLKind[decl.kind] : "(undefined kind)"}`);
 }
 
+const findTopLevelConflicts_cache = new Map();
+function findTopLevelConflicts(library, language) {
+    if (!findTopLevelConflicts_cache.has(library))
+        findTopLevelConflicts_cache.set(library, new Map);
+    const libraryCache = findTopLevelConflicts_cache.get(library);
+    if (!libraryCache.has(language))
+        libraryCache.set(language, findTopLevelConflictsUncached(library, language));
+    return libraryCache.get(language);
+}
+function findTopLevelConflictsUncached(library, language) {
+    const foundNames = new Set();
+    const conflictingNames = new Set();
+    const ignoreTypedefs = language === Language.CPP;
+    for (const file of library.files) {
+        for (const entry of file.entries) {
+            if (isSyntheticEntry(entry))
+                continue;
+            if (ignoreTypedefs && isTypedef$1(entry))
+                // for redefinitions like `typedef _Resource Resource;` - in CPP than anyway will be expanded to Resource declaration
+                continue;
+            if (isCallback$1(entry) || isInterface$1(entry) || isTypedef$1(entry) || isEnum$1(entry)) {
+                if (foundNames.has(entry.name)) {
+                    conflictingNames.add(entry.name);
+                }
+                else {
+                    foundNames.add(entry.name);
+                }
+            }
+        }
+    }
+    return Array.from(conflictingNames);
+}
+function isTopLevelConflicted(library, language, node) {
+    const topLevelConflicts = findTopLevelConflicts(library, language);
+    while (node.parent && isNamespace(node.parent)) {
+        node = node.parent;
+    }
+    return node.parent !== undefined
+        && isFile(node.parent) && isEntry(node) && topLevelConflicts.includes(node.name);
+}
+
+/*
+ * Copyright (c) 2024 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.
+ */
+var LayoutNodeRole;
+(function (LayoutNodeRole) {
+    LayoutNodeRole[LayoutNodeRole["PEER"] = 0] = "PEER";
+    LayoutNodeRole[LayoutNodeRole["INTERFACE"] = 1] = "INTERFACE";
+    LayoutNodeRole[LayoutNodeRole["GLOBAL"] = 2] = "GLOBAL";
+    LayoutNodeRole[LayoutNodeRole["COMPONENT"] = 3] = "COMPONENT";
+    LayoutNodeRole[LayoutNodeRole["SERIALIZER"] = 4] = "SERIALIZER";
+})(LayoutNodeRole || (LayoutNodeRole = {}));
+
 /*
  * Copyright (c) 2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -7693,7 +7764,7 @@ class IDLDeserializer {
     }
 }
 const DifferenceFound = new DiagnosticMessageGroup("error", "DifferenceFound", "Difference found");
-const noCompare = new Set(["parent", "fileName", "nodeLocation", "nameLocation", "valueLocation", "typesValue"]);
+const noCompare = new Set(["parent", "fileName", "nodeLocation", "nameLocation", "valueLocation", "typesValue", "text"]);
 const canContainMoreCompare = new Set(["extendedAttributes", "typeParameters", "typeArguments"]);
 function safeString(value) {
     if (typeof value == "symbol") {
@@ -8243,6 +8314,9 @@ class CppLanguageWriter extends CLikeLanguageWriter {
         var _a;
         return new CppLanguageWriter(new IndentedPrinter([], this.indentDepth()), (_a = options === null || options === void 0 ? void 0 : options.resolver) !== null && _a !== void 0 ? _a : this.resolver, this.typeConvertor, this.primitivesTypes);
     }
+    get interopModule() {
+        throw new Error(`Modules are not supported in C++`);
+    }
     writeDeclaration(name, signature, modifiers, postfix) {
         const realName = this.classMode === 'normal' ? name : `${this.currentClass.at(0)}::${name}`;
         const newModifiers = this.classMode === 'normal'
@@ -8315,6 +8389,9 @@ class CppLanguageWriter extends CLikeLanguageWriter {
     writeConstant(constName, constType, constVal) {
         this.print(`${this.getNodeName(constType)} ${constName}${constVal ? ' = ' + constVal : ''};`);
     }
+    writeImports(moduleName, importedFeatures, aliases) {
+        throw new Error(`Imports are not supported in C++`);
+    }
     /**
      * Writes multiline comments decorated with stars
      */
@@ -8690,6 +8767,9 @@ class TSLanguageWriter extends LanguageWriter {
         }
         return this.typeConvertor.convert(type);
     }
+    get interopModule() {
+        return "@koalaui/interop";
+    }
     writeClass(name, op, superClass, interfaces, generics, isDeclared, isAbstract) {
         let extendsClause = superClass ? ` extends ${superClass}` : '';
         let implementsClause = interfaces ? ` implements ${interfaces.join(",")}` : '';
@@ -8749,11 +8829,22 @@ class TSLanguageWriter extends LanguageWriter {
         this.printer.print("}");
     }
     writeFieldDeclaration(name, type, modifiers, optional, initExpr) {
-        const init = initExpr != undefined ? ` = ${initExpr.asString()}` : ``;
         let prefix = this.makeFieldModifiersList(modifiers);
         if (prefix)
             prefix += " ";
-        this.printer.print(`${prefix}${name}${optional ? "?" : ""}: ${this.getNodeName(type)}${init}`);
+        const typeName = this.getNodeName(type);
+        const isGetter = modifiers === null || modifiers === void 0 ? void 0 : modifiers.includes(FieldModifier.GET);
+        const isSetter = modifiers === null || modifiers === void 0 ? void 0 : modifiers.includes(FieldModifier.SET);
+        if (isGetter) {
+            this.printer.print(`${prefix}get ${name}(): ${typeName}`);
+        }
+        if (isSetter) {
+            this.printer.print(`${prefix}set ${name}(value: ${typeName})`);
+        }
+        if (isGetter || isSetter)
+            return;
+        const init = initExpr != undefined ? ` = ${initExpr.asString()}` : ``;
+        this.printer.print(`${prefix}${name}${optional ? "?" : ""}: ${typeName}${init}`);
     }
     writeNativeMethodDeclaration(method) {
         let name = method.name;
@@ -8790,7 +8881,6 @@ class TSLanguageWriter extends LanguageWriter {
     }
     writeProperty(propName, propType, modifiers, getter, setter, initExpr) {
         let isStatic = modifiers.includes(FieldModifier.STATIC);
-        let isMutable = !modifiers.includes(FieldModifier.READONLY);
         let containerName = propName.concat("_container");
         if (getter) {
             if (!getter.op) {
@@ -8800,17 +8890,17 @@ class TSLanguageWriter extends LanguageWriter {
                 (writer) => {
                     writer.print(`return ${containerName}`);
                 });
-            if (isMutable) {
-                const setSignature = new NamedMethodSignature(IDLVoidType, [propType], [propName]);
-                this.writeSetterImplementation(new Method(propName, setSignature, isStatic ? [MethodModifier.STATIC] : []), setter ? setter.op :
-                    (writer) => {
-                        writer.print(`${containerName} = ${propName}`);
-                    });
-            }
         }
-        else {
-            this.writeFieldDeclaration(propName, propType, modifiers, isOptionalType(propType), initExpr);
+        if (setter) {
+            const setSignature = new NamedMethodSignature(IDLVoidType, [propType], [propName]);
+            this.writeSetterImplementation(new Method(propName, setSignature, isStatic ? [MethodModifier.STATIC] : []), setter ? setter.op :
+                (writer) => {
+                    writer.print(`${containerName} = ${propName}`);
+                });
         }
+        if (getter || setter)
+            return;
+        this.writeFieldDeclaration(propName, propType, modifiers, isOptionalType(propType), initExpr);
     }
     writeTypeDeclaration(decl) {
         var _a;
@@ -8821,6 +8911,16 @@ class TSLanguageWriter extends LanguageWriter {
     writeConstant(constName, constType, constVal) {
         this.print(`export const ${constName}: ${this.getNodeName(constType)}${constVal ? ' = ' + constVal : ''}`);
     }
+    writeImports(moduleName, importedFeatures, aliases) {
+        if (importedFeatures.length !== aliases.length) {
+            throw new Error(`Inconsistent imports from ${moduleName}`);
+        }
+        const importNodes = [];
+        for (let i = 0; i < importedFeatures.length; i++) {
+            importNodes.push(importedFeatures[i] + (aliases[i] ? ` as ${aliases[i]}` : ``));
+        }
+        this.writeExpressionStatement(this.makeString(`import { ${importNodes.join(', ')} } from "${moduleName}"`));
+    }
     writeDeclaration(name, signature, needReturn, needBracket, modifiers, generics) {
         let prefix = !modifiers ? undefined : this.supportedModifiers
             .filter(it => modifiers.includes(it))
@@ -9042,6 +9142,15 @@ class CJDeclarationNameConvertor extends DeclarationNameConvertor {
     }
 }
 CJDeclarationNameConvertor.I = new CJDeclarationNameConvertor();
+class KotlinDeclarationNameConvertor extends DeclarationNameConvertor {
+    convertInterface(decl) {
+        return removePoints(getQualifiedName(decl, "namespace.name"));
+    }
+    convertEnum(decl) {
+        return removePoints(getQualifiedName(decl, "namespace.name"));
+    }
+}
+KotlinDeclarationNameConvertor.I = new KotlinDeclarationNameConvertor();
 class ETSFeatureNameConvertor extends DeclarationNameConvertor {
     convertEnum(decl) {
         const namespace = getNamespacesPathFor(decl).map(it => it.name);
@@ -9058,18 +9167,20 @@ class CJFeatureNameConvertor extends DeclarationNameConvertor {
 }
 CJFeatureNameConvertor.I = new CJFeatureNameConvertor();
 class KotlinFeatureNameConvertor extends DeclarationNameConvertor {
+    convertInterface(decl) {
+        return removePoints(getQualifiedName(decl, "namespace.name"));
+    }
     convertEnum(decl) {
-        return decl.name;
+        return removePoints(getQualifiedName(decl, "namespace.name"));
     }
 }
 KotlinFeatureNameConvertor.I = new KotlinFeatureNameConvertor();
 function createDeclarationNameConvertor(language) {
     switch (language) {
         case Language.ARKTS: return ETSDeclarationNameConvertor.I;
-        case Language.JAVA:
         case Language.CPP:
         case Language.TS: return DeclarationNameConvertor.I;
-        case Language.CJ:        default: throw new Error(`Language ${language.toString()} is not supported`);
+        case Language.CJ:        case Language.KOTLIN:        default: throw new Error(`Language ${language.toString()} is not supported`);
     }
 }
 
@@ -9237,9 +9348,6 @@ class ETSLanguageWriter extends TSLanguageWriter {
         super(printer, resolver, typeConvertor, Language.ARKTS);
         this.arrayConvertor = arrayConvertor;
     }
-    pushNamespace(namespace, options) {
-        super.pushNamespace(namespace, options);
-    }
     fork(options) {
         var _a;
         return new ETSLanguageWriter(new IndentedPrinter([], this.indentDepth()), (_a = options === null || options === void 0 ? void 0 : options.resolver) !== null && _a !== void 0 ? _a : this.resolver, this.typeConvertor, this.arrayConvertor);
@@ -9400,31 +9508,10 @@ ETSLanguageWriter._isUseTypeChecker = true;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var LayoutNodeRole;
-(function (LayoutNodeRole) {
-    LayoutNodeRole[LayoutNodeRole["PEER"] = 0] = "PEER";
-    LayoutNodeRole[LayoutNodeRole["INTERFACE"] = 1] = "INTERFACE";
-    LayoutNodeRole[LayoutNodeRole["GLOBAL"] = 2] = "GLOBAL";
-    LayoutNodeRole[LayoutNodeRole["COMPONENT"] = 3] = "COMPONENT";
-    LayoutNodeRole[LayoutNodeRole["SERIALIZER"] = 4] = "SERIALIZER";
-})(LayoutNodeRole || (LayoutNodeRole = {}));
-
-/*
- * Copyright (c) 2024 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.
- */
-function getSerializerName(declaration) {
-    return `${getQualifiedName(declaration, "namespace.name").split('.').join('_')}_serializer`;
+function getSerializerName(library, language, declaration) {
+    const qualifier = isTopLevelConflicted(library, language, declaration)
+        ? "package.namespace.name" : "namespace.name";
+    return `${getQualifiedName(declaration, qualifier).split('.').join('_')}_serializer`;
 }
 class BaseArgConvertor {
     constructor(idlType, runtimeTypes, isScoped, useArray, param) {
@@ -9572,12 +9659,12 @@ class InterfaceConvertor extends BaseArgConvertor {
         throw new Error("Must never be used");
     }
     convertorSerialize(param, value, writer) {
-        const accessor = getSerializerName(this.declaration);
+        const accessor = getSerializerName(this.library, writer.language, this.declaration);
         writer.addFeature(accessor, this.library.layout.resolve({ node: this.declaration, role: LayoutNodeRole.SERIALIZER }));
         return writer.makeStatement(writer.makeStaticMethodCall(accessor, 'write', [writer.makeString(`${param}Serializer`), writer.makeString(writer.escapeKeyword(value))]));
     }
     convertorDeserialize(bufferName, deserializerName, assigneer, writer) {
-        const accessor = getSerializerName(this.declaration);
+        const accessor = getSerializerName(this.library, writer.language, this.declaration);
         writer.addFeature(accessor, this.library.layout.resolve({ node: this.declaration, role: LayoutNodeRole.SERIALIZER }));
         return assigneer(writer.makeStaticMethodCall(accessor, 'read', [writer.makeString(deserializerName)]));
     }
@@ -9665,10 +9752,10 @@ class MaterializedClassConvertor extends BaseArgConvertor {
         this.declaration = declaration;
     }
     convertorArg(param, writer) {
+        const nameConvertor = this.library.createTypeNameConvertor(Language.CPP);
         switch (writer.language) {
             case Language.CPP:
-                return `static_cast<${generatorTypePrefix()}${qualifiedName(this.declaration, "_", "namespace.name")}>(${param})`;
-            case Language.JAVA:
+                return `static_cast<${nameConvertor.convert(this.declaration)}>(${param})`;
             case Language.CJ:
                 return `MaterializedBase.toPeerPtr(${writer.escapeKeyword(param)})`;
             default:
@@ -9680,12 +9767,12 @@ class MaterializedClassConvertor extends BaseArgConvertor {
         }
     }
     convertorSerialize(param, value, printer) {
-        const accessorRoot = getSerializerName(this.declaration);
+        const accessorRoot = getSerializerName(this.library, printer.language, this.declaration);
         printer.addFeature(accessorRoot, this.library.layout.resolve({ node: this.declaration, role: LayoutNodeRole.SERIALIZER }));
         return printer.makeStatement(printer.makeStaticMethodCall(accessorRoot, 'write', [printer.makeString(`${param}Serializer`), printer.makeString(value)]));
     }
     convertorDeserialize(bufferName, deserializerName, assigneer, writer) {
-        const accessorRoot = getSerializerName(this.declaration);
+        const accessorRoot = getSerializerName(this.library, writer.language, this.declaration);
         writer.addFeature(accessorRoot, this.library.layout.resolve({ node: this.declaration, role: LayoutNodeRole.SERIALIZER }));
         const readStatement = writer.makeCast(writer.makeStaticMethodCall(accessorRoot, "read", [writer.makeString(deserializerName)]), this.declaration);
         return assigneer(readStatement);
@@ -9787,9 +9874,6 @@ function zip(left, right) {
         throw new Error("Arrays of different length");
     return left.map((_, i) => [left[i], right[i]]);
 }
-({
-    target: ts__namespace.ScriptTarget.ES5,
-    module: ts__namespace.ModuleKind.CommonJS});
 function throwException(message) {
     throw new Error(message);
 }
@@ -9838,6 +9922,9 @@ function getExtractor(target, lang, toPtr = true) {
     const method = toPtr ? `to${extractorClass}Ptr` : `from${extractorClass}Ptr`;
     return { receiver, method };
 }
+function removePoints(s) {
+    return s.split(/[\.\-]/g).join('_');
+}
 
 /*
  * Copyright (c) 2025 Huawei Device Co., Ltd.
@@ -10292,10 +10379,6 @@ let currentConfig = defaultCoreConfiguration;
 function generatorConfiguration() {
     return currentConfig;
 }
-function generatorTypePrefix() {
-    const conf = generatorConfiguration();
-    return `${conf.TypePrefix}${conf.LibraryPrefix}`;
-}
 
 /*
  * Copyright (c) 2024 Huawei Device Co., Ltd.
@@ -12152,9 +12235,6 @@ class Config {
         return `ir`;
     }
 }
-Config.DoNotPrintPeers = [
-    'es2panda_Context', // useless
-];
 
 /*
  * Copyright (c) 2024 Huawei Device Co., Ltd.
@@ -12226,6 +12306,9 @@ class BridgesConstructions {
     static get stringCast() {
         return `getStringCopy`;
     }
+    static get stringArrayCast() {
+        return `getStringArray`;
+    }
     static dropConstCast(value) {
         return `(void*)${value}`;
     }
@@ -12937,7 +13020,7 @@ class InteropTypeConvertor extends BaseTypeConvertor {
 class InteropMacroTypeConvertor extends InteropTypeConvertor {
     constructor(typechecker) {
         super(typechecker, {
-            sequence: (type) => `KNativePointerArray`,
+            sequence: (type) => isString(type.elementType[0]) ? `KStringArray` : `KNativePointerArray`,
             string: (type) => `KStringPtr`,
         });
     }
@@ -12960,7 +13043,7 @@ class InteropMacroTypeConvertor extends InteropTypeConvertor {
 class NativeTypeConvertor extends InteropTypeConvertor {
     constructor(typechecker) {
         super(typechecker, {
-            sequence: (type) => `KNativePointerArray`,
+            sequence: (type) => isString(type.elementType[0]) ? `KStringArray&` : `KNativePointerArray`,
             string: (type) => `KStringPtr&`,
         });
     }
@@ -12984,7 +13067,9 @@ class CastTypeConvertor extends BaseTypeConvertor {
     constructor(typechecker) {
         const primitive = (type) => BridgesConstructions.primitiveTypeCast(this.castToTypeConvertor.convertType(type));
         super(typechecker, {
-            sequence: (type) => BridgesConstructions.referenceTypeCast(this.castToTypeConvertor.convertType(type)),
+            sequence: (type) => isString(type.elementType[0]) ?
+                BridgesConstructions.stringArrayCast :
+                BridgesConstructions.referenceTypeCast(this.castToTypeConvertor.convertType(type)),
             enum: (type) => BridgesConstructions.enumCast(this.castToTypeConvertor.convertType(type)),
             reference: (type) => BridgesConstructions.referenceTypeCast(this.castToTypeConvertor.convertType(type)),
             i8: primitive,
@@ -13216,12 +13301,13 @@ class EnumsPrinter extends SingleFilePrinter {
  * limitations under the License.
  */
 class IndexPrinter extends SingleFilePrinter {
-    constructor() {
-        super(...arguments);
+    constructor(config, idl) {
+        super(idl);
+        this.config = config;
         this.writer = createDefaultTypescriptWriter();
     }
     filterInterface(node) {
-        return !this.typechecker.isPeer(node) || Config.DoNotPrintPeers.includes(fqName(node));
+        return !this.typechecker.isPeer(node) || this.config.ignore.isIgnoredPeer(fqName(node));
     }
     printInterface(node) {
         this.writer.writeExpressionStatement(this.writer.makeString(`export * from "./peers/${dropPrefix(node.name, Config.dataClassPrefix)}"`));
@@ -13271,7 +13357,7 @@ class BindingsConstructions {
 class BindingsTypeConvertor extends InteropTypeConvertor {
     constructor(typechecker) {
         super(typechecker, {
-            sequence: (type) => `BigUint64Array`,
+            sequence: (type) => isString(type.elementType[0]) ? `KStringArrayPtr` : `BigUint64Array`,
             string: (type) => `KStringPtr`,
         });
     }
@@ -13440,6 +13526,9 @@ class PeersConstructions {
     static passNode(name) {
         return `passNode(${name})`;
     }
+    static passStringArray(name) {
+        return `passStringArray(${name})`;
+    }
     static passNodeArray(name) {
         return `passNodeArray(${name})`;
     }
@@ -13665,7 +13754,8 @@ class BindingParameterTypeConvertor extends TopLevelTypeConvertor {
     constructor(typechecker) {
         super(typechecker, {
             sequence: (type) => (parameter) => [
-                PeersConstructions.passNodeArray(parameter),
+                isString(type.elementType[0]) ?
+                    PeersConstructions.passStringArray(parameter) : PeersConstructions.passNodeArray(parameter),
                 PeersConstructions.arrayLength(parameter)
             ],
             string: (type) => (parameter) => parameter,
@@ -13988,7 +14078,7 @@ class AllPeersPrinter extends MultiFilePrinter {
         this.config = config;
     }
     filterInterface(node) {
-        return !this.typechecker.isPeer(node) || Config.DoNotPrintPeers.includes(fqName(node));
+        return !this.typechecker.isPeer(node) || this.config.ignore.isIgnoredPeer(fqName(node));
     }
     printInterface(node) {
         return {
@@ -14549,7 +14639,7 @@ class DynamicEmitter {
         this.bridgesPrinter = new SingleFileEmitter((idl) => new BridgesPrinter(this.config, idl).print(), `libarkts/generated/native/bridges.cc`, `bridges.cc`, true);
         this.bindingsPrinter = new SingleFileEmitter((idl) => new BindingsPrinter(idl).print(), `libarkts/generated/Es2pandaNativeModule.ts`, `Es2pandaNativeModule.ts`, true);
         this.enumsPrinter = new SingleFileEmitter((idl) => new EnumsPrinter(idl).print(), `libarkts/generated/Es2pandaEnums.ts`, `Es2pandaEnums.ts`, true);
-        this.indexPrinter = new SingleFileEmitter((idl) => new IndexPrinter(idl).print(), `libarkts/generated/index.ts`, `index.ts`, true);
+        this.indexPrinter = new SingleFileEmitter((idl) => new IndexPrinter(this.config, idl).print(), `libarkts/generated/index.ts`, `index.ts`, true);
         this.peersPrinter = new MultiFileEmitter((idl) => new AllPeersPrinter(this.config, idl).print(), `libarkts/generated/peers`, `peer.ts`, true);
         this.factoryPrinter = new SingleFileEmitter((idl) => new FactoryPrinter(this.config, idl).print(), `libarkts/generated/factory.ts`, `factory.ts`, true);
         const myJson = path__namespace$1.resolve(__dirname, '..', 'package.json');
@@ -14661,7 +14751,8 @@ class DynamicEmitter {
  */
 class IgnoreOptions {
     constructor(filePath) {
-        var _a, _b;
+        var _a, _b, _c;
+        this.peers = [];
         this.partial = [];
         this.ignored = new Map();
         if (filePath === undefined) {
@@ -14669,7 +14760,8 @@ class IgnoreOptions {
         }
         const ignore = lib.parse(fs__namespace$1.readFileSync(filePath).toString()).ignore;
         this.partial = (_a = ignore === null || ignore === void 0 ? void 0 : ignore.partial) !== null && _a !== void 0 ? _a : [];
-        const full = (_b = ignore === null || ignore === void 0 ? void 0 : ignore.full) !== null && _b !== void 0 ? _b : [];
+        this.peers = (_b = ignore === null || ignore === void 0 ? void 0 : ignore.peers) !== null && _b !== void 0 ? _b : ['es2panda_Context'];
+        const full = (_c = ignore === null || ignore === void 0 ? void 0 : ignore.full) !== null && _c !== void 0 ? _c : [];
         full.forEach((fqName) => {
             const parts = fqName.split('.');
             const [ns, name] = parts.length === 1 ? ['', parts.at(0)] : parts;
@@ -14681,6 +14773,9 @@ class IgnoreOptions {
             this.ignored.get(ns).set(key, last !== '!');
         });
     }
+    isIgnoredPeer(name) {
+        return this.peers.includes(name);
+    }
     isIgnoredMethod(iface, method) {
         var _a;
         return (_a = this.partial) === null || _a === void 0 ? void 0 : _a.some(it => { var _a; return it.interface === iface && ((_a = it.methods) === null || _a === void 0 ? void 0 : _a.includes(method)); });

package/package.json

@@ -1,54 +1,53 @@
 {
-  "name": "@idlizer/arktscgen",
-  "version": "2.1.10-arktscgen-4",
-  "description": "",
-  "main": "lib/index.js",
-  "bin": "lib/index.js",
-  "files": [
-    "lib/*.js",
-    "templates/*",
-    "./build/libarkts-copy/src",
-    "./build/libarkts-copy/native",
-    "./build/libarkts-copy/generator",
-    "./build/libarkts-copy/package.json",
-    "./build/libarkts-copy/tsconfig.json",
-    "!./build/libarkts-copy/generated",
-    "!./build/libarkts-copy/native/build"
-  ],
-  "license": "Apache-2.0",
-  "keywords": [],
-  "dependencies": {
-    "@idlizer/core": "2.1.10-arktscgen-4",
-    "@types/node": "^18.0.0",
-    "commander": "^10.0.0",
-    "typescript": "^4.9.5"
-  },
-  "devDependencies": {
-    "@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",
-    "@types/chai": "^4.3.1",
-    "@types/json5": "^2.2.0",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^18.0.0",
-    "json5": "^2.2.3",
-    "source-map-support": "^0.5.21"
-  },
-  "scripts": {
-    "compile:core": "npm run --prefix ../core compile",
-    "compile:self": "rollup -c",
-    "compile": "npm run compile:core && npm run compile:self",
-    "external:test": "npm run --prefix ../external/ui2abc/libarkts run",
-    "external:clean": "rimraf ../external/ui2abc/libarkts/generated",
-    "external:generate": "npm run compile && node . --panda-sdk-path ../external/incremental/tools/panda/node_modules/@panda/sdk/ --output-dir ../external/ui2abc/ --options-file ../external/ui2abc/libarkts/generator/options.json5 --debug --no-initialize",
-    "all": "npm run compile && npm run external:clean && npm run external:generate && npm run external:test",
-    "prepack": "npm run compile && mkdir -p ./build && cp -r ../external/ui2abc/libarkts ./build/libarkts-copy",
-    "postpack": "rimraf ./build/libarkts-copy",
-    "test:pack": "node ./tools/main.mjs test-pack",
-    "test:all": "npm run all && npm run test:pack",
-    "release:patch": "node ./tools/main.mjs release patch",
-    "release:minor": "node ./tools/main.mjs release minor",
-    "release:major": "node ./tools/main.mjs release major"
-  }
+    "name": "@idlizer/arktscgen",
+    "version": "2.1.10-arktscgen-5",
+    "description": "",
+    "main": "lib/index.js",
+    "bin": "lib/index.js",
+    "files": [
+        "lib/*.js",
+        "templates/*",
+        "./build/libarkts-copy/src",
+        "./build/libarkts-copy/native",
+        "./build/libarkts-copy/generator",
+        "./build/libarkts-copy/package.json",
+        "./build/libarkts-copy/tsconfig.json",
+        "!./build/libarkts-copy/generated",
+        "!./build/libarkts-copy/native/build"
+    ],
+    "license": "Apache-2.0",
+    "keywords": [],
+    "dependencies": {
+        "@idlizer/core": "2.1.10-arktscgen-5",
+        "@types/node": "^18.0.0",
+        "commander": "^10.0.0",
+        "typescript": "^4.9.5"
+    },
+    "devDependencies": {
+        "@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",
+        "@types/chai": "^4.3.1",
+        "@types/json5": "^2.2.0",
+        "@types/node": "^18.0.0",
+        "json5": "^2.2.3",
+        "source-map-support": "^0.5.21"
+    },
+    "scripts": {
+        "compile:core": "npm run --prefix ../core compile",
+        "compile:self": "rollup -c",
+        "compile": "npm run compile:core && npm run compile:self",
+        "external:test": "npm run --prefix ../external/ui2abc/libarkts run:current",
+        "external:clean": "rimraf ../external/ui2abc/libarkts/generated",
+        "external:generate": "npm run compile && node . --panda-sdk-path ../external/incremental/tools/panda/node_modules/@panda/sdk/ --output-dir ../external/ui2abc/ --options-file ../external/ui2abc/libarkts/generator/options.json5 --debug --no-initialize",
+        "all": "npm run compile && npm run external:clean && npm run external:generate && npm run external:test",
+        "prepack": "npm run compile && mkdir -p ./build && cp -r ../external/ui2abc/libarkts ./build/libarkts-copy",
+        "postpack": "rimraf ./build/libarkts-copy",
+        "test:pack": "node ./tools/main.mjs test-pack",
+        "test:all": "npm run all && npm run test:pack",
+        "release:patch": "node ./tools/main.mjs release patch",
+        "release:minor": "node ./tools/main.mjs release minor",
+        "release:major": "node ./tools/main.mjs release major"
+    }
 }