@idlizer/core 2.1.5 → 2.1.7

package/build/lib/src/idl.js

@@ -64,6 +64,7 @@ export var IDLExtendedAttributes;
     IDLExtendedAttributes["DtsName"] = "DtsName";
     IDLExtendedAttributes["DtsTag"] = "DtsTag";
     IDLExtendedAttributes["Entity"] = "Entity";
+    IDLExtendedAttributes["Extends"] = "Extends";
     IDLExtendedAttributes["Import"] = "Import";
     IDLExtendedAttributes["DefaultExport"] = "DefaultExport";
     IDLExtendedAttributes["IndexSignature"] = "IndexSignature";
@@ -386,6 +387,9 @@ export function createOptionalType(element, nodeInitializer) {
     if (isOptionalType(element) && !nodeInitializer) {
         return element;
     }
+    if (isOptionalType(element)) {
+        return Object.assign(Object.assign({ kind: IDLKind.OptionalType, type: element.type }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlTypeBrand: innerIdlSymbol });
+    }
     return Object.assign(Object.assign({ kind: IDLKind.OptionalType, type: element }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlTypeBrand: innerIdlSymbol });
 }
 /**
@@ -418,7 +422,7 @@ export const IDLStringType = createPrimitiveType('String');
 export const IDLAnyType = createPrimitiveType('any');
 export const IDLUndefinedType = createPrimitiveType('undefined');
 export const IDLUnknownType = createPrimitiveType('unknown');
-export const IDLObjectType = createReferenceType('Object');
+export const IDLObjectType = createPrimitiveType('Object');
 export const IDLThisType = createPrimitiveType('this');
 export const IDLDate = createPrimitiveType('date');
 export const IDLBufferType = createPrimitiveType('buffer');
@@ -568,7 +572,7 @@ export function createFile(entries, fileName, packageClause = [], nodeInitialize
     return Object.assign(Object.assign({ kind: IDLKind.File, packageClause, entries: entries, fileName }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol });
 }
 export function createImport(clause, name, nodeInitializer) {
-    return Object.assign(Object.assign({ kind: IDLKind.Import, name: name || "", clause }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
+    return Object.assign(Object.assign({ kind: IDLKind.Import, name: name !== null && name !== void 0 ? name : "", clause }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
 }
 export function createEnum(name, elements, nodeInitializer) {
     return Object.assign(Object.assign({ kind: IDLKind.Enum, name: name, elements: elements }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
@@ -622,13 +626,6 @@ export function createConstructor(parameters, returnType, nodeInitializer = {})
         returnType }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
 }
 export function createCallback(name, parameters, returnType, nodeInitializer = {}, typeParameters = []) {
-    if (returnType === IDLThisType || isReferenceType(returnType) && returnType.name === "this")
-        returnType = IDLAnyType;
-    parameters = parameters.map(it => {
-        if (it.type && isNamedNode(it.type) && (it.type.name === "T" || it.type.name === "this"))
-            return createParameter(it.name, IDLAnyType, it.isOptional, it.isVariadic, { fileName: it.fileName });
-        return it;
-    });
     return Object.assign(Object.assign({ kind: IDLKind.Callback, name, parameters, returnType, typeParameters }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
 }
 export function createTypeParameterReference(name, nodeInitializer) {
@@ -643,7 +640,7 @@ export function createConstant(name, type, value, nodeInitializer = {}) {
         value }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
 }
 export function clone(node) {
-    var _a, _b, _c, _d;
+    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 get = (node) => node;
     switch (node.kind) {
@@ -651,7 +648,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createInterface(entry.name, entry.subkind, (_a = entry.inheritance) === null || _a === void 0 ? void 0 : _a.map(clone), (_b = entry.constructors) === null || _b === void 0 ? void 0 : _b.map(clone), entry.constants.map(clone), entry.properties.map(clone), entry.methods.map(clone), entry.callables.map(clone), (_c = entry.typeParameters) === null || _c === void 0 ? void 0 : _c.map(it => it), {
                 documentation: node.documentation,
-                extendedAttributes: node.extendedAttributes,
+                extendedAttributes: (_d = node.extendedAttributes) === null || _d === void 0 ? void 0 : _d.slice(),
                 fileName: node.fileName
             }));
         }
@@ -659,7 +656,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createImport(entry.clause, entry.name, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_e = entry.extendedAttributes) === null || _e === void 0 ? void 0 : _e.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -667,7 +664,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createCallback(entry.name, entry.parameters.map(clone), clone(entry.returnType), {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_f = entry.extendedAttributes) === null || _f === void 0 ? void 0 : _f.slice(),
                 fileName: entry.fileName
             }, entry.typeParameters));
         }
@@ -675,7 +672,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createConstant(entry.name, clone(entry.type), entry.value, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_g = entry.extendedAttributes) === null || _g === void 0 ? void 0 : _g.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -683,7 +680,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createProperty(entry.name, clone(entry.type), entry.isReadonly, entry.isStatic, entry.isOptional, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_h = entry.extendedAttributes) === null || _h === void 0 ? void 0 : _h.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -691,7 +688,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createParameter(entry.name, clone(entry.type), entry.isOptional, entry.isVariadic, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_j = entry.extendedAttributes) === null || _j === void 0 ? void 0 : _j.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -704,7 +701,7 @@ export function clone(node) {
                 isStatic: entry.isStatic
             }, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_k = entry.extendedAttributes) === null || _k === void 0 ? void 0 : _k.slice(),
                 fileName: entry.fileName
             }, entry.typeParameters));
         }
@@ -715,7 +712,7 @@ export function clone(node) {
                 isStatic: entry.isStatic
             }, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_l = entry.extendedAttributes) === null || _l === void 0 ? void 0 : _l.slice(),
                 fileName: entry.documentation
             }, entry.typeParameters));
         }
@@ -723,7 +720,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createConstructor(entry.parameters.map(clone), entry.returnType ? clone(entry.returnType) : undefined, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_m = entry.extendedAttributes) === null || _m === void 0 ? void 0 : _m.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -731,7 +728,7 @@ export function clone(node) {
             const entry = get(node);
             const cloned = createEnum(entry.name, entry.elements.map(clone), {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_o = entry.extendedAttributes) === null || _o === void 0 ? void 0 : _o.slice(),
                 fileName: entry.fileName
             });
             cloned.elements.forEach(it => {
@@ -743,7 +740,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createEnumMember(entry.name, entry.parent, clone(entry.type), entry.initializer, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_p = entry.extendedAttributes) === null || _p === void 0 ? void 0 : _p.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -751,7 +748,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createTypedef(entry.name, clone(entry.type), entry.typeParameters, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_q = entry.extendedAttributes) === null || _q === void 0 ? void 0 : _q.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -762,7 +759,7 @@ export function clone(node) {
             const type = get(node);
             return make(createContainerType(type.containerKind, type.elementType.map(clone), {
                 documentation: type.documentation,
-                extendedAttributes: type.extendedAttributes,
+                extendedAttributes: (_r = type.extendedAttributes) === null || _r === void 0 ? void 0 : _r.slice(),
                 fileName: type.fileName
             }));
         }
@@ -770,15 +767,15 @@ export function clone(node) {
             const type = get(node);
             return make(createUnspecifiedGenericType(type.name, type.typeArguments.map(clone), {
                 documentation: type.documentation,
-                extendedAttributes: type.extendedAttributes,
+                extendedAttributes: (_s = type.extendedAttributes) === null || _s === void 0 ? void 0 : _s.slice(),
                 fileName: type.fileName
             }));
         }
         case IDLKind.ReferenceType: {
             const type = get(node);
-            return make(createReferenceType(type.name, (_d = type.typeArguments) === null || _d === void 0 ? void 0 : _d.map(clone), {
+            return make(createReferenceType(type.name, (_t = type.typeArguments) === null || _t === void 0 ? void 0 : _t.map(clone), {
                 documentation: type.documentation,
-                extendedAttributes: type.extendedAttributes,
+                extendedAttributes: (_u = type.extendedAttributes) === null || _u === void 0 ? void 0 : _u.slice(),
                 fileName: type.fileName
             }));
         }
@@ -786,7 +783,7 @@ export function clone(node) {
             const type = get(node);
             return make(createUnionType(type.types.map(clone), type.name, {
                 documentation: type.documentation,
-                extendedAttributes: type.extendedAttributes,
+                extendedAttributes: (_v = type.extendedAttributes) === null || _v === void 0 ? void 0 : _v.slice(),
                 fileName: type.fileName
             }));
         }
@@ -794,7 +791,7 @@ export function clone(node) {
             const type = get(node);
             return make(createTypeParameterReference(type.name, {
                 documentation: type.documentation,
-                extendedAttributes: type.extendedAttributes,
+                extendedAttributes: (_w = type.extendedAttributes) === null || _w === void 0 ? void 0 : _w.slice(),
                 fileName: type.fileName
             }));
         }
@@ -802,7 +799,7 @@ export function clone(node) {
             const type = get(node);
             return make(createOptionalType(clone(type.type), {
                 documentation: type.documentation,
-                extendedAttributes: type.extendedAttributes,
+                extendedAttributes: (_x = type.extendedAttributes) === null || _x === void 0 ? void 0 : _x.slice(),
                 fileName: type.fileName
             }));
         }
@@ -810,7 +807,7 @@ export function clone(node) {
             const entry = get(node);
             return make(createVersion(entry.value, {
                 documentation: entry.documentation,
-                extendedAttributes: entry.extendedAttributes,
+                extendedAttributes: (_y = entry.extendedAttributes) === null || _y === void 0 ? void 0 : _y.slice(),
                 fileName: entry.fileName
             }));
         }
@@ -818,7 +815,7 @@ export function clone(node) {
             const ns = get(node);
             return make(createNamespace(ns.name, ns.members.map(clone), {
                 documentation: ns.documentation,
-                extendedAttributes: ns.extendedAttributes,
+                extendedAttributes: (_z = ns.extendedAttributes) === null || _z === void 0 ? void 0 : _z.slice(),
                 fileName: ns.fileName
             }));
         }
@@ -826,12 +823,21 @@ export function clone(node) {
             const file = get(node);
             return make(createFile(file.entries.map(clone), file.fileName, file.packageClause, {
                 documentation: file.documentation,
-                extendedAttributes: file.extendedAttributes,
+                extendedAttributes: (_0 = file.extendedAttributes) === null || _0 === void 0 ? void 0 : _0.slice(),
                 fileName: file.fileName
             }));
         }
     }
 }
+export function hasTypeParameters(entry) {
+    let foundTypeParameter = false;
+    forEachChild(entry, n => {
+        if (isTypeParameterType(n)) {
+            foundTypeParameter = true;
+        }
+    });
+    return foundTypeParameter;
+}
 export function escapeIDLKeyword(name) {
     return name + (IDLKeywords.has(name) ? "_" : "");
 }
@@ -1024,10 +1030,35 @@ export function printScoped(idl) {
         return printInterface(idl);
     throw new Error(`Unexpected scoped: ${idl.kind} ${idl.name}`);
 }
+function printInterfaceInherit(idl) {
+    var _a;
+    if (idl.inheritance.length === 0) {
+        return "";
+    }
+    const inheritance = [...idl.inheritance];
+    const types = [];
+    if (idl.subkind === IDLInterfaceSubkind.Class) {
+        if (inheritance[0] !== IDLTopType) {
+            const ref = clone(inheritance[0]);
+            (_a = ref.extendedAttributes) !== null && _a !== void 0 ? _a : (ref.extendedAttributes = []);
+            if (!hasExtAttribute(ref, IDLExtendedAttributes.Extends)) {
+                ref.extendedAttributes = ref.extendedAttributes.concat([
+                    { name: IDLExtendedAttributes.Extends }
+                ]);
+            }
+            types.push(`${printType(ref)}`);
+            inheritance.shift();
+        }
+    }
+    inheritance.forEach(type => {
+        types.push(printType(type));
+    });
+    return ": " + types.join(', ');
+}
 export function printInterface(idl) {
     return [
         ...printExtendedAttributes(idl, 0),
-        `interface ${idl.name}${hasSuperType(idl) ? ": " + printType(idl.inheritance[0]) : ""} {`,
+        `interface ${idl.name}${printInterfaceInherit(idl)} {`,
         // TODO: type system hack!
     ]
         .concat(printedIndentInc)

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

@@ -135,7 +135,7 @@ export function createDestroyPeerMethod(clazz) {
     if (clazz.isGlobalScope() || clazz.isStaticMaterialized) {
         return undefined;
     }
-    return new MaterializedMethod(clazz.className, clazz.getImplementationName(), [], idl.IDLVoidType, false, new Method('destroyPeer', new NamedMethodSignature(idl.IDLVoidType, [idl.createReferenceType(clazz.className)], ['peer'])));
+    return new MaterializedMethod(idl.getQualifiedName(clazz.decl, "namespace.name").split('.').join('_'), clazz.getImplementationName(), [], idl.IDLVoidType, false, new Method('destroyPeer', new NamedMethodSignature(idl.IDLVoidType, [idl.createReferenceType(clazz.decl)], ['peer'])));
 }
 export function getInternalClassName(name) {
     return `${name}Internal`;

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

@@ -182,8 +182,7 @@ export class PeerLibrary {
         }
         if (result && (idl.isImport(result) || idl.isNamespace(result)))
             result = undefined;
-        if (result)
-            (_b = this.referenceCache) === null || _b === void 0 ? void 0 : _b.set(type, result);
+        (_b = this.referenceCache) === null || _b === void 0 ? void 0 : _b.set(type, result);
         return result;
     }
     disableFallback() {
@@ -293,6 +292,7 @@ export class PeerLibrary {
                 case idl.IDLUndefinedType: return new UndefinedConvertor(param);
                 case idl.IDLVoidType: return new VoidConvertor(param);
                 case idl.IDLUnknownType:
+                case idl.IDLObjectType:
                 case idl.IDLAnyType: return new ObjectConvertor(param, idl.IDLAnyType);
                 case idl.IDLDate: return new DateConvertor(param);
                 case idl.IDLFunctionType: return new FunctionConvertor(this, param);
@@ -417,12 +417,12 @@ export class PeerLibrary {
             case idl.IDLVoidType: return idl.IDLVoidType;
             case idl.IDLUndefinedType: return idl.IDLUndefinedType;
             case idl.IDLUnknownType: return ArkCustomObject;
-            case idl.IDLObjectType: return ArkCustomObject;
+            // case idl.IDLObjectType: return ArkCustomObject
         }
         const typeName = idl.isNamedNode(type) ? type.name : undefined;
         switch (typeName) {
             case "object":
-            case "Object": return ArkCustomObject;
+            case "Object": return idl.IDLObjectType;
         }
         if (idl.isReferenceType(type)) {
             // TODO: remove all this!

package/build/lib/src/peer-generation/idl/common.d.ts

@@ -6,6 +6,7 @@ export declare function collapseTypes(types: idl.IDLType[], name?: string): idl.
 export declare function generifiedTypeName(refType: idl.IDLReferenceType | undefined, refName?: string): string | undefined;
 export declare function sanitizeGenerics(genericDeclarationString: string): string;
 export declare function generateSyntheticUnionName(types: idl.IDLType[]): string;
+export declare function generateSyntheticFunctionParameterName(parameter: idl.IDLParameter): string;
 export declare function generateSyntheticFunctionName(parameters: idl.IDLParameter[], returnType: idl.IDLType, isAsync?: boolean): string;
 export declare function isImportAttr(decl: idl.IDLNode): boolean;
 //# sourceMappingURL=common.d.ts.map

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

@@ -28,7 +28,7 @@ export function generateSyntheticIdlNodeName(type) {
         }
     }
     if (idl.isNamedNode(type))
-        return type.name;
+        return type.name.split('.').map(capitalize).join('_');
     if (idl.isOptionalType(type))
         return `Opt_${generateSyntheticIdlNodeName(type.type)}`;
     throw `Can not compute type name of ${idl.IDLKind[type.kind]}`;
@@ -75,9 +75,15 @@ export function sanitizeGenerics(genericDeclarationString) {
 export function generateSyntheticUnionName(types) {
     return `Union_${types.map(it => generateSyntheticIdlNodeName(it)).join("_").replaceAll(".", "_")}`;
 }
+export function generateSyntheticFunctionParameterName(parameter) {
+    if (parameter.isOptional) {
+        return generateSyntheticIdlNodeName(idl.createOptionalType(parameter.type));
+    }
+    return generateSyntheticIdlNodeName(parameter.type);
+}
 export function generateSyntheticFunctionName(parameters, returnType, isAsync = false) {
     let prefix = isAsync ? "AsyncCallback" : "Callback";
-    const names = parameters.map(it => `${generateSyntheticIdlNodeName(it.type)}`).concat(generateSyntheticIdlNodeName(returnType));
+    const names = parameters.map(generateSyntheticFunctionParameterName).concat(generateSyntheticIdlNodeName(returnType));
     return `${prefix}_${names.join("_").replaceAll(".", "_")}`;
 }
 export function isImportAttr(decl) {

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

@@ -27,6 +27,10 @@ export function isMaterialized(declaration, resolver) {
     if (generatorConfiguration().forceMaterialized.includes(declaration.name)) {
         return true;
     }
+    // TODO: rework this
+    if (["BaseSpan"].includes(declaration.name)) {
+        return false;
+    }
     for (const ignore of ["Attribute", "Method", "Interface"]) {
         if (declaration.name.endsWith(ignore)) {
             return false;

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

@@ -110,7 +110,7 @@ export class UnionRuntimeTypeChecker {
                 const discriminator = discr ? discr.asString() : "<undefined>";
                 report += ` ${num}| ${typename}| ${properties}| ${resolved}| ${discriminator}\n`;
             });
-            throw new Error(report);
+            // throw new Error(report)
         }
     }
 }

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

@@ -42,6 +42,7 @@ export declare function heritageDeclarations(typechecker: ts.TypeChecker, clause
 export declare function typeName(type: ts.TypeReferenceNode | ts.TypeQueryNode | ts.ImportTypeNode): string | undefined;
 export declare function typeEntityName(type: ts.TypeReferenceNode | ts.TypeQueryNode | ts.ImportTypeNode): ts.EntityName | undefined;
 export declare function zip<A, B>(left: readonly A[], right: readonly B[]): [A, B][];
+export declare function zipStrip<A, B>(left: readonly A[], right: readonly B[]): [A, B][];
 export declare function identNameWithNamespace(node: ts.Node, language: Language): string;
 export declare function identName(node: ts.Node | undefined): string | undefined;
 export declare function identString(node: ts.Identifier | ts.PrivateIdentifier | ts.StringLiteral | ts.QualifiedName | ts.NumericLiteral | ts.ComputedPropertyName | ts.BindingName | undefined): string | undefined;
@@ -66,7 +67,7 @@ export declare function className(node: ts.ClassDeclaration | ts.InterfaceDeclar
  * Add a prefix to an enum value which camel case name coincidence
  * with the the same upper case name for an another enum value
  */
-export declare function nameEnumValues(enumTarget: ts.EnumDeclaration): string[];
+export declare function nameEnumValues(enumTarget: string[]): string[];
 export declare function groupBy<K, V>(values: V[], selector: (value: V) => K): Map<K, V[]>;
 export declare function groupByIndexed<K, V>(values: V[], selector: (value: V) => K): Map<K, [V, number][]>;
 export declare function removeExt(filename: string): string;

package/build/lib/src/util.js

@@ -269,6 +269,13 @@ export function zip(left, right) {
         throw new Error("Arrays of different length");
     return left.map((_, i) => [left[i], right[i]]);
 }
+export function zipStrip(left, right) {
+    const result = [];
+    for (let i = 0; i < left.length && i < right.length; ++i) {
+        result.push([left[i], right[i]]);
+    }
+    return result;
+}
 export function identNameWithNamespace(node, language) {
     let parent = node.parent;
     while (parent && !ts.isModuleDeclaration(parent))
@@ -558,9 +565,7 @@ export function className(node) {
 export function nameEnumValues(enumTarget) {
     const prefix = "LEGACY";
     const nameToIndex = new Map();
-    enumTarget.members
-        .map(it => identName(it.name))
-        .forEach((name, index) => {
+    enumTarget.forEach((name, index) => {
         let upperCaseName;
         if (isUpperCase(name)) {
             upperCaseName = name;

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

@@ -39,4 +39,6 @@ export declare class IDLDependencyCollector implements IDLConverter<idl.IDLNode[
     walk(node?: idl.IDLNode): idl.IDLNode[];
 }
 export declare function collectDependencies(resolver: ReferenceResolver, node: idl.IDLNode): idl.IDLNode[];
+export declare function filterRedundantMethodsOverloads(methods: idl.IDLMethod[]): idl.IDLMethod[];
+export declare function filterRedundantAttributesOverloads(properties: idl.IDLProperty[]): idl.IDLProperty[];
 //# sourceMappingURL=visitor.d.ts.map

package/build/lib/src/visitor.js

@@ -134,4 +134,112 @@ export class IDLDependencyCollector {
 export function collectDependencies(resolver, node) {
     return walkIDL(new IDLDependencyCollector(resolver), node);
 }
+function isFirstTypeSubsetOfSecond(first, second) {
+    if (idl.isOptionalType(second)) {
+        return isFirstTypeSubsetOfSecond(idl.maybeUnwrapOptionalType(first), idl.maybeUnwrapOptionalType(second));
+    }
+    if (idl.isUnionType(second)) {
+        const firstTypes = idl.isUnionType(first) ? first.types : [first];
+        const secondTypes = second.types;
+        return firstTypes.every(firstType => secondTypes.some(secondType => isFirstTypeSubsetOfSecond(firstType, secondType)));
+    }
+    return idl.printType(first) === idl.printType(second);
+}
+function isFirstParameterSubsetOfSecond(first, second) {
+    if (first === undefined)
+        return second.isOptional;
+    if (first.isOptional && !second.isOptional)
+        return false;
+    if (second.isOptional)
+        return isFirstTypeSubsetOfSecond(idl.maybeUnwrapOptionalType(first.type), idl.maybeUnwrapOptionalType(second.type));
+    return isFirstTypeSubsetOfSecond(first.type, second.type);
+}
+function isFirstMethodSubsetOfSecond(first, second) {
+    if (first.parameters.length > second.parameters.length)
+        return false;
+    if (first.isAsync !== second.isAsync)
+        return false;
+    if (first.isStatic !== second.isStatic)
+        return false;
+    if (second.parameters.some((secondParameter, idx) => !isFirstParameterSubsetOfSecond(first.parameters.at(idx), secondParameter)))
+        return false;
+    if (!isFirstTypeSubsetOfSecond(first.returnType, second.returnType))
+        return false;
+    return true;
+}
+function isFirstPropertySubsetOfSecond(first, second) {
+    if (idl.getExtAttribute(first, idl.IDLExtendedAttributes.Accessor) !==
+        idl.getExtAttribute(second, idl.IDLExtendedAttributes.Accessor))
+        return false;
+    if (first.isStatic !== second.isStatic)
+        return false;
+    if (first.isOptional && !second.isOptional)
+        return false;
+    if (second.isOptional)
+        return isFirstTypeSubsetOfSecond(idl.maybeUnwrapOptionalType(first.type), idl.maybeUnwrapOptionalType(second.type));
+    return isFirstTypeSubsetOfSecond(first.type, second.type);
+}
+function filterRedundantOverloadsSameNamed(entries) {
+    const entryToSupersets = new Map();
+    for (const entry of entries) {
+        entryToSupersets.set(entry, []);
+        for (const other of entries) {
+            if (entry === other)
+                continue;
+            if (idl.isMethod(entry) && idl.isMethod(other)) {
+                if (isFirstMethodSubsetOfSecond(entry, other))
+                    entryToSupersets.get(entry).push(other);
+            }
+            else if (idl.isProperty(entry) && idl.isProperty(other)) {
+                if (isFirstPropertySubsetOfSecond(entry, other))
+                    entryToSupersets.get(entry).push(other);
+            }
+            else {
+                throw new Error("Not implemented");
+            }
+        }
+    }
+    const visited = [];
+    const roots = [];
+    const visit = (method) => {
+        if (visited.includes(method))
+            return;
+        visited.push(method);
+        for (const superset of entryToSupersets.get(method)) {
+            visit(superset);
+        }
+        if (!entryToSupersets.get(method).some(it => roots.includes(it)))
+            roots.push(method);
+    };
+    entries.forEach(visit);
+    return roots;
+}
+export function filterRedundantMethodsOverloads(methods) {
+    const sameNamedGroups = new Map();
+    for (const method of methods) {
+        if (!sameNamedGroups.has(method.name))
+            sameNamedGroups.set(method.name, []);
+        sameNamedGroups.get(method.name).push(method);
+    }
+    const filtered = [];
+    for (const sameNamed of sameNamedGroups.values()) {
+        filtered.push(...filterRedundantOverloadsSameNamed(sameNamed));
+    }
+    // stabilizing order
+    return methods.filter(it => filtered.includes(it));
+}
+export function filterRedundantAttributesOverloads(properties) {
+    const sameNamedGroups = new Map();
+    for (const property of properties) {
+        if (!sameNamedGroups.has(property.name))
+            sameNamedGroups.set(property.name, []);
+        sameNamedGroups.get(property.name).push(property);
+    }
+    const filtered = [];
+    for (const sameNamed of sameNamedGroups.values()) {
+        filtered.push(...filterRedundantOverloadsSameNamed(sameNamed));
+    }
+    // stabilizing order
+    return properties.filter(it => filtered.includes(it));
+}
 //# sourceMappingURL=visitor.js.map

package/package.json

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