@gtkx/codegen 0.21.0 → 1.0.0-rc.1

package/dist/fingerprint.d.ts

@@ -1,30 +1,10 @@
-/** Filename of the staleness sentinel written into the `@gtkx/gi` store root. */
+import type { ElementProp } from "@gtkx/config";
 export declare const FINGERPRINT_FILENAME = ".codegen-fingerprint.json";
-/**
- * The `@gtkx/codegen` package version, mixed into the store fingerprint so a
- * codegen upgrade invalidates a previously-generated store.
- */
-export declare const CODEGEN_VERSION: string;
-/**
- * The staleness sentinel written into the generated `@gtkx/gi` store: the
- * fingerprint value plus the inputs that produced it, so a consumer can
- * recompute and compare without reloading the GIR repository.
- */
 export type CodegenFingerprint = {
-    /** The fingerprint hash of {@link CODEGEN_VERSION}, libraries, and GIR contents. */
-    readonly value: string;
-    /** Absolute paths of every loaded `.gir` file, in load order. */
-    readonly girFiles: readonly string[];
-    /** The resolved `Name-Version` library identifiers the store was built for. */
-    readonly libraries: readonly string[];
+    value: string;
+    girFiles: string[];
+    libraries: string[];
 };
-/**
- * Computes a content fingerprint over the codegen version, the resolved library
- * set, and the contents of every loaded GIR file. A change to any of these
- * means the generated bindings are stale and must be regenerated.
- *
- * @param girFiles - Absolute paths of the loaded `.gir` files
- * @param libraries - The resolved `Name-Version` library identifiers
- */
-export declare const computeFingerprint: (girFiles: readonly string[], libraries: readonly string[]) => string;
+export declare const computeFingerprint: (girFiles: string[], libraries: string[], elementProps: Record<string, ElementProp[]>) => string;
+export declare const isStoreFresh: (giStoreDir: string, libraries: string[], elementProps: Record<string, ElementProp[]>) => boolean;
 //# sourceMappingURL=fingerprint.d.ts.map

package/dist/fingerprint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fingerprint.d.ts","sourceRoot":"","sources":["../src/fingerprint.ts"],"names":[],"mappings":"AAMA,iFAAiF;AACjF,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,MAAoE,CAAC;AAEnG;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC7B,oFAAoF;IACpF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,SAAS,MAAM,EAAE,EAAE,WAAW,SAAS,MAAM,EAAE,KAAG,MAY9F,CAAC"}
+{"version":3,"file":"fingerprint.d.ts","sourceRoot":"","sources":["../src/fingerprint.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAKhD,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAIhE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACjB,MAAM,EAAE,aACP,MAAM,EAAE,gBACL,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,KAC5C,MAcF,CAAC;AAIF,eAAO,MAAM,YAAY,eACT,MAAM,aACP,MAAM,EAAE,gBACL,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,KAC5C,OAeF,CAAC"}

package/dist/fingerprint.js

@@ -1,28 +1,19 @@
 import { createHash } from "node:crypto";
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { createRequire } from "node:module";
+import { join } from "node:path";
+import { sortStrings } from "@gtkx/utils";
 const require = createRequire(import.meta.url);
-/** Filename of the staleness sentinel written into the `@gtkx/gi` store root. */
 export const FINGERPRINT_FILENAME = ".codegen-fingerprint.json";
-/**
- * The `@gtkx/codegen` package version, mixed into the store fingerprint so a
- * codegen upgrade invalidates a previously-generated store.
- */
-export const CODEGEN_VERSION = require("../package.json").version;
-/**
- * Computes a content fingerprint over the codegen version, the resolved library
- * set, and the contents of every loaded GIR file. A change to any of these
- * means the generated bindings are stale and must be regenerated.
- *
- * @param girFiles - Absolute paths of the loaded `.gir` files
- * @param libraries - The resolved `Name-Version` library identifiers
- */
-export const computeFingerprint = (girFiles, libraries) => {
+const CODEGEN_VERSION = require("../package.json").version;
+export const computeFingerprint = (girFiles, libraries, elementProps) => {
     const hash = createHash("sha256");
     hash.update(CODEGEN_VERSION);
     hash.update("\n");
-    hash.update([...libraries].sort((a, b) => a.localeCompare(b)).join(","));
-    for (const file of [...girFiles].sort((a, b) => a.localeCompare(b))) {
+    hash.update(JSON.stringify(elementProps));
+    hash.update("\n");
+    hash.update(sortStrings(libraries).join(","));
+    for (const file of sortStrings(girFiles)) {
         hash.update("\n");
         hash.update(file);
         hash.update("\0");
@@ -30,4 +21,25 @@ export const computeFingerprint = (girFiles, libraries) => {
     }
     return hash.digest("hex");
 };
+const sortAlpha = (values) => sortStrings(values).join(",");
+export const isStoreFresh = (giStoreDir, libraries, elementProps) => {
+    const sentinelPath = join(giStoreDir, FINGERPRINT_FILENAME);
+    if (!existsSync(sentinelPath))
+        return false;
+    let sentinel;
+    try {
+        sentinel = JSON.parse(readFileSync(sentinelPath, "utf8"));
+    }
+    catch {
+        return false;
+    }
+    if (sortAlpha(sentinel.libraries) !== sortAlpha(libraries))
+        return false;
+    try {
+        return computeFingerprint(sentinel.girFiles, sentinel.libraries, elementProps) === sentinel.value;
+    }
+    catch {
+        return false;
+    }
+};
 //# sourceMappingURL=fingerprint.js.map

package/dist/fingerprint.js.map

@@ -1 +1 @@
-{"version":3,"file":"fingerprint.js","sourceRoot":"","sources":["../src/fingerprint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,iFAAiF;AACjF,MAAM,CAAC,MAAM,oBAAoB,GAAG,2BAA2B,CAAC;AAEhE;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAY,OAAO,CAAC,iBAAiB,CAAyB,CAAC,OAAO,CAAC;AAgBnG;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAA2B,EAAE,SAA4B,EAAU,EAAE;IACpG,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClB,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC,CAAC"}
+{"version":3,"file":"fingerprint.js","sourceRoot":"","sources":["../src/fingerprint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,2BAA2B,CAAC;AAEhE,MAAM,eAAe,GAAY,OAAO,CAAC,iBAAiB,CAAyB,CAAC,OAAO,CAAC;AAQ5F,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,QAAkB,EAClB,SAAmB,EACnB,YAA2C,EACrC,EAAE;IACR,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,MAAgB,EAAU,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE9E,MAAM,CAAC,MAAM,YAAY,GAAG,CACxB,UAAkB,EAClB,SAAmB,EACnB,YAA2C,EACpC,EAAE;IACT,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;IAC5D,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,QAA4B,CAAC;IACjC,IAAI,CAAC;QACD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAuB,CAAC;IACpF,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IACzE,IAAI,CAAC;QACD,OAAO,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,KAAK,QAAQ,CAAC,KAAK,CAAC;IACtG,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { createHash } from \"node:crypto\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport { join } from \"node:path\";\nimport type { ElementProp } from \"@gtkx/config\";\nimport { sortStrings } from \"@gtkx/utils\";\n\nconst require = createRequire(import.meta.url);\n\nexport const FINGERPRINT_FILENAME = \".codegen-fingerprint.json\";\n\nconst CODEGEN_VERSION: string = (require(\"../package.json\") as { version: string }).version;\n\nexport type CodegenFingerprint = {\n    value: string;\n    girFiles: string[];\n    libraries: string[];\n};\n\nexport const computeFingerprint = (\n    girFiles: string[],\n    libraries: string[],\n    elementProps: Record<string, ElementProp[]>,\n): string => {\n    const hash = createHash(\"sha256\");\n    hash.update(CODEGEN_VERSION);\n    hash.update(\"\\n\");\n    hash.update(JSON.stringify(elementProps));\n    hash.update(\"\\n\");\n    hash.update(sortStrings(libraries).join(\",\"));\n    for (const file of sortStrings(girFiles)) {\n        hash.update(\"\\n\");\n        hash.update(file);\n        hash.update(\"\\0\");\n        hash.update(readFileSync(file));\n    }\n    return hash.digest(\"hex\");\n};\n\nconst sortAlpha = (values: string[]): string => sortStrings(values).join(\",\");\n\nexport const isStoreFresh = (\n    giStoreDir: string,\n    libraries: string[],\n    elementProps: Record<string, ElementProp[]>,\n): boolean => {\n    const sentinelPath = join(giStoreDir, FINGERPRINT_FILENAME);\n    if (!existsSync(sentinelPath)) return false;\n    let sentinel: CodegenFingerprint;\n    try {\n        sentinel = JSON.parse(readFileSync(sentinelPath, \"utf8\")) as CodegenFingerprint;\n    } catch {\n        return false;\n    }\n    if (sortAlpha(sentinel.libraries) !== sortAlpha(libraries)) return false;\n    try {\n        return computeFingerprint(sentinel.girFiles, sentinel.libraries, elementProps) === sentinel.value;\n    } catch {\n        return false;\n    }\n};\n"]}

package/dist/gir/ancestry.d.ts

@@ -0,0 +1,9 @@
+import type { GirClass } from "./class.js";
+import type { Library } from "./library.js";
+export type ResolvedAncestor = {
+    klass: GirClass;
+    namespaceName: string;
+};
+export declare const resolveInterface: (library: Library, defaultNamespace: string, name: string) => ResolvedAncestor | undefined;
+export declare function ancestorChain(library: Library, klass: GirClass, namespaceName: string): Generator<ResolvedAncestor>;
+//# sourceMappingURL=ancestry.d.ts.map

package/dist/gir/ancestry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ancestry.d.ts","sourceRoot":"","sources":["../../src/gir/ancestry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,MAAM,gBAAgB,GAAG;IAC3B,KAAK,EAAE,QAAQ,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACzB,CAAC;AAaF,eAAO,MAAM,gBAAgB,YAChB,OAAO,oBACE,MAAM,QAClB,MAAM,KACb,gBAAgB,GAAG,SAIrB,CAAC;AAEF,wBAAiB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAWpH"}

package/dist/gir/ancestry.js

@@ -0,0 +1,29 @@
+const resolveClassOrInterface = (library, defaultNamespace, name) => {
+    const resolved = library.resolveType(defaultNamespace, name);
+    if (resolved === undefined)
+        return undefined;
+    if (resolved.kind !== "class" && resolved.kind !== "interface")
+        return undefined;
+    return { klass: resolved.value, namespaceName: resolved.namespace.name };
+};
+export const resolveInterface = (library, defaultNamespace, name) => {
+    const resolved = library.resolveType(defaultNamespace, name);
+    if (resolved?.kind !== "interface")
+        return undefined;
+    return { klass: resolved.value, namespaceName: resolved.namespace.name };
+};
+export function* ancestorChain(library, klass, namespaceName) {
+    const visited = new Set();
+    let current = { klass, namespaceName };
+    while (current !== undefined) {
+        const key = `${current.namespaceName}.${current.klass.name}`;
+        if (visited.has(key))
+            return;
+        visited.add(key);
+        yield current;
+        if (current.klass.parent === undefined)
+            return;
+        current = resolveClassOrInterface(library, current.namespaceName, current.klass.parent);
+    }
+}
+//# sourceMappingURL=ancestry.js.map

package/dist/gir/ancestry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ancestry.js","sourceRoot":"","sources":["../../src/gir/ancestry.ts"],"names":[],"mappings":"AAQA,MAAM,uBAAuB,GAAG,CAC5B,OAAgB,EAChB,gBAAwB,EACxB,IAAY,EACgB,EAAE;IAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC7D,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7C,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,SAAS,CAAC;IACjF,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;AAC7E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,OAAgB,EAChB,gBAAwB,EACxB,IAAY,EACgB,EAAE;IAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC7D,IAAI,QAAQ,EAAE,IAAI,KAAK,WAAW;QAAE,OAAO,SAAS,CAAC;IACrD,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;AAC7E,CAAC,CAAC;AAEF,MAAM,SAAS,CAAC,CAAC,aAAa,CAAC,OAAgB,EAAE,KAAe,EAAE,aAAqB;IACnF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,IAAI,OAAO,GAAiC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IACrE,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO;QAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,OAAO,CAAC;QACd,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO;QAC/C,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5F,CAAC;AACL,CAAC","sourcesContent":["import type { GirClass } from \"./class.js\";\nimport type { Library } from \"./library.js\";\n\nexport type ResolvedAncestor = {\n    klass: GirClass;\n    namespaceName: string;\n};\n\nconst resolveClassOrInterface = (\n    library: Library,\n    defaultNamespace: string,\n    name: string,\n): ResolvedAncestor | undefined => {\n    const resolved = library.resolveType(defaultNamespace, name);\n    if (resolved === undefined) return undefined;\n    if (resolved.kind !== \"class\" && resolved.kind !== \"interface\") return undefined;\n    return { klass: resolved.value, namespaceName: resolved.namespace.name };\n};\n\nexport const resolveInterface = (\n    library: Library,\n    defaultNamespace: string,\n    name: string,\n): ResolvedAncestor | undefined => {\n    const resolved = library.resolveType(defaultNamespace, name);\n    if (resolved?.kind !== \"interface\") return undefined;\n    return { klass: resolved.value, namespaceName: resolved.namespace.name };\n};\n\nexport function* ancestorChain(library: Library, klass: GirClass, namespaceName: string): Generator<ResolvedAncestor> {\n    const visited = new Set<string>();\n    let current: ResolvedAncestor | undefined = { klass, namespaceName };\n    while (current !== undefined) {\n        const key = `${current.namespaceName}.${current.klass.name}`;\n        if (visited.has(key)) return;\n        visited.add(key);\n        yield current;\n        if (current.klass.parent === undefined) return;\n        current = resolveClassOrInterface(library, current.namespaceName, current.klass.parent);\n    }\n}\n"]}

package/dist/gir/callback.d.ts

@@ -1,15 +1,14 @@
+import type { GirFunction } from "./function.js";
 import { type GirParameter, type GirReturnValue } from "./parameter.js";
 import { type RawNode } from "./parse.js";
-/** A `<callback>` declaration (top-level inside a namespace or nested in a field). */
+import type { ParseContext } from "./type-id.js";
 export type GirCallback = {
-    readonly name: string;
-    readonly cType: string | undefined;
-    readonly parameters: readonly GirParameter[];
-    readonly returnValue: GirReturnValue;
-    readonly introspectable: boolean;
+    name: string;
+    doc: string | undefined;
+    parameters: GirParameter[];
+    returnValue: GirReturnValue;
+    introspectable: boolean;
 };
-/**
- * Builds a {@link GirCallback} from a `<callback>` element.
- */
-export declare const callbackFromNode: (node: RawNode) => GirCallback;
+export declare const callbackFromNode: (node: RawNode, context: ParseContext) => GirCallback;
+export declare const callbackAsFunction: (callback: GirCallback) => GirFunction;
 //# sourceMappingURL=callback.d.ts.map

package/dist/gir/callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/gir/callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAA0C,MAAM,gBAAgB,CAAC;AAChH,OAAO,EAA6B,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAErE,sFAAsF;AACtF,MAAM,MAAM,WAAW,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,SAAS,YAAY,EAAE,CAAC;IAC7C,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IACrC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,OAAO,KAAG,WAUhD,CAAC"}
+{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/gir/callback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAiB,MAAM,gBAAgB,CAAC;AACvF,OAAO,EAAY,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,UAAU,EAAE,YAAY,EAAE,CAAC;IAC3B,WAAW,EAAE,cAAc,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,OAAO,WAAW,YAAY,KAAG,WAGtE,CAAC;AAEH,eAAO,MAAM,kBAAkB,aAAc,WAAW,KAAG,WAUzD,CAAC"}

package/dist/gir/callback.js

@@ -1,17 +1,18 @@
-import { parameterFromNode, returnValueFromNode } from "./parameter.js";
-import { attr, childOf, childrenOf } from "./parse.js";
-/**
- * Builds a {@link GirCallback} from a `<callback>` element.
- */
-export const callbackFromNode = (node) => {
-    const parametersNode = childOf(node, "parameters");
-    const parameterNodes = childrenOf(parametersNode, "parameter");
-    return {
-        name: attr(node, "name") ?? "",
-        cType: attr(node, "c:type"),
-        parameters: parameterNodes.map((parameter) => parameterFromNode(parameter, false)),
-        returnValue: returnValueFromNode(childOf(node, "return-value")),
-        introspectable: attr(node, "introspectable") !== "0",
-    };
-};
+import { parseCallable } from "./parameter.js";
+import { attrBool } from "./parse.js";
+export const callbackFromNode = (node, context) => ({
+    ...parseCallable(node, context),
+    introspectable: attrBool(node, "introspectable", true),
+});
+export const callbackAsFunction = (callback) => ({
+    name: callback.name,
+    doc: callback.doc,
+    cIdentifier: undefined,
+    throws: false,
+    introspectable: callback.introspectable,
+    shadowedBy: undefined,
+    instance: undefined,
+    parameters: callback.parameters,
+    returnValue: callback.returnValue,
+});
 //# sourceMappingURL=callback.js.map

package/dist/gir/callback.js.map

@@ -1 +1 @@
-{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/gir/callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAChH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAgB,MAAM,YAAY,CAAC;AAWrE;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAe,EAAE;IAC3D,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC/D,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;QAC9B,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;QAC3B,UAAU,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAClF,WAAW,EAAE,mBAAmB,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC/D,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,KAAK,GAAG;KACvD,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/gir/callback.ts"],"names":[],"mappings":"AACA,OAAO,EAA0C,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACvF,OAAO,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAWpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,OAAqB,EAAe,EAAE,CAAC,CAAC;IACpF,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC;IAC/B,cAAc,EAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC;CACzD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAqB,EAAe,EAAE,CAAC,CAAC;IACvE,IAAI,EAAE,QAAQ,CAAC,IAAI;IACnB,GAAG,EAAE,QAAQ,CAAC,GAAG;IACjB,WAAW,EAAE,SAAS;IACtB,MAAM,EAAE,KAAK;IACb,cAAc,EAAE,QAAQ,CAAC,cAAc;IACvC,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,SAAS;IACnB,UAAU,EAAE,QAAQ,CAAC,UAAU;IAC/B,WAAW,EAAE,QAAQ,CAAC,WAAW;CACpC,CAAC,CAAC","sourcesContent":["import type { GirFunction } from \"./function.js\";\nimport { type GirParameter, type GirReturnValue, parseCallable } from \"./parameter.js\";\nimport { attrBool, type RawNode } from \"./parse.js\";\nimport type { ParseContext } from \"./type-id.js\";\n\nexport type GirCallback = {\n    name: string;\n    doc: string | undefined;\n    parameters: GirParameter[];\n    returnValue: GirReturnValue;\n    introspectable: boolean;\n};\n\nexport const callbackFromNode = (node: RawNode, context: ParseContext): GirCallback => ({\n    ...parseCallable(node, context),\n    introspectable: attrBool(node, \"introspectable\", true),\n});\n\nexport const callbackAsFunction = (callback: GirCallback): GirFunction => ({\n    name: callback.name,\n    doc: callback.doc,\n    cIdentifier: undefined,\n    throws: false,\n    introspectable: callback.introspectable,\n    shadowedBy: undefined,\n    instance: undefined,\n    parameters: callback.parameters,\n    returnValue: callback.returnValue,\n});\n"]}

package/dist/gir/class.d.ts

@@ -1,49 +1,28 @@
-import { type GirField } from "./field.js";
 import { type GirFunction } from "./function.js";
+import { type GirSignal } from "./parameter.js";
 import { type RawNode } from "./parse.js";
 import { type GirProperty } from "./property.js";
-import { type GirSignal } from "./signal.js";
-/** A `<class>` or `<interface>` declaration. */
+import type { ParseContext } from "./type-id.js";
 export type GirClass = {
-    /** Local name inside the namespace (no prefix). */
-    readonly name: string;
-    readonly cType: string | undefined;
-    /** GIR `parent`, possibly cross-namespace (e.g. `"GObject.InitiallyUnowned"`). */
-    readonly parent: string | undefined;
-    /** GLib type name (e.g. `"GtkWidget"`). */
-    readonly glibTypeName: string | undefined;
-    /** C symbol that returns the GType integer (e.g. `"gtk_widget_get_type"`). */
-    readonly glibGetType: string | undefined;
-    /** Local record name that holds this class's vtable (`glib:type-struct`). */
-    readonly glibTypeStruct: string | undefined;
-    /** Glib ref/unref/etc. function names on fundamentals; not used for GObject subclasses. */
-    readonly glibRefFunc: string | undefined;
-    readonly glibUnrefFunc: string | undefined;
-    readonly glibSetValueFunc: string | undefined;
-    readonly glibGetValueFunc: string | undefined;
-    /** `glib:fundamental="1"` — a non-GObject fundamental type (e.g. `GdkEvent`, `GskRenderNode`). */
-    readonly fundamental: boolean;
-    readonly abstract: boolean;
-    readonly final: boolean;
-    readonly isInterface: boolean;
-    readonly introspectable: boolean;
-    /** Names of interfaces this class implements (cross-namespace possible). */
-    readonly implements: readonly string[];
-    /** Names of interfaces a `<interface>` requires (`<prerequisite>` elements). */
-    readonly prerequisites: readonly string[];
-    readonly methods: readonly GirFunction[];
-    readonly constructors: readonly GirFunction[];
-    readonly functions: readonly GirFunction[];
-    readonly virtualMethods: readonly GirFunction[];
-    readonly properties: readonly GirProperty[];
-    readonly signals: readonly GirSignal[];
-    readonly fields: readonly GirField[];
+    name: string;
+    doc: string | undefined;
+    cType: string | undefined;
+    parent: string | undefined;
+    glibTypeName: string | undefined;
+    glibGetType: string | undefined;
+    glibTypeStruct: string | undefined;
+    glibRefFunc: string | undefined;
+    glibUnrefFunc: string | undefined;
+    fundamental: boolean;
+    isInterface: boolean;
+    introspectable: boolean;
+    implements: string[];
+    prerequisites: string[];
+    methods: GirFunction[];
+    constructors: GirFunction[];
+    functions: GirFunction[];
+    properties: GirProperty[];
+    signals: GirSignal[];
 };
-/**
- * Builds a {@link GirClass} from a `<class>` or `<interface>` element.
- *
- * @param node - The XML element
- * @param isInterface - `true` when the source element was `<interface>`
- */
-export declare const classFromNode: (node: RawNode, isInterface: boolean) => GirClass;
+export declare const classFromNode: (node: RawNode, isInterface: boolean, context: ParseContext) => GirClass;
 //# sourceMappingURL=class.d.ts.map

package/dist/gir/class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["../../src/gir/class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAmD,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAC3F,OAAO,EAAE,KAAK,WAAW,EAAoB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,KAAK,SAAS,EAAkB,MAAM,aAAa,CAAC;AAE7D,gDAAgD;AAChD,MAAM,MAAM,QAAQ,GAAG;IACnB,mDAAmD;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,kFAAkF;IAClF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,2CAA2C;IAC3C,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,8EAA8E;IAC9E,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,6EAA6E;IAC7E,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,2FAA2F;IAC3F,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,kGAAkG;IAClG,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,gFAAgF;IAChF,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9C,QAAQ,CAAC,SAAS,EAAE,SAAS,WAAW,EAAE,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,SAAS,WAAW,EAAE,CAAC;IAChD,QAAQ,CAAC,UAAU,EAAE,SAAS,WAAW,EAAE,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,CAAC;CACxC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,OAAO,EAAE,aAAa,OAAO,KAAG,QA6BlE,CAAC"}
+{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["../../src/gir/class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAoE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5G,OAAO,EAAE,KAAK,WAAW,EAAoB,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,UAAU,EAAE,WAAW,EAAE,CAAC;IAC1B,OAAO,EAAE,SAAS,EAAE,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,aAAa,SAAU,OAAO,eAAe,OAAO,WAAW,YAAY,KAAG,QAwBzF,CAAC"}

package/dist/gir/class.js

@@ -1,16 +1,10 @@
-import { fieldFromNode } from "./field.js";
 import { functionFromNode } from "./function.js";
-import { attr, attrBool, childrenOf, GIR_CONSTRUCTOR_TAG } from "./parse.js";
+import { parseCallable } from "./parameter.js";
+import { attr, attrBool, childrenOf, docOf, GIR_CONSTRUCTOR_TAG, nameAttr } from "./parse.js";
 import { propertyFromNode } from "./property.js";
-import { signalFromNode } from "./signal.js";
-/**
- * Builds a {@link GirClass} from a `<class>` or `<interface>` element.
- *
- * @param node - The XML element
- * @param isInterface - `true` when the source element was `<interface>`
- */
-export const classFromNode = (node, isInterface) => ({
-    name: attr(node, "name") ?? "",
+export const classFromNode = (node, isInterface, context) => ({
+    name: nameAttr(node),
+    doc: docOf(node),
     cType: attr(node, "c:type"),
     parent: attr(node, "parent"),
     glibTypeName: attr(node, "glib:type-name"),
@@ -18,25 +12,19 @@ export const classFromNode = (node, isInterface) => ({
     glibTypeStruct: attr(node, "glib:type-struct"),
     glibRefFunc: attr(node, "glib:ref-func"),
     glibUnrefFunc: attr(node, "glib:unref-func"),
-    glibSetValueFunc: attr(node, "glib:set-value-func"),
-    glibGetValueFunc: attr(node, "glib:get-value-func"),
     fundamental: attrBool(node, "glib:fundamental"),
-    abstract: attrBool(node, "abstract"),
-    final: attrBool(node, "final"),
     isInterface,
-    introspectable: attr(node, "introspectable") !== "0",
+    introspectable: attrBool(node, "introspectable", true),
     implements: childrenOf(node, "implements")
         .map((implement) => attr(implement, "name"))
         .filter((name) => name !== undefined),
     prerequisites: childrenOf(node, "prerequisite")
         .map((prerequisite) => attr(prerequisite, "name"))
         .filter((name) => name !== undefined),
-    methods: childrenOf(node, "method").map((method) => functionFromNode(method, "method")),
-    constructors: childrenOf(node, GIR_CONSTRUCTOR_TAG).map((ctor) => functionFromNode(ctor, "constructor")),
-    functions: childrenOf(node, "function").map((function_) => functionFromNode(function_, "function")),
-    virtualMethods: childrenOf(node, "virtual-method").map((vmethod) => functionFromNode(vmethod, "virtual-method")),
-    properties: childrenOf(node, "property").map(propertyFromNode),
-    signals: childrenOf(node, "glib:signal").map(signalFromNode),
-    fields: childrenOf(node, "field").map(fieldFromNode),
+    methods: childrenOf(node, "method").map((method) => functionFromNode(method, context)),
+    constructors: childrenOf(node, GIR_CONSTRUCTOR_TAG).map((ctor) => functionFromNode(ctor, context)),
+    functions: childrenOf(node, "function").map((function_) => functionFromNode(function_, context)),
+    properties: childrenOf(node, "property").map((property) => propertyFromNode(property, context)),
+    signals: childrenOf(node, "glib:signal").map((signal) => parseCallable(signal, context)),
 });
 //# sourceMappingURL=class.js.map

package/dist/gir/class.js.map

@@ -1 +1 @@
-{"version":3,"file":"class.js","sourceRoot":"","sources":["../../src/gir/class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"class.js","sourceRoot":"","sources":["../../src/gir/class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAoB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAkB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAC5G,OAAO,EAAoB,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAyBnE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,WAAoB,EAAE,OAAqB,EAAY,EAAE,CAAC,CAAC;IACpG,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IACpB,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC;IAChB,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;IAC3B,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;IAC5B,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAC1C,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC;IACxC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAC9C,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC;IACxC,aAAa,EAAE,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAC5C,WAAW,EAAE,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAC/C,WAAW;IACX,cAAc,EAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC;IACtD,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC;SACrC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC3C,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC;IACzD,aAAa,EAAE,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC;SAC1C,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACjD,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC;IACzD,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtF,YAAY,EAAE,UAAU,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClG,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChG,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/F,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3F,CAAC,CAAC","sourcesContent":["import { functionFromNode, type GirFunction } from \"./function.js\";\nimport { type GirSignal, parseCallable } from \"./parameter.js\";\nimport { attr, attrBool, childrenOf, docOf, GIR_CONSTRUCTOR_TAG, nameAttr, type RawNode } from \"./parse.js\";\nimport { type GirProperty, propertyFromNode } from \"./property.js\";\nimport type { ParseContext } from \"./type-id.js\";\n\nexport type GirClass = {\n    name: string;\n    doc: string | undefined;\n    cType: string | undefined;\n    parent: string | undefined;\n    glibTypeName: string | undefined;\n    glibGetType: string | undefined;\n    glibTypeStruct: string | undefined;\n    glibRefFunc: string | undefined;\n    glibUnrefFunc: string | undefined;\n    fundamental: boolean;\n    isInterface: boolean;\n    introspectable: boolean;\n    implements: string[];\n    prerequisites: string[];\n    methods: GirFunction[];\n    constructors: GirFunction[];\n    functions: GirFunction[];\n    properties: GirProperty[];\n    signals: GirSignal[];\n};\n\nexport const classFromNode = (node: RawNode, isInterface: boolean, context: ParseContext): GirClass => ({\n    name: nameAttr(node),\n    doc: docOf(node),\n    cType: attr(node, \"c:type\"),\n    parent: attr(node, \"parent\"),\n    glibTypeName: attr(node, \"glib:type-name\"),\n    glibGetType: attr(node, \"glib:get-type\"),\n    glibTypeStruct: attr(node, \"glib:type-struct\"),\n    glibRefFunc: attr(node, \"glib:ref-func\"),\n    glibUnrefFunc: attr(node, \"glib:unref-func\"),\n    fundamental: attrBool(node, \"glib:fundamental\"),\n    isInterface,\n    introspectable: attrBool(node, \"introspectable\", true),\n    implements: childrenOf(node, \"implements\")\n        .map((implement) => attr(implement, \"name\"))\n        .filter((name): name is string => name !== undefined),\n    prerequisites: childrenOf(node, \"prerequisite\")\n        .map((prerequisite) => attr(prerequisite, \"name\"))\n        .filter((name): name is string => name !== undefined),\n    methods: childrenOf(node, \"method\").map((method) => functionFromNode(method, context)),\n    constructors: childrenOf(node, GIR_CONSTRUCTOR_TAG).map((ctor) => functionFromNode(ctor, context)),\n    functions: childrenOf(node, \"function\").map((function_) => functionFromNode(function_, context)),\n    properties: childrenOf(node, \"property\").map((property) => propertyFromNode(property, context)),\n    signals: childrenOf(node, \"glib:signal\").map((signal) => parseCallable(signal, context)),\n});\n"]}

package/dist/gir/enum.d.ts

@@ -1,39 +1,21 @@
-import { type GirFunction } from "./function.js";
 import { type RawNode } from "./parse.js";
-/** A single `<member>` of an `<enumeration>` or `<bitfield>`. */
 type EnumMember = {
-    /** GIR `name`, snake_case lowercase (e.g. `"fill"`). */
-    readonly name: string;
-    /** GIR `c:identifier`, SCREAMING_SNAKE_CASE (e.g. `"GTK_ALIGN_FILL"`). */
-    readonly cIdentifier: string | undefined;
-    /** Numeric value as a string; preserved verbatim from GIR. */
-    readonly value: string;
+    name: string;
+    doc: string | undefined;
+    value: string;
+    cIdentifier: string | undefined;
 };
-/** Discriminator for enums vs bitfields. */
-export type EnumKind = "enumeration" | "bitfield";
-/** An `<enumeration>` or `<bitfield>` declaration. */
+type EnumKind = "enumeration" | "bitfield";
 export type GirEnum = {
-    readonly kind: EnumKind;
-    /** Local name within the namespace (no namespace prefix). */
-    readonly name: string;
-    readonly cType: string | undefined;
-    /** GLib type name (e.g. `"GtkAlign"`); absent for unregistered enums. */
-    readonly glibTypeName: string | undefined;
-    /** GLib get-type C symbol; absent for unregistered enums. */
-    readonly glibGetType: string | undefined;
-    /** Optional `glib:error-domain` marker; presence flips emission to `createErrorDomain`. */
-    readonly errorDomain: string | undefined;
-    readonly introspectable: boolean;
-    readonly members: readonly EnumMember[];
-    /** Free functions nested inside the enum (e.g. error quark accessors). */
-    readonly functions: readonly GirFunction[];
+    kind: EnumKind;
+    name: string;
+    doc: string | undefined;
+    glibTypeName: string | undefined;
+    glibGetType: string | undefined;
+    errorDomain: string | undefined;
+    introspectable: boolean;
+    members: EnumMember[];
 };
-/**
- * Builds a {@link GirEnum} from an `<enumeration>` or `<bitfield>` element.
- *
- * @param node - The XML element
- * @param kind - `"enumeration"` or `"bitfield"`, matching the element name
- */
 export declare const enumFromNode: (node: RawNode, kind: EnumKind) => GirEnum;
 export {};
 //# sourceMappingURL=enum.d.ts.map

package/dist/gir/enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/gir/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAoB,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5D,iEAAiE;AACjE,KAAK,UAAU,GAAG;IACd,wDAAwD;IACxD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,8DAA8D;IAC9D,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,4CAA4C;AAC5C,MAAM,MAAM,QAAQ,GAAG,aAAa,GAAG,UAAU,CAAC;AAElD,sDAAsD;AACtD,MAAM,MAAM,OAAO,GAAG;IAClB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,6DAA6D;IAC7D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,yEAAyE;IACzE,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,6DAA6D;IAC7D,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,2FAA2F;IAC3F,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,CAAC;IACxC,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,SAAS,WAAW,EAAE,CAAC;CAC9C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,OAAO,EAAE,MAAM,QAAQ,KAAG,OAc3D,CAAC"}
+{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/gir/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAEvF,KAAK,UAAU,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,KAAK,QAAQ,GAAG,aAAa,GAAG,UAAU,CAAC;AAE3C,MAAM,MAAM,OAAO,GAAG;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,OAAO,QAAQ,QAAQ,KAAG,OAc3D,CAAC"}

package/dist/gir/enum.js

@@ -1,24 +1,17 @@
-import { functionFromNode } from "./function.js";
-import { attr, childrenOf } from "./parse.js";
-/**
- * Builds a {@link GirEnum} from an `<enumeration>` or `<bitfield>` element.
- *
- * @param node - The XML element
- * @param kind - `"enumeration"` or `"bitfield"`, matching the element name
- */
+import { attr, attrBool, childrenOf, docOf, nameAttr } from "./parse.js";
 export const enumFromNode = (node, kind) => ({
     kind,
-    name: attr(node, "name") ?? "",
-    cType: attr(node, "c:type"),
+    name: nameAttr(node),
+    doc: docOf(node),
     glibTypeName: attr(node, "glib:type-name"),
     glibGetType: attr(node, "glib:get-type"),
     errorDomain: attr(node, "glib:error-domain"),
-    introspectable: attr(node, "introspectable") !== "0",
+    introspectable: attrBool(node, "introspectable", true),
     members: childrenOf(node, "member").map((member) => ({
-        name: attr(member, "name") ?? "",
-        cIdentifier: attr(member, "c:identifier"),
+        name: nameAttr(member),
+        doc: docOf(member),
         value: attr(member, "value") ?? "0",
+        cIdentifier: attr(member, "c:identifier"),
     })),
-    functions: childrenOf(node, "function").map((function_) => functionFromNode(function_, "function")),
 });
 //# sourceMappingURL=enum.js.map

package/dist/gir/enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../src/gir/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAoB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAgB,MAAM,YAAY,CAAC;AAiC5D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,IAAc,EAAW,EAAE,CAAC,CAAC;IACrE,IAAI;IACJ,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;IAC9B,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;IAC3B,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAC1C,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC;IACxC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAC5C,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,KAAK,GAAG;IACpD,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;QAChC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC;QACzC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,GAAG;KACtC,CAAC,CAAC;IACH,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;CACtG,CAAC,CAAC"}
+{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../src/gir/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAsBvF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,IAAc,EAAW,EAAE,CAAC,CAAC;IACrE,IAAI;IACJ,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IACpB,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC;IAChB,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAC1C,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC;IACxC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAC5C,cAAc,EAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC;IACtD,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;QAClB,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,GAAG;QACnC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC;KAC5C,CAAC,CAAC;CACN,CAAC,CAAC","sourcesContent":["import { attr, attrBool, childrenOf, docOf, nameAttr, type RawNode } from \"./parse.js\";\n\ntype EnumMember = {\n    name: string;\n    doc: string | undefined;\n    value: string;\n    cIdentifier: string | undefined;\n};\n\ntype EnumKind = \"enumeration\" | \"bitfield\";\n\nexport type GirEnum = {\n    kind: EnumKind;\n    name: string;\n    doc: string | undefined;\n    glibTypeName: string | undefined;\n    glibGetType: string | undefined;\n    errorDomain: string | undefined;\n    introspectable: boolean;\n    members: EnumMember[];\n};\n\nexport const enumFromNode = (node: RawNode, kind: EnumKind): GirEnum => ({\n    kind,\n    name: nameAttr(node),\n    doc: docOf(node),\n    glibTypeName: attr(node, \"glib:type-name\"),\n    glibGetType: attr(node, \"glib:get-type\"),\n    errorDomain: attr(node, \"glib:error-domain\"),\n    introspectable: attrBool(node, \"introspectable\", true),\n    members: childrenOf(node, \"member\").map((member) => ({\n        name: nameAttr(member),\n        doc: docOf(member),\n        value: attr(member, \"value\") ?? \"0\",\n        cIdentifier: attr(member, \"c:identifier\"),\n    })),\n});\n"]}

package/dist/gir/field.d.ts

@@ -1,27 +1,14 @@
 import { type RawNode } from "./parse.js";
-import { type GirTypeRef } from "./type-ref.js";
-/**
- * A `<field>` inside a class, interface, record, or union.
- *
- * Vtable slots (fields holding `<callback>` children inside a
- * `glib:is-gtype-struct-for` record) keep `callback` populated; ordinary
- * data fields keep `type`. The two are mutually exclusive.
- */
+import type { ParseContext, TypeId } from "./type-id.js";
 export type GirField = {
-    /** GIR field name, snake_case. */
-    readonly name: string;
-    /** Field type, or `undefined` when the field is a vtable callback slot. */
-    readonly type: GirTypeRef | undefined;
-    /** Inline callback for vtable slots; `undefined` for data fields. */
-    readonly callback: RawNode | undefined;
-    readonly readable: boolean;
-    readonly writable: boolean;
-    readonly private: boolean;
-    /** GIR `bits` attribute width when the field is a bitfield member. */
-    readonly bits: number | undefined;
+    name: string;
+    doc: string | undefined;
+    type: TypeId | undefined;
+    cType: string | undefined;
+    readable: boolean;
+    writable: boolean;
+    private: boolean;
+    bits: number | undefined;
 };
-/**
- * Builds a {@link GirField} from a `<field>` element.
- */
-export declare const fieldFromNode: (node: RawNode) => GirField;
+export declare const fieldFromNode: (node: RawNode, context: ParseContext) => GirField;
 //# sourceMappingURL=field.d.ts.map

package/dist/gir/field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field.d.ts","sourceRoot":"","sources":["../../src/gir/field.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,eAAe,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,MAAM,QAAQ,GAAG;IACnB,kCAAkC;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,2EAA2E;IAC3E,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IACtC,qEAAqE;IACrE,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,sEAAsE;IACtE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,OAAO,KAAG,QAY7C,CAAC"}
+{"version":3,"file":"field.d.ts","sourceRoot":"","sources":["../../src/gir/field.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAC7F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGzD,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,aAAa,SAAU,OAAO,WAAW,YAAY,KAAG,QASnE,CAAC"}

package/dist/gir/field.js

@@ -1,19 +1,13 @@
-import { attr, attrBool, childOf } from "./parse.js";
-import { typeRefFromSlot } from "./type-ref.js";
-/**
- * Builds a {@link GirField} from a `<field>` element.
- */
-export const fieldFromNode = (node) => {
-    const callback = childOf(node, "callback");
-    const bitsAttr = attr(node, "bits");
-    return {
-        name: attr(node, "name") ?? "",
-        type: callback === undefined ? typeRefFromSlot(node) : undefined,
-        callback,
-        readable: attrBool(node, "readable", true),
-        writable: attrBool(node, "writable", false),
-        private: attrBool(node, "private", false),
-        bits: bitsAttr === undefined ? undefined : Number.parseInt(bitsAttr, 10),
-    };
-};
+import { attr, attrBool, childOf, docOf, intAttr, nameAttr } from "./parse.js";
+import { typeRefFromNode } from "./type-ref.js";
+export const fieldFromNode = (node, context) => ({
+    name: nameAttr(node),
+    doc: docOf(node),
+    type: typeRefFromNode(node, context),
+    cType: attr(childOf(node, "type"), "c:type"),
+    readable: attrBool(node, "readable", true),
+    writable: attrBool(node, "writable", false),
+    private: attrBool(node, "private", false),
+    bits: intAttr(node, "bits"),
+});
 //# sourceMappingURL=field.js.map