@gtkx/codegen 1.0.0-rc.1 → 1.0.0-rc.3

package/dist/store/gi/record-layout.js

@@ -1,10 +1,16 @@
 import { computeFieldSlots, layoutOfPrimitive, } from "../../gir/size.js";
 const POINTER_LAYOUT = { size: 8, align: 8 };
-export const computeRecordFieldSlots = (context, fields, isUnion = false) => {
-    const inputs = [];
-    for (const field of fields) {
-        inputs.push(fieldLayoutInput(context, field, new Set()));
-    }
+const recordLayoutCache = new Map();
+// GIR carries no alignment attribute, and a type whose alignment exceeds its widest member cannot be
+// derived from the field list: Graphene models `graphene_simd4f_t` as four `gfloat`, which computes
+// to align 4 while the real type is a 16-byte SIMD vector. Keying the override on `c:type` keeps it
+// to the handful of types where the XML genuinely cannot express the ABI.
+const ALIGNMENT_OVERRIDES = new Map([
+    ["graphene_simd4f_t", { size: 16, align: 16 }],
+    ["graphene_simd4x4f_t", { size: 64, align: 16 }],
+]);
+const computeRecordFieldSlots = (context, fields, isUnion = false) => {
+    const inputs = Array.from(fields, (field) => fieldLayoutInput(context, field, new Set()));
     const result = computeFieldSlots(inputs, isUnion);
     const slots = result.slots.map((slot, index) => {
         const field = fields[index];
@@ -15,82 +21,112 @@ export const computeRecordFieldSlots = (context, fields, isUnion = false) => {
     });
     return { slots, size: result.size };
 };
-export const bitMask = (width) => {
-    if (width >= 32)
-        return 0xffffffff;
+const bitMask = (width) => {
+    if (width >= 32) {
+        return 0xFF_FF_FF_FF;
+    }
     return (1 << width) - 1;
 };
-export const mergeBitfield = (readExpr, valueExpr, mask, shift) => `((${readExpr} & ~(${mask} << ${shift})) | ((Number(${valueExpr}) & ${mask}) << ${shift})) >>> 0`;
+const mergeBitfield = (readExpr, valueExpr, mask, shift) => {
+    const maskExpr = String(mask);
+    const shiftExpr = String(shift);
+    return (`((${readExpr} & ~(${maskExpr} << ${shiftExpr})) | ` +
+        `((Number(${valueExpr}) & ${maskExpr}) << ${shiftExpr})) >>> 0`);
+};
 const fieldLayoutInput = (context, field, visited) => {
+    if (field.inlineMembers !== undefined) {
+        const layout = inlineMemberLayout(context, field.inlineMembers, field.inlineIsUnion, visited);
+        return { layout, bits: undefined };
+    }
     if (field.type === undefined) {
         return { layout: POINTER_LAYOUT, bits: undefined };
     }
     return { layout: layoutOfType(context, field.type, field.cType, visited), bits: field.bits };
 };
+const inlineMemberLayout = (context, members, isUnion, visited) => {
+    const inputs = Array.from(members, (member) => fieldLayoutInput(context, member, visited));
+    if (inputs.length === 0) {
+        return { size: 0, align: 1 };
+    }
+    const { size } = computeFieldSlots(inputs, isUnion);
+    return { size, align: Math.max(1, ...inputs.map((input) => input.layout.align)) };
+};
+const pointerOr = (occurrenceCType, otherwise) => occurrenceCType?.endsWith("*") === true ? POINTER_LAYOUT : otherwise();
 const layoutOfType = (context, ref, occurrenceCType, visited) => {
-    const type = context.library.typeOf(ref);
-    if (type === undefined)
+    const type = context.library.typeFor(ref);
+    if (type === undefined) {
         return POINTER_LAYOUT;
+    }
     switch (type.kind) {
-        case "primitive":
-            return layoutOfPrimitive(type.category);
-        case "carray":
+        case "primitive": {
+            return pointerOr(occurrenceCType, () => layoutOfPrimitive(type.category));
+        }
+        case "carray": {
             return arrayLayout(context, type, visited);
+        }
         case "list":
         case "hashtable":
         case "callback":
         case "varargs":
         case "class":
-        case "interface":
+        case "interface": {
             return POINTER_LAYOUT;
-        case "enum":
-            return occurrenceCType?.endsWith("*") === true ? POINTER_LAYOUT : layoutOfPrimitive("int32");
-        case "record":
-            return occurrenceCType?.endsWith("*") === true ? POINTER_LAYOUT : layoutOfRecord(context, type, visited);
-        case "alias":
-            return occurrenceCType?.endsWith("*") === true
-                ? POINTER_LAYOUT
-                : resolveAliasLayout(context, type, visited);
+        }
+        case "enum": {
+            return pointerOr(occurrenceCType, () => layoutOfPrimitive("int32"));
+        }
+        case "record": {
+            return pointerOr(occurrenceCType, () => layoutOfRecord(context, type, visited));
+        }
+        case "alias": {
+            return pointerOr(occurrenceCType, () => resolveAliasLayout(context, type, visited));
+        }
     }
 };
 const arrayLayout = (context, ref, visited) => {
-    if (ref.fixedSize === undefined)
+    if (ref.fixedSize === undefined) {
         return POINTER_LAYOUT;
+    }
     const elementLayout = layoutOfType(context, ref.element, ref.elementCType, visited);
     return { size: elementLayout.size * ref.fixedSize, align: elementLayout.align };
 };
-const layoutOfRecord = (context, resolved, visited) => {
-    if (resolved.value.cType?.endsWith("*") === true)
+const declaredLayout = (record) => {
+    if (record.cType?.endsWith("*") === true) {
         return POINTER_LAYOUT;
+    }
+    return record.cType === undefined ? undefined : ALIGNMENT_OVERRIDES.get(record.cType);
+};
+const layoutOfRecord = (context, resolved, visited) => {
+    const declared = declaredLayout(resolved.value);
+    if (declared !== undefined) {
+        return declared;
+    }
     const key = `${resolved.namespace.name}.${resolved.value.name}`;
-    if (visited.has(key))
+    if (visited.has(key)) {
         return POINTER_LAYOUT;
+    }
     const cached = recordLayoutCache.get(key);
-    if (cached !== undefined)
+    if (cached !== undefined) {
         return cached;
+    }
     const nextVisited = new Set(visited);
     nextVisited.add(key);
-    const inputs = [];
-    for (const field of resolved.value.fields) {
-        if (field.type === undefined) {
-            inputs.push({ layout: POINTER_LAYOUT, bits: undefined });
-            continue;
-        }
-        inputs.push({ layout: layoutOfType(context, field.type, field.cType, nextVisited), bits: field.bits });
-    }
-    if (inputs.length === 0)
+    const inputs = Array.from(resolved.value.fields, (field) => fieldLayoutInput(context, field, nextVisited));
+    if (inputs.length === 0) {
         return POINTER_LAYOUT;
+    }
     const { size } = computeFieldSlots(inputs, resolved.value.isUnion);
     const align = Math.max(1, ...inputs.map((input) => input.layout.align));
     const layout = { size, align };
     recordLayoutCache.set(key, layout);
     return layout;
 };
-const recordLayoutCache = new Map();
 const resolveAliasLayout = (context, resolved, visited) => {
     const ref = resolved.value.target;
-    if (ref === undefined)
+    if (ref === undefined) {
         return POINTER_LAYOUT;
+    }
     return layoutOfType(context, ref, resolved.value.targetCType, visited);
 };
+export { computeRecordFieldSlots, bitMask, mergeBitfield };
 //# sourceMappingURL=record-layout.js.map

package/dist/store/gi/record-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"record-layout.js","sourceRoot":"","sources":["../../../src/store/gi/record-layout.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirField } from \"../../gir/field.js\";\nimport {\n    computeFieldSlots,\n    type FieldLayout,\n    type FieldLayoutInput,\n    type FieldSlot,\n    layoutOfPrimitive,\n} from \"../../gir/size.js\";\nimport type { EntityType, GirType } from \"../../gir/type.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\n\nconst POINTER_LAYOUT: FieldLayout = { size: 8, align: 8 };\n\nexport type RecordFieldSlot = {\n    field: GirField;\n    slot: FieldSlot;\n};\n\nexport const computeRecordFieldSlots = (\n    context: ModuleContext,\n    fields: GirField[],\n    isUnion = false,\n): { slots: RecordFieldSlot[]; size: number } => {\n    const inputs: FieldLayoutInput[] = [];\n    for (const field of fields) {\n        inputs.push(fieldLayoutInput(context, field, new Set()));\n    }\n    const result = computeFieldSlots(inputs, isUnion);\n    const slots = result.slots.map((slot, index) => {\n        const field = fields[index];\n        if (field === undefined) {\n            throw new Error(\"computeRecordFieldSlots: parallel arrays diverged\");\n        }\n        return { field, slot };\n    });\n    return { slots, size: result.size };\n};\n\nexport const bitMask = (width: number): number => {\n    if (width >= 32) return 0xffffffff;\n    return (1 << width) - 1;\n};\n\nexport const mergeBitfield = (readExpr: string, valueExpr: string, mask: number, shift: number): string =>\n    `((${readExpr} & ~(${mask} << ${shift})) | ((Number(${valueExpr}) & ${mask}) << ${shift})) >>> 0`;\n\nconst fieldLayoutInput = (context: ModuleContext, field: GirField, visited: Set<string>): FieldLayoutInput => {\n    if (field.type === undefined) {\n        return { layout: POINTER_LAYOUT, bits: undefined };\n    }\n    return { layout: layoutOfType(context, field.type, field.cType, visited), bits: field.bits };\n};\n\nconst layoutOfType = (\n    context: ModuleContext,\n    ref: TypeId,\n    occurrenceCType: string | undefined,\n    visited: Set<string>,\n): FieldLayout => {\n    const type = context.library.typeOf(ref);\n    if (type === undefined) return POINTER_LAYOUT;\n    switch (type.kind) {\n        case \"primitive\":\n            return layoutOfPrimitive(type.category);\n        case \"carray\":\n            return arrayLayout(context, type, visited);\n        case \"list\":\n        case \"hashtable\":\n        case \"callback\":\n        case \"varargs\":\n        case \"class\":\n        case \"interface\":\n            return POINTER_LAYOUT;\n        case \"enum\":\n            return occurrenceCType?.endsWith(\"*\") === true ? POINTER_LAYOUT : layoutOfPrimitive(\"int32\");\n        case \"record\":\n            return occurrenceCType?.endsWith(\"*\") === true ? POINTER_LAYOUT : layoutOfRecord(context, type, visited);\n        case \"alias\":\n            return occurrenceCType?.endsWith(\"*\") === true\n                ? POINTER_LAYOUT\n                : resolveAliasLayout(context, type, visited);\n    }\n};\n\nconst arrayLayout = (\n    context: ModuleContext,\n    ref: Extract<GirType, { kind: \"carray\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    if (ref.fixedSize === undefined) return POINTER_LAYOUT;\n    const elementLayout = layoutOfType(context, ref.element, ref.elementCType, visited);\n    return { size: elementLayout.size * ref.fixedSize, align: elementLayout.align };\n};\n\nconst layoutOfRecord = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"record\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    if (resolved.value.cType?.endsWith(\"*\") === true) return POINTER_LAYOUT;\n    const key = `${resolved.namespace.name}.${resolved.value.name}`;\n    if (visited.has(key)) return POINTER_LAYOUT;\n    const cached = recordLayoutCache.get(key);\n    if (cached !== undefined) return cached;\n    const nextVisited = new Set(visited);\n    nextVisited.add(key);\n    const inputs: FieldLayoutInput[] = [];\n    for (const field of resolved.value.fields) {\n        if (field.type === undefined) {\n            inputs.push({ layout: POINTER_LAYOUT, bits: undefined });\n            continue;\n        }\n        inputs.push({ layout: layoutOfType(context, field.type, field.cType, nextVisited), bits: field.bits });\n    }\n    if (inputs.length === 0) return POINTER_LAYOUT;\n    const { size } = computeFieldSlots(inputs, resolved.value.isUnion);\n    const align = Math.max(1, ...inputs.map((input) => input.layout.align));\n    const layout: FieldLayout = { size, align };\n    recordLayoutCache.set(key, layout);\n    return layout;\n};\n\nconst recordLayoutCache = new Map<string, FieldLayout>();\n\nconst resolveAliasLayout = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"alias\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    const ref = resolved.value.target;\n    if (ref === undefined) return POINTER_LAYOUT;\n    return layoutOfType(context, ref, resolved.value.targetCType, visited);\n};\n"]}
+{"version":3,"file":"record-layout.js","sourceRoot":"","sources":["../../../src/store/gi/record-layout.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirField } from \"../../gir/field.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { EntityType, GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport {\n    computeFieldSlots,\n    type FieldLayout,\n    type FieldLayoutInput,\n    type FieldSlot,\n    layoutOfPrimitive,\n} from \"../../gir/size.js\";\n\ntype ResolvedRecordValue = Extract<EntityType, { kind: \"record\" }>[\"value\"];\n\ntype RecordFieldSlot = {\n    field: GirField;\n    slot: FieldSlot;\n};\n\nconst POINTER_LAYOUT: FieldLayout = { size: 8, align: 8 };\nconst recordLayoutCache: Map<string, FieldLayout> = new Map();\n\n// GIR carries no alignment attribute, and a type whose alignment exceeds its widest member cannot be\n// derived from the field list: Graphene models `graphene_simd4f_t` as four `gfloat`, which computes\n// to align 4 while the real type is a 16-byte SIMD vector. Keying the override on `c:type` keeps it\n// to the handful of types where the XML genuinely cannot express the ABI.\nconst ALIGNMENT_OVERRIDES: Map<string, FieldLayout> = new Map([\n    [\"graphene_simd4f_t\", { size: 16, align: 16 }],\n    [\"graphene_simd4x4f_t\", { size: 64, align: 16 }],\n]);\n\nconst computeRecordFieldSlots = (\n    context: ModuleContext,\n    fields: GirField[],\n    isUnion = false,\n): { slots: RecordFieldSlot[]; size: number } => {\n    const inputs: FieldLayoutInput[] = Array.from(fields, (field) => fieldLayoutInput(context, field, new Set()));\n    const result = computeFieldSlots(inputs, isUnion);\n\n    const slots = result.slots.map((slot, index) => {\n        const field = fields[index];\n\n        if (field === undefined) {\n            throw new Error(\"computeRecordFieldSlots: parallel arrays diverged\");\n        }\n\n        return { field, slot };\n    });\n\n    return { slots, size: result.size };\n};\n\nconst bitMask = (width: number): number => {\n    if (width >= 32) {\n        return 0xFF_FF_FF_FF;\n    }\n\n    return (1 << width) - 1;\n};\n\nconst mergeBitfield = (readExpr: string, valueExpr: string, mask: number, shift: number): string => {\n    const maskExpr = String(mask);\n    const shiftExpr = String(shift);\n\n    return (\n        `((${readExpr} & ~(${maskExpr} << ${shiftExpr})) | ` +\n        `((Number(${valueExpr}) & ${maskExpr}) << ${shiftExpr})) >>> 0`\n    );\n};\n\nconst fieldLayoutInput = (context: ModuleContext, field: GirField, visited: Set<string>): FieldLayoutInput => {\n    if (field.inlineMembers !== undefined) {\n        const layout = inlineMemberLayout(context, field.inlineMembers, field.inlineIsUnion, visited);\n\n        return { layout, bits: undefined };\n    }\n\n    if (field.type === undefined) {\n        return { layout: POINTER_LAYOUT, bits: undefined };\n    }\n\n    return { layout: layoutOfType(context, field.type, field.cType, visited), bits: field.bits };\n};\n\nconst inlineMemberLayout = (\n    context: ModuleContext,\n    members: GirField[],\n    isUnion: boolean,\n    visited: Set<string>,\n): FieldLayout => {\n    const inputs = Array.from(members, (member) => fieldLayoutInput(context, member, visited));\n\n    if (inputs.length === 0) {\n        return { size: 0, align: 1 };\n    }\n\n    const { size } = computeFieldSlots(inputs, isUnion);\n\n    return { size, align: Math.max(1, ...inputs.map((input) => input.layout.align)) };\n};\n\nconst pointerOr = (occurrenceCType: string | undefined, otherwise: () => FieldLayout): FieldLayout =>\n    occurrenceCType?.endsWith(\"*\") === true ? POINTER_LAYOUT : otherwise();\n\nconst layoutOfType = (\n    context: ModuleContext,\n    ref: TypeId,\n    occurrenceCType: string | undefined,\n    visited: Set<string>,\n): FieldLayout => {\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    switch (type.kind) {\n        case \"primitive\": {\n            return pointerOr(occurrenceCType, () => layoutOfPrimitive(type.category));\n        }\n        case \"carray\": {\n            return arrayLayout(context, type, visited);\n        }\n        case \"list\":\n        case \"hashtable\":\n        case \"callback\":\n        case \"varargs\":\n        case \"class\":\n        case \"interface\": {\n            return POINTER_LAYOUT;\n        }\n        case \"enum\": {\n            return pointerOr(occurrenceCType, () => layoutOfPrimitive(\"int32\"));\n        }\n        case \"record\": {\n            return pointerOr(occurrenceCType, () => layoutOfRecord(context, type, visited));\n        }\n        case \"alias\": {\n            return pointerOr(occurrenceCType, () => resolveAliasLayout(context, type, visited));\n        }\n    }\n};\n\nconst arrayLayout = (\n    context: ModuleContext,\n    ref: Extract<GirType, { kind: \"carray\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    if (ref.fixedSize === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    const elementLayout = layoutOfType(context, ref.element, ref.elementCType, visited);\n\n    return { size: elementLayout.size * ref.fixedSize, align: elementLayout.align };\n};\n\nconst declaredLayout = (record: ResolvedRecordValue): FieldLayout | undefined => {\n    if (record.cType?.endsWith(\"*\") === true) {\n        return POINTER_LAYOUT;\n    }\n\n    return record.cType === undefined ? undefined : ALIGNMENT_OVERRIDES.get(record.cType);\n};\n\nconst layoutOfRecord = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"record\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    const declared = declaredLayout(resolved.value);\n\n    if (declared !== undefined) {\n        return declared;\n    }\n\n    const key = `${resolved.namespace.name}.${resolved.value.name}`;\n\n    if (visited.has(key)) {\n        return POINTER_LAYOUT;\n    }\n\n    const cached = recordLayoutCache.get(key);\n\n    if (cached !== undefined) {\n        return cached;\n    }\n\n    const nextVisited = new Set(visited);\n    nextVisited.add(key);\n\n    const inputs: FieldLayoutInput[] = Array.from(resolved.value.fields, (field) =>\n        fieldLayoutInput(context, field, nextVisited));\n\n    if (inputs.length === 0) {\n        return POINTER_LAYOUT;\n    }\n\n    const { size } = computeFieldSlots(inputs, resolved.value.isUnion);\n    const align = Math.max(1, ...inputs.map((input) => input.layout.align));\n    const layout: FieldLayout = { size, align };\n    recordLayoutCache.set(key, layout);\n\n    return layout;\n};\n\nconst resolveAliasLayout = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"alias\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    const ref = resolved.value.target;\n\n    if (ref === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    return layoutOfType(context, ref, resolved.value.targetCType, visited);\n};\n\nexport { computeRecordFieldSlots, bitMask, mergeBitfield, type RecordFieldSlot };\n"]}

package/dist/store/gi/record.d.ts

@@ -1,4 +1,5 @@
 import type { GirRecord } from "../../gir/record.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const generateRecord: (context: ModuleContext, record: GirRecord) => void;
+declare const generateRecord: (context: ModuleContext, record: GirRecord) => void;
+export { generateRecord };
 //# sourceMappingURL=record.d.ts.map

package/dist/store/gi/record.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAc7D,eAAO,MAAM,cAAc,YAAa,aAAa,UAAU,SAAS,KAAG,IAyB1E,CAAC"}
+{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAa7D,QAAA,MAAM,cAAc,GAAI,SAAS,aAAa,EAAE,QAAQ,SAAS,KAAG,IA8BnE,CAAC;AAmCF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/store/gi/record.js

@@ -1,24 +1,21 @@
 import { renderJsDoc } from "../../writer/doc.js";
 import { indentMembers } from "../../writer/emit.js";
 import { dedupeCallables, generateBindings, renderPlainTypeMembers } from "./callables.js";
-import { isClassStructRecord } from "./class-struct-record.js";
-import { gtypeExprFor } from "./gtype-binding.js";
+import { renderSourceGtype } from "./gtype-binding.js";
 import { renderRecordConstructor, renderRecordConstructorPropsInterface } from "./record-constructor.js";
 import { renderRecordFieldAccessor } from "./record-field-accessor.js";
 import { computeRecordFieldSlots } from "./record-layout.js";
 import { appendWrapperClassRegistration } from "./registration.js";
 const isGErrorRecord = (context, record) => context.namespace.name === "GLib" && record.glibGetType === "g_error_get_type";
-export const generateRecord = (context, record) => {
-    if (!record.introspectable)
+const generateRecord = (context, record) => {
+    if (!record.introspectable) {
         return;
-    if (record.isVtable)
-        return;
-    if (record.name.length === 0)
-        return;
-    if (isClassStructRecord(context.library, context.namespace.name, record))
+    }
+    if (record.name.length === 0) {
         return;
+    }
     const className = record.name;
-    const extendsError = isGErrorRecord(context, record);
+    const isErrorSubclass = isGErrorRecord(context, record);
     const callables = {
         constructors: dedupeCallables(record.constructors),
         functions: dedupeCallables(record.functions),
@@ -27,33 +24,35 @@ export const generateRecord = (context, record) => {
     generateBindings(context, callables);
     const members = renderRecordMembers(context, record, className, callables);
     const body = indentMembers(members);
-    const heritage = extendsError ? " extends globalThis.Error" : "";
+    const heritage = isErrorSubclass ? " extends globalThis.Error" : "";
     context.module.appendDeclaration(`${renderJsDoc(record.doc)}export class ${className}${heritage} {\n${body}\n}`);
     context.module.appendDeclaration(renderRecordConstructorPropsInterface(context, record, className));
-    const gtypeExpr = gtypeExprFor(context, record);
+    const gtypeExpr = renderSourceGtype(context, record);
     appendWrapperClassRegistration(context, {
         className,
         gtypeExpr,
     });
 };
 const renderRecordMembers = (context, record, className, callables) => {
-    const extendsError = isGErrorRecord(context, record);
+    const isErrorSubclass = isGErrorRecord(context, record);
     const { members, claimedNames } = renderPlainTypeMembers({
         context,
         className,
         callables,
         hasGtype: record.glibGetType !== undefined,
     });
-    members.unshift(renderRecordConstructor(context, record, className, extendsError));
+    members.unshift(renderRecordConstructor(context, record, className, isErrorSubclass));
     const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);
     for (const slot of slots) {
         const block = renderRecordFieldAccessor(context, slot, claimedNames, record.fields);
-        if (block !== undefined)
+        if (block !== undefined) {
             members.push(block);
+        }
     }
-    if (extendsError) {
+    if (isErrorSubclass) {
         members.push('get name(): string {\n    return "GLib.Error";\n}');
     }
     return members;
 };
+export { generateRecord };
 //# sourceMappingURL=record.js.map

package/dist/store/gi/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirRecord } from \"../../gir/record.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport { type Callables, dedupeCallables, generateBindings, renderPlainTypeMembers } from \"./callables.js\";\nimport { isClassStructRecord } from \"./class-struct-record.js\";\nimport { gtypeExprFor } from \"./gtype-binding.js\";\nimport { renderRecordConstructor, renderRecordConstructorPropsInterface } from \"./record-constructor.js\";\nimport { renderRecordFieldAccessor } from \"./record-field-accessor.js\";\nimport { computeRecordFieldSlots } from \"./record-layout.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\n\nconst isGErrorRecord = (context: ModuleContext, record: GirRecord): boolean =>\n    context.namespace.name === \"GLib\" && record.glibGetType === \"g_error_get_type\";\n\nexport const generateRecord = (context: ModuleContext, record: GirRecord): void => {\n    if (!record.introspectable) return;\n    if (record.isVtable) return;\n    if (record.name.length === 0) return;\n    if (isClassStructRecord(context.library, context.namespace.name, record)) return;\n    const className = record.name;\n    const extendsError = isGErrorRecord(context, record);\n    const callables: Callables = {\n        constructors: dedupeCallables(record.constructors),\n        functions: dedupeCallables(record.functions),\n        methods: dedupeCallables(record.methods),\n    };\n    generateBindings(context, callables);\n\n    const members = renderRecordMembers(context, record, className, callables);\n    const body = indentMembers(members);\n    const heritage = extendsError ? \" extends globalThis.Error\" : \"\";\n    context.module.appendDeclaration(`${renderJsDoc(record.doc)}export class ${className}${heritage} {\\n${body}\\n}`);\n    context.module.appendDeclaration(renderRecordConstructorPropsInterface(context, record, className));\n\n    const gtypeExpr = gtypeExprFor(context, record);\n    appendWrapperClassRegistration(context, {\n        className,\n        gtypeExpr,\n    });\n};\n\nconst renderRecordMembers = (\n    context: ModuleContext,\n    record: GirRecord,\n    className: string,\n    callables: Callables,\n): string[] => {\n    const extendsError = isGErrorRecord(context, record);\n    const { members, claimedNames } = renderPlainTypeMembers({\n        context,\n        className,\n        callables,\n        hasGtype: record.glibGetType !== undefined,\n    });\n    members.unshift(renderRecordConstructor(context, record, className, extendsError));\n    const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n    for (const slot of slots) {\n        const block = renderRecordFieldAccessor(context, slot, claimedNames, record.fields);\n        if (block !== undefined) members.push(block);\n    }\n    if (extendsError) {\n        members.push('get name(): string {\\n    return \"GLib.Error\";\\n}');\n    }\n    return members;\n};\n"]}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirRecord } from \"../../gir/record.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport { type Callables, dedupeCallables, generateBindings, renderPlainTypeMembers } from \"./callables.js\";\nimport { renderSourceGtype } from \"./gtype-binding.js\";\nimport { renderRecordConstructor, renderRecordConstructorPropsInterface } from \"./record-constructor.js\";\nimport { renderRecordFieldAccessor } from \"./record-field-accessor.js\";\nimport { computeRecordFieldSlots } from \"./record-layout.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\n\nconst isGErrorRecord = (context: ModuleContext, record: GirRecord): boolean =>\n    context.namespace.name === \"GLib\" && record.glibGetType === \"g_error_get_type\";\n\nconst generateRecord = (context: ModuleContext, record: GirRecord): void => {\n    if (!record.introspectable) {\n        return;\n    }\n\n    if (record.name.length === 0) {\n        return;\n    }\n\n    const className = record.name;\n    const isErrorSubclass = isGErrorRecord(context, record);\n\n    const callables: Callables = {\n        constructors: dedupeCallables(record.constructors),\n        functions: dedupeCallables(record.functions),\n        methods: dedupeCallables(record.methods),\n    };\n\n    generateBindings(context, callables);\n    const members = renderRecordMembers(context, record, className, callables);\n    const body = indentMembers(members);\n    const heritage = isErrorSubclass ? \" extends globalThis.Error\" : \"\";\n    context.module.appendDeclaration(`${renderJsDoc(record.doc)}export class ${className}${heritage} {\\n${body}\\n}`);\n    context.module.appendDeclaration(renderRecordConstructorPropsInterface(context, record, className));\n    const gtypeExpr = renderSourceGtype(context, record);\n\n    appendWrapperClassRegistration(context, {\n        className,\n        gtypeExpr,\n    });\n};\n\nconst renderRecordMembers = (\n    context: ModuleContext,\n    record: GirRecord,\n    className: string,\n    callables: Callables,\n): string[] => {\n    const isErrorSubclass = isGErrorRecord(context, record);\n\n    const { members, claimedNames } = renderPlainTypeMembers({\n        context,\n        className,\n        callables,\n        hasGtype: record.glibGetType !== undefined,\n    });\n\n    members.unshift(renderRecordConstructor(context, record, className, isErrorSubclass));\n    const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    for (const slot of slots) {\n        const block = renderRecordFieldAccessor(context, slot, claimedNames, record.fields);\n\n        if (block !== undefined) {\n            members.push(block);\n        }\n    }\n\n    if (isErrorSubclass) {\n        members.push('get name(): string {\\n    return \"GLib.Error\";\\n}');\n    }\n\n    return members;\n};\n\nexport { generateRecord };\n"]}

package/dist/store/gi/registration.d.ts

@@ -4,13 +4,13 @@ type WrapperClassRegistration = {
     gtypeExpr?: string | undefined;
     vfuncs?: string | undefined;
 };
-export declare const appendWrapperClassRegistration: (context: ModuleContext, registration: WrapperClassRegistration) => void;
 type InterfaceRegistration = {
     className: string;
     makerName: string;
     gtypeExpr?: string | undefined;
     vfuncs?: string | undefined;
 };
-export declare const appendInterfaceRegistration: (context: ModuleContext, registration: InterfaceRegistration) => void;
-export {};
+declare const appendWrapperClassRegistration: (context: ModuleContext, registration: WrapperClassRegistration) => void;
+declare const appendInterfaceRegistration: (context: ModuleContext, registration: InterfaceRegistration) => void;
+export { appendWrapperClassRegistration, appendInterfaceRegistration };
 //# sourceMappingURL=registration.d.ts.map

package/dist/store/gi/registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../src/store/gi/registration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,KAAK,wBAAwB,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,eAAO,MAAM,8BAA8B,YAC9B,aAAa,gBACR,wBAAwB,KACvC,IAQF,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,eAAO,MAAM,2BAA2B,YAAa,aAAa,gBAAgB,qBAAqB,KAAG,IASzG,CAAC"}
+{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../src/store/gi/registration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,KAAK,wBAAwB,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,QAAA,MAAM,8BAA8B,GAChC,SAAS,aAAa,EACtB,cAAc,wBAAwB,KACvC,IAUF,CAAC;AAEF,QAAA,MAAM,2BAA2B,GAAI,SAAS,aAAa,EAAE,cAAc,qBAAqB,KAAG,IAWlG,CAAC;AAEF,OAAO,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,CAAC"}

package/dist/store/gi/registration.js

@@ -1,4 +1,4 @@
-export const appendWrapperClassRegistration = (context, registration) => {
+const appendWrapperClassRegistration = (context, registration) => {
     const { className, gtypeExpr, vfuncs } = registration;
     if (gtypeExpr === undefined) {
         return;
@@ -7,7 +7,7 @@ export const appendWrapperClassRegistration = (context, registration) => {
     const args = vfuncs === undefined ? gtypeExpr : `${gtypeExpr}, ${vfuncs}`;
     context.module.appendRegistration(`registerWrapperClass(${className}, ${args});`);
 };
-export const appendInterfaceRegistration = (context, registration) => {
+const appendInterfaceRegistration = (context, registration) => {
     const { className, makerName, gtypeExpr, vfuncs } = registration;
     if (gtypeExpr === undefined) {
         return;
@@ -17,4 +17,5 @@ export const appendInterfaceRegistration = (context, registration) => {
     const args = vfuncs === undefined ? base : `${base}, ${vfuncs}`;
     context.module.appendRegistration(`registerInterface(${args});`);
 };
+export { appendWrapperClassRegistration, appendInterfaceRegistration };
 //# sourceMappingURL=registration.js.map

package/dist/store/gi/registration.js.map

@@ -1 +1 @@
-{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../../src/store/gi/registration.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC1C,OAAsB,EACtB,YAAsC,EAClC,EAAE;IACN,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IACtD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO;IACX,CAAC;IACD,OAAO,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,MAAM,EAAE,CAAC;IAC1E,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,wBAAwB,SAAS,KAAK,IAAI,IAAI,CAAC,CAAC;AACtF,CAAC,CAAC;AASF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,OAAsB,EAAE,YAAmC,EAAQ,EAAE;IAC7G,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IACjE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO;IACX,CAAC;IACD,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,GAAG,SAAS,KAAK,SAAS,KAAK,SAAS,EAAE,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,MAAM,EAAE,CAAC;IAChE,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,qBAAqB,IAAI,IAAI,CAAC,CAAC;AACrE,CAAC,CAAC","sourcesContent":["import type { ModuleContext } from \"../../writer/context.js\";\n\ntype WrapperClassRegistration = {\n    className: string;\n    gtypeExpr?: string | undefined;\n    vfuncs?: string | undefined;\n};\n\nexport const appendWrapperClassRegistration = (\n    context: ModuleContext,\n    registration: WrapperClassRegistration,\n): void => {\n    const { className, gtypeExpr, vfuncs } = registration;\n    if (gtypeExpr === undefined) {\n        return;\n    }\n    context.addRuntimeImport(\"registerWrapperClass\");\n    const args = vfuncs === undefined ? gtypeExpr : `${gtypeExpr}, ${vfuncs}`;\n    context.module.appendRegistration(`registerWrapperClass(${className}, ${args});`);\n};\n\ntype InterfaceRegistration = {\n    className: string;\n    makerName: string;\n    gtypeExpr?: string | undefined;\n    vfuncs?: string | undefined;\n};\n\nexport const appendInterfaceRegistration = (context: ModuleContext, registration: InterfaceRegistration): void => {\n    const { className, makerName, gtypeExpr, vfuncs } = registration;\n    if (gtypeExpr === undefined) {\n        return;\n    }\n    context.addRuntimeImport(\"registerInterface\");\n    const base = `${className}, ${gtypeExpr}, ${makerName}`;\n    const args = vfuncs === undefined ? base : `${base}, ${vfuncs}`;\n    context.module.appendRegistration(`registerInterface(${args});`);\n};\n"]}
+{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../../src/store/gi/registration.ts"],"names":[],"mappings":"AAeA,MAAM,8BAA8B,GAAG,CACnC,OAAsB,EACtB,YAAsC,EAClC,EAAE;IACN,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IAEtD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO;IACX,CAAC;IAED,OAAO,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,MAAM,EAAE,CAAC;IAC1E,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,wBAAwB,SAAS,KAAK,IAAI,IAAI,CAAC,CAAC;AACtF,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,OAAsB,EAAE,YAAmC,EAAQ,EAAE;IACtG,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IAEjE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO;IACX,CAAC;IAED,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,GAAG,SAAS,KAAK,SAAS,KAAK,SAAS,EAAE,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,MAAM,EAAE,CAAC;IAChE,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,qBAAqB,IAAI,IAAI,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,OAAO,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,CAAC","sourcesContent":["import type { ModuleContext } from \"../../writer/context.js\";\n\ntype WrapperClassRegistration = {\n    className: string;\n    gtypeExpr?: string | undefined;\n    vfuncs?: string | undefined;\n};\n\ntype InterfaceRegistration = {\n    className: string;\n    makerName: string;\n    gtypeExpr?: string | undefined;\n    vfuncs?: string | undefined;\n};\n\nconst appendWrapperClassRegistration = (\n    context: ModuleContext,\n    registration: WrapperClassRegistration,\n): void => {\n    const { className, gtypeExpr, vfuncs } = registration;\n\n    if (gtypeExpr === undefined) {\n        return;\n    }\n\n    context.addRuntimeImport(\"registerWrapperClass\");\n    const args = vfuncs === undefined ? gtypeExpr : `${gtypeExpr}, ${vfuncs}`;\n    context.module.appendRegistration(`registerWrapperClass(${className}, ${args});`);\n};\n\nconst appendInterfaceRegistration = (context: ModuleContext, registration: InterfaceRegistration): void => {\n    const { className, makerName, gtypeExpr, vfuncs } = registration;\n\n    if (gtypeExpr === undefined) {\n        return;\n    }\n\n    context.addRuntimeImport(\"registerInterface\");\n    const base = `${className}, ${gtypeExpr}, ${makerName}`;\n    const args = vfuncs === undefined ? base : `${base}, ${vfuncs}`;\n    context.module.appendRegistration(`registerInterface(${args});`);\n};\n\nexport { appendWrapperClassRegistration, appendInterfaceRegistration };\n"]}

package/dist/store/gi/return-wrap.d.ts

@@ -5,6 +5,6 @@ type WrapReturnOptions = {
     nullable: boolean;
     valueExpression: string;
 };
-export declare const wrapReturnValue: (context: ModuleContext, options: WrapReturnOptions) => string;
-export {};
+declare const wrapReturnValue: (context: ModuleContext, options: WrapReturnOptions) => string;
+export { wrapReturnValue };
 //# sourceMappingURL=return-wrap.d.ts.map

package/dist/store/gi/return-wrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"return-wrap.d.ts","sourceRoot":"","sources":["../../../src/store/gi/return-wrap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,KAAK,iBAAiB,GAAG;IACrB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,eAAe,YAAa,aAAa,WAAW,iBAAiB,KAAG,MAuBpF,CAAC"}
+{"version":3,"file":"return-wrap.d.ts","sourceRoot":"","sources":["../../../src/store/gi/return-wrap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D,KAAK,iBAAiB,GAAG;IACrB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CAC3B,CAAC;AAIF,QAAA,MAAM,eAAe,GAAI,SAAS,aAAa,EAAE,SAAS,iBAAiB,KAAG,MAsC7E,CAAC;AA+CF,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/dist/store/gi/return-wrap.js

@@ -1,46 +1,67 @@
 import { renderDescriptor } from "../../analysis/descriptor-render.js";
 import { renderTsType } from "../../analysis/ts-type.js";
-export const wrapReturnValue = (context, options) => {
+const BIGINT_CATEGORIES = new Set(["gtype", "bigint64", "biguint64"]);
+const wrapReturnValue = (context, options) => {
     const { ref, nullable, valueExpression } = options;
-    if (ref === undefined)
+    if (ref === undefined) {
         return valueExpression;
-    const type = context.library.typeOf(ref);
-    if (type === undefined)
+    }
+    const type = context.library.typeFor(ref);
+    if (type === undefined) {
         return wrapValue(context, ref, valueExpression);
+    }
     switch (type.kind) {
-        case "primitive":
+        case "primitive": {
             return wrapPrimitive(type.category, nullable, valueExpression);
-        case "varargs":
+        }
+        case "varargs": {
             return `(${valueExpression} as unknown[])`;
-        case "callback":
-            return context.library.nameOf(ref) === undefined
-                ? `(${valueExpression} as unknown[])`
-                : `(${valueExpression} as ${renderTsType(context, ref, false)})`;
-        case "enum":
+        }
+        case "callback": {
+            return wrapCallback(context, ref, valueExpression);
+        }
+        case "enum": {
             return `(${valueExpression} as number)`;
-        case "alias":
-            return type.value.target === undefined
-                ? valueExpression
-                : wrapReturnValue(context, { ref: type.value.target, nullable, valueExpression });
-        default:
+        }
+        case "alias": {
+            return wrapAlias(context, type.value.target, nullable, valueExpression);
+        }
+        case "carray":
+        case "class":
+        case "hashtable":
+        case "interface":
+        case "list":
+        case "record": {
             return wrapValue(context, ref, valueExpression);
+        }
     }
 };
+const wrapCallback = (context, ref, valueExpression) => context.library.nameFor(ref) === undefined
+    ? `(${valueExpression} as unknown[])`
+    : `(${valueExpression} as ${renderTsType(context, ref, false)})`;
+const wrapAlias = (context, target, isNullable, valueExpression) => target === undefined
+    ? valueExpression
+    : wrapReturnValue(context, { ref: target, nullable: isNullable, valueExpression });
 const wrapValue = (context, ref, valueExpression) => {
     context.addRuntimeImport("fromNative");
     const descriptor = context.hoistDescriptor(renderDescriptor(context, ref, "none"));
     return `(fromNative(${descriptor}, ${valueExpression}) as ${renderTsType(context, ref, false)})`;
 };
-const wrapPrimitive = (category, nullable, valueExpression) => {
-    if (category === "void")
+const wrapStringPrimitive = (isNullable, valueExpression) => `(${valueExpression} as ${isNullable ? "string | null" : "string"})`;
+const wrapPrimitive = (category, isNullable, valueExpression) => {
+    if (category === "void") {
         return valueExpression;
-    if (category === "string")
-        return `(${valueExpression} as ${nullable ? "string | null" : "string"})`;
-    if (category === "boolean")
+    }
+    if (category === "string") {
+        return wrapStringPrimitive(isNullable, valueExpression);
+    }
+    if (category === "boolean") {
         return `Boolean(${valueExpression})`;
-    if (category === "gtype" || category === "bigint64" || category === "biguint64") {
+    }
+    if (BIGINT_CATEGORIES.has(category)) {
         return `(${valueExpression} as bigint)`;
     }
     return `(${valueExpression} as number)`;
 };
+export { wrapReturnValue };
 //# sourceMappingURL=return-wrap.js.map

package/dist/store/gi/return-wrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"return-wrap.js","sourceRoot":"","sources":["../../../src/store/gi/return-wrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAWzD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,OAA0B,EAAU,EAAE;IAC1F,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IACnD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC;IAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACxE,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,WAAW;YACZ,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QACnE,KAAK,SAAS;YACV,OAAO,IAAI,eAAe,gBAAgB,CAAC;QAC/C,KAAK,UAAU;YACX,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;gBAC5C,CAAC,CAAC,IAAI,eAAe,gBAAgB;gBACrC,CAAC,CAAC,IAAI,eAAe,OAAO,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;QACzE,KAAK,MAAM;YACP,OAAO,IAAI,eAAe,aAAa,CAAC;QAC5C,KAAK,OAAO;YACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS;gBAClC,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;QAC1F;YACI,OAAO,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACxD,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAE,eAAuB,EAAU,EAAE;IACvF,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnF,OAAO,eAAe,UAAU,KAAK,eAAe,QAAQ,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;AACrG,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,QAA2B,EAAE,QAAiB,EAAE,eAAuB,EAAU,EAAE;IACtG,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,eAAe,CAAC;IAChD,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,IAAI,eAAe,OAAO,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC;IACrG,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,WAAW,eAAe,GAAG,CAAC;IACjE,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC9E,OAAO,IAAI,eAAe,aAAa,CAAC;IAC5C,CAAC;IACD,OAAO,IAAI,eAAe,aAAa,CAAC;AAC5C,CAAC,CAAC","sourcesContent":["import { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport type { PrimitiveCategory } from \"../../gir/primitives.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\n\ntype WrapReturnOptions = {\n    ref: TypeId | undefined;\n    nullable: boolean;\n    valueExpression: string;\n};\n\nexport const wrapReturnValue = (context: ModuleContext, options: WrapReturnOptions): string => {\n    const { ref, nullable, valueExpression } = options;\n    if (ref === undefined) return valueExpression;\n    const type = context.library.typeOf(ref);\n    if (type === undefined) return wrapValue(context, ref, valueExpression);\n    switch (type.kind) {\n        case \"primitive\":\n            return wrapPrimitive(type.category, nullable, valueExpression);\n        case \"varargs\":\n            return `(${valueExpression} as unknown[])`;\n        case \"callback\":\n            return context.library.nameOf(ref) === undefined\n                ? `(${valueExpression} as unknown[])`\n                : `(${valueExpression} as ${renderTsType(context, ref, false)})`;\n        case \"enum\":\n            return `(${valueExpression} as number)`;\n        case \"alias\":\n            return type.value.target === undefined\n                ? valueExpression\n                : wrapReturnValue(context, { ref: type.value.target, nullable, valueExpression });\n        default:\n            return wrapValue(context, ref, valueExpression);\n    }\n};\n\nconst wrapValue = (context: ModuleContext, ref: TypeId, valueExpression: string): string => {\n    context.addRuntimeImport(\"fromNative\");\n    const descriptor = context.hoistDescriptor(renderDescriptor(context, ref, \"none\"));\n    return `(fromNative(${descriptor}, ${valueExpression}) as ${renderTsType(context, ref, false)})`;\n};\n\nconst wrapPrimitive = (category: PrimitiveCategory, nullable: boolean, valueExpression: string): string => {\n    if (category === \"void\") return valueExpression;\n    if (category === \"string\") return `(${valueExpression} as ${nullable ? \"string | null\" : \"string\"})`;\n    if (category === \"boolean\") return `Boolean(${valueExpression})`;\n    if (category === \"gtype\" || category === \"bigint64\" || category === \"biguint64\") {\n        return `(${valueExpression} as bigint)`;\n    }\n    return `(${valueExpression} as number)`;\n};\n"]}
+{"version":3,"file":"return-wrap.js","sourceRoot":"","sources":["../../../src/store/gi/return-wrap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PrimitiveCategory } from \"../../gir/primitives.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\n\ntype WrapReturnOptions = {\n    ref: TypeId | undefined;\n    nullable: boolean;\n    valueExpression: string;\n};\n\nconst BIGINT_CATEGORIES: Set<PrimitiveCategory> = new Set([\"gtype\", \"bigint64\", \"biguint64\"]);\n\nconst wrapReturnValue = (context: ModuleContext, options: WrapReturnOptions): string => {\n    const { ref, nullable, valueExpression } = options;\n\n    if (ref === undefined) {\n        return valueExpression;\n    }\n\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return wrapValue(context, ref, valueExpression);\n    }\n\n    switch (type.kind) {\n        case \"primitive\": {\n            return wrapPrimitive(type.category, nullable, valueExpression);\n        }\n        case \"varargs\": {\n            return `(${valueExpression} as unknown[])`;\n        }\n        case \"callback\": {\n            return wrapCallback(context, ref, valueExpression);\n        }\n        case \"enum\": {\n            return `(${valueExpression} as number)`;\n        }\n        case \"alias\": {\n            return wrapAlias(context, type.value.target, nullable, valueExpression);\n        }\n        case \"carray\":\n        case \"class\":\n        case \"hashtable\":\n        case \"interface\":\n        case \"list\":\n        case \"record\": {\n            return wrapValue(context, ref, valueExpression);\n        }\n    }\n};\n\nconst wrapCallback = (context: ModuleContext, ref: TypeId, valueExpression: string): string =>\n    context.library.nameFor(ref) === undefined\n        ? `(${valueExpression} as unknown[])`\n        : `(${valueExpression} as ${renderTsType(context, ref, false)})`;\n\nconst wrapAlias = (\n    context: ModuleContext,\n    target: TypeId | undefined,\n    isNullable: boolean,\n    valueExpression: string,\n): string =>\n    target === undefined\n        ? valueExpression\n        : wrapReturnValue(context, { ref: target, nullable: isNullable, valueExpression });\n\nconst wrapValue = (context: ModuleContext, ref: TypeId, valueExpression: string): string => {\n    context.addRuntimeImport(\"fromNative\");\n    const descriptor = context.hoistDescriptor(renderDescriptor(context, ref, \"none\"));\n\n    return `(fromNative(${descriptor}, ${valueExpression}) as ${renderTsType(context, ref, false)})`;\n};\n\nconst wrapStringPrimitive = (isNullable: boolean, valueExpression: string): string =>\n    `(${valueExpression} as ${isNullable ? \"string | null\" : \"string\"})`;\n\nconst wrapPrimitive = (category: PrimitiveCategory, isNullable: boolean, valueExpression: string): string => {\n    if (category === \"void\") {\n        return valueExpression;\n    }\n\n    if (category === \"string\") {\n        return wrapStringPrimitive(isNullable, valueExpression);\n    }\n\n    if (category === \"boolean\") {\n        return `Boolean(${valueExpression})`;\n    }\n\n    if (BIGINT_CATEGORIES.has(category)) {\n        return `(${valueExpression} as bigint)`;\n    }\n\n    return `(${valueExpression} as number)`;\n};\n\nexport { wrapReturnValue };\n"]}

package/dist/store/gi/runtime-override.d.ts

@@ -1,3 +1,4 @@
 import type { GirFunction } from "../../gir/function.js";
-export declare const renderRuntimeOverride: (callable: GirFunction, memberName: string) => string | undefined;
+declare const renderRuntimeOverride: (callable: GirFunction, memberName: string) => string | undefined;
+export { renderRuntimeOverride };
 //# sourceMappingURL=runtime-override.d.ts.map

package/dist/store/gi/runtime-override.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-override.d.ts","sourceRoot":"","sources":["../../../src/store/gi/runtime-override.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA6BzD,eAAO,MAAM,qBAAqB,aAAc,WAAW,cAAc,MAAM,KAAG,MAAM,GAAG,SAM1F,CAAC"}
+{"version":3,"file":"runtime-override.d.ts","sourceRoot":"","sources":["../../../src/store/gi/runtime-override.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA6BzD,QAAA,MAAM,qBAAqB,GAAI,UAAU,WAAW,EAAE,YAAY,MAAM,KAAG,MAAM,GAAG,SAcnF,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC"}

package/dist/store/gi/runtime-override.js

@@ -17,13 +17,16 @@ const RUNTIME_OVERRIDES = new Map([
         },
     ],
 ]);
-export const renderRuntimeOverride = (callable, memberName) => {
-    if (callable.cIdentifier === undefined)
+const renderRuntimeOverride = (callable, memberName) => {
+    if (callable.cIdentifier === undefined) {
         return undefined;
+    }
     const override = RUNTIME_OVERRIDES.get(callable.cIdentifier);
-    if (override === undefined)
+    if (override === undefined) {
         return undefined;
+    }
     const generics = override.generics ?? "";
     return `${memberName}${generics}(${override.signature}): ${override.returnType} {\n    ${override.body}\n}`;
 };
+export { renderRuntimeOverride };
 //# sourceMappingURL=runtime-override.js.map

package/dist/store/gi/runtime-override.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-override.js","sourceRoot":"","sources":["../../../src/store/gi/runtime-override.ts"],"names":[],"mappings":"AASA,MAAM,iBAAiB,GAAiC,IAAI,GAAG,CAAC;IAC5D;QACI,mBAAmB;QACnB;YACI,QAAQ,EAAE,eAAe;YACzB,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,uEAAuE;SAChF;KACJ;IACD;QACI,mBAAmB;QACnB;YACI,SAAS,EAAE,sBAAsB;YACjC,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,uEAAuE;SAChF;KACJ;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAAqB,EAAE,UAAkB,EAAsB,EAAE;IACnG,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC;IACzC,OAAO,GAAG,UAAU,GAAG,QAAQ,IAAI,QAAQ,CAAC,SAAS,MAAM,QAAQ,CAAC,UAAU,WAAW,QAAQ,CAAC,IAAI,KAAK,CAAC;AAChH,CAAC,CAAC","sourcesContent":["import type { GirFunction } from \"../../gir/function.js\";\n\ntype RuntimeOverride = {\n    generics?: string;\n    signature: string;\n    returnType: string;\n    body: string;\n};\n\nconst RUNTIME_OVERRIDES: Map<string, RuntimeOverride> = new Map([\n    [\n        \"g_value_get_boxed\",\n        {\n            generics: \"<T = unknown>\",\n            signature: \"\",\n            returnType: \"T\",\n            body: 'throw new Error(\"g_value_get_boxed: runtime override not installed\");',\n        },\n    ],\n    [\n        \"g_value_set_boxed\",\n        {\n            signature: \"boxed: object | null\",\n            returnType: \"void\",\n            body: 'throw new Error(\"g_value_set_boxed: runtime override not installed\");',\n        },\n    ],\n]);\n\nexport const renderRuntimeOverride = (callable: GirFunction, memberName: string): string | undefined => {\n    if (callable.cIdentifier === undefined) return undefined;\n    const override = RUNTIME_OVERRIDES.get(callable.cIdentifier);\n    if (override === undefined) return undefined;\n    const generics = override.generics ?? \"\";\n    return `${memberName}${generics}(${override.signature}): ${override.returnType} {\\n    ${override.body}\\n}`;\n};\n"]}
+{"version":3,"file":"runtime-override.js","sourceRoot":"","sources":["../../../src/store/gi/runtime-override.ts"],"names":[],"mappings":"AASA,MAAM,iBAAiB,GAAiC,IAAI,GAAG,CAAC;IAC5D;QACI,mBAAmB;QACnB;YACI,QAAQ,EAAE,eAAe;YACzB,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,uEAAuE;SAChF;KACJ;IACD;QACI,mBAAmB;QACnB;YACI,SAAS,EAAE,sBAAsB;YACjC,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,uEAAuE;SAChF;KACJ;CACJ,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,CAAC,QAAqB,EAAE,UAAkB,EAAsB,EAAE;IAC5F,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE7D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC;IAEzC,OAAO,GAAG,UAAU,GAAG,QAAQ,IAAI,QAAQ,CAAC,SAAS,MAAM,QAAQ,CAAC,UAAU,WAAW,QAAQ,CAAC,IAAI,KAAK,CAAC;AAChH,CAAC,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC","sourcesContent":["import type { GirFunction } from \"../../gir/function.js\";\n\ntype RuntimeOverride = {\n    generics?: string;\n    signature: string;\n    returnType: string;\n    body: string;\n};\n\nconst RUNTIME_OVERRIDES: Map<string, RuntimeOverride> = new Map([\n    [\n        \"g_value_get_boxed\",\n        {\n            generics: \"<T = unknown>\",\n            signature: \"\",\n            returnType: \"T\",\n            body: 'throw new Error(\"g_value_get_boxed: runtime override not installed\");',\n        },\n    ],\n    [\n        \"g_value_set_boxed\",\n        {\n            signature: \"boxed: object | null\",\n            returnType: \"void\",\n            body: 'throw new Error(\"g_value_set_boxed: runtime override not installed\");',\n        },\n    ],\n]);\n\nconst renderRuntimeOverride = (callable: GirFunction, memberName: string): string | undefined => {\n    if (callable.cIdentifier === undefined) {\n        return undefined;\n    }\n\n    const override = RUNTIME_OVERRIDES.get(callable.cIdentifier);\n\n    if (override === undefined) {\n        return undefined;\n    }\n\n    const generics = override.generics ?? \"\";\n\n    return `${memberName}${generics}(${override.signature}): ${override.returnType} {\\n    ${override.body}\\n}`;\n};\n\nexport { renderRuntimeOverride };\n"]}

package/dist/store/gi/signal.d.ts

@@ -1,5 +1,6 @@
 import type { GirClass } from "../../gir/class.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const renderSignalMembers: (context: ModuleContext, klass: GirClass) => string[];
-export declare const renderSignalDeclarations: (context: ModuleContext, klass: GirClass, className: string, parentlessExtendsObject: boolean) => string[];
+declare const renderSignalMembers: (context: ModuleContext, klass: GirClass) => string[];
+declare const renderSignalDeclarations: (context: ModuleContext, klass: GirClass, className: string, isParentlessObjectSubclass: boolean) => string[];
+export { renderSignalMembers, renderSignalDeclarations };
 //# sourceMappingURL=signal.d.ts.map

package/dist/store/gi/signal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../../src/store/gi/signal.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAQ7D,eAAO,MAAM,mBAAmB,YAAa,aAAa,SAAS,QAAQ,KAAG,MAAM,EA0BnF,CAAC;AAKF,eAAO,MAAM,wBAAwB,YACxB,aAAa,SACf,QAAQ,aACJ,MAAM,2BACQ,OAAO,KACjC,MAAM,EAgBR,CAAC"}
+{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../../src/store/gi/signal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AA4C7D,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,MAAM,EAmC5E,CAAC;AAEF,QAAA,MAAM,wBAAwB,GAC1B,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,WAAW,MAAM,EACjB,4BAA4B,OAAO,KACpC,MAAM,EAmBR,CAAC;AAoVF,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,CAAC"}