@idlizer/core 2.1.9-arktscgen-6 → 2.1.9-arktscgen-9

package/build/lib/src/idl.js

@@ -65,6 +65,7 @@ export var IDLExtendedAttributes;
     IDLExtendedAttributes["DtsTag"] = "DtsTag";
     IDLExtendedAttributes["Entity"] = "Entity";
     IDLExtendedAttributes["Extends"] = "Extends";
+    IDLExtendedAttributes["ExtensionMethod"] = "ExtensionMethod";
     IDLExtendedAttributes["Import"] = "Import";
     IDLExtendedAttributes["DefaultExport"] = "DefaultExport";
     IDLExtendedAttributes["IndexSignature"] = "IndexSignature";
@@ -72,6 +73,7 @@ export var IDLExtendedAttributes;
     IDLExtendedAttributes["NativeModule"] = "NativeModule";
     IDLExtendedAttributes["Optional"] = "Optional";
     IDLExtendedAttributes["OriginalEnumMemberName"] = "OriginalEnumMemberName";
+    IDLExtendedAttributes["OriginalGenericName"] = "OriginalGenericName";
     IDLExtendedAttributes["Predefined"] = "Predefined";
     IDLExtendedAttributes["Protected"] = "Protected";
     IDLExtendedAttributes["Synthetic"] = "Synthetic";
@@ -183,11 +185,11 @@ export function forEachChild(node, cbEnter, cbLeave) {
     cleanup === null || cleanup === void 0 ? void 0 : cleanup();
 }
 /** Updates tree in place! */
-function updateEachChild(node, op, cbLeave) {
+export function updateEachChild(node, op, cbLeave) {
     var _a;
     const old = node;
     node = op(old);
-    if (node.kind !== old.kind) {
+    if (node.kind !== old.kind && !(isType(old) && isType(node))) {
         throw new Error("Kinds must be the same!");
     }
     switch (node.kind) {
@@ -640,7 +642,18 @@ export function createConstant(name, type, value, nodeInitializer = {}) {
 }
 export function clone(node) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
-    const make = (node) => node;
+    const make = (newnode) => {
+        if (node.nodeLocation) {
+            newnode.nodeLocation = node.nodeLocation;
+        }
+        if (node.nameLocation) {
+            newnode.nameLocation = node.nameLocation;
+        }
+        if (node.valueLocation) {
+            newnode.valueLocation = node.valueLocation;
+        }
+        return newnode;
+    };
     const get = (node) => node;
     switch (node.kind) {
         case IDLKind.Interface: {

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

@@ -12,6 +12,9 @@ export * from "./util";
 export * from "./rand_utils";
 export * from "./IndentedPrinter";
 export * from "./LibraryInterface";
+export * from "./diagnostictypes";
+export * from "./diagnosticmessages";
+export * from "./formatter";
 export * from "./LanguageWriters/LanguageWriter";
 export * from "./LanguageWriters/ArgConvertors";
 export * from "./LanguageWriters/common";
@@ -22,12 +25,14 @@ export * from "./LanguageWriters/convertors/ETSConvertors";
 export * from "./LanguageWriters/convertors/JavaConvertors";
 export * from "./LanguageWriters/convertors/CJConvertors";
 export * from "./LanguageWriters/convertors/InteropConvertors";
+export * from "./LanguageWriters/convertors/KotlinConvertors";
 export * from "./LanguageWriters/writers/CJLanguageWriter";
 export * from "./LanguageWriters/writers/CLikeLanguageWriter";
 export * from "./LanguageWriters/writers/CppLanguageWriter";
 export * from "./LanguageWriters/writers/JavaLanguageWriter";
 export * from "./LanguageWriters/writers/TsLanguageWriter";
 export * from "./LanguageWriters/writers/ETSLanguageWriter";
+export * from "./LanguageWriters/writers/KotlinLanguageWriter";
 export * from "./LanguageWriters/nameConvertor";
 export * from "./peer-generation/idl/IdlNameConvertor";
 export * from "./peer-generation/LayoutManager";
@@ -40,11 +45,12 @@ export * from "./peer-generation/BuilderClass";
 export * from "./peer-generation/Materialized";
 export * from "./peer-generation/modules";
 export * from "./peer-generation/isMaterialized";
-export * from "./peer-generation/isExternalType";
 export * from "./peer-generation/isStructureType";
 export * from "./peer-generation/isEnumType";
 export * from "./peer-generation/unions";
 export * from "./peer-generation/getSuperType";
+export * from "./transformers/FqnTransformer";
+export * from "./transformers/GenericTransformer";
 export * from "./LanguageWriters";
 export * from "./peer-generation/ReferenceResolver";
 export * from "./peer-generation/idl/common";

package/build/lib/src/index.js

@@ -26,6 +26,9 @@ export * from "./util";
 export * from "./rand_utils";
 export * from "./IndentedPrinter";
 export * from "./LibraryInterface";
+export * from "./diagnostictypes";
+export * from "./diagnosticmessages";
+export * from "./formatter";
 export * from "./LanguageWriters/LanguageWriter";
 export * from "./LanguageWriters/ArgConvertors";
 export * from "./LanguageWriters/common";
@@ -36,12 +39,14 @@ export * from "./LanguageWriters/convertors/ETSConvertors";
 export * from "./LanguageWriters/convertors/JavaConvertors";
 export * from "./LanguageWriters/convertors/CJConvertors";
 export * from "./LanguageWriters/convertors/InteropConvertors";
+export * from "./LanguageWriters/convertors/KotlinConvertors";
 export * from "./LanguageWriters/writers/CJLanguageWriter";
 export * from "./LanguageWriters/writers/CLikeLanguageWriter";
 export * from "./LanguageWriters/writers/CppLanguageWriter";
 export * from "./LanguageWriters/writers/JavaLanguageWriter";
 export * from "./LanguageWriters/writers/TsLanguageWriter";
 export * from "./LanguageWriters/writers/ETSLanguageWriter";
+export * from "./LanguageWriters/writers/KotlinLanguageWriter";
 export * from "./LanguageWriters/nameConvertor";
 export * from "./peer-generation/idl/IdlNameConvertor";
 export * from "./peer-generation/LayoutManager";
@@ -54,11 +59,12 @@ export * from "./peer-generation/BuilderClass";
 export * from "./peer-generation/Materialized";
 export * from "./peer-generation/modules";
 export * from "./peer-generation/isMaterialized";
-export * from "./peer-generation/isExternalType";
 export * from "./peer-generation/isStructureType";
 export * from "./peer-generation/isEnumType";
 export * from "./peer-generation/unions";
 export * from "./peer-generation/getSuperType";
+export * from "./transformers/FqnTransformer";
+export * from "./transformers/GenericTransformer";
 export * from "./LanguageWriters";
 export * from "./peer-generation/ReferenceResolver";
 export * from "./peer-generation/idl/common";

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

@@ -1,4 +1,5 @@
 import * as idl from '../idl';
+import { Language } from '../Language';
 import { ArgConvertor } from '../LanguageWriters/ArgConvertors';
 import { Field, Method } from '../LanguageWriters/LanguageWriter';
 import { PeerClassBase } from './PeerClass';
@@ -17,7 +18,6 @@ export declare class MaterializedMethod extends PeerMethod {
     tsReturnType(): idl.IDLType | undefined;
     getPrivateMethod(): MaterializedMethod;
     withReturnType(returnType: idl.IDLType): MaterializedMethod;
-    setOverloadIndex(index: number): void;
 }
 export declare function copyMaterializedMethod(method: MaterializedMethod, overrides: {
     method?: Method;
@@ -47,6 +47,6 @@ export declare class MaterializedClass implements PeerClassBase {
 }
 export declare function createDestroyPeerMethod(clazz: MaterializedClass): MaterializedMethod | undefined;
 export declare function getInternalClassName(name: string): string;
-export declare function getInternalClassQualifiedName(target: idl.IDLEntry, pattern?: idl.QNPattern): string;
+export declare function getInternalClassQualifiedName(target: idl.IDLEntry, pattern?: idl.QNPattern, language?: Language): string;
 export declare function getMaterializedFileName(name: string): string;
 //# sourceMappingURL=Materialized.d.ts.map

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

@@ -42,6 +42,7 @@ export class MaterializedMethod extends PeerMethod {
                 method: copyMethod(this.method, {
                     modifiers: ((_b = this.method.modifiers) !== null && _b !== void 0 ? _b : [])
                         .filter(it => it !== MethodModifier.PUBLIC)
+                        .filter(it => it !== MethodModifier.OVERRIDE)
                         .concat([MethodModifier.PRIVATE])
                 })
             });
@@ -55,15 +56,10 @@ export class MaterializedMethod extends PeerMethod {
         const method = copyMethod(this.method, { signature: signature });
         return copyMaterializedMethod(this, { method: method });
     }
-    setOverloadIndex(index) {
-        this.overloadIndex = index;
-    }
 }
 export function copyMaterializedMethod(method, overrides) {
     var _a;
-    const copied = new MaterializedMethod(method.sig, method.originalParentName, method.implementationParentName, method.returnType, method.isCallSignature, (_a = overrides.method) !== null && _a !== void 0 ? _a : method.method);
-    copied.setSameOverloadIndex(method);
-    return copied;
+    return new MaterializedMethod(method.sig, method.originalParentName, method.implementationParentName, method.returnType, method.isCallSignature, (_a = overrides.method) !== null && _a !== void 0 ? _a : method.method);
 }
 export class MaterializedClass {
     constructor(decl, className, isInterface, isStaticMaterialized, superClass, interfaces, generics, fields, ctors, // zero size when used for global functions
@@ -83,7 +79,6 @@ export class MaterializedClass {
         this.needBeGenerated = needBeGenerated;
         this.taggedMethods = taggedMethods;
         this._isGlobal = false;
-        PeerMethod.markAndGroupOverloads(methods);
     }
     getImplementationName() {
         return this.isInterface ? getInternalClassName(this.className) : this.className;
@@ -107,8 +102,8 @@ export function createDestroyPeerMethod(clazz) {
 export function getInternalClassName(name) {
     return `${name}Internal`;
 }
-export function getInternalClassQualifiedName(target, pattern = "package.namespace.name") {
-    return getInternalClassName(qualifiedName(target, ".", pattern));
+export function getInternalClassQualifiedName(target, pattern = "package.namespace.name", language) {
+    return getInternalClassName(qualifiedName(target, language !== null && language !== void 0 ? language : ".", pattern));
 }
 export function getMaterializedFileName(name) {
     const pascalCase = name.split('_').map(x => capitalize(x)).join('');

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

@@ -17,7 +17,7 @@ import * as idl from '../idl';
 import { resolveNamedNode } from '../resolveNamedNode';
 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, BigIntToU64Convertor, ObjectConvertor, ExternalTypeConvertor, } from "../LanguageWriters/ArgConvertors";
+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, BigIntToU64Convertor, ObjectConvertor, } from "../LanguageWriters/ArgConvertors";
 import { CppNameConvertor } from '../LanguageWriters/convertors/CppConvertors';
 import { CJTypeNameConvertor } from '../LanguageWriters/convertors/CJConvertors';
 import { CppConvertor } from '../LanguageWriters/convertors/CppConvertors';
@@ -32,7 +32,6 @@ import { isMaterialized } from './isMaterialized';
 import { isInIdlizeInternal } from '../idlize';
 import { isInCurrentModule } from './modules';
 import { generatorConfiguration } from '../config';
-import { isExternalType } from './isExternalType';
 import { KotlinTypeNameConvertor } from '../LanguageWriters/convertors/KotlinConvertors';
 export const lenses = {
     globals: lib.lens(lib.select.files())
@@ -392,9 +391,6 @@ export class PeerLibrary {
             return new TypeAliasConvertor(this, param, declaration);
         }
         if (idl.isInterface(declaration)) {
-            if (isExternalType(declaration, this)) {
-                return new ExternalTypeConvertor(this, param, declaration);
-            }
             if (isMaterialized(declaration, this)) {
                 return new MaterializedClassConvertor(this, param, declaration);
             }

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

@@ -16,7 +16,6 @@ export declare class PeerMethodSignature {
     readonly context: idl.IDLEntry | undefined;
     readonly modifiers: (MethodModifier.FORCE_CONTEXT | MethodModifier.THROWS)[];
     constructor(name: string, fqname: string, args: PeerMethodArg[], returnType: idl.IDLType, context?: idl.IDLEntry | undefined, modifiers?: (MethodModifier.FORCE_CONTEXT | MethodModifier.THROWS)[]);
-    static stub(): PeerMethodSignature;
     static generateOverloadPostfix(decl: idl.IDLConstructor | idl.IDLMethod | idl.IDLCallable | idl.IDLProperty): string;
     static get CTOR(): string;
     static get GET_FINALIZER(): string;
@@ -28,11 +27,8 @@ export declare class PeerMethod {
     returnType: IDLType;
     isCallSignature: boolean;
     method: Method;
-    protected overloadIndex?: number;
     constructor(sig: PeerMethodSignature, originalParentName: string, returnType: IDLType, isCallSignature: boolean, method: Method);
     argConvertors(library: PeerLibrary): ArgConvertor[];
     argAndOutConvertors(library: PeerLibrary): ArgConvertor[];
-    static markAndGroupOverloads(methods: PeerMethod[]): PeerMethod[];
-    setSameOverloadIndex(copyFrom: PeerMethod): void;
 }
 //# sourceMappingURL=PeerMethod.d.ts.map

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

@@ -15,7 +15,6 @@
 import * as idl from '../idl';
 import { createOutArgConvertor } from "../LanguageWriters/ArgConvertors";
 import { MethodModifier } from "../LanguageWriters/LanguageWriter";
-import { isDefined } from "../util";
 export class PeerMethodArg {
     constructor(name, type) {
         this.name = name;
@@ -37,32 +36,30 @@ export class PeerMethodSignature {
         this.context = context;
         this.modifiers = modifiers;
     }
-    // whilt migration we're creating PeerMethod, but in reality we shoudnt (created method does not goes through interop and does not have representation in native)
-    static stub() {
-        return new PeerMethodSignature("%STUB$", "%STUB$", [], idl.IDLVoidType, undefined);
-    }
     static generateOverloadPostfix(decl) {
-        if (!decl.parent || !idl.isInterface(decl.parent))
+        if (!decl.parent)
             return ``;
+        let sameNamed = [];
         if (idl.isMethod(decl) || idl.isProperty(decl)) {
-            let sameNamed = [
-                ...decl.parent.properties,
-                ...decl.parent.methods,
-            ].filter(it => it.name === decl.name);
-            const overloadIndex = sameNamed.length > 1 ? sameNamed.indexOf(decl).toString() : '';
-            return overloadIndex;
+            let members = [];
+            if (idl.isInterface(decl.parent))
+                members = [...decl.parent.properties, ...decl.parent.methods];
+            else if (idl.isNamespace(decl.parent))
+                members = decl.parent.members;
+            else if (idl.isFile(decl.parent))
+                members = decl.parent.entries.filter(idl.isMethod);
+            sameNamed = members.filter(it => it.name === decl.name);
+        }
+        else if (idl.isConstructor(decl) && idl.isInterface(decl.parent)) {
+            sameNamed = decl.parent.constructors;
         }
-        if (idl.isConstructor(decl)) {
-            const sameNamed = decl.parent.constructors.filter(it => it.name === decl.name);
-            const overloadIndex = sameNamed.length > 1 ? sameNamed.indexOf(decl).toString() : '';
-            return overloadIndex;
+        else if (idl.isCallable(decl) && idl.isInterface(decl.parent)) {
+            sameNamed = decl.parent.callables;
         }
-        if (idl.isCallable(decl)) {
-            const sameNamed = decl.parent.callables;
-            const overloadIndex = sameNamed.length > 1 ? sameNamed.indexOf(decl).toString() : '';
-            return overloadIndex;
+        else {
+            throw new Error("unexpected type of declaration");
         }
-        throw new Error("unexpected type of declaration");
+        return sameNamed.length > 1 ? sameNamed.indexOf(decl).toString() : '';
     }
     static get CTOR() { return "construct"; }
     static get GET_FINALIZER() { return "getFinalizer"; }
@@ -90,20 +87,5 @@ export class PeerMethod {
         const outArgConvertor = createOutArgConvertor(library, this.sig.returnType, this.sig.args.map(it => it.name));
         return outArgConvertor ? convertors.concat(outArgConvertor) : convertors;
     }
-    static markAndGroupOverloads(methods) {
-        let groupedMethods = [];
-        for (const peerMethod of methods) {
-            if (isDefined(peerMethod.overloadIndex))
-                continue;
-            const sameNamedMethods = methods.filter(it => it.method.name === peerMethod.method.name);
-            if (sameNamedMethods.length > 1)
-                sameNamedMethods.forEach((it, index) => it.overloadIndex = index);
-            groupedMethods = groupedMethods.concat(sameNamedMethods);
-        }
-        return groupedMethods;
-    }
-    setSameOverloadIndex(copyFrom) {
-        this.overloadIndex = copyFrom.overloadIndex;
-    }
 }
 //# sourceMappingURL=PeerMethod.js.map

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

@@ -38,7 +38,7 @@ export function qualifiedName(decl, languageOrDelimiter, pattern) {
         throw new Error("internal error, name required for no-named node");
     const delimiter = typeof languageOrDelimiter === "string"
         ? languageOrDelimiter
-        : (languageOrDelimiter === Language.CPP ? '_' : '.');
+        : ([Language.CPP, Language.CJ, Language.KOTLIN].includes(languageOrDelimiter) ? '_' : '.');
     if (!idl.isEntry(decl))
         throw new Error(`Expected to have an IDLEntry, got ${idl.IDLKind[decl.kind]}`);
     return idl.getQualifiedName(decl, pattern).split(".").join(delimiter);

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

@@ -15,7 +15,6 @@
 import { generatorConfiguration } from '../config';
 import * as idl from '../idl';
 import { isBuilderClass } from './BuilderClass';
-import { isExternalType } from './isExternalType';
 import { getSuper } from './getSuperType';
 export function isMaterialized(declaration, resolver) {
     var _a;
@@ -45,9 +44,6 @@ export function isMaterialized(declaration, resolver) {
     if (generatorConfiguration().ignoreMaterialized.includes(declaration.name)) {
         return false;
     }
-    if (isExternalType(declaration, resolver)) {
-        return false;
-    }
     // A materialized class is a class or an interface with methods
     // excluding components and related classes
     if (declaration.methods.length > 0 || declaration.constructors.length > 0)

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

@@ -2,6 +2,7 @@ import { ModuleConfiguration } from "../config";
 import * as idl from "../idl";
 export declare function isInModule(node: idl.IDLNode, module: ModuleConfiguration): boolean;
 export declare function isInModule(packageName: string, module: ModuleConfiguration): boolean;
+export declare function isInExternalModule(node: idl.IDLNode): boolean;
 export declare function getModuleFor(node: idl.IDLNode): ModuleConfiguration;
 export declare function getModuleFor(packageName: string): ModuleConfiguration;
 export declare function currentModule(): ModuleConfiguration;

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

@@ -1,22 +1,40 @@
 import { generatorConfiguration } from "../config";
 import * as idl from "../idl";
+const modulesCache = new Map();
 export function isInModule(nodeOrPackage, module) {
     if (typeof nodeOrPackage === 'object')
         return isInModule(idl.getPackageName(nodeOrPackage), module);
     return module.packages.some(modulePackage => nodeOrPackage.startsWith(modulePackage));
 }
+export function isInExternalModule(node) {
+    var _a;
+    return (_a = getModuleFor(node).external) !== null && _a !== void 0 ? _a : false;
+}
 export function getModuleFor(nodeOrPackage) {
     if (typeof nodeOrPackage === "object")
         return getModuleFor(idl.getPackageName(nodeOrPackage));
     const packageName = nodeOrPackage;
+    let module = modulesCache.get(packageName);
+    if (module)
+        return module;
+    module = getApplicableModuleFor(packageName);
+    modulesCache.set(packageName, module);
+    return module;
+}
+function getApplicableModuleFor(packageName) {
     const config = generatorConfiguration();
     const applicableModules = [...config.modules.values()].filter(module => isInModule(packageName, module));
     if (applicableModules.length === 0) {
-        if (nodeOrPackage === '') {
+        if (packageName === '') {
             console.error("WARNING: use current module for empty package");
             return currentModule();
         }
-        throw new Error(`Package ${packageName} is not listed in any module`);
+        if (packageName.startsWith(`idlize.`)) {
+            return currentModule();
+        }
+        const modules = [...config.modules.keys()].map(it => `"${it}"`).join(", ");
+        throw new Error(`Package "${packageName}" is not listed in any module.`
+            + ` Add the "${packageName}" to the existed list of modules [${modules}] or new one in the configuration file`);
     }
     if (applicableModules.length > 1)
         throw new Error(`Package ${packageName} listed in ${applicableModules.length} packages: ${applicableModules.map(it => it.name).join(", ")}`);
@@ -30,9 +48,10 @@ export function currentModule() {
     return result;
 }
 export function isInCurrentModule(nodeOrPackage) {
-    if (typeof nodeOrPackage === 'string')
-        return isInModule(nodeOrPackage, currentModule());
-    else
-        return isInModule(nodeOrPackage, currentModule());
+    // check the nodeOrPackage belongs to some module
+    const module = typeof nodeOrPackage === 'string'
+        ? getModuleFor(nodeOrPackage)
+        : getModuleFor(nodeOrPackage);
+    return generatorConfiguration().moduleName == module.name;
 }
 //# sourceMappingURL=modules.js.map

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

@@ -20,11 +20,9 @@ export declare class UnionRuntimeTypeChecker {
     private convertors;
     private conflictingConvertors;
     private duplicateMembers;
-    private discriminators;
     constructor(convertors: ArgConvertor[]);
     private checkConflicts;
     makeDiscriminator(value: string, convertorIndex: number, writer: LanguageWriter): LanguageExpression;
-    reportConflicts(context: string | undefined, writer: LanguageWriter): void;
 }
 export declare function flattenUnionType(library: LibraryInterface, type: IDLType): IDLType;
 //# sourceMappingURL=unions.d.ts.map

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

@@ -15,8 +15,8 @@
 import { convertType } from "../LanguageWriters";
 import { IDLCustomObjectType, IDLUndefinedType, isType, isUnionType } from '../idl';
 import { collapseTypes } from "./idl/common";
-import { CustomTypeConvertor } from "../LanguageWriters/ArgConvertors";
 import { RuntimeType } from "../LanguageWriters/common";
+import { Language } from "../Language";
 export class UnionFlattener {
     constructor(resolver) {
         this.resolver = resolver;
@@ -53,7 +53,6 @@ export class UnionRuntimeTypeChecker {
         this.convertors = convertors;
         this.conflictingConvertors = new Set();
         this.duplicateMembers = new Set();
-        this.discriminators = [];
         this.checkConflicts();
     }
     checkConflicts() {
@@ -87,31 +86,12 @@ export class UnionRuntimeTypeChecker {
     }
     makeDiscriminator(value, convertorIndex, writer) {
         const convertor = this.convertors[convertorIndex];
-        if (this.conflictingConvertors.has(convertor) && writer.language.needsUnionDiscrimination) {
+        if (this.conflictingConvertors.has(convertor) && writer.language === Language.TS) {
             const discriminator = convertor.unionDiscriminator(value, convertorIndex, writer, this.duplicateMembers);
-            this.discriminators.push([discriminator, convertor, convertorIndex]);
             if (discriminator)
                 return discriminator;
         }
-        return writer.makeNaryOp("||", convertor.runtimeTypes.map((it, runtimeTypeIndex) => writer.makeNaryOp("==", [
-            writer.makeUnionVariantCondition(convertor, value, `${value}_type`, RuntimeType[it], convertorIndex, runtimeTypeIndex)
-        ])));
-    }
-    reportConflicts(context, writer) {
-        if (this.discriminators.filter(([discriminator, _, __]) => discriminator === undefined).length > 1) {
-            let report = `Union discrimination code can not be generated for \`${context}\`.\n`;
-            report += `Possible reasons for that are too similar or unresolved types in union (see below).\n`;
-            report += ` #  | type                          | duplicated properties         | resolved | discriminator expression\n`;
-            const properties = Array.from(this.duplicateMembers).join(",").padEnd(30);
-            this.discriminators.forEach(([discr, conv, n]) => {
-                const num = n.toString().padEnd(3);
-                const typename = conv.targetType(writer).padEnd(30);
-                const resolved = (conv instanceof CustomTypeConvertor ? "no" : "yes").padEnd(9);
-                const discriminator = discr ? discr.asString() : "<undefined>";
-                report += ` ${num}| ${typename}| ${properties}| ${resolved}| ${discriminator}\n`;
-            });
-            // throw new Error(report)
-        }
+        return writer.makeString(writer.discriminate(value, convertorIndex, convertor.idlType, convertor.runtimeTypes));
     }
 }
 export function flattenUnionType(library, type) {

package/build/lib/src/transformers/FqnTransformer.d.ts

@@ -0,0 +1,4 @@
+import * as idl from "../idl";
+import { ReferenceResolver } from "../peer-generation/ReferenceResolver";
+export declare function inplaceFQN(node: idl.IDLNode, resolver: ReferenceResolver): void;
+//# sourceMappingURL=FqnTransformer.d.ts.map

package/build/lib/src/transformers/FqnTransformer.js

@@ -0,0 +1,17 @@
+import * as idl from "../idl";
+export function inplaceFQN(node, resolver) {
+    if (idl.isReferenceType(node))
+        inplaceReferenceFQN(node, resolver);
+    idl.forEachChild(node, (child) => {
+        if (idl.isReferenceType(child))
+            inplaceReferenceFQN(child, resolver);
+    });
+}
+function inplaceReferenceFQN(ref, resolver) {
+    const resolved = resolver.resolveTypeReference(ref);
+    if (resolved === undefined) {
+        throw new Error("Can not expand FQN for " + ref.name);
+    }
+    ref.name = idl.getFQName(resolved);
+}
+//# sourceMappingURL=FqnTransformer.js.map

package/build/lib/src/transformers/GenericTransformer.d.ts

@@ -0,0 +1,8 @@
+import * as idl from "../idl";
+import { ReferenceResolver } from "../peer-generation/ReferenceResolver";
+export declare function inplaceGenerics(node: idl.IDLNode, resolver: ReferenceResolver, options?: {
+    ignore?: ((node: idl.IDLNode) => boolean)[];
+}): void;
+export declare function isInplacedGeneric(entry: idl.IDLEntry): boolean;
+export declare function maybeRestoreGenerics(maybeTransformedGeneric: idl.IDLReferenceType | idl.IDLEntry, resolver: ReferenceResolver): idl.IDLReferenceType | undefined;
+//# sourceMappingURL=GenericTransformer.d.ts.map