@gtkx/runtime 1.6.0 → 2.0.0-beta.2

package/dist/vfunc-call.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vfunc-call.d.ts","sourceRoot":"","sources":["../src/vfunc-call.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAqK5C;;;;;;;;;;;;;GAaG;AACH,iBAAS,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAIxG;AAkCD;;;;;;;;;;;;;;;;;GAiBG;AACH,iBAAS,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAQ7F;AAED,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"vfunc-call.d.ts","sourceRoot":"","sources":["../src/vfunc-call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAyJ5C;;;;;;;;;;;;;GAaG;AACH,iBAAS,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAIxG;AAkCD;;;;;;;;;;;;;;;;;GAiBG;AACH,iBAAS,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAQ7F;AAED,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC"}

package/dist/vfunc-call.js

@@ -63,17 +63,8 @@ function buildInvoker(slot, instanceType, caller) {
     };
 }
 function cachedInvoker(cache, owner, key, build) {
-    let byKey = cache.get(owner);
-    if (byKey === undefined) {
-        byKey = new Map();
-        cache.set(owner, byKey);
-    }
-    let invoker = byKey.get(key);
-    if (invoker === undefined) {
-        invoker = build();
-        byKey.set(key, invoker);
-    }
-    return invoker;
+    const byKey = cache.getOrInsertComputed(owner, () => new Map());
+    return byKey.getOrInsertComputed(key, build);
 }
 function resolveParentSlot(klass, parentType, methodName) {
     const classDescriptor = findClassVfuncDescriptor(klass, methodName);

package/dist/vfunc-call.js.map

@@ -1 +1 @@
-{"version":3,"file":"vfunc-call.js","sourceRoot":"","sources":["../src/vfunc-call.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BindVfuncOptions } from \"@gtkx/native\";\nimport type { AnyClass } from \"@gtkx/utils\";\nimport { bindVfunc } from \"@gtkx/native\";\nimport { type Arg, isCallerAllocatedArg, requiresInputArg } from \"./arg.js\";\nimport { buildNativeArgTypes, fromNativeCallable } from \"./fn.js\";\nimport { toNative } from \"./native-value.js\";\nimport {\n    getClassType,\n    getHandle,\n    getInterfaceVfuncRegistry,\n    getVfuncRegistry,\n    instanceClassName,\n    resolveWrapperType,\n    type VfuncDescriptor,\n} from \"./registry.js\";\nimport { TYPE_INVALID, typeInterfaces, typeIsA, typeParent } from \"./type.js\";\nimport { type RefSeeds, seedsFor } from \"./vfunc-seeds.js\";\nimport { findClassVfuncDescriptor, findInterfaceVfuncDescriptor, vfuncArgs } from \"./vfunc.js\";\n\ntype Invoker = (instance: object, inputs: unknown[]) => unknown;\ntype InvokerCache = WeakMap<AnyClass, Map<string, Invoker>>;\ntype ResolvedSlot = { descriptor: VfuncDescriptor; interfaceType?: bigint };\n\nconst NO_BASELINE = -1;\n\nconst SEEDED_SLOTS: Record<string, RefSeeds> = {\n    \"LayoutManagerClass.measure\": new Map([[6, NO_BASELINE], [7, NO_BASELINE]]),\n    \"WidgetClass.measure\": new Map([[5, NO_BASELINE], [6, NO_BASELINE]]),\n};\n\nconst parentInvokers: InvokerCache = new WeakMap();\nconst vfuncInvokers: InvokerCache = new WeakMap();\n\nfunction toNativeInput(arg: Arg, input: unknown): unknown {\n    return isCallerAllocatedArg(arg) ? input : toNative(arg.type, input);\n}\n\nfunction bindOptionsFor(\n    slot: ResolvedSlot,\n    instanceType: bigint | undefined,\n    args: Arg[],\n    label: string,\n): BindVfuncOptions {\n    const { descriptor, interfaceType } = slot;\n\n    const options: BindVfuncOptions = {\n        byteOffset: descriptor.byteOffset,\n        label,\n        argDescriptors: buildNativeArgTypes(args, descriptor.canThrow === true),\n        returnDescriptor: descriptor.returnDescriptor,\n    };\n\n    if (descriptor.vtableSize !== undefined) {\n        options.vtableSize = descriptor.vtableSize;\n    }\n\n    if (instanceType !== undefined) {\n        options.instanceType = instanceType;\n    }\n\n    if (interfaceType !== undefined) {\n        options.interfaceType = interfaceType;\n    }\n\n    return options;\n}\n\nfunction buildInvoker(slot: ResolvedSlot, instanceType: bigint | undefined, caller: string): Invoker {\n    const { descriptor } = slot;\n    const args = vfuncArgs(descriptor);\n    const canThrow = descriptor.canThrow === true;\n    const label = `${descriptor.className}.${descriptor.vfuncName}`;\n    const [, ...inputArgs] = args.filter(requiresInputArg);\n    let pendingSeeds: RefSeeds | undefined;\n\n    const takeRefSeeds = (): RefSeeds | undefined => {\n        const seeds = pendingSeeds;\n        pendingSeeds = undefined;\n\n        return seeds;\n    };\n\n    const shaped = fromNativeCallable(\n        bindVfunc(bindOptionsFor(slot, instanceType, args, label)),\n        {\n            args,\n            returns: descriptor.returnDescriptor,\n            canThrow,\n        },\n        takeRefSeeds,\n    );\n\n    return (instance, inputs) => {\n        if (inputs.length !== inputArgs.length) {\n            throw new Error(\n                `${caller}: ${label} expects ${String(inputArgs.length)} arguments, ` +\n                `received ${String(inputs.length)}`,\n            );\n        }\n\n        const nativeInputs = inputArgs.map((arg, index) => toNativeInput(arg, inputs[index]));\n        pendingSeeds = SEEDED_SLOTS[label] ?? seedsFor(descriptor.argDescriptors, instance);\n\n        return shaped(getHandle(instance), ...nativeInputs);\n    };\n}\n\nfunction cachedInvoker(cache: InvokerCache, owner: AnyClass, key: string, build: () => Invoker): Invoker {\n    let byKey = cache.get(owner);\n\n    if (byKey === undefined) {\n        byKey = new Map();\n        cache.set(owner, byKey);\n    }\n\n    let invoker = byKey.get(key);\n\n    if (invoker === undefined) {\n        invoker = build();\n        byKey.set(key, invoker);\n    }\n\n    return invoker;\n}\n\nfunction resolveParentSlot(klass: AnyClass, parentType: bigint, methodName: string): ResolvedSlot | undefined {\n    const classDescriptor = findClassVfuncDescriptor(klass, methodName);\n\n    if (classDescriptor) {\n        return { descriptor: classDescriptor };\n    }\n\n    for (const interfaceType of typeInterfaces(parentType)) {\n        const descriptor = findInterfaceVfuncDescriptor(interfaceType, methodName);\n\n        if (descriptor) {\n            return { descriptor, interfaceType };\n        }\n    }\n\n    return undefined;\n}\n\nfunction resolveParentType(klass: AnyClass, methodName: string): bigint {\n    const gtype = getClassType(klass);\n\n    if (gtype === TYPE_INVALID) {\n        throw new Error(\n            `callParent: cannot call '${methodName}' because ${klass.name} was never passed to registerClass`,\n        );\n    }\n\n    return typeParent(gtype);\n}\n\nfunction buildParentInvoker(klass: AnyClass, methodName: string): Invoker {\n    const parentType = resolveParentType(klass, methodName);\n    const slot = resolveParentSlot(klass, parentType, methodName);\n\n    if (!slot) {\n        throw new Error(`callParent: ${klass.name} inherits no '${methodName}' vtable slot`);\n    }\n\n    return buildInvoker(slot, parentType, \"callParent\");\n}\n\n/**\n * Calls the implementation of a virtual function that the parent type of `klass` provides, so an\n * override can chain up to the behavior it replaces. `klass` is the class whose override is\n * running, named lexically rather than taken from `instance`, so each level of a hierarchy reaches\n * exactly one level up. Arguments and the return value follow the same convention the override\n * itself uses: pure out parameters are left out and returned instead, and a slot with several\n * outputs returns them as a tuple. Throws if `klass` was never registered, inherits no such slot,\n * or the parent type leaves the slot empty.\n *\n * @param klass The registered class whose override is chaining up.\n * @param methodName Name of the overridden method, such as `vfuncMeasure`.\n * @param instance The instance the override was invoked on.\n * @param inputs The arguments the override received.\n */\nfunction callParent(klass: AnyClass, methodName: string, instance: object, ...inputs: unknown[]): unknown {\n    const invoker = cachedInvoker(parentInvokers, klass, methodName, () => buildParentInvoker(klass, methodName));\n\n    return invoker(instance, inputs);\n}\n\nfunction resolveOwnerSlot(owner: AnyClass, key: string): ResolvedSlot {\n    const classDescriptor = getVfuncRegistry(owner)?.[key];\n\n    if (classDescriptor !== undefined) {\n        return { descriptor: classDescriptor };\n    }\n\n    const interfaceType = getClassType(owner);\n    const descriptor = getInterfaceVfuncRegistry(interfaceType)?.[key];\n\n    if (descriptor === undefined) {\n        throw new Error(`callVfunc: ${owner.name} declares no '${key}' vtable slot`);\n    }\n\n    return { descriptor, interfaceType };\n}\n\nfunction requiresDefaultVtable(slot: ResolvedSlot, instanceType: bigint): boolean {\n    return slot.interfaceType !== undefined && !typeIsA(instanceType, slot.interfaceType);\n}\n\nfunction resolveInstanceType(key: string, instance: object, slot: ResolvedSlot): bigint | undefined {\n    const instanceType = resolveWrapperType(instance);\n\n    if (instanceType === TYPE_INVALID) {\n        const name = instanceClassName(instance);\n        throw new Error(`callVfunc: cannot call '${key}' because ${name} descends from no registered wrapper class`);\n    }\n\n    return requiresDefaultVtable(slot, instanceType) ? undefined : instanceType;\n}\n\n/**\n * Calls the implementation of a virtual function a wrapper class or interface declares, backing the\n * `vfunc`-prefixed members the generated bindings emit. The slot is read from the nearest generated\n * wrapper class in the instance's class chain rather than from the instance's own type, so an\n * override reaching it through `super` runs the implementation it replaced instead of re-entering\n * itself. When that wrapper class does not carry the interface the slot belongs to, because a class\n * registered below it adopted the interface, the slot comes from the interface's own default vtable\n * instead, which holds exactly what the adopting class replaced. Arguments and the return value\n * follow the same convention an override uses: pure out parameters are left out and returned\n * instead, and a slot with several outputs returns them as a tuple. Throws if the owner declares no\n * such slot, the instance descends from no wrapper class, or the resolved vtable leaves the slot\n * empty.\n *\n * @param owner The wrapper class or interface declaring the slot.\n * @param key Name of the generated member, such as `vfuncMeasure`.\n * @param instance The instance to invoke the slot on.\n * @param inputs The arguments the slot receives.\n */\nfunction callVfunc(owner: AnyClass, key: string, instance: object, inputs: unknown[]): unknown {\n    const slot = resolveOwnerSlot(owner, key);\n    const instanceType = resolveInstanceType(key, instance, slot);\n\n    const invoker = cachedInvoker(vfuncInvokers, owner, `${key}:${String(instanceType)}`, () =>\n        buildInvoker(slot, instanceType, \"callVfunc\"));\n\n    return invoker(instance, inputs);\n}\n\nexport { callParent, callVfunc };\n"]}
+{"version":3,"file":"vfunc-call.js","sourceRoot":"","sources":["../src/vfunc-call.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAyB,MAAM,cAAc,CAAC;AAChE,OAAO,EAAY,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EACH,YAAY,EACZ,SAAS,EACT,yBAAyB,EACzB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,GAErB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC9E,OAAO,EAAiB,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAM/F,MAAM,WAAW,GAAG,CAAC,CAAC,CAAC;AAEvB,MAAM,YAAY,GAA6B;IAC3C,4BAA4B,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3E,qBAAqB,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,MAAM,cAAc,GAAiB,IAAI,OAAO,EAAE,CAAC;AACnD,MAAM,aAAa,GAAiB,IAAI,OAAO,EAAE,CAAC;AAElD,SAAS,aAAa,CAAC,GAAQ,EAAE,KAAc;IAC3C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,cAAc,CACnB,IAAkB,EAClB,YAAgC,EAChC,IAAW,EACX,KAAa;IAEb,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAE3C,MAAM,OAAO,GAAqB;QAC9B,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,KAAK;QACL,cAAc,EAAE,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,KAAK,IAAI,CAAC;QACvE,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;KAChD,CAAC;IAEF,IAAI,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAC/C,CAAC;IAED,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;IACxC,CAAC;IAED,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;IAC1C,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CAAC,IAAkB,EAAE,YAAgC,EAAE,MAAc;IACtF,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,KAAK,IAAI,CAAC;IAC9C,MAAM,KAAK,GAAG,GAAG,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;IAChE,MAAM,CAAC,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACvD,IAAI,YAAkC,CAAC;IAEvC,MAAM,YAAY,GAAG,GAAyB,EAAE;QAC5C,MAAM,KAAK,GAAG,YAAY,CAAC;QAC3B,YAAY,GAAG,SAAS,CAAC;QAEzB,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,kBAAkB,CAC7B,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,EAC1D;QACI,IAAI;QACJ,OAAO,EAAE,UAAU,CAAC,gBAAgB;QACpC,QAAQ;KACX,EACD,YAAY,CACf,CAAC;IAEF,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QACxB,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACX,GAAG,MAAM,KAAK,KAAK,YAAY,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc;gBACrE,YAAY,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CACtC,CAAC;QACN,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACtF,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAEpF,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,GAAG,YAAY,CAAC,CAAC;IACxD,CAAC,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAAC,KAAmB,EAAE,KAAe,EAAE,GAAW,EAAE,KAAoB;IAC1F,MAAM,KAAK,GAAG,KAAK,CAAC,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,GAAG,EAAmB,CAAC,CAAC;IAEjF,OAAO,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAe,EAAE,UAAkB,EAAE,UAAkB;IAC9E,MAAM,eAAe,GAAG,wBAAwB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAEpE,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IAC3C,CAAC;IAED,KAAK,MAAM,aAAa,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QACrD,MAAM,UAAU,GAAG,4BAA4B,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAE3E,IAAI,UAAU,EAAE,CAAC;YACb,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;QACzC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAe,EAAE,UAAkB;IAC1D,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAElC,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACX,4BAA4B,UAAU,aAAa,KAAK,CAAC,IAAI,oCAAoC,CACpG,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAe,EAAE,UAAkB;IAC3D,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAE9D,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,eAAe,KAAK,CAAC,IAAI,iBAAiB,UAAU,eAAe,CAAC,CAAC;IACzF,CAAC;IAED,OAAO,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;AACxD,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,UAAU,CAAC,KAAe,EAAE,UAAkB,EAAE,QAAgB,EAAE,GAAG,MAAiB;IAC3F,MAAM,OAAO,GAAG,aAAa,CAAC,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAE9G,OAAO,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAe,EAAE,GAAW;IAClD,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAEvD,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IAC3C,CAAC;IAED,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,yBAAyB,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAEnE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,IAAI,iBAAiB,GAAG,eAAe,CAAC,CAAC;IACjF,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAkB,EAAE,YAAoB;IACnE,OAAO,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;AAC1F,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW,EAAE,QAAgB,EAAE,IAAkB;IAC1E,MAAM,YAAY,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAElD,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,aAAa,IAAI,4CAA4C,CAAC,CAAC;IACjH,CAAC;IAED,OAAO,qBAAqB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;AAChF,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAS,SAAS,CAAC,KAAe,EAAE,GAAW,EAAE,QAAgB,EAAE,MAAiB;IAChF,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CACvF,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAEnD,OAAO,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC","sourcesContent":["import type { AnyClass } from \"@gtkx/utils\";\nimport { bindVfunc, type BindVfuncOptions } from \"@gtkx/native\";\nimport { type Arg, isCallerAllocatedArg, requiresInputArg } from \"./arg.js\";\nimport { buildNativeArgTypes, fromNativeCallable } from \"./fn.js\";\nimport { toNative } from \"./native-value.js\";\nimport {\n    getClassType,\n    getHandle,\n    getInterfaceVfuncRegistry,\n    getVfuncRegistry,\n    instanceClassName,\n    resolveWrapperType,\n    type VfuncDescriptor,\n} from \"./registry.js\";\nimport { TYPE_INVALID, typeInterfaces, typeIsA, typeParent } from \"./type.js\";\nimport { type RefSeeds, seedsFor } from \"./vfunc-seeds.js\";\nimport { findClassVfuncDescriptor, findInterfaceVfuncDescriptor, vfuncArgs } from \"./vfunc.js\";\n\ntype Invoker = (instance: object, inputs: unknown[]) => unknown;\ntype InvokerCache = WeakMap<AnyClass, Map<string, Invoker>>;\ntype ResolvedSlot = { descriptor: VfuncDescriptor; interfaceType?: bigint };\n\nconst NO_BASELINE = -1;\n\nconst SEEDED_SLOTS: Record<string, RefSeeds> = {\n    \"LayoutManagerClass.measure\": new Map([[6, NO_BASELINE], [7, NO_BASELINE]]),\n    \"WidgetClass.measure\": new Map([[5, NO_BASELINE], [6, NO_BASELINE]]),\n};\n\nconst parentInvokers: InvokerCache = new WeakMap();\nconst vfuncInvokers: InvokerCache = new WeakMap();\n\nfunction toNativeInput(arg: Arg, input: unknown): unknown {\n    return isCallerAllocatedArg(arg) ? input : toNative(arg.type, input);\n}\n\nfunction bindOptionsFor(\n    slot: ResolvedSlot,\n    instanceType: bigint | undefined,\n    args: Arg[],\n    label: string,\n): BindVfuncOptions {\n    const { descriptor, interfaceType } = slot;\n\n    const options: BindVfuncOptions = {\n        byteOffset: descriptor.byteOffset,\n        label,\n        argDescriptors: buildNativeArgTypes(args, descriptor.canThrow === true),\n        returnDescriptor: descriptor.returnDescriptor,\n    };\n\n    if (descriptor.vtableSize !== undefined) {\n        options.vtableSize = descriptor.vtableSize;\n    }\n\n    if (instanceType !== undefined) {\n        options.instanceType = instanceType;\n    }\n\n    if (interfaceType !== undefined) {\n        options.interfaceType = interfaceType;\n    }\n\n    return options;\n}\n\nfunction buildInvoker(slot: ResolvedSlot, instanceType: bigint | undefined, caller: string): Invoker {\n    const { descriptor } = slot;\n    const args = vfuncArgs(descriptor);\n    const canThrow = descriptor.canThrow === true;\n    const label = `${descriptor.className}.${descriptor.vfuncName}`;\n    const [, ...inputArgs] = args.filter(requiresInputArg);\n    let pendingSeeds: RefSeeds | undefined;\n\n    const takeRefSeeds = (): RefSeeds | undefined => {\n        const seeds = pendingSeeds;\n        pendingSeeds = undefined;\n\n        return seeds;\n    };\n\n    const shaped = fromNativeCallable(\n        bindVfunc(bindOptionsFor(slot, instanceType, args, label)),\n        {\n            args,\n            returns: descriptor.returnDescriptor,\n            canThrow,\n        },\n        takeRefSeeds,\n    );\n\n    return (instance, inputs) => {\n        if (inputs.length !== inputArgs.length) {\n            throw new Error(\n                `${caller}: ${label} expects ${String(inputArgs.length)} arguments, ` +\n                `received ${String(inputs.length)}`,\n            );\n        }\n\n        const nativeInputs = inputArgs.map((arg, index) => toNativeInput(arg, inputs[index]));\n        pendingSeeds = SEEDED_SLOTS[label] ?? seedsFor(descriptor.argDescriptors, instance);\n\n        return shaped(getHandle(instance), ...nativeInputs);\n    };\n}\n\nfunction cachedInvoker(cache: InvokerCache, owner: AnyClass, key: string, build: () => Invoker): Invoker {\n    const byKey = cache.getOrInsertComputed(owner, () => new Map<string, Invoker>());\n\n    return byKey.getOrInsertComputed(key, build);\n}\n\nfunction resolveParentSlot(klass: AnyClass, parentType: bigint, methodName: string): ResolvedSlot | undefined {\n    const classDescriptor = findClassVfuncDescriptor(klass, methodName);\n\n    if (classDescriptor) {\n        return { descriptor: classDescriptor };\n    }\n\n    for (const interfaceType of typeInterfaces(parentType)) {\n        const descriptor = findInterfaceVfuncDescriptor(interfaceType, methodName);\n\n        if (descriptor) {\n            return { descriptor, interfaceType };\n        }\n    }\n\n    return undefined;\n}\n\nfunction resolveParentType(klass: AnyClass, methodName: string): bigint {\n    const gtype = getClassType(klass);\n\n    if (gtype === TYPE_INVALID) {\n        throw new Error(\n            `callParent: cannot call '${methodName}' because ${klass.name} was never passed to registerClass`,\n        );\n    }\n\n    return typeParent(gtype);\n}\n\nfunction buildParentInvoker(klass: AnyClass, methodName: string): Invoker {\n    const parentType = resolveParentType(klass, methodName);\n    const slot = resolveParentSlot(klass, parentType, methodName);\n\n    if (!slot) {\n        throw new Error(`callParent: ${klass.name} inherits no '${methodName}' vtable slot`);\n    }\n\n    return buildInvoker(slot, parentType, \"callParent\");\n}\n\n/**\n * Calls the implementation of a virtual function that the parent type of `klass` provides, so an\n * override can chain up to the behavior it replaces. `klass` is the class whose override is\n * running, named lexically rather than taken from `instance`, so each level of a hierarchy reaches\n * exactly one level up. Arguments and the return value follow the same convention the override\n * itself uses: pure out parameters are left out and returned instead, and a slot with several\n * outputs returns them as a tuple. Throws if `klass` was never registered, inherits no such slot,\n * or the parent type leaves the slot empty.\n *\n * @param klass The registered class whose override is chaining up.\n * @param methodName Name of the overridden method, such as `vfuncMeasure`.\n * @param instance The instance the override was invoked on.\n * @param inputs The arguments the override received.\n */\nfunction callParent(klass: AnyClass, methodName: string, instance: object, ...inputs: unknown[]): unknown {\n    const invoker = cachedInvoker(parentInvokers, klass, methodName, () => buildParentInvoker(klass, methodName));\n\n    return invoker(instance, inputs);\n}\n\nfunction resolveOwnerSlot(owner: AnyClass, key: string): ResolvedSlot {\n    const classDescriptor = getVfuncRegistry(owner)?.[key];\n\n    if (classDescriptor !== undefined) {\n        return { descriptor: classDescriptor };\n    }\n\n    const interfaceType = getClassType(owner);\n    const descriptor = getInterfaceVfuncRegistry(interfaceType)?.[key];\n\n    if (descriptor === undefined) {\n        throw new Error(`callVfunc: ${owner.name} declares no '${key}' vtable slot`);\n    }\n\n    return { descriptor, interfaceType };\n}\n\nfunction requiresDefaultVtable(slot: ResolvedSlot, instanceType: bigint): boolean {\n    return slot.interfaceType !== undefined && !typeIsA(instanceType, slot.interfaceType);\n}\n\nfunction resolveInstanceType(key: string, instance: object, slot: ResolvedSlot): bigint | undefined {\n    const instanceType = resolveWrapperType(instance);\n\n    if (instanceType === TYPE_INVALID) {\n        const name = instanceClassName(instance);\n        throw new Error(`callVfunc: cannot call '${key}' because ${name} descends from no registered wrapper class`);\n    }\n\n    return requiresDefaultVtable(slot, instanceType) ? undefined : instanceType;\n}\n\n/**\n * Calls the implementation of a virtual function a wrapper class or interface declares, backing the\n * `vfunc`-prefixed members the generated bindings emit. The slot is read from the nearest generated\n * wrapper class in the instance's class chain rather than from the instance's own type, so an\n * override reaching it through `super` runs the implementation it replaced instead of re-entering\n * itself. When that wrapper class does not carry the interface the slot belongs to, because a class\n * registered below it adopted the interface, the slot comes from the interface's own default vtable\n * instead, which holds exactly what the adopting class replaced. Arguments and the return value\n * follow the same convention an override uses: pure out parameters are left out and returned\n * instead, and a slot with several outputs returns them as a tuple. Throws if the owner declares no\n * such slot, the instance descends from no wrapper class, or the resolved vtable leaves the slot\n * empty.\n *\n * @param owner The wrapper class or interface declaring the slot.\n * @param key Name of the generated member, such as `vfuncMeasure`.\n * @param instance The instance to invoke the slot on.\n * @param inputs The arguments the slot receives.\n */\nfunction callVfunc(owner: AnyClass, key: string, instance: object, inputs: unknown[]): unknown {\n    const slot = resolveOwnerSlot(owner, key);\n    const instanceType = resolveInstanceType(key, instance, slot);\n\n    const invoker = cachedInvoker(vfuncInvokers, owner, `${key}:${String(instanceType)}`, () =>\n        buildInvoker(slot, instanceType, \"callVfunc\"));\n\n    return invoker(instance, inputs);\n}\n\nexport { callParent, callVfunc };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/runtime",
-  "version": "1.6.0",
+  "version": "2.0.0-beta.2",
   "description": "FFI runtime for the generated GTK bindings: types, GValues, signals.",
   "keywords": [
     "gtkx",
@@ -34,10 +34,14 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": null,
       "default": "./dist/index.js"
     },
     "./internal": {
       "types": "./dist/internal.d.ts",
+      "import": "./dist/internal.js",
+      "require": null,
       "default": "./dist/internal.js"
     }
   },
@@ -57,14 +61,14 @@
     }
   },
   "engines": {
-    "node": ">=24"
+    "node": ">=26.7.0"
   },
   "dependencies": {
-    "@gtkx/utils": "1.6.0",
-    "@gtkx/native": "1.6.0"
+    "@gtkx/native": "2.0.0-beta.2",
+    "@gtkx/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
-    "@gtkx/vitest": "1.6.0"
+    "@gtkx/vitest": "2.0.0-beta.2"
   },
   "scripts": {
     "release": "tsx ../../scripts/release-package.ts"

package/src/application-class.ts

@@ -1,4 +1,4 @@
-import { type AnyClass, getOrInsert } from "@gtkx/utils";
+import type { AnyClass } from "@gtkx/utils";
 import { releaseDefaultApplication } from "./default-application.js";
 import { registerClass } from "./register-class.js";
 import { getClassType } from "./registry.js";
@@ -93,7 +93,7 @@ const shutDownThroughRun = (application: ShutdownApplication): void => {
 };
 
 const deriveApplicationClass = <T extends CommandLineApplication>(base: AnyClass<T>): AnyClass<T> =>
-    getOrInsert(derivedClasses, base, () => buildApplicationClass(base)) as AnyClass<T>;
+    derivedClasses.getOrInsertComputed(base, () => buildApplicationClass(base)) as AnyClass<T>;
 
 /**
  * Constructs an application GTKX can shut down. GLib parses an application's command line at most

package/src/arg.ts

@@ -12,7 +12,10 @@ type Arg = {
     isConsumed?: boolean;
     /** When true, the argument is a `GValue` the callee fills in, packed into the result as what it holds. */
     isUnpacked?: boolean;
-    /** When true, the caller must provide the argument: `undefined` is rejected instead of reaching C as `NULL`. */
+    /**
+     * When true, the caller must provide the argument: `undefined` is rejected instead of reaching
+     * C as `NULL`, and so is `null` for a type that reaches C as a pointer.
+     */
     isRequired?: boolean;
 };
 

package/src/bind.ts

@@ -25,18 +25,7 @@ function bind(
 function createBindCache(): (key: string, ...args: Parameters<typeof bind>) => ReturnType<typeof bind> {
     const cache: Map<string, ReturnType<typeof bind>> = new Map();
 
-    return (key, ...args) => {
-        const existing = cache.get(key);
-
-        if (existing !== undefined) {
-            return existing;
-        }
-
-        const bound = bind(...args);
-        cache.set(key, bound);
-
-        return bound;
-    };
+    return (key, ...args) => cache.getOrInsertComputed(key, () => bind(...args));
 }
 
 export { bind, createBindCache };

package/src/callback.ts

@@ -1,16 +1,28 @@
 import { copy, type Descriptor } from "@gtkx/native";
 import type { CallbackDescriptor, RefDescriptor } from "./descriptors.js";
-import { foldedLengthSources, type LengthSource, type LengthSources } from "./folded-lengths.js";
+import {
+    foldedLengthArgIndices,
+    foldedLengthSources,
+    type LengthSource,
+    type LengthSources,
+} from "./folded-lengths.js";
 import { fromNative, toNative } from "./native-value.js";
-import { getHandle } from "./registry.js";
+import { describeValueKind, getHandle } from "./registry.js";
 import { splitTupleResult } from "./tuple.js";
 import { copyValue } from "./value.js";
 import { popSeedFrame, pushSeedFrame, type RefSeeds } from "./vfunc-seeds.js";
 
 type Callback = (...args: unknown[]) => unknown;
 type CallbackKind = "vfunc" | "signal" | "callback";
-type CallbackTraits = { isInstanceBound: boolean; hasInstanceArg: boolean; hasFoldedLengths: boolean };
+type CallbackTraits = {
+    isInstanceBound: boolean;
+    hasInstanceArg: boolean;
+    hasFoldedLengths: boolean;
+    hasFoldedInputs: boolean;
+};
 type OutParam = { value: unknown; descriptor: Descriptor; argIndex: number };
+type CollectedArgs = { params: OutParam[]; argIndex: number; isFolded: boolean };
+type PartitionedArgs = { inputs: unknown[]; outParams: OutParam[] };
 type LengthLink = { target: OutParam; sources: LengthSource[] };
 type OutParamGroups = { lengthLinks: LengthLink[]; valueParams: OutParam[] };
 type OutValues = Map<number, unknown>;
@@ -31,12 +43,13 @@ type CallbackPlan = {
     lengthSources: LengthSources;
     hasOutParams: boolean;
     hasRefOutParams: boolean;
+    foldedInputIndices: ReadonlySet<number>;
 };
 
 const CALLBACK_TRAITS: Record<CallbackKind, CallbackTraits> = {
-    callback: { isInstanceBound: false, hasInstanceArg: false, hasFoldedLengths: true },
-    signal: { isInstanceBound: false, hasInstanceArg: true, hasFoldedLengths: false },
-    vfunc: { isInstanceBound: true, hasInstanceArg: true, hasFoldedLengths: true },
+    callback: { isInstanceBound: false, hasInstanceArg: false, hasFoldedLengths: true, hasFoldedInputs: true },
+    signal: { isInstanceBound: false, hasInstanceArg: true, hasFoldedLengths: false, hasFoldedInputs: false },
+    vfunc: { isInstanceBound: true, hasInstanceArg: true, hasFoldedLengths: true, hasFoldedInputs: false },
 };
 
 const fillCallerAllocatedBuffer = (descriptor: Descriptor, target: object, source: object): void => {
@@ -62,9 +75,9 @@ const collectRefArg = (
     descriptor: RefDescriptor,
     wrappedValue: unknown,
     inputs: unknown[],
-    out: { params: OutParam[]; argIndex: number },
+    out: CollectedArgs,
 ): void => {
-    if (descriptor.inout === true) {
+    if (descriptor.inout === true && !out.isFolded) {
         inputs.push((wrappedValue as { value: unknown }).value);
     }
 
@@ -75,7 +88,7 @@ const collectCallbackArg = (
     descriptor: Descriptor | undefined,
     wrappedValue: unknown,
     inputs: unknown[],
-    out: { params: OutParam[]; argIndex: number },
+    out: CollectedArgs,
 ): void => {
     if (descriptor?.kind === "ref") {
         collectRefArg(descriptor, wrappedValue, inputs, out);
@@ -83,25 +96,24 @@ const collectCallbackArg = (
         return;
     }
 
-    inputs.push(wrappedValue);
+    if (!out.isFolded) {
+        inputs.push(wrappedValue);
+    }
 
     if (descriptor !== undefined && isCallerAllocatedOut(descriptor)) {
         out.params.push({ value: wrappedValue, descriptor, argIndex: out.argIndex });
     }
 };
 
-const partitionCallbackArgs = (
-    effectiveTypes: Descriptor[],
-    wrapped: unknown[],
-    start: number,
-): { inputs: unknown[]; outParams: OutParam[] } => {
+const partitionCallbackArgs = (plan: CallbackPlan, wrapped: unknown[]): PartitionedArgs => {
     const inputs: unknown[] = [];
     const params: OutParam[] = [];
-    const collected = { params, argIndex: start };
+    const collected: CollectedArgs = { params, argIndex: plan.start, isFolded: false };
 
-    for (let i = start; i < effectiveTypes.length; i++) {
+    for (let i = plan.start; i < plan.effectiveTypes.length; i++) {
         collected.argIndex = i;
-        collectCallbackArg(effectiveTypes[i], wrapped[i], inputs, collected);
+        collected.isFolded = plan.foldedInputIndices.has(i);
+        collectCallbackArg(plan.effectiveTypes[i], wrapped[i], inputs, collected);
     }
 
     return { inputs, outParams: params };
@@ -215,17 +227,15 @@ const wrapCallbackArgs = (effectiveTypes: Descriptor[], rawArgs: unknown[]): voi
 };
 
 const trimCallbackInputs = (plan: CallbackPlan, wrapped: unknown[]): unknown[] => {
-    const count = plan.effectiveTypes.length;
-
-    if (wrapped.length > count) {
-        wrapped.length = count;
-    }
+    const inputs: unknown[] = [];
 
-    for (let index = 0; index < plan.start; index++) {
-        wrapped.shift();
+    for (let index = plan.start; index < plan.effectiveTypes.length; index++) {
+        if (!plan.foldedInputIndices.has(index)) {
+            inputs.push(wrapped[index]);
+        }
     }
 
-    return wrapped;
+    return inputs;
 };
 
 const nativeReturn = (plan: CallbackPlan, primary: unknown): unknown =>
@@ -240,7 +250,7 @@ const runCallback = (plan: CallbackPlan, rawArgs: unknown[]): unknown => {
         return nativeReturn(plan, plan.fn.apply(thisArg, trimCallbackInputs(plan, rawArgs)));
     }
 
-    const { inputs, outParams } = partitionCallbackArgs(effectiveTypes, rawArgs, plan.start);
+    const { inputs, outParams } = partitionCallbackArgs(plan, rawArgs);
     const result = applyCallback(plan, thisArg, inputs, outParams);
 
     if (outParams.length === 0) {
@@ -270,9 +280,22 @@ const getEffectiveTypes = (spec: CallbackSpec): Descriptor[] => {
 const wrapCallbackValue = (spec: CallbackDescriptor, callback: unknown): unknown =>
     callback == null ? callback : wrapCallback(callback as Callback, spec, "callback");
 
+const planFoldedInputIndices = (spec: CallbackSpec, hasFoldedInputs: boolean): ReadonlySet<number> =>
+    hasFoldedInputs ? foldedLengthArgIndices(spec) : new Set<number>();
+
+/** Thrown when a value passed where a callback, signal handler or vfunc is expected cannot be called. */
+class CallbackMarshalError extends TypeError {
+    /** Name callers match on when the error is caught as a plain `TypeError`. */
+    public override name = "CallbackMarshalError";
+}
+
 function wrapCallback(fn: Callback, spec: CallbackSpec, kind: CallbackKind): Callback {
+    if (typeof fn !== "function") {
+        throw new CallbackMarshalError(`Cannot marshal ${describeValueKind(fn)} into a ${kind}`);
+    }
+
     const effectiveTypes = getEffectiveTypes(spec);
-    const { isInstanceBound, hasInstanceArg, hasFoldedLengths } = CALLBACK_TRAITS[kind];
+    const { isInstanceBound, hasInstanceArg, hasFoldedLengths, hasFoldedInputs } = CALLBACK_TRAITS[kind];
     const start = hasInstanceArg ? 1 : 0;
 
     const plan: CallbackPlan = {
@@ -285,9 +308,10 @@ function wrapCallback(fn: Callback, spec: CallbackSpec, kind: CallbackKind): Cal
         lengthSources: planLengthSources(spec, hasFoldedLengths),
         hasOutParams: haveOutParamArgs(effectiveTypes, start),
         hasRefOutParams: haveRefOutParamArgs(effectiveTypes, start),
+        foldedInputIndices: planFoldedInputIndices(spec, hasFoldedInputs),
     };
 
     return (...rawArgs: unknown[]): unknown => runCallback(plan, rawArgs);
 }
 
-export { isCallerAllocatedOut, wrapCallbackValue, wrapCallback };
+export { CallbackMarshalError, isCallerAllocatedOut, wrapCallbackValue, wrapCallback };

package/src/closure.ts

@@ -1,7 +1,17 @@
-import { type ExternalObject, type Handle, read } from "@gtkx/native";
+import { type ExternalObject, type Handle, read, symbolAddress } from "@gtkx/native";
 import { type AnyClass } from "@gtkx/utils";
-import { bind } from "./bind.js";
-import { boxedT, callbackT, sizedArrayT, structT, uint32T, uint64T, voidT } from "./descriptors.js";
+import { bind, createBindCache } from "./bind.js";
+import {
+    biguint64T,
+    boxedT,
+    type CallbackDescriptor,
+    callbackT,
+    sizedArrayT,
+    structT,
+    uint32T,
+    uint64T,
+    voidT,
+} from "./descriptors.js";
 import { CLOSURE_SIZE, LIB, VALUE_SIZE, VALUE_T } from "./library.js";
 import { describeValueKind, getClassType, getHandle, getWrapperClass, wrapHandle } from "./registry.js";
 import { resolveBoxedType, typeIsA } from "./type.js";
@@ -59,7 +69,12 @@ const gCclosureNew = bind(LIB, "g_cclosure_new", [MARSHAL_T], OWNED_CLOSURE_T);
 const gValueGetBoxed = bind(LIB, "g_value_get_boxed", [VALUE_T], NESTED_VALUE_T);
 const gClosureRef = bind(LIB, "g_closure_ref", [CLOSURE_T], uint64T);
 const gClosureSink = bind(LIB, "g_closure_sink", [CLOSURE_T], voidT);
-const gClosureSetMarshal = bind(LIB, "g_closure_set_marshal", [CLOSURE_T, uint64T], voidT);
+const gClosureSetMarshal = bind(LIB, "g_closure_set_marshal", [CLOSURE_T, biguint64T], voidT);
+const cclosureNewCache = createBindCache();
+const genericMarshal: { address?: bigint } = {};
+
+const genericClosureMarshal = (): bigint =>
+    (genericMarshal.address ??= symbolAddress(LIB, "g_cclosure_marshal_generic"));
 
 const isClosureInstance = (value: object): boolean =>
     typeIsA(getClassType(value.constructor as AnyClass), resolveBoxedType(CLOSURE_T));
@@ -84,7 +99,7 @@ function marshalFor(callback: ClosureCallback): (...args: unknown[]) => void {
 
 function newClosure(callback: ClosureCallback): ExternalObject<Handle> {
     const handle = gCclosureNew(marshalFor(callback)) as ExternalObject<Handle>;
-    const marshal = read(handle, uint64T, CCLOSURE_CALLBACK_OFFSET);
+    const marshal = read(handle, biguint64T, CCLOSURE_CALLBACK_OFFSET);
     gClosureRef(handle);
     gClosureSink(handle);
     gClosureSetMarshal(handle, marshal);
@@ -92,6 +107,16 @@ function newClosure(callback: ClosureCallback): ExternalObject<Handle> {
     return handle;
 }
 
+function newCCallbackClosure(key: string, callback: CallbackDescriptor, fn: unknown): ExternalObject<Handle> {
+    const create = cclosureNewCache(key, LIB, "g_cclosure_new", [callback], OWNED_CLOSURE_T);
+    const handle = create(fn) as ExternalObject<Handle>;
+    gClosureRef(handle);
+    gClosureSink(handle);
+    gClosureSetMarshal(handle, genericClosureMarshal());
+
+    return handle;
+}
+
 /**
  * Marshals a value passed where a `GObject.Closure` is expected into a closure handle: a function
  * becomes a new `GClosure` dispatching into it, and an existing closure yields its own handle.
@@ -121,4 +146,4 @@ class ClosureMarshalError extends TypeError {
     public override name = "ClosureMarshalError";
 }
 
-export { type ClosureCallback, ClosureMarshalError, toClosure, tryToClosure };
+export { type ClosureCallback, ClosureMarshalError, newCCallbackClosure, toClosure, tryToClosure };