@idlizer/core 2.0.20 → 2.0.22

package/build/lib/src/LanguageWriters/LanguageWriter.d.ts

@@ -273,7 +273,7 @@ export declare abstract class LanguageWriter {
     writeStatement(stmt: LanguageStatement): void;
     writeStatements(...statements: LanguageStatement[]): void;
     writeExpressionStatement(smth: LanguageExpression): void;
-    writeExpressionStatements(statements: LanguageExpression[]): void;
+    writeExpressionStatements(...statements: LanguageExpression[]): void;
     writeStaticBlock(op: (writer: this) => void): void;
     makeRef(type: idl.IDLType, _options?: MakeRefOptions): idl.IDLType;
     makeThis(): LanguageExpression;

package/build/lib/src/LanguageWriters/LanguageWriter.js

@@ -437,7 +437,7 @@ export class LanguageWriter {
     writeExpressionStatement(smth) {
         this.writeStatement(new ExpressionStatement(smth));
     }
-    writeExpressionStatements(statements) {
+    writeExpressionStatements(...statements) {
         statements.forEach(it => this.writeExpressionStatement(it));
     }
     writeStaticBlock(op) {

package/build/lib/src/LanguageWriters/convertors/CJConvertors.js

@@ -106,7 +106,7 @@ export class CJTypeNameConvertor {
             case idl.IDLF64Type: return 'Float64';
             case idl.IDLPointerType: return 'UInt64';
             case idl.IDLVoidType: return 'Unit';
-            case idl.IDLBufferType: return 'ArrayList<UInt8>';
+            case idl.IDLBufferType: return 'Array<UInt8>';
         }
         throw new Error(`Unsupported IDL primitive ${idl.DebugUtils.debugPrintType(type)}`);
     }

package/build/lib/src/LanguageWriters/convertors/InteropConvertors.d.ts

@@ -35,6 +35,8 @@ export declare class InteropNameConvertor implements IdlNameConvertor {
     convert(node: idl.IDLNode): string;
 }
 export declare class InteropReturnTypeConvertor implements TypeConvertor<string> {
+    protected readonly resolver?: ReferenceResolver | undefined;
+    constructor(resolver?: ReferenceResolver | undefined);
     isVoid(method: PeerMethod): boolean;
     convert(type: idl.IDLType): string;
     convertContainer(type: idl.IDLContainerType): string;

package/build/lib/src/LanguageWriters/convertors/InteropConvertors.js

@@ -173,6 +173,9 @@ export class InteropNameConvertor {
     }
 }
 export class InteropReturnTypeConvertor {
+    constructor(resolver) {
+        this.resolver = resolver;
+    }
     isVoid(method) {
         return this.convert(method.returnType) === idl.IDLVoidType.name;
     }
@@ -225,6 +228,10 @@ export class InteropReturnTypeConvertor {
     convertTypeReference(type) {
         if (type.name.endsWith("Attribute"))
             return idl.IDLVoidType.name;
+        // Callbacks and array types return by value
+        if (this.resolver && idl.isCallback(this.resolver.toDeclaration(type))) {
+            return type.name;
+        }
         return PrimitiveTypesInstance.NativePointer.getText();
     }
     convertUnion(type) {
@@ -247,6 +254,7 @@ export class InteropArgConvertor {
     convertPrimitiveType(type) {
         switch (type) {
             case idl.IDLI32Type: return "KInt";
+            case idl.IDLF32Type: return "KFloat";
             case idl.IDLNumberType: return 'number';
             case idl.IDLBigintType: return 'bigint';
             case idl.IDLBooleanType:

package/build/lib/src/LanguageWriters/convertors/TSConvertors.js

@@ -126,6 +126,8 @@ export class TSTypeNameConvertor {
             case idl.IDLBooleanType: return 'boolean';
             case idl.IDLI32Type:
                 return 'int32';
+            case idl.IDLF32Type:
+                return 'float32';
             case idl.IDLI8Type:
             case idl.IDLU8Type:
             case idl.IDLI16Type:
@@ -133,7 +135,6 @@ export class TSTypeNameConvertor {
             case idl.IDLU32Type:
             case idl.IDLI64Type:
             case idl.IDLU64Type:
-            case idl.IDLF32Type:
             case idl.IDLF64Type:
             case idl.IDLNumberType:
                 return 'number';

package/build/lib/src/LanguageWriters/index.d.ts

@@ -1,5 +1,8 @@
 import { Language } from "../Language";
+import { ReferenceResolver } from "../peer-generation/ReferenceResolver";
 import { InteropArgConvertor } from "./convertors/InteropConvertors";
+import { LanguageWriter } from "./LanguageWriter";
 export * from "./nameConvertor";
+export declare function createLanguageWriter(language: Language, resolver?: ReferenceResolver): LanguageWriter;
 export declare function createInteropArgConvertor(language: Language): InteropArgConvertor;
 //# sourceMappingURL=index.d.ts.map

package/build/lib/src/LanguageWriters/index.js

@@ -1,9 +1,31 @@
+import { IndentedPrinter } from "../IndentedPrinter";
 import { Language } from "../Language";
-import { CJInteropArgConvertor } from "./convertors/CJConvertors";
-import { CppInteropArgConvertor } from "./convertors/CppConvertors";
+import { PrimitiveTypesInstance } from "../peer-generation/PrimitiveType";
+import { createEmptyReferenceResolver } from "../peer-generation/ReferenceResolver";
+import { CJIDLTypeToForeignStringConvertor, CJInteropArgConvertor, CJTypeNameConvertor } from "./convertors/CJConvertors";
+import { CppInteropArgConvertor, CppInteropConvertor } from "./convertors/CppConvertors";
+import { ETSTypeNameConvertor } from "./convertors/ETSConvertors";
 import { InteropArgConvertor } from "./convertors/InteropConvertors";
-import { JavaInteropArgConvertor } from "./convertors/JavaConvertors";
+import { JavaInteropArgConvertor, JavaTypeNameConvertor } from "./convertors/JavaConvertors";
+import { TSTypeNameConvertor } from "./convertors/TSConvertors";
+import { CJLanguageWriter } from "./writers/CJLanguageWriter";
+import { CppLanguageWriter } from "./writers/CppLanguageWriter";
+import { ETSLanguageWriter } from "./writers/ETSLanguageWriter";
+import { JavaLanguageWriter } from "./writers/JavaLanguageWriter";
+import { TSLanguageWriter } from "./writers/TsLanguageWriter";
 export * from "./nameConvertor";
+export function createLanguageWriter(language, resolver) {
+    resolver !== null && resolver !== void 0 ? resolver : (resolver = EmptyReferenceResolver);
+    const printer = new IndentedPrinter();
+    switch (language) {
+        case Language.TS: return new TSLanguageWriter(printer, resolver, new TSTypeNameConvertor(resolver));
+        case Language.ARKTS: return new ETSLanguageWriter(printer, resolver, new ETSTypeNameConvertor(resolver), new CppInteropConvertor(resolver));
+        case Language.JAVA: return new JavaLanguageWriter(printer, resolver, new JavaTypeNameConvertor(resolver));
+        case Language.CPP: return new CppLanguageWriter(printer, resolver, new CppInteropConvertor(resolver), PrimitiveTypesInstance);
+        case Language.CJ: return new CJLanguageWriter(printer, resolver, new CJTypeNameConvertor(resolver), new CJIDLTypeToForeignStringConvertor(resolver));
+        default: throw new Error(`Language ${language.toString()} is not supported`);
+    }
+}
 export function createInteropArgConvertor(language) {
     switch (language) {
         case Language.TS:
@@ -14,4 +36,5 @@ export function createInteropArgConvertor(language) {
     }
     throw new Error(`InteropArgConvertor for language ${language} not implemented`);
 }
+const EmptyReferenceResolver = createEmptyReferenceResolver();
 //# sourceMappingURL=index.js.map

package/build/lib/src/LanguageWriters/writers/CJLanguageWriter.js

@@ -329,7 +329,7 @@ export class CJLanguageWriter extends LanguageWriter {
         const init = initExpr != undefined ? ` = ${initExpr.asString()}` : ``;
         name = this.escapeKeyword(name);
         let prefix = this.makeFieldModifiersList(modifiers);
-        this.printer.print(`${prefix ? prefix.concat(" ") : ""}var ${name}: ${this.getNodeName(type)}${init}`);
+        this.printer.print(`${prefix ? prefix.concat(" ") : ""}var ${name}: ${this.getNodeName(idl.maybeOptional(type, optional))}${init}`);
     }
     writeMethodDeclaration(name, signature, modifiers) {
         this.writeDeclaration(name, signature, modifiers);
@@ -395,6 +395,7 @@ export class CJLanguageWriter extends LanguageWriter {
     }
     writeNativeMethodDeclaration(name, signature) {
         let signture = `${signature.args.map((it, index) => `${this.escapeKeyword(signature.argName(index))}: ${this.typeForeignConvertor.convert(it)}`).join(", ")}`;
+        name = name.startsWith('_') ? name.slice(1) : name;
         this.print(`func ${name}(${signture}): ${this.typeForeignConvertor.convert(signature.returnType)}`);
     }
     makeEnumCast(enumName, _unsafe, _convertor) {

package/build/lib/src/index.d.ts

@@ -1,6 +1,7 @@
 export * from "./config";
 export * from "./configMerge";
 export * from "./idl";
+export * from "./visitor";
 export * from "./library";
 export * from "./idlize";
 export * from "./inheritance";
@@ -27,6 +28,7 @@ export * from "./LanguageWriters/writers/CppLanguageWriter";
 export * from "./LanguageWriters/writers/JavaLanguageWriter";
 export * from "./LanguageWriters/writers/TsLanguageWriter";
 export * from "./LanguageWriters/writers/ETSLanguageWriter";
+export * from "./LanguageWriters/nameConvertor";
 export * from "./peer-generation/idl/IdlNameConvertor";
 export * from "./peer-generation/LayoutManager";
 export * from "./peer-generation/PrimitiveType";

package/build/lib/src/index.js

@@ -15,6 +15,7 @@
 export * from "./config";
 export * from "./configMerge";
 export * from "./idl";
+export * from "./visitor";
 export * from "./library";
 export * from "./idlize";
 export * from "./inheritance";
@@ -41,6 +42,7 @@ export * from "./LanguageWriters/writers/CppLanguageWriter";
 export * from "./LanguageWriters/writers/JavaLanguageWriter";
 export * from "./LanguageWriters/writers/TsLanguageWriter";
 export * from "./LanguageWriters/writers/ETSLanguageWriter";
+export * from "./LanguageWriters/nameConvertor";
 export * from "./peer-generation/idl/IdlNameConvertor";
 export * from "./peer-generation/LayoutManager";
 export * from "./peer-generation/PrimitiveType";

package/build/lib/src/peer-generation/LayoutManager.d.ts

@@ -1,15 +1,15 @@
-import { IDLNode } from "../idl";
+import { IDLEntry } from "../idl";
 export declare enum LayoutNodeRole {
     PEER = 0,
     INTERFACE = 1
 }
 export interface LayoutManagerStrategy {
-    resolve(node: IDLNode, role: LayoutNodeRole): string;
+    resolve(node: IDLEntry, role: LayoutNodeRole): string;
 }
 export declare class LayoutManager {
     private strategy;
     constructor(strategy: LayoutManagerStrategy);
-    resolve(node: IDLNode, role: LayoutNodeRole): string;
+    resolve(node: IDLEntry, role: LayoutNodeRole): string;
     static Empty(): LayoutManager;
 }
 //# sourceMappingURL=LayoutManager.d.ts.map

package/build/lib/src/peer-generation/Materialized.d.ts

@@ -42,12 +42,14 @@ export declare class MaterializedClass implements PeerClassBase {
     readonly interfaces: idl.IDLReferenceType[] | undefined;
     readonly generics: string[] | undefined;
     readonly fields: MaterializedField[];
-    readonly ctor: MaterializedMethod;
-    readonly finalizer: MaterializedMethod;
+    readonly ctor: MaterializedMethod | undefined;
+    readonly finalizer: MaterializedMethod | undefined;
     readonly methods: MaterializedMethod[];
     readonly needBeGenerated: boolean;
     readonly taggedMethods: idl.IDLMethod[];
-    constructor(decl: idl.IDLInterface, className: string, isInterface: boolean, superClass: idl.IDLReferenceType | undefined, interfaces: idl.IDLReferenceType[] | undefined, generics: string[] | undefined, fields: MaterializedField[], ctor: MaterializedMethod, finalizer: MaterializedMethod, methods: MaterializedMethod[], needBeGenerated?: boolean, taggedMethods?: idl.IDLMethod[]);
+    constructor(decl: idl.IDLInterface, className: string, isInterface: boolean, superClass: idl.IDLReferenceType | undefined, interfaces: idl.IDLReferenceType[] | undefined, generics: string[] | undefined, fields: MaterializedField[], ctor: MaterializedMethod | undefined, // undefined when used for global functions
+    finalizer: MaterializedMethod | undefined, // undefined when used for global functions
+    methods: MaterializedMethod[], needBeGenerated?: boolean, taggedMethods?: idl.IDLMethod[]);
     getComponentName(): string;
     getImplementationName(): string;
     generatedName(isCallSignature: boolean): string;

package/build/lib/src/peer-generation/Materialized.js

@@ -87,6 +87,9 @@ export class MaterializedMethod extends PeerMethod {
             }
             return `(void*) 300`;
         }
+        if (idl.isReferenceType(this.method.signature.returnType)) {
+            return "{}";
+        }
         return undefined;
     }
     get receiverType() {
@@ -134,7 +137,9 @@ export function copyMaterializedMethod(method, overrides) {
     return copied;
 }
 export class MaterializedClass {
-    constructor(decl, className, isInterface, superClass, interfaces, generics, fields, ctor, finalizer, methods, needBeGenerated = true, taggedMethods = []) {
+    constructor(decl, className, isInterface, superClass, interfaces, generics, fields, ctor, // undefined when used for global functions
+    finalizer, // undefined when used for global functions
+    methods, needBeGenerated = true, taggedMethods = []) {
         this.decl = decl;
         this.className = className;
         this.isInterface = isInterface;

package/build/lib/src/peer-generation/PeerLibrary.d.ts

@@ -1,5 +1,6 @@
 import * as idl from '../idl';
 import { Language } from '../Language';
+import { LanguageWriter } from '../LanguageWriters/LanguageWriter';
 import { IdlNameConvertor } from '../LanguageWriters';
 import { ArgConvertor } from "../LanguageWriters/ArgConvertors";
 import { LibraryInterface } from '../LibraryInterface';
@@ -24,6 +25,7 @@ export declare class PeerLibrary implements LibraryInterface {
     constructor(language: Language);
     name: string;
     readonly customComponentMethods: string[];
+    createLanguageWriter(language?: Language): LanguageWriter;
     createTypeNameConvertor(language: Language): IdlNameConvertor;
     protected readonly targetNameConvertorInstance: IdlNameConvertor;
     private readonly interopNameConvertorInstance;

package/build/lib/src/peer-generation/PeerLibrary.js

@@ -15,6 +15,7 @@
 import { warn } from 'console';
 import * as idl from '../idl';
 import { Language } from '../Language';
+import { createLanguageWriter } from '../LanguageWriters';
 import { BufferConvertor, CallbackConvertor, DateConvertor, MapConvertor, PointerConvertor, TupleConvertor, TypeAliasConvertor, AggregateConvertor, StringConvertor, ClassConvertor, ArrayConvertor, FunctionConvertor, OptionConvertor, NumberConvertor, NumericConvertor, CustomTypeConvertor, UnionConvertor, MaterializedClassConvertor, BooleanConvertor, EnumConvertor, UndefinedConvertor, VoidConvertor, ImportTypeConvertor, InterfaceConvertor, } from "../LanguageWriters/ArgConvertors";
 import { InteropNameConvertor } from '../LanguageWriters/convertors/InteropConvertors';
 import { CJTypeNameConvertor } from '../LanguageWriters/convertors/CJConvertors';
@@ -22,6 +23,7 @@ import { CppInteropConvertor } from '../LanguageWriters/convertors/CppConvertors
 import { ETSTypeNameConvertor } from '../LanguageWriters/convertors/ETSConvertors';
 import { JavaTypeNameConvertor } from '../LanguageWriters/convertors/JavaConvertors';
 import { TSTypeNameConvertor } from '../LanguageWriters/convertors/TSConvertors';
+import { isBuilderClass } from './BuilderClass';
 import { generateSyntheticFunctionName, isImportAttr } from './idl/common';
 import { isMaterialized } from './Materialized';
 import { LayoutManager } from './LayoutManager';
@@ -53,6 +55,9 @@ export class PeerLibrary {
         this.targetNameConvertorInstance = this.createTypeNameConvertor(this.language);
         this.interopNameConvertorInstance = new InteropNameConvertor(this);
     }
+    createLanguageWriter(language) {
+        return createLanguageWriter(language !== null && language !== void 0 ? language : this.language, this);
+    }
     createTypeNameConvertor(language) {
         switch (language) {
             case Language.TS: return new TSTypeNameConvertor(this);
@@ -243,11 +248,13 @@ export class PeerLibrary {
             if (isMaterialized(declaration, this)) {
                 return new MaterializedClassConvertor(param, declaration);
             }
+            if (isBuilderClass(declaration)) {
+                return new ClassConvertor(this, declarationName, param, declaration);
+            }
             switch (declaration.subkind) {
                 case idl.IDLInterfaceSubkind.Interface:
-                    return new InterfaceConvertor(this, declarationName, param, declaration);
                 case idl.IDLInterfaceSubkind.Class:
-                    return new ClassConvertor(this, declarationName, param, declaration);
+                    return new InterfaceConvertor(this, declarationName, param, declaration);
                 case idl.IDLInterfaceSubkind.AnonymousInterface:
                     return new AggregateConvertor(this, param, type, declaration);
                 case idl.IDLInterfaceSubkind.Tuple:

package/build/lib/src/peer-generation/idl/IdlNameConvertor.js

@@ -41,7 +41,10 @@ export class DeclarationNameConvertor {
 DeclarationNameConvertor.I = new DeclarationNameConvertor();
 export class TSFeatureNameConvertor extends DeclarationNameConvertor {
     convertEnum(decl) {
-        return `${idl.getNamespacesPathFor(decl).join('')}${decl.name}`;
+        const namespace = idl.getNamespacesPathFor(decl).map(it => it.name);
+        if (namespace.length > 0)
+            return namespace[0];
+        return decl.name;
     }
 }
 TSFeatureNameConvertor.I = new TSFeatureNameConvertor();

package/build/lib/src/visitor.d.ts

@@ -0,0 +1,43 @@
+import * as idl from './idl';
+import { ReferenceResolver } from './peer-generation/ReferenceResolver';
+export interface IDLConverter<T> {
+    visitOptional(type: idl.IDLOptionalType): T;
+    visitUnion(type: idl.IDLUnionType): T;
+    visitContainer(type: idl.IDLContainerType): T;
+    visitImport(type: idl.IDLReferenceType, importClause: string): T;
+    visitTypeReference(type: idl.IDLReferenceType): T;
+    visitTypeParameter(type: idl.IDLTypeParameterType): T;
+    visitPrimitiveType(type: idl.IDLPrimitiveType): T;
+    visitNamespace(node: idl.IDLNamespace): T;
+    visitInterface(node: idl.IDLInterface): T;
+    visitEnum(node: idl.IDLEnum): T;
+    visitTypedef(node: idl.IDLTypedef): T;
+    visitCallback(node: idl.IDLCallback): T;
+    visitMethod(node: idl.IDLMethod): T;
+    visitProperty(node: idl.IDLProperty): T;
+    visitConstant(node: idl.IDLConstant): T;
+}
+export declare function walkIDL<T>(convertor: IDLConverter<T>, node: idl.IDLNode): T;
+export declare class IDLDependencyCollector implements IDLConverter<idl.IDLNode[]> {
+    private readonly resolver;
+    constructor(resolver: ReferenceResolver);
+    visitOptional(type: idl.IDLOptionalType): idl.IDLNode[];
+    visitUnion(type: idl.IDLUnionType): idl.IDLNode[];
+    visitContainer(type: idl.IDLContainerType): idl.IDLNode[];
+    visitImport(type: idl.IDLReferenceType): idl.IDLNode[];
+    visitTypeReference(type: idl.IDLReferenceType): idl.IDLNode[];
+    visitTypeParameter(): idl.IDLNode[];
+    visitPrimitiveType(): idl.IDLNode[];
+    visitNamespace(decl: idl.IDLNamespace): idl.IDLNode[];
+    visitInterface(decl: idl.IDLInterface): idl.IDLNode[];
+    protected visitSupertype(type: idl.IDLType | idl.IDLInterface): idl.IDLNode[];
+    visitEnum(): idl.IDLNode[];
+    visitTypedef(decl: idl.IDLTypedef): idl.IDLNode[];
+    visitCallback(decl: idl.IDLCallback): idl.IDLNode[];
+    visitMethod(decl: idl.IDLMethod): idl.IDLNode[];
+    visitProperty(node: idl.IDLProperty): idl.IDLNode[];
+    visitConstant(decl: idl.IDLConstant): idl.IDLNode[];
+    walk(node?: idl.IDLNode): idl.IDLNode[];
+}
+export declare function collectDependencies(resolver: ReferenceResolver, node: idl.IDLNode): idl.IDLNode[];
+//# sourceMappingURL=visitor.d.ts.map

package/build/lib/src/visitor.js

@@ -0,0 +1,143 @@
+/*
+ * 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.
+ */
+import * as idl from './idl';
+export function walkIDL(convertor, node) {
+    if (idl.isNamespace(node))
+        return convertor.visitNamespace(node);
+    if (idl.isInterface(node))
+        return convertor.visitInterface(node);
+    if (idl.isEnum(node))
+        return convertor.visitEnum(node);
+    if (idl.isEnumMember(node))
+        return convertor.visitEnum(node.parent);
+    if (idl.isTypedef(node))
+        return convertor.visitTypedef(node);
+    if (idl.isCallback(node))
+        return convertor.visitCallback(node);
+    if (idl.isMethod(node))
+        return convertor.visitMethod(node);
+    if (idl.isProperty(node))
+        return convertor.visitProperty(node);
+    if (idl.isConstant(node))
+        return convertor.visitConstant(node);
+    if (idl.isOptionalType(node))
+        return convertor.visitOptional(node);
+    if (idl.isUnionType(node))
+        return convertor.visitUnion(node);
+    if (idl.isContainerType(node))
+        return convertor.visitContainer(node);
+    if (idl.isReferenceType(node)) {
+        const importAttr = idl.getExtAttribute(node, idl.IDLExtendedAttributes.Import);
+        return importAttr
+            ? convertor.visitImport(node, importAttr)
+            : convertor.visitTypeReference(node);
+    }
+    if (idl.isTypeParameterType(node))
+        return convertor.visitTypeParameter(node);
+    if (idl.isPrimitiveType(node))
+        return convertor.visitPrimitiveType(node);
+    throw new Error(`Unknown kind ${idl.IDLKind[node.kind]}`);
+}
+////////////////////////////////////////////////////////////////////////////
+export class IDLDependencyCollector {
+    constructor(resolver) {
+        this.resolver = resolver;
+    }
+    visitOptional(type) {
+        return this.walk(type.type);
+    }
+    visitUnion(type) {
+        return type.types.flatMap(ty => this.walk(ty));
+    }
+    visitContainer(type) {
+        return type.elementType.flatMap(ty => this.walk(ty));
+    }
+    visitImport(type) {
+        const maybeDecl = this.resolver.resolveTypeReference(type);
+        return maybeDecl ? [maybeDecl] : [];
+    }
+    visitTypeReference(type) {
+        const decl = this.resolver.resolveTypeReference(type);
+        const result = !decl ? []
+            : idl.isEnumMember(decl) ? [decl.parent] : [decl];
+        if (type.typeArguments) {
+            result.push(...type.typeArguments.flatMap(it => this.walk(it)));
+        }
+        return result;
+    }
+    visitTypeParameter() {
+        return [];
+    }
+    visitPrimitiveType() {
+        return [];
+    }
+    visitNamespace(decl) {
+        return decl.members.flatMap(it => this.walk(it));
+    }
+    visitInterface(decl) {
+        return [
+            ...decl.inheritance
+                .filter(it => it !== idl.IDLTopType)
+                .flatMap(it => this.visitSupertype(it)),
+            ...decl.properties
+                .filter(it => !it.isStatic)
+                .flatMap(it => this.walk(it.type)),
+            ...[...decl.constructors, ...decl.callables, ...decl.methods]
+                .flatMap(it => [
+                ...it.parameters.flatMap(param => this.walk(param.type)),
+                ...this.walk(it.returnType)
+            ])
+        ];
+    }
+    visitSupertype(type) {
+        if (idl.isInterface(type)) {
+            return this.walk(idl.createReferenceType(type.name, undefined, type));
+        }
+        return this.walk(type);
+    }
+    visitEnum() {
+        return [];
+    }
+    visitTypedef(decl) {
+        return this.walk(decl.type);
+    }
+    visitCallback(decl) {
+        return [
+            ...decl.parameters.flatMap(it => this.walk(it.type)),
+            ...this.walk(decl.returnType),
+        ];
+    }
+    visitMethod(decl) {
+        return [
+            ...decl.parameters.flatMap(it => this.walk(it.type)),
+            ...this.walk(decl.returnType),
+        ];
+    }
+    visitProperty(node) {
+        return this.walk(node.type);
+    }
+    visitConstant(decl) {
+        return this.walk(decl.type);
+    }
+    walk(node) {
+        if (node === undefined)
+            return [];
+        return walkIDL(this, node);
+    }
+}
+export function collectDependencies(resolver, node) {
+    return walkIDL(new IDLDependencyCollector(resolver), node);
+}
+//# sourceMappingURL=visitor.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idlizer/core",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "description": "",
   "types": "build/lib/src/index.d.ts",
   "exports": {
@@ -34,7 +34,7 @@
   },
   "keywords": [],
   "dependencies": {
-    "@koalaui/interop": "1.4.7",
+    "@koalaui/interop": "1.4.9",
     "typescript": "4.9.5",
     "@types/node": "^18.0.0"
   },