@ts-for-gir/lib 4.0.0-beta.2 → 4.0.0-beta.21

package/lib/gir/base.js

@@ -57,13 +57,7 @@ export class IntrospectedBase {
         this._isIntrospectable = from.isIntrospectable;
         return this;
     }
-    static fromXML(
-    // eslint-disable-next-line
-    element, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    parent, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    options) {
+    static fromXML(element, parent, options) {
         throw new Error("GirBase cannot be instantiated");
     }
 }
@@ -74,13 +68,7 @@ export class IntrospectedNamespaceMember extends IntrospectedBase {
     get namespace() {
         return this.parent;
     }
-    static fromXML(
-    // eslint-disable-next-line
-    element, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    parent, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    options) {
+    static fromXML(element, parent, options) {
         throw new Error("GirBase cannot be instantiated");
     }
 }

package/lib/gir/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/gir/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/gir/base.ts"],"names":[],"mappings":"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"}

package/lib/gir/class.d.ts

@@ -1,21 +1,20 @@
 import { TypeIdentifier, Generic } from "../gir.js";
 import { TypeExpression } from "../gir.js";
 import { IntrospectedBase, IntrospectedClassMember, IntrospectedNamespaceMember, Options } from "./base.js";
-import { GirInterfaceElement, GirClassElement, GirRecordElement, GirUnionElement, ClassStructTypeIdentifier } from "../index.js";
+import { ClassStructTypeIdentifier, type GirInterfaceElement, type GirClassElement, type GirRecordElement, type GirUnionElement } from "../index.js";
 import { IntrospectedClassFunction, IntrospectedVirtualClassFunction, IntrospectedStaticClassFunction, IntrospectedConstructor, IntrospectedDirectAllocationConstructor, IntrospectedClassCallback } from "./function.js";
 import { IntrospectedProperty, IntrospectedField } from "./property.js";
 import { IntrospectedNamespace } from "./namespace.js";
 import { IntrospectedSignal } from "./signal.js";
 import { FormatGenerator } from "../generators/generator.js";
-import { LoadOptions } from "../types.js";
 import { GirVisitor } from "../visitor.js";
+import type { OptionsLoad } from "../types/index.js";
 export declare enum FilterBehavior {
     DELETE = 0,
     PRESERVE = 1
 }
 export declare function filterConflicts<T extends IntrospectedClassMember | IntrospectedClassFunction | IntrospectedProperty>(ns: IntrospectedNamespace, c: IntrospectedBaseClass, elements: T[], behavior?: FilterBehavior): T[];
 export declare function filterFunctionConflict<T extends IntrospectedStaticClassFunction | IntrospectedVirtualClassFunction | IntrospectedClassFunction | IntrospectedConstructor>(ns: IntrospectedNamespace, base: IntrospectedBaseClass, elements: T[], conflict_ids: string[]): T[];
-export declare function promisifyFunctions(functions: IntrospectedClassFunction[]): IntrospectedClassFunction<IntrospectedBaseClass | import("./enum.js").IntrospectedEnum>[];
 export declare const enum ClassInjectionMember {
     MEMBER = "member",
     CONSTRUCTOR = "_constructor",
@@ -90,7 +89,7 @@ export declare abstract class IntrospectedBaseClass extends IntrospectedNamespac
         propagate?: boolean;
     }): void;
     getType(): TypeIdentifier;
-    static fromXML(element: GirClassElement | GirInterfaceElement | GirRecordElement, ns: IntrospectedNamespace, options: LoadOptions): IntrospectedBaseClass;
+    static fromXML(element: GirClassElement | GirInterfaceElement | GirRecordElement, ns: IntrospectedNamespace, options: OptionsLoad): IntrospectedBaseClass;
     abstract asString<T = string>(generator: FormatGenerator<T>): T;
 }
 type ClassMember = IntrospectedClassMember | IntrospectedClassFunction | IntrospectedProperty;
@@ -121,7 +120,7 @@ export declare class IntrospectedClass extends IntrospectedBaseClass {
         callbacks?: IntrospectedClassCallback[];
     }): IntrospectedClass;
     get staticDefinition(): string | null;
-    static fromXML(element: GirClassElement, ns: IntrospectedNamespace, options: LoadOptions): IntrospectedClass;
+    static fromXML(element: GirClassElement, ns: IntrospectedNamespace, options: OptionsLoad): IntrospectedClass;
     registerStaticDefinition(typeStruct: string): void;
     asString<T extends FormatGenerator<unknown>>(generator: T): ReturnType<T["generateClass"]>;
 }
@@ -147,7 +146,7 @@ export declare class IntrospectedRecord extends IntrospectedBaseClass {
         callbacks?: IntrospectedClassCallback[];
     }): IntrospectedRecord;
     static foreign(name: string, namespace: IntrospectedNamespace): IntrospectedRecord;
-    static fromXML(element: GirRecordElement | GirUnionElement, namespace: IntrospectedNamespace, options: LoadOptions): IntrospectedRecord;
+    static fromXML(element: GirRecordElement | GirUnionElement, namespace: IntrospectedNamespace, options: OptionsLoad): IntrospectedRecord;
     /**
      * Calculate if a type expression is "simple" without pointers
      */
@@ -183,7 +182,7 @@ export declare class IntrospectedInterface extends IntrospectedBaseClass {
     findParentMap<K>(predicate: (p: IntrospectedClass | IntrospectedInterface) => K | undefined): K | undefined;
     resolveParents(): InterfaceResolution;
     accept(visitor: GirVisitor): IntrospectedInterface;
-    static fromXML(element: GirInterfaceElement, namespace: IntrospectedNamespace, options: LoadOptions): IntrospectedInterface;
+    static fromXML(element: GirInterfaceElement, namespace: IntrospectedNamespace, options: OptionsLoad): IntrospectedInterface;
     asString<T extends FormatGenerator<unknown>>(generator: T): ReturnType<T["generateInterface"]>;
 }
 export {};

package/lib/gir/class.js

@@ -1,4 +1,5 @@
-import { NativeType, TypeIdentifier, NeverType, ArrayType, ClosureType, BinaryType, PromiseType, VoidType, TupleType, BooleanType, Generic, GenericType, GenerifiedTypeIdentifier, AnyType, ConflictType, TypeConflict } from "../gir.js";
+import { Logger } from "../logger.js";
+import { NativeType, TypeIdentifier, NeverType, ArrayType, Generic, GenericType, GenerifiedTypeIdentifier, AnyType, ConflictType, TypeConflict } from "../gir.js";
 import { IntrospectedNamespaceMember } from "./base.js";
 import { GirDirection, ClassStructTypeIdentifier } from "../index.js";
 import { IntrospectedClassFunction, IntrospectedVirtualClassFunction, IntrospectedStaticClassFunction, IntrospectedConstructor, IntrospectedFunctionParameter, IntrospectedClassCallback } from "./function.js";
@@ -12,6 +13,7 @@ export var FilterBehavior;
     FilterBehavior[FilterBehavior["DELETE"] = 0] = "DELETE";
     FilterBehavior[FilterBehavior["PRESERVE"] = 1] = "PRESERVE";
 })(FilterBehavior || (FilterBehavior = {}));
+const log = new Logger(true, "gir/class");
 export function filterConflicts(ns, c, elements, behavior = FilterBehavior.PRESERVE) {
     const filtered = [...elements.filter(p => p && p.name)];
     const prev = [];
@@ -47,7 +49,7 @@ export function filterConflicts(ns, c, elements, behavior = FilterBehavior.PRESE
                         }
                         if (next instanceof IntrospectedProperty &&
                             !isSubtypeOf(ns, thisType, resolved_parent.getType(), next.type, p.type)) {
-                            console.log(`>> Conflict in ${next.parent?.name}.${next.name} with ${p.parent?.name}.${p.name}.`);
+                            log.warn(`>> Conflict in ${next.parent?.name}.${next.name} with ${p.parent?.name}.${p.name}.`);
                             return ConflictType.PROPERTY_NAME_CONFLICT;
                         }
                     }
@@ -121,7 +123,7 @@ export function filterFunctionConflict(ns, base, elements, conflict_ids) {
                     if (p.name && p.name == next.name) {
                         const conflicting = isConflictingFunction(ns, nextType, next, parentType, p);
                         if (conflicting) {
-                            msg = `// Conflicted with ${resolved_parent.namespace.name}.${resolved_parent.name}.${p.name}`;
+                            msg = `// Conflicted with ${resolved_parent.namespace.namespace}.${resolved_parent.name}.${p.name}`;
                             return true;
                         }
                         return conflicting;
@@ -133,7 +135,7 @@ export function filterFunctionConflict(ns, base, elements, conflict_ids) {
         // the class or in the parent...
         const field_conflicts = [...base.props, ...base.fields].some(p => p.name && p.name === next.name) ||
             base.someParent(resolved_parent => [...resolved_parent.props, ...resolved_parent.fields].some(p => p.name && p.name === next.name));
-        const isGObject = base.someParent(p => p.namespace.name === "GObject" && p.name === "Object");
+        const isGObject = base.someParent(p => p.namespace.namespace === "GObject" && p.name === "Object");
         if (isGObject) {
             conflicts = conflicts || ["connect", "connect_after", "emit"].includes(next.name);
         }
@@ -173,7 +175,7 @@ export function filterFunctionConflict(ns, base, elements, conflict_ids) {
             prev.push(next, never);
         }
         else if (field_conflicts) {
-            console.error(`Omitting ${next.name} due to field or property conflict.`);
+            log.warn(`Omitting ${next.name} due to field or property conflict.`);
         }
         else {
             prev.push(next);
@@ -181,71 +183,6 @@ export function filterFunctionConflict(ns, base, elements, conflict_ids) {
         return prev;
     }, []);
 }
-export function promisifyFunctions(functions) {
-    return functions
-        .map(node => {
-        if (node.parameters.length > 0) {
-            const last_param = node.parameters[node.parameters.length - 1];
-            if (last_param) {
-                const last_param_unwrapped = last_param.type.unwrap();
-                if (last_param_unwrapped instanceof ClosureType) {
-                    const internal = last_param_unwrapped.type;
-                    if (internal instanceof TypeIdentifier && internal.is("Gio", "AsyncReadyCallback")) {
-                        const parent = node.parent;
-                        const interfaceParent = node.interfaceParent;
-                        if (parent instanceof IntrospectedBaseClass) {
-                            const async_res = (node instanceof IntrospectedStaticClassFunction
-                                ? [
-                                    ...parent.constructors,
-                                    ...parent.members.filter(m => m instanceof IntrospectedStaticClassFunction)
-                                ]
-                                : [
-                                    ...(interfaceParent instanceof IntrospectedInterface
-                                        ? [...interfaceParent.members]
-                                        : []),
-                                    ...parent.members.filter(m => !(m instanceof IntrospectedStaticClassFunction))
-                                ]).find(m => m.name === `${node.name.replace(/_async$/, "")}_finish` ||
-                                m.name === `${node.name}_finish`);
-                            if (async_res) {
-                                const async_parameters = node.parameters
-                                    .slice(0, -1)
-                                    .map(p => p.copy({ parent: null }));
-                                const sync_parameters = node.parameters.map(p => p.copy({ isOptional: false }));
-                                const output_parameters = async_res instanceof IntrospectedConstructor ? [] : async_res.output_parameters;
-                                let async_return = new PromiseType(async_res.return());
-                                if (output_parameters.length > 0) {
-                                    const raw_return = async_res.return();
-                                    if (raw_return.equals(VoidType) || raw_return.equals(BooleanType)) {
-                                        const [output_type, ...output_types] = output_parameters.map(op => op.type);
-                                        async_return = new PromiseType(new TupleType(output_type, ...output_types));
-                                    }
-                                    else {
-                                        const [...output_types] = output_parameters.map(op => op.type);
-                                        async_return = new PromiseType(new TupleType(raw_return, ...output_types));
-                                    }
-                                }
-                                return [
-                                    node.copy({
-                                        parameters: async_parameters,
-                                        returnType: async_return
-                                    }),
-                                    node.copy({
-                                        parameters: sync_parameters
-                                    }),
-                                    node.copy({
-                                        returnType: new BinaryType(async_return, node.return())
-                                    })
-                                ];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return node;
-    })
-        .flat(1);
-}
 export class IntrospectedBaseClass extends IntrospectedNamespaceMember {
     /**
      * Used to add a TypeScript index signature to a class
@@ -279,15 +216,9 @@ export class IntrospectedBaseClass extends IntrospectedNamespaceMember {
         this.generics.push(param);
     }
     getType() {
-        return new TypeIdentifier(this.name, this.namespace.name);
+        return new TypeIdentifier(this.name, this.namespace.namespace);
     }
-    static fromXML(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    element, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    ns, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    options) {
+    static fromXML(element, ns, options) {
         throw new Error("fromXML is not implemented on GirBaseClass");
     }
 }
@@ -560,9 +491,9 @@ export class IntrospectedClass extends IntrospectedBaseClass {
         return this._staticDefinition;
     }
     static fromXML(element, ns, options) {
-        const name = sanitizeIdentifierName(ns.name, element.$.name);
+        const name = sanitizeIdentifierName(ns.namespace, element.$.name);
         if (options.verbose) {
-            console.debug(`  >> GirClass: Parsing definition ${element.$.name} (${name})...`);
+            log.debug(`  >> GirClass: Parsing definition ${element.$.name} (${name})...`);
         }
         const clazz = new IntrospectedClass(name, ns);
         if (options.loadDocs) {
@@ -571,26 +502,26 @@ export class IntrospectedClass extends IntrospectedBaseClass {
         }
         if (element.$["glib:type-name"]) {
             clazz.resolve_names.push(element.$["glib:type-name"]);
-            ns.registerResolveName(element.$["glib:type-name"], ns.name, name);
+            ns.registerResolveName(element.$["glib:type-name"], ns.namespace, name);
         }
         if (element.$["glib:type-struct"]) {
             clazz.resolve_names.push();
-            ns.registerResolveName(element.$["glib:type-struct"], ns.name, name);
+            ns.registerResolveName(element.$["glib:type-struct"], ns.namespace, name);
         }
         if (element.$["c:type"]) {
             clazz.resolve_names.push(element.$["c:type"]);
-            ns.registerResolveName(element.$["c:type"], ns.name, name);
+            ns.registerResolveName(element.$["c:type"], ns.namespace, name);
         }
         const typeStruct = element.$["glib:type-struct"];
         if (typeStruct) {
             clazz.registerStaticDefinition(typeStruct);
             clazz.resolve_names.push(typeStruct);
-            ns.registerResolveName(typeStruct, ns.name, name);
+            ns.registerResolveName(typeStruct, ns.namespace, name);
         }
         try {
             // Setup parent type if this is an interface or class.
             if (element.$.parent) {
-                clazz.superType = parseTypeIdentifier(ns.name, element.$.parent);
+                clazz.superType = parseTypeIdentifier(ns.namespace, element.$.parent);
             }
             if (element.$.abstract) {
                 clazz.isAbstract = true;
@@ -639,7 +570,7 @@ export class IntrospectedClass extends IntrospectedBaseClass {
             if (element.implements) {
                 element.implements.forEach(implementee => {
                     const name = implementee.$.name;
-                    const type = parseTypeIdentifier(ns.name, name);
+                    const type = parseTypeIdentifier(ns.namespace, name);
                     if (type) {
                         clazz.interfaces.push(type);
                     }
@@ -649,7 +580,7 @@ export class IntrospectedClass extends IntrospectedBaseClass {
             if (element.callback) {
                 clazz.callbacks.push(...element.callback.map(callback => {
                     if (options.verbose) {
-                        console.debug(`Adding callback ${callback.$.name} for ${ns.name}`);
+                        log.debug(`Adding callback ${callback.$.name} for ${ns.namespace}`);
                     }
                     return IntrospectedClassCallback.fromXML(callback, clazz, options);
                 }));
@@ -664,8 +595,7 @@ export class IntrospectedClass extends IntrospectedBaseClass {
             }
         }
         catch (e) {
-            console.error(`Failed to parse class: ${clazz.name} in ${ns.name}.`);
-            console.error(e);
+            log.error(`Failed to parse class: ${clazz.name} in ${ns.namespace}.`, e);
         }
         return clazz;
     }
@@ -691,7 +621,7 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
         if (this._structFor) {
             return this._structFor;
         }
-        return new TypeIdentifier(this.name, this.namespace.name);
+        return new TypeIdentifier(this.name, this.namespace.namespace);
     }
     someParent(predicate) {
         const resolution = this.resolveParents();
@@ -756,7 +686,7 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
         const clazz = new IntrospectedRecord({ name, namespace });
         clazz._copyBaseProperties(this);
         if (superType) {
-            clazz.superType;
+            clazz.superType = superType;
         }
         clazz._structFor = _structFor;
         clazz._isForeign = _isForeign;
@@ -778,27 +708,27 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
         if (!element.$.name) {
             throw new Error("Invalid GIR File: No name provided for union.");
         }
-        const name = sanitizeIdentifierName(namespace.name, element.$.name);
+        const name = sanitizeIdentifierName(namespace.namespace, element.$.name);
         if (options.verbose) {
-            console.debug(`  >> GirRecord: Parsing definition ${element.$.name} (${name})...`);
+            log.debug(`  >> GirRecord: Parsing definition ${element.$.name} (${name})...`);
         }
         const clazz = new IntrospectedRecord({ name, namespace });
         clazz.setPrivate(element.$.name.startsWith("_") ||
             ("disguised" in element.$ && element.$.disguised === "1") ||
             ("opaque" in element.$ && element.$.opaque === "1"));
         if (typeof element.$["glib:is-gtype-struct-for"] === "string" && !!element.$["glib:is-gtype-struct-for"]) {
-            const structFor = parseTypeIdentifier(namespace.name, element.$["glib:is-gtype-struct-for"]);
+            const structFor = parseTypeIdentifier(namespace.namespace, element.$["glib:is-gtype-struct-for"]);
             // This let's replace these references when generating.
             clazz._structFor = new ClassStructTypeIdentifier(structFor.name, structFor.namespace);
         }
         else {
             if (element.$["glib:type-name"]) {
                 clazz.resolve_names.push(element.$["glib:type-name"]);
-                namespace.registerResolveName(element.$["glib:type-name"], namespace.name, name);
+                namespace.registerResolveName(element.$["glib:type-name"], namespace.namespace, name);
             }
             if (element.$["c:type"]) {
                 clazz.resolve_names.push(element.$["c:type"]);
-                namespace.registerResolveName(element.$["c:type"], namespace.name, name);
+                namespace.registerResolveName(element.$["c:type"], namespace.namespace, name);
             }
         }
         if (options.loadDocs) {
@@ -831,8 +761,7 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
             }
         }
         catch (e) {
-            console.error(`Failed to parse record: ${clazz.name}.`);
-            console.error(e);
+            log.error(`Failed to parse record: ${clazz.name}.`, e);
         }
         return clazz;
     }
@@ -928,7 +857,6 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
         // "simple" records.
         if (!this.isSimple()) {
             return null;
-            ("not simple");
         }
         // Because we may have to recursively check
         // if types are instantiable we cache whether
@@ -1035,9 +963,9 @@ export class IntrospectedInterface extends IntrospectedBaseClass {
         return visitor.visitInterface?.(node) ?? node;
     }
     static fromXML(element, namespace, options) {
-        const name = sanitizeIdentifierName(namespace.name, element.$.name);
+        const name = sanitizeIdentifierName(namespace.namespace, element.$.name);
         if (options.verbose) {
-            console.debug(`  >> GirInterface: Parsing definition ${element.$.name} (${name})...`);
+            log.debug(`  >> GirInterface: Parsing definition ${element.$.name} (${name})...`);
         }
         const clazz = new IntrospectedInterface({ name, namespace });
         if (options.loadDocs) {
@@ -1046,22 +974,22 @@ export class IntrospectedInterface extends IntrospectedBaseClass {
         }
         if (element.$["glib:type-name"]) {
             clazz.resolve_names.push(element.$["glib:type-name"]);
-            namespace.registerResolveName(element.$["glib:type-name"], namespace.name, name);
+            namespace.registerResolveName(element.$["glib:type-name"], namespace.namespace, name);
         }
         if (element.$["glib:type-struct"]) {
             clazz.resolve_names.push();
-            namespace.registerResolveName(element.$["glib:type-struct"], namespace.name, name);
+            namespace.registerResolveName(element.$["glib:type-struct"], namespace.namespace, name);
         }
         if (element.$["c:type"]) {
             clazz.resolve_names.push(element.$["c:type"]);
-            namespace.registerResolveName(element.$["c:type"], namespace.name, name);
+            namespace.registerResolveName(element.$["c:type"], namespace.namespace, name);
         }
         try {
             // Setup the "parent" (prerequisite) for this interface.
             if (element.prerequisite && element.prerequisite[0]) {
                 const [prerequisite] = element.prerequisite;
                 if (prerequisite.$.name) {
-                    clazz.superType = parseTypeIdentifier(namespace.name, prerequisite.$.name);
+                    clazz.superType = parseTypeIdentifier(namespace.namespace, prerequisite.$.name);
                 }
             }
             if (Array.isArray(element.constructor)) {
@@ -1107,7 +1035,7 @@ export class IntrospectedInterface extends IntrospectedBaseClass {
             if (element.callback) {
                 for (const callback of element.callback) {
                     if (options.verbose) {
-                        console.debug(`Adding callback ${callback.$.name} for ${namespace.name}`);
+                        log.debug(`Adding callback ${callback.$.name} for ${namespace.namespace}`);
                     }
                     clazz.callbacks.push(IntrospectedClassCallback.fromXML(callback, clazz, options));
                 }
@@ -1120,8 +1048,7 @@ export class IntrospectedInterface extends IntrospectedBaseClass {
             }
         }
         catch (e) {
-            console.error(`Failed to parse interface: ${clazz.name}.`);
-            console.error(e);
+            log.error(`Failed to parse interface: ${clazz.name}.`, e);
         }
         return clazz;
     }