@ts-for-gir/lib 3.2.9 → 4.0.0-beta.1

package/lib/validators/class.js

@@ -0,0 +1,217 @@
+import { AnyType, NativeType, TypeIdentifier } from "../gir.js";
+import { IntrospectedRecord } from "../gir/class.js";
+import { IntrospectedError } from "../gir/enum.js";
+import { IntrospectedClassFunction, IntrospectedDirectAllocationConstructor, IntrospectedStaticClassFunction } from "../gir/function.js";
+import { resolveTypeIdentifier } from "../gir/util.js";
+import { GirVisitor } from "../visitor.js";
+const filterIntrospectableClassMembers = (node) => {
+    node.fields = node.fields.filter(field => field.isIntrospectable);
+    node.props = node.props.filter(prop => prop.isIntrospectable);
+    node.callbacks = node.callbacks.filter(prop => prop.isIntrospectable);
+    node.constructors = node.constructors.filter(prop => prop.isIntrospectable);
+    node.members = node.members.filter(prop => prop.isIntrospectable);
+    return node;
+};
+const PROTECTED_FIELD_NAMES = ["parent_instance", "parent", "parent_class", "object_class"];
+const filterProtectedFields = (node) => {
+    const set = new Set(PROTECTED_FIELD_NAMES);
+    node.fields = node.fields.filter(f => {
+        return !set.has(f.name);
+    });
+    return node;
+};
+/**
+ * Filters fields, properties, and members to ensure they are not named
+ * after reserved object keys (prototype, constructor)
+ */
+const filterReservedProperties = (node) => {
+    const set = new Set(["prototype", "constructor"]);
+    node.fields = node.fields.filter(f => {
+        return !set.has(f.name);
+    });
+    node.props = node.props.filter(p => {
+        return !set.has(p.name);
+    });
+    node.members = node.members.filter(m => {
+        return !set.has(m.name);
+    });
+    return node;
+};
+const filterConflictingNamedClassMembers = (node) => {
+    // Props shadow members
+    node.members = node.members.filter(m => {
+        return !node.props.some(prop => prop.name === m.name && !(m instanceof IntrospectedStaticClassFunction));
+    });
+    // Props and members shadow fields
+    node.fields = node.fields.filter(f => !node.members.some(n => n.name === f.name && !(n instanceof IntrospectedStaticClassFunction)) &&
+        !node.props.some(n => n.name === f.name));
+    return node;
+};
+/**
+ * Subtypes of ParamSpec are not supported (e.g. a subtype of ParamSpecString).
+ *
+ * First, we transform the node to use ParamSpec as a parent and then flag it
+ * to not emit.
+ *
+ * If a generator doesn't follow the emit() standard, the parent type will at least
+ * be valid.
+ *
+ * @param node
+ * @returns
+ */
+const fixParamSpecSubtypes = (node) => {
+    if (node.superType?.namespace === "GObject" && node.superType.name.startsWith("ParamSpec")) {
+        // We don't assert this import because we don't want to force libraries
+        // to unnecessarily import GObject.
+        node.superType = new TypeIdentifier("ParamSpec", "GObject");
+        node.noEmit();
+    }
+    return node;
+};
+/**
+ * Checks if a class implements a GObject.Object-based interface
+ * If the class is missing a direct parent we inject GObject.Object
+ * as a stand-in considering it already indirectly inherits
+ * from it.
+ *
+ * @param node
+ */
+const fixMissingParent = (node) => {
+    const { namespace } = node;
+    if (node.superType == null) {
+        const isGObject = node.someParent(p => p.getType().is("GObject", "Object"));
+        if (isGObject) {
+            node.superType = namespace.assertInstalledImport("GObject").assertClass("Object").getType();
+        }
+    }
+    return node;
+};
+/**
+ * Fields cannot be array types, error types,
+ * or class-like types in GJS. This strips
+ * fields which have these "complex" types.
+ *
+ * @param node
+ */
+const removeComplexFields = (node) => {
+    const { namespace } = node;
+    node.fields = node.fields.filter(f => {
+        const type = f.type.deepUnwrap();
+        if (type instanceof NativeType) {
+            return true;
+        }
+        if (type instanceof TypeIdentifier) {
+            // Find the type for the identifier
+            const classNode = resolveTypeIdentifier(namespace, type);
+            // Don't allow private or disguised fields
+            if (classNode && classNode.isPrivate) {
+                return false;
+            }
+            // Only allow fields pointing to simple structs.
+            if (classNode && classNode instanceof IntrospectedRecord && !classNode.isSimple()) {
+                return false;
+            }
+            const en = namespace.assertInstalledImport(type.namespace).getEnum(type.name);
+            if (!(en instanceof IntrospectedError)) {
+                return true;
+            }
+            return false;
+        }
+        return true;
+    });
+    return node;
+};
+/**
+ * TODO: Consider making this transformation optional.
+ *
+ * If we are referencing an unknown library, any-ify the type.
+ *
+ * @param node
+ */
+const removeReferencesToMissingLibraries = (node) => {
+    const { namespace } = node;
+    node.fields = node.fields.map(f => {
+        const type = f.type.deepUnwrap();
+        if (type instanceof TypeIdentifier) {
+            // Find the type for the identifier
+            const nsNode = namespace.getInstalledImport(type.namespace);
+            // Don't allow private or disguised fields
+            if (!nsNode) {
+                return f.copy({ type: AnyType });
+            }
+        }
+        return f;
+    });
+    return node;
+};
+const removePrivateFields = (node) => {
+    node.fields = node.fields.filter(f => {
+        return !f.isPrivate && !f.name.startsWith("_");
+    });
+    return node;
+};
+/**
+ * Boxed types have a specific order of preference for
+ * which constructor will be used...
+ *
+ * 1. Zero Args Constructor
+ * 2. Direct Allocation (if the type is simple)
+ * 3. The new() constructor
+ * 4. The first constructor
+ *
+ * @param node
+ */
+const resolveMainConstructor = (node) => {
+    const newConstructor = node.constructors.find(c => c.name === "new");
+    const zeroArgsConstructor = node.constructors.find(c => c.parameters.length === 0);
+    const firstConstructor = node.constructors?.[0];
+    if (node.isForeign()) {
+        node.mainConstructor = null;
+        return node;
+    }
+    if (zeroArgsConstructor || node.isSimpleWithoutPointers()) {
+        node.mainConstructor = IntrospectedDirectAllocationConstructor.fromFields(node.fields, node);
+        return node;
+    }
+    const resolvedConstructor = newConstructor ?? firstConstructor;
+    if (resolvedConstructor) {
+        node.mainConstructor = resolvedConstructor.copy();
+    }
+    if (node.isSimple()) {
+        node.mainConstructor = IntrospectedDirectAllocationConstructor.fromFields(node.fields, node);
+        return node;
+    }
+    return node;
+};
+const mergeStaticDefinitions = (node) => {
+    if (!node.staticDefinition) {
+        return node;
+    }
+    const { namespace } = node;
+    const staticDefinition = namespace.getClass(node.staticDefinition);
+    if (!(staticDefinition instanceof IntrospectedRecord)) {
+        return node;
+    }
+    const staticMethods = staticDefinition.members
+        .filter(m => m instanceof IntrospectedClassFunction)
+        .map(m => m.asStaticClassFunction(node));
+    for (const staticMethod of staticMethods) {
+        if (!node.members.some(member => member.name === staticMethod.name && member instanceof IntrospectedStaticClassFunction)) {
+            node.members.push(staticMethod);
+        }
+    }
+    return node;
+};
+function chainVisitors(node, ...args) {
+    let currentNode = node;
+    for (const visitor of args) {
+        currentNode = visitor(currentNode);
+    }
+    return currentNode;
+}
+export class ClassVisitor extends GirVisitor {
+    visitClass = (node) => chainVisitors(node, removeReferencesToMissingLibraries, fixMissingParent, fixParamSpecSubtypes, removeComplexFields, removePrivateFields, mergeStaticDefinitions, filterConflictingNamedClassMembers, filterIntrospectableClassMembers, filterProtectedFields, filterReservedProperties);
+    visitInterface = (node) => chainVisitors(node, filterIntrospectableClassMembers, filterReservedProperties);
+    visitRecord = (node) => chainVisitors(node, fixMissingParent, fixParamSpecSubtypes, resolveMainConstructor, removeComplexFields, removePrivateFields, filterConflictingNamedClassMembers, filterIntrospectableClassMembers, filterProtectedFields, filterReservedProperties);
+}
+//# sourceMappingURL=class.js.map

package/lib/validators/class.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"class.js","sourceRoot":"","sources":["../../src/validators/class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,EAAmE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EACH,yBAAyB,EACzB,uCAAuC,EACvC,+BAA+B,EAClC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,gCAAgC,GAAG,CAAkC,IAAO,EAAK,EAAE;IACrF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAClE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC9D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACtE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC5E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAElE,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,iBAAiB,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;AAE5F,MAAM,qBAAqB,GAAG,CAAkC,IAAO,EAAK,EAAE;IAC1E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAE3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACjC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAkC,IAAO,EAAK,EAAE;IAC7E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACjC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACnC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,kCAAkC,GAAG,CAAkC,IAAO,EAAK,EAAE;IACvF,uBAAuB;IACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACnC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,+BAA+B,CAAC,CAAC,CAAC;IAC7G,CAAC,CAAC,CAAC;IAEH,kCAAkC;IAClC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAC5B,CAAC,CAAC,EAAE,CACA,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,+BAA+B,CAAC,CAAC;QAC7F,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAC/C,CAAC;IAEF,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,oBAAoB,GAAG,CAAkC,IAAO,EAAK,EAAE;IACzE,IAAI,IAAI,CAAC,SAAS,EAAE,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACzF,uEAAuE;QACvE,mCAAmC;QACnC,IAAI,CAAC,SAAS,GAAG,IAAI,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAE5D,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,gBAAgB,GAAG,CAAkC,IAAO,EAAK,EAAE;IACrE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAE3B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE5E,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;QAChG,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,mBAAmB,GAAG,CAAkC,IAAO,EAAK,EAAE;IACxE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAE3B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACjC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAEjC,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,IAAI,YAAY,cAAc,EAAE,CAAC;YACjC,mCAAmC;YACnC,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAEzD,0CAA0C;YAC1C,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBACnC,OAAO,KAAK,CAAC;YACjB,CAAC;YAED,gDAAgD;YAChD,IAAI,SAAS,IAAI,SAAS,YAAY,kBAAkB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAChF,OAAO,KAAK,CAAC;YACjB,CAAC;YAED,MAAM,EAAE,GAAG,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE9E,IAAI,CAAC,CAAC,EAAE,YAAY,iBAAiB,CAAC,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,kCAAkC,GAAG,CAAkC,IAAO,EAAK,EAAE;IACvF,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAE3B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC9B,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAEjC,IAAI,IAAI,YAAY,cAAc,EAAE,CAAC;YACjC,mCAAmC;YACnC,MAAM,MAAM,GAAG,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE5D,0CAA0C;YAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;QAED,OAAO,CAAC,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAkC,IAAO,EAAK,EAAE;IACxE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACjC,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,sBAAsB,GAAG,CAAC,IAAwB,EAAsB,EAAE;IAC5E,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACrE,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;IACnF,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;IAEhD,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QACnB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAE5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;QACxD,IAAI,CAAC,eAAe,GAAG,uCAAuC,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,mBAAmB,GAAG,cAAc,IAAI,gBAAgB,CAAC;IAC/D,IAAI,mBAAmB,EAAE,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,mBAAmB,CAAC,IAAI,EAAE,CAAC;IACtD,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QAClB,IAAI,CAAC,eAAe,GAAG,uCAAuC,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,IAAuB,EAAqB,EAAE;IAC1E,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC3B,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAEnE,IAAI,CAAC,CAAC,gBAAgB,YAAY,kBAAkB,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO;SACzC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,yBAAyB,CAAC;SACnD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;IAE7C,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACvC,IACI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CACd,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,MAAM,YAAY,+BAA+B,CACnG,EACH,CAAC;YACC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,SAAS,aAAa,CAAI,IAAO,EAAE,GAAG,IAAwB;IAC1D,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;QACzB,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,MAAM,OAAO,YAAa,SAAQ,UAAU;IACxC,UAAU,GAAG,CAAC,IAAuB,EAAE,EAAE,CACrC,aAAa,CACT,IAAI,EACJ,kCAAkC,EAClC,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,kCAAkC,EAClC,gCAAgC,EAChC,qBAAqB,EACrB,wBAAwB,CAC3B,CAAC;IAEN,cAAc,GAAG,CAAC,IAA2B,EAAE,EAAE,CAC7C,aAAa,CAAC,IAAI,EAAE,gCAAgC,EAAE,wBAAwB,CAAC,CAAC;IAEpF,WAAW,GAAG,CAAC,IAAwB,EAAE,EAAE,CACvC,aAAa,CACT,IAAI,EACJ,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,kCAAkC,EAClC,gCAAgC,EAChC,qBAAqB,EACrB,wBAAwB,CAC3B,CAAC;CACT"}

package/lib/validators/interface.d.ts

@@ -0,0 +1,5 @@
+import { IntrospectedInterface } from "../gir/class.js";
+import { GirVisitor } from "../visitor.js";
+export declare class InterfaceVisitor extends GirVisitor {
+    visitInterface: (node: IntrospectedInterface) => IntrospectedInterface;
+}

package/lib/validators/interface.js

@@ -0,0 +1,16 @@
+import { GirVisitor } from "../visitor.js";
+export class InterfaceVisitor extends GirVisitor {
+    visitInterface = (node) => {
+        // If an interface does not list a prerequisite type, we fill it with GObject.Object
+        if (!node.noParent && node.superType == null) {
+            const gobject = node.namespace.assertInstalledImport("GObject");
+            const GObject = gobject.assertClass("Object");
+            if (!GObject) {
+                throw new Error(`GObject.Object could not be found while generating ${node.namespace.name}.${node.name}`);
+            }
+            node.superType = GObject.getType();
+        }
+        return node;
+    };
+}
+//# sourceMappingURL=interface.js.map

package/lib/validators/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../src/validators/interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC5C,cAAc,GAAG,CAAC,IAA2B,EAAyB,EAAE;QACpE,oFAAoF;QACpF,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAChE,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAE9C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CACX,sDAAsD,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAC3F,CAAC;YACN,CAAC;YAED,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;CACL"}

package/lib/visitor.d.ts

@@ -0,0 +1,35 @@
+import { TypeExpression } from './gir.js';
+import { IntrospectedAlias } from './gir/alias.js';
+import { IntrospectedRecord, IntrospectedInterface, IntrospectedClass, IntrospectedBaseClass } from './gir/class.js';
+import { IntrospectedConstant } from './gir/const.js';
+import { GirEnumMember, IntrospectedError, IntrospectedEnum } from './gir/enum.js';
+import { IntrospectedCallback, IntrospectedConstructor, IntrospectedFunctionParameter, IntrospectedFunction, IntrospectedClassFunction, IntrospectedStaticClassFunction, IntrospectedVirtualClassFunction, IntrospectedDirectAllocationConstructor, IntrospectedClassCallback } from './gir/function.js';
+import { IntrospectedNamespace } from './gir/namespace.js';
+import { IntrospectedProperty, IntrospectedField } from './gir/property.js';
+import { IntrospectedSignal, IntrospectedSignalType } from './gir/signal.js';
+export declare abstract class GirVisitor {
+    visitType?: (node: TypeExpression) => TypeExpression;
+    visitCallback?: (node: IntrospectedCallback) => IntrospectedCallback;
+    visitClassCallback?: (node: IntrospectedClassCallback) => IntrospectedClassCallback;
+    visitAlias?: (node: IntrospectedAlias) => IntrospectedAlias;
+    visitConstructor?: (node: IntrospectedConstructor) => IntrospectedConstructor;
+    visitDirectAllocationConstructor?: (node: IntrospectedDirectAllocationConstructor) => IntrospectedDirectAllocationConstructor;
+    visitConstructorFunction?: (node: IntrospectedConstructor) => IntrospectedConstructor;
+    visitRecord?: (node: IntrospectedRecord) => IntrospectedRecord;
+    visitInterface?: (node: IntrospectedInterface) => IntrospectedInterface;
+    visitEnumMember?: (node: GirEnumMember) => GirEnumMember;
+    visitError?: (node: IntrospectedError) => IntrospectedError;
+    visitEnum?: (node: IntrospectedEnum) => IntrospectedEnum;
+    visitConst?: (node: IntrospectedConstant) => IntrospectedConstant;
+    visitClass?: (node: IntrospectedClass) => IntrospectedClass;
+    visitParameter?: (node: IntrospectedFunctionParameter) => IntrospectedFunctionParameter;
+    visitProperty?: (node: IntrospectedProperty) => IntrospectedProperty;
+    visitField?: (node: IntrospectedField) => IntrospectedField;
+    visitSignal?: (node: IntrospectedSignal, type?: IntrospectedSignalType) => IntrospectedSignal;
+    visitFunction?: (node: IntrospectedFunction) => IntrospectedFunction;
+    visitClassFunction?: <T extends IntrospectedBaseClass | IntrospectedEnum>(node: IntrospectedClassFunction<T>) => IntrospectedClassFunction<T>;
+    visitStaticClassFunction?: (node: IntrospectedStaticClassFunction) => IntrospectedStaticClassFunction;
+    visitVirtualClassFunction?: (node: IntrospectedVirtualClassFunction) => IntrospectedVirtualClassFunction;
+    visitNamespace?: (node: IntrospectedNamespace) => IntrospectedNamespace;
+}
+export declare function visit(namespace: IntrospectedNamespace, visitor: GirVisitor): void;

package/lib/visitor.js

@@ -0,0 +1,29 @@
+export class GirVisitor {
+    visitType;
+    visitCallback;
+    visitClassCallback;
+    visitAlias;
+    visitConstructor;
+    visitDirectAllocationConstructor;
+    visitConstructorFunction;
+    visitRecord;
+    visitInterface;
+    visitEnumMember;
+    visitError;
+    visitEnum;
+    visitConst;
+    visitClass;
+    visitParameter;
+    visitProperty;
+    visitField;
+    visitSignal;
+    visitFunction;
+    visitClassFunction;
+    visitStaticClassFunction;
+    visitVirtualClassFunction;
+    visitNamespace;
+}
+export function visit(namespace, visitor) {
+    namespace.accept(visitor);
+}
+//# sourceMappingURL=visitor.js.map

package/lib/visitor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"AAoBA,MAAM,OAAgB,UAAU;IAC5B,SAAS,CAA2C;IACpD,aAAa,CAAuD;IACpE,kBAAkB,CAAiE;IACnF,UAAU,CAAiD;IAC3D,gBAAgB,CAA6D;IAC7E,gCAAgC,CAEY;IAC5C,wBAAwB,CAA6D;IACrF,WAAW,CAAmD;IAC9D,cAAc,CAAyD;IACvE,eAAe,CAAyC;IACxD,UAAU,CAAiD;IAC3D,SAAS,CAA+C;IACxD,UAAU,CAAuD;IACjE,UAAU,CAAiD;IAC3D,cAAc,CAAyE;IACvF,aAAa,CAAuD;IACpE,UAAU,CAAiD;IAC3D,WAAW,CAAkF;IAC7F,aAAa,CAAuD;IACpE,kBAAkB,CAEe;IACjC,wBAAwB,CAA6E;IACrG,yBAAyB,CAA+E;IACxG,cAAc,CAAyD;CAC1E;AAED,MAAM,UAAU,KAAK,CAAC,SAAgC,EAAE,OAAmB;IACvE,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAC7B,CAAC"}

package/package.json

@@ -1,13 +1,19 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "3.2.9",
-  "description": "Typescript .d.ts generator from GIR for gjs and node-gtk",
+  "version": "4.0.0-beta.1",
+  "description": "Typescript .d.ts generator from GIR for gjs",
   "module": "lib/index.js",
   "main": "lib/index.js",
   "type": "module",
   "engines": {
     "node": ">=18"
   },
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js"
+    }
+  },
   "scripts": {
     "build": "yarn lint && yarn build:ts",
     "build:ts": "tsc",
@@ -34,7 +40,6 @@
     "gjs",
     "typescript",
     "generate",
-    "node-gtk",
     "gir",
     "gobject-introspection",
     "gnome",
@@ -47,22 +52,21 @@
   "devDependencies": {
     "@types/ejs": "^3.1.5",
     "@types/eslint": "8.56.5",
-    "@types/lodash": "^4.14.202",
-    "@types/node": "^20.11.24",
-    "@types/xml2js": "^0.4.14",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@types/lodash": "^4.17.0",
+    "@types/node": "^20.11.27",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "typescript": "5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
+    "@gi.ts/parser": "^2.0.0",
     "colorette": "^2.0.20",
     "ejs": "^3.1.9",
-    "lodash": "^4.17.21",
-    "xml2js": "0.6.2"
+    "lodash": "^4.17.21"
   }
 }

package/lib/injection/callbacks/node-gtk/index.d.ts

@@ -1,2 +0,0 @@
-import type { InjectionCallback } from '../../../types/index.js';
-export declare const callbacksNode: InjectionCallback[];

package/lib/injection/callbacks/node-gtk/index.js

@@ -1,2 +0,0 @@
-export const callbacksNode = [];
-//# sourceMappingURL=index.js.map

package/lib/injection/callbacks/node-gtk/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/injection/callbacks/node-gtk/index.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAwB,EAAE,CAAA"}

package/lib/injection/classes/node-gtk/gdk-4.0.d.ts

@@ -1,2 +0,0 @@
-import type { InjectionClass } from '../../../types/index.js';
-export declare const classesGdk40Node: InjectionClass[];

package/lib/injection/classes/node-gtk/gdk-4.0.js

@@ -1,32 +0,0 @@
-export const classesGdk40Node = [
-    // See https://github.com/romgrk/node-gtk/blob/master/lib/overrides/Gdk-4.0.js
-    {
-        versions: ['4.0'],
-        qualifiedName: 'Gdk.RGBA',
-        constructors: [
-            {
-                girTypeName: 'constructor',
-                isStatic: true,
-                name: 'create',
-                returnTypes: [{ type: 'Gdk.RGBA' }],
-                inParams: [
-                    {
-                        name: 'value',
-                        type: [{ type: 'string' }],
-                    },
-                ],
-                doc: {
-                    text: 'Creates a new color from the given string. Passes value to `GdkRGBA.parse()`',
-                    tags: [
-                        {
-                            paramName: '',
-                            tagName: 'param',
-                            text: 'value',
-                        },
-                    ],
-                },
-            },
-        ],
-    },
-];
-//# sourceMappingURL=gdk-4.0.js.map

package/lib/injection/classes/node-gtk/gdk-4.0.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"gdk-4.0.js","sourceRoot":"","sources":["../../../../src/injection/classes/node-gtk/gdk-4.0.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAqB;IAC9C,8EAA8E;IAC9E;QACI,QAAQ,EAAE,CAAC,KAAK,CAAC;QACjB,aAAa,EAAE,UAAU;QACzB,YAAY,EAAE;YACV;gBACI,WAAW,EAAE,aAAa;gBAC1B,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;gBACnC,QAAQ,EAAE;oBACN;wBACI,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qBAC7B;iBACJ;gBACD,GAAG,EAAE;oBACD,IAAI,EAAE,8EAA8E;oBACpF,IAAI,EAAE;wBACF;4BACI,SAAS,EAAE,EAAE;4BACb,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,OAAO;yBAChB;qBACJ;iBACJ;aACJ;SACJ;KACJ;CACJ,CAAA"}

package/lib/injection/classes/node-gtk/gio-2.0.d.ts

@@ -1,2 +0,0 @@
-import type { InjectionClass } from '../../../types/index.js';
-export declare const classesGio20Node: InjectionClass[];

package/lib/injection/classes/node-gtk/gio-2.0.js

@@ -1,14 +0,0 @@
-export const classesGio20Node = [
-    {
-        versions: ['2.0'],
-        qualifiedName: 'Gio.ListStore',
-        generics: [
-            {
-                name: 'A',
-                extends: 'GObject.Object',
-                value: 'GObject.Object',
-            },
-        ],
-    },
-];
-//# sourceMappingURL=gio-2.0.js.map

package/lib/injection/classes/node-gtk/gio-2.0.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"gio-2.0.js","sourceRoot":"","sources":["../../../../src/injection/classes/node-gtk/gio-2.0.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAqB;IAC9C;QACI,QAAQ,EAAE,CAAC,KAAK,CAAC;QACjB,aAAa,EAAE,eAAe;QAC9B,QAAQ,EAAE;YACN;gBACI,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,gBAAgB;gBACzB,KAAK,EAAE,gBAAgB;aAC1B;SACJ;KACJ;CACJ,CAAA"}

package/lib/injection/classes/node-gtk/glib-2.0.d.ts

@@ -1,2 +0,0 @@
-import type { InjectionClass } from '../../../types/index.js';
-export declare const classesGLib20Node: InjectionClass[];

package/lib/injection/classes/node-gtk/glib-2.0.js

@@ -1,19 +0,0 @@
-export const classesGLib20Node = [
-    {
-        versions: ['2.0'],
-        qualifiedName: 'GLib.MainLoop',
-        methods: [
-            {
-                girTypeName: 'method',
-                name: 'run',
-                returnTypes: [{ type: 'void' }],
-            },
-            {
-                girTypeName: 'method',
-                name: 'quit',
-                returnTypes: [{ type: 'void' }],
-            },
-        ],
-    },
-];
-//# sourceMappingURL=glib-2.0.js.map

package/lib/injection/classes/node-gtk/glib-2.0.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"glib-2.0.js","sourceRoot":"","sources":["../../../../src/injection/classes/node-gtk/glib-2.0.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAqB;IAC/C;QACI,QAAQ,EAAE,CAAC,KAAK,CAAC;QACjB,aAAa,EAAE,eAAe;QAC9B,OAAO,EAAE;YACL;gBACI,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;aAClC;YACD;gBACI,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;aAClC;SACJ;KACJ;CACJ,CAAA"}

package/lib/injection/classes/node-gtk/gobject-2.0.d.ts

@@ -1,2 +0,0 @@
-import type { InjectionClass } from '../../../types/index.js';
-export declare const classesGObject20Node: InjectionClass[];

package/lib/injection/classes/node-gtk/gobject-2.0.js

@@ -1,66 +0,0 @@
-export const classesGObject20Node = [
-    {
-        versions: ['2.0'],
-        qualifiedName: 'GObject.Object',
-        methods: [
-            {
-                girTypeName: 'method',
-                name: 'setProperty',
-                isVirtual: true,
-                generics: [
-                    {
-                        name: 'T',
-                        value: 'any',
-                    },
-                ],
-                returnTypes: [{ type: 'void' }],
-                inParams: [
-                    {
-                        name: 'propertyName',
-                        type: [{ type: 'string' }],
-                    },
-                    {
-                        name: 'value',
-                        type: [{ type: 'T' }],
-                    },
-                ],
-            },
-            {
-                girTypeName: 'method',
-                name: 'getProperty',
-                isVirtual: true,
-                generics: [
-                    {
-                        name: 'T',
-                        value: 'unknown',
-                    },
-                ],
-                returnTypes: [{ type: 'T' }],
-                inParams: [
-                    {
-                        name: 'propertyName',
-                        type: [{ type: 'string' }],
-                    },
-                ],
-            },
-        ],
-    },
-    {
-        versions: ['2.0'],
-        qualifiedName: 'GObject.Value',
-        methods: [
-            {
-                girTypeName: 'method',
-                name: 'getBoxed',
-                generics: [
-                    {
-                        name: 'T',
-                        value: 'unknown',
-                    },
-                ],
-                returnTypes: [{ type: 'T' }],
-            },
-        ],
-    },
-];
-//# sourceMappingURL=gobject-2.0.js.map

package/lib/injection/classes/node-gtk/gobject-2.0.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"gobject-2.0.js","sourceRoot":"","sources":["../../../../src/injection/classes/node-gtk/gobject-2.0.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,oBAAoB,GAAqB;IAClD;QACI,QAAQ,EAAE,CAAC,KAAK,CAAC;QACjB,aAAa,EAAE,gBAAgB;QAC/B,OAAO,EAAE;YACL;gBACI,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE;oBACN;wBACI,IAAI,EAAE,GAAG;wBACT,KAAK,EAAE,KAAK;qBACf;iBACJ;gBACD,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;gBAC/B,QAAQ,EAAE;oBACN;wBACI,IAAI,EAAE,cAAc;wBACpB,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qBAC7B;oBACD;wBACI,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;qBACxB;iBACJ;aACJ;YACD;gBACI,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE;oBACN;wBACI,IAAI,EAAE,GAAG;wBACT,KAAK,EAAE,SAAS;qBACnB;iBACJ;gBACD,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;gBAC5B,QAAQ,EAAE;oBACN;wBACI,IAAI,EAAE,cAAc;wBACpB,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qBAC7B;iBACJ;aACJ;SACJ;KACJ;IACD;QACI,QAAQ,EAAE,CAAC,KAAK,CAAC;QACjB,aAAa,EAAE,eAAe;QAC9B,OAAO,EAAE;YACL;gBACI,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE;oBACN;wBACI,IAAI,EAAE,GAAG;wBACT,KAAK,EAAE,SAAS;qBACnB;iBACJ;gBACD,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;aAC/B;SACJ;KACJ;CACJ,CAAA"}

package/lib/injection/classes/node-gtk/graphene-1.0.d.ts

@@ -1,2 +0,0 @@
-import type { InjectionClass } from '../../../types/index.js';
-export declare const classesGraphene10Node: InjectionClass[];