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

package/lib/generics/visitor.js

@@ -82,7 +82,7 @@ export class GenericVisitor extends GirVisitor {
                                     deriveFrom: resolved.getType()
                                 });
                                 const firstGeneric = node.generics[node.generics.length - 1];
-                                return new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.name, [
+                                return new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.namespace, [
                                     firstGeneric.type
                                 ]);
                             }
@@ -109,7 +109,7 @@ export class GenericVisitor extends GirVisitor {
                     if (generic.propagate) {
                         const constrainedGeneric = node.generics.find(d => generic.constraint && d.constraint?.equals(generic.constraint));
                         if (constrainedGeneric) {
-                            node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.name, [
+                            node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.namespace, [
                                 constrainedGeneric.type
                             ]);
                         }
@@ -122,19 +122,15 @@ export class GenericVisitor extends GirVisitor {
                                     deriveFrom: resolved.getType()
                                 });
                                 const firstGeneric = node.generics[node.generics.length - 1];
-                                node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.name, [
-                                    firstGeneric.type
-                                ]);
+                                node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.namespace, [firstGeneric.type]);
                             }
                             else if ([...node.resolveParents()].some(c => generic.defaultType && c.identifier.equals(generic.defaultType))) {
-                                node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.name, [
-                                    node.getType()
-                                ]);
+                                node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.namespace, [node.getType()]);
                             }
                         }
                     }
                     else if ([...node.resolveParents()].some(c => generic.defaultType && c.identifier.equals(generic.defaultType))) {
-                        node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.name, [
+                        node.superType = new GenerifiedTypeIdentifier(resolved.name, resolved.namespace.namespace, [
                             node.getType()
                         ]);
                     }

package/lib/generics/visitor.js.map

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

package/lib/gir/alias.d.ts

@@ -3,8 +3,8 @@ import { IntrospectedNamespaceMember, Options } from "./base.js";
 import { GirAliasElement } from "../index.js";
 import { IntrospectedNamespace } from "./namespace.js";
 import { FormatGenerator, GenericDescriptor } from "../generators/generator.js";
-import { LoadOptions } from "../types.js";
 import { GirVisitor } from "../visitor.js";
+import type { OptionsLoad } from "../types/index.js";
 export declare class IntrospectedAlias extends IntrospectedNamespaceMember {
     readonly type: TypeExpression;
     readonly generics: GenericDescriptor[];
@@ -20,5 +20,5 @@ export declare class IntrospectedAlias extends IntrospectedNamespaceMember {
         type?: TypeExpression;
     }): IntrospectedAlias;
     asString<T extends FormatGenerator<unknown>>(generator: T): ReturnType<T["generateAlias"]>;
-    static fromXML(element: GirAliasElement, ns: IntrospectedNamespace, options: LoadOptions): IntrospectedAlias | null;
+    static fromXML(element: GirAliasElement, ns: IntrospectedNamespace, options: OptionsLoad): IntrospectedAlias | null;
 }

package/lib/gir/alias.js

@@ -24,13 +24,13 @@ export class IntrospectedAlias extends IntrospectedNamespaceMember {
     }
     static fromXML(element, ns, options) {
         if (!element.$.name) {
-            console.error(`Alias in ${ns.name} lacks name.`);
+            console.error(`Alias in ${ns.namespace} lacks name.`);
             return null;
         }
         const alias = new IntrospectedAlias({
             namespace: ns,
-            name: sanitizeIdentifierName(ns.name, element.$.name),
-            type: getAliasType(ns.name, ns, element),
+            name: sanitizeIdentifierName(ns.namespace, element.$.name),
+            type: getAliasType(ns.namespace, ns, element),
             isIntrospectable: isIntrospectable(element)
         });
         if (options.loadDocs) {

package/lib/gir/alias.js.map

@@ -1 +1 @@
-{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../src/gir/alias.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAW,MAAM,WAAW,CAAC;AAGjE,OAAO,EAAyB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAK1F,MAAM,OAAO,iBAAkB,SAAQ,2BAA2B;IACrD,IAAI,CAAiB;IACrB,QAAQ,CAAsB;IAEvC,YAAY,EACR,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,QAAQ,GAAG,EAAE,EACb,GAAG,IAAI,EAMT;QACE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;QAEpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,OAAmB;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACvC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,OAAuD;QACxD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAEvC,OAAO,IAAI,iBAAiB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC7G,CAAC;IAED,QAAQ,CAAqC,SAAY;QACrD,OAAO,SAAS,CAAC,aAAa,CAAC,IAAI,CAAmC,CAAC;IAC3E,CAAC;IAED,MAAM,CAAC,OAAO,CACV,OAAwB,EACxB,EAAyB,EACzB,OAAoB;QAEpB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,iBAAiB,CAAC;YAChC,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YACrD,IAAI,EAAE,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC;YACxC,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,CAAC;SAC9C,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,KAAK,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC9B,KAAK,CAAC,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
+{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../src/gir/alias.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAW,MAAM,WAAW,CAAC;AAGjE,OAAO,EAAyB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAM1F,MAAM,OAAO,iBAAkB,SAAQ,2BAA2B;IACrD,IAAI,CAAiB;IACrB,QAAQ,CAAsB;IAEvC,YAAY,EACR,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,QAAQ,GAAG,EAAE,EACb,GAAG,IAAI,EAMT;QACE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;QAEpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,OAAmB;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACvC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,OAAuD;QACxD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAEvC,OAAO,IAAI,iBAAiB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC7G,CAAC;IAED,QAAQ,CAAqC,SAAY;QACrD,OAAO,SAAS,CAAC,aAAa,CAAC,IAAI,CAAmC,CAAC;IAC3E,CAAC;IAED,MAAM,CAAC,OAAO,CACV,OAAwB,EACxB,EAAyB,EACzB,OAAoB;QAEpB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,SAAS,cAAc,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,iBAAiB,CAAC;YAChC,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAC1D,IAAI,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC;YAC7C,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,CAAC;SAC9C,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,KAAK,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC9B,KAAK,CAAC,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}

package/lib/gir/base.d.ts

@@ -1,8 +1,8 @@
 import { FormatGenerator } from "../generators/index.js";
-import { LoadOptions } from "../types.js";
 import { GirVisitor } from "../visitor.js";
 import { IntrospectedNamespace } from "./namespace.js";
 import type { IntrospectedBaseClass } from "./nodes.js";
+import type { OptionsLoad } from "../types/index.js";
 export interface Metadata {
     deprecated?: boolean;
     deprecatedVersion?: string;
@@ -48,14 +48,14 @@ export declare abstract class IntrospectedBase<Parent extends IntrospectedNamesp
         parent?: Parent;
     }): IntrospectedBase<Parent>;
     abstract accept(visitor: GirVisitor): IntrospectedBase<Parent>;
-    static fromXML(element: Record<string, any>, parent: IntrospectedNamespace | AnyIntrospectedType, options: LoadOptions): AnyIntrospectedType | null;
+    static fromXML(element: Record<string, any>, parent: IntrospectedNamespace | AnyIntrospectedType, options: OptionsLoad): AnyIntrospectedType | null;
     abstract asString<T extends FormatGenerator<unknown>>(generator: T): (T extends FormatGenerator<infer R> ? R : never) | null;
     abstract asString<T extends FormatGenerator<unknown>>(generator: T): unknown;
 }
 export declare abstract class IntrospectedNamespaceMember extends IntrospectedBase<IntrospectedNamespace> {
     constructor(name: string, namespace: IntrospectedNamespace, options?: BaseOptions);
     get namespace(): IntrospectedNamespace;
-    static fromXML(element: Record<string, any>, parent: IntrospectedNamespace, options: LoadOptions): IntrospectedNamespaceMember | null;
+    static fromXML(element: Record<string, any>, parent: IntrospectedNamespace, options: OptionsLoad): IntrospectedNamespaceMember | null;
 }
 export declare abstract class IntrospectedClassMember<Parent extends IntrospectedBaseClass | null = IntrospectedBaseClass | null> extends IntrospectedBase<Parent> {
     get namespace(): IntrospectedNamespace;

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

@@ -7,8 +7,8 @@ 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
@@ -90,7 +90,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 +121,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 +147,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 +183,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,3 +1,4 @@
+import { Logger } from "../logger.js";
 import { NativeType, TypeIdentifier, NeverType, ArrayType, ClosureType, BinaryType, PromiseType, VoidType, TupleType, BooleanType, Generic, GenericType, GenerifiedTypeIdentifier, AnyType, ConflictType, TypeConflict } from "../gir.js";
 import { IntrospectedNamespaceMember } from "./base.js";
 import { GirDirection, ClassStructTypeIdentifier } from "../index.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);
@@ -279,7 +281,7 @@ 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
@@ -560,9 +562,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 +573,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 +641,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 +651,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 +666,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 +692,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();
@@ -778,27 +779,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 +832,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;
     }
@@ -1035,9 +1035,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 +1046,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 +1107,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 +1120,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;
     }