@gtkx/codegen 1.0.0-rc.3 → 1.0.0

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

@@ -1 +1 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/store/gi/interface.ts"],"names":[],"mappings":"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","sourcesContent":["import { pascalCase } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { reservedSignalMemberRename, resolvePrerequisiteReference } from \"../../analysis/inheritance.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { renderBlock, renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport {\n    type Callables,\n    dedupeCallables,\n    generateBindings,\n    type InstanceScope,\n    instanceScope,\n    renderClassInstanceMember,\n    renderInstanceMethodSignature,\n    renderStaticHead,\n} from \"./callables.js\";\nimport { renderSourceGtype } from \"./gtype-binding.js\";\nimport { methodExportName } from \"./method.js\";\nimport {\n    type PropertyAccessorArgs,\n    renderPropertyAccessor,\n    renderPropertyAccessorSignature,\n} from \"./property-accessor.js\";\nimport { appendInterfaceRegistration } from \"./registration.js\";\nimport { renderSignalDeclarations, renderSignalMembers } from \"./signal.js\";\nimport { renderVfuncMetadata } from \"./vtable.js\";\n\ntype InterfaceMemberRenderers = {\n    renderMethod: (\n        context: ModuleContext,\n        callable: GirFunction,\n        scope: InstanceScope,\n        nameOverride?: string,\n    ) => string | undefined;\n    renderProperty: (args: PropertyAccessorArgs) => string | undefined;\n};\n\ntype MethodMemberOptions = {\n    context: ModuleContext;\n    className: string;\n    scope: InstanceScope;\n    callables: Callables;\n    renderers: InterfaceMemberRenderers;\n    claimedNames: Set<string>;\n};\n\ntype PropertyMemberOptions = {\n    context: ModuleContext;\n    iface: GirClass;\n    scope: InstanceScope;\n    renderers: InterfaceMemberRenderers;\n    claimedNames: Set<string>;\n};\n\nconst generateInterface = (context: ModuleContext, iface: GirClass): void => {\n    if (!iface.introspectable) {\n        return;\n    }\n\n    if (iface.name.length === 0) {\n        return;\n    }\n\n    const className = pascalCase(iface.name);\n\n    const callables: Callables = {\n        constructors: dedupeCallables(iface.constructors),\n        functions: dedupeCallables(iface.functions),\n        methods: dedupeCallables(iface.methods),\n    };\n\n    generateBindings(context, callables);\n    const gtypeExpr = renderSourceGtype(context, iface);\n    context.module.appendDeclaration(renderInterfaceType(context, iface, className, callables));\n    context.module.appendDeclaration(renderInterfaceClass(context, className, callables, gtypeExpr));\n\n    for (const declaration of renderSignalDeclarations(context, iface, className, true)) {\n        context.module.appendDeclaration(declaration);\n    }\n\n    context.module.appendDeclaration(renderInterfaceMaker(context, iface, className, callables));\n\n    appendInterfaceRegistration(context, {\n        className,\n        makerName: makerName(className),\n        gtypeExpr,\n        vfuncs: renderVfuncMetadata(context, iface),\n    });\n};\n\nconst makerName = (className: string): string => `make${className}`;\n\nconst interfaceTypeExtends = (context: ModuleContext, iface: GirClass): string => {\n    const refs = iface.prerequisites\n        .map((name) => resolvePrerequisiteReference(context, name))\n        .filter((entry): entry is string => entry !== undefined);\n\n    if (refs.length > 0) {\n        return refs.join(\", \");\n    }\n\n    return context.qualify(\"GObject\", \"Object\");\n};\n\nconst renderInterfaceType = (\n    context: ModuleContext,\n    iface: GirClass,\n    className: string,\n    callables: Callables,\n): string => {\n    const members = renderInterfaceTypeMembers(context, iface, callables);\n\n    return `${renderJsDoc(iface.doc)}${renderBracedOrEmpty(\n        `export interface ${className} extends ${interfaceTypeExtends(context, iface)}`,\n        members.join(\"\\n\"),\n    )}`;\n};\n\nconst collectMethodMembers = (options: MethodMemberOptions): string[] => {\n    const { context, className, scope, callables, renderers, claimedNames } = options;\n    const members: string[] = [];\n\n    for (const callable of callables.methods) {\n        const rename = reservedSignalMemberRename(className, callable);\n        const block = renderers.renderMethod(context, callable, scope, rename);\n\n        if (block === undefined) {\n            continue;\n        }\n\n        members.push(block);\n        claimedNames.add(rename ?? methodExportName(callable));\n    }\n\n    return members;\n};\n\nconst collectPropertyMembers = (options: PropertyMemberOptions): string[] => {\n    const { context, iface, scope, renderers, claimedNames } = options;\n    const members: string[] = [];\n\n    for (const property of iface.properties) {\n        const block = renderers.renderProperty({ context, property, claimedNames, methodByName: scope.methodByName });\n\n        if (block !== undefined) {\n            members.push(block);\n        }\n    }\n\n    return members;\n};\n\nconst renderInterfaceMembers = (\n    context: ModuleContext,\n    iface: GirClass,\n    callables: Callables,\n    renderers: InterfaceMemberRenderers,\n): string[] => {\n    const className = pascalCase(iface.name);\n    const scope = instanceScope(className, callables);\n    const claimedNames: Set<string> = new Set();\n    const methodMembers = collectMethodMembers({ context, className, scope, callables, renderers, claimedNames });\n    const propertyMembers = collectPropertyMembers({ context, iface, scope, renderers, claimedNames });\n\n    return [...methodMembers, ...propertyMembers];\n};\n\nconst renderInterfaceTypeMembers = (context: ModuleContext, iface: GirClass, callables: Callables): string[] =>\n    renderInterfaceMembers(context, iface, callables, {\n        renderMethod: renderInstanceMethodSignature,\n        renderProperty: renderPropertyAccessorSignature,\n    });\n\nconst renderInterfaceClass = (\n    context: ModuleContext,\n    className: string,\n    callables: Callables,\n    gtypeExpr: string | undefined,\n): string => {\n    const members: string[] = [];\n\n    if (gtypeExpr !== undefined) {\n        members.push(renderInterfaceHasInstance(context, className, gtypeExpr));\n    }\n\n    members.push(...renderStaticHead(context, callables, className));\n\n    return renderBracedOrEmpty(`export abstract class ${className}`, members.join(\"\\n\\n\"));\n};\n\nconst renderInterfaceHasInstance = (context: ModuleContext, className: string, gtypeExpr: string): string => {\n    context.addRuntimeImport(\"valueIsA\");\n\n    return renderBlock(\n        `static [Symbol.hasInstance](value: unknown): value is ${className}`,\n        `return valueIsA(value, ${gtypeExpr});`,\n    );\n};\n\nconst renderInterfaceMaker = (\n    context: ModuleContext,\n    iface: GirClass,\n    className: string,\n    callables: Callables,\n): string => {\n    context.addRuntimeTypeImport(\"Mixin\");\n    const members = renderInterfaceInstanceMembers(context, iface, callables);\n    const classExpression = renderBracedOrEmpty(\"class extends Base\", members.join(\"\\n\\n\"));\n\n    return `export const ${makerName(className)}: Mixin = (Base) =>\\n${classExpression};`;\n};\n\nconst renderInterfaceInstanceMembers = (context: ModuleContext, iface: GirClass, callables: Callables): string[] => [\n    ...renderInterfaceMembers(context, iface, callables, {\n        renderMethod: renderClassInstanceMember,\n        renderProperty: renderPropertyAccessor,\n    }),\n    ...renderSignalMembers(context, iface),\n];\n\nexport { generateInterface };\n"]}
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/store/gi/interface.ts"],"names":[],"mappings":"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","sourcesContent":["import { pascalCase, sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { GirProperty } from \"../../gir/property.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { reservedSignalMemberRename, resolvePrerequisiteReference } from \"../../analysis/inheritance.js\";\nimport { resolveInterfaces } from \"../../gir/ancestry.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { renderBlock, renderBraced, renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport {\n    type Callables,\n    dedupeCallables,\n    generateBindings,\n    type InstanceMemberRenderer,\n    type InstanceScope,\n    instanceScope,\n    isEmittableCallable,\n    renderClassInstanceMember,\n    renderInstanceMethodSignature,\n    renderStaticHead,\n} from \"./callables.js\";\nimport { annotationSpec, getDoc } from \"./doc-spec.js\";\nimport { renderSourceGtype } from \"./gtype-binding.js\";\nimport { methodExportName } from \"./method.js\";\nimport {\n    type PropertyAccessorArgs,\n    renderPropertyAccessor,\n    renderPropertyAccessorSignature,\n} from \"./property-accessor.js\";\nimport { appendInterfaceRegistration } from \"./registration.js\";\nimport { renderSignalDeclarations, renderSignalMembers } from \"./signal.js\";\nimport {\n    hasCallableVfuncSlots,\n    renderVfuncMembers,\n    renderVfuncMetadata,\n    type VfuncMemberMode,\n} from \"./vtable.js\";\n\ntype InterfaceMemberRenderers = {\n    renderMethod: InstanceMemberRenderer;\n    renderProperty: (args: PropertyAccessorArgs) => string | undefined;\n};\n\ntype MethodMemberOptions = {\n    context: ModuleContext;\n    className: string;\n    scope: InstanceScope;\n    callables: Callables;\n    renderers: InterfaceMemberRenderers;\n    claimedNames: Set<string>;\n};\n\ntype PropertyMemberOptions = {\n    context: ModuleContext;\n    iface: GirClass;\n    scope: InstanceScope;\n    renderers: InterfaceMemberRenderers;\n    claimedNames: Set<string>;\n};\n\ntype InterfaceClassOptions = {\n    iface: GirClass;\n    className: string;\n    callables: Callables;\n    gtypeExpr: string | undefined;\n    implRef: string;\n};\n\nconst BRAND_NOTE = [\n    \"Phantom link to the type a class fills to adopt the interface, which `registerClass` reads\",\n    \"through its `implements` option. It holds no value at runtime. `unknown` asks nothing of the\",\n    \"class, which is what an interface with no slot to fill carries.\",\n].join(\"\\n\");\n\nconst generateInterface = (context: ModuleContext, iface: GirClass): void => {\n    if (!iface.introspectable) {\n        return;\n    }\n\n    if (iface.name.length === 0) {\n        return;\n    }\n\n    const className = pascalCase(iface.name);\n\n    const callables: Callables = {\n        constructors: dedupeCallables(iface.constructors),\n        functions: dedupeCallables(iface.functions),\n        methods: dedupeCallables(iface.methods),\n    };\n\n    generateBindings(context, callables);\n    const gtypeExpr = renderSourceGtype(context, iface);\n    const implRef = appendInterfaceTypes(context, iface, className, callables) ?? \"unknown\";\n    const classCode = renderInterfaceClass(context, { iface, className, callables, gtypeExpr, implRef });\n    context.module.appendDeclaration(classCode, context.declaredType(className));\n\n    for (const declaration of renderSignalDeclarations(context, iface, className, true)) {\n        context.module.appendDeclaration(declaration);\n    }\n\n    context.module.appendDeclaration(renderInterfaceMaker(context, iface, className, callables));\n\n    appendInterfaceRegistration(context, {\n        className,\n        makerName: makerName(className),\n        gtypeExpr,\n        layout: renderInterfaceLayout(context, iface, callables),\n    });\n};\n\nconst makerName = (className: string): string => `make${className}`;\n\nconst renderInterfaceLayout = (\n    context: ModuleContext,\n    iface: GirClass,\n    callables: Callables,\n): string | undefined => {\n    const vfuncs = renderVfuncMetadata(context, iface);\n    const properties = renderSlotBackedProperties(context, iface, callables);\n\n    if (vfuncs === undefined && properties === undefined) {\n        return undefined;\n    }\n\n    const entries: string[] = [];\n\n    if (vfuncs !== undefined) {\n        entries.push(`vfuncs: ${vfuncs},`);\n    }\n\n    if (properties !== undefined) {\n        entries.push(`properties: ${properties},`);\n    }\n\n    return renderBraced(entries.join(\"\\n\"));\n};\n\nconst invokerMembers = (context: ModuleContext, iface: GirClass, callables: Callables): Map<string, string> => {\n    const className = pascalCase(iface.name);\n\n    const invokers: Set<string> = new Set(\n        iface.vfuncs.map((vfunc) => vfunc.invoker).filter((invoker) => invoker !== undefined),\n    );\n\n    const members: Map<string, string> = new Map();\n\n    for (const callable of callables.methods) {\n        if (invokers.has(callable.name) && isEmittableCallable(context, callable)) {\n            members.set(callable.name, reservedSignalMemberRename(className, callable) ?? methodExportName(callable));\n        }\n    }\n\n    return members;\n};\n\nconst renderSlotAccessor = (\n    key: string,\n    method: string | undefined,\n    members: Map<string, string>,\n): string | undefined => {\n    const member = method === undefined ? undefined : members.get(method);\n\n    return member === undefined ? undefined : `${key}: ${sourceStringLiteral(member)},`;\n};\n\nconst renderSlotBackedProperty = (property: GirProperty, members: Map<string, string>): string | undefined => {\n    if (!property.introspectable) {\n        return undefined;\n    }\n\n    const fields = [\n        renderSlotAccessor(\"getter\", property.getter, members),\n        renderSlotAccessor(\"setter\", property.setter, members),\n    ].filter((field) => field !== undefined);\n\n    if (fields.length === 0) {\n        return undefined;\n    }\n\n    return `${sourceStringLiteral(property.name)}: ${renderBraced(fields.join(\"\\n\"))},`;\n};\n\nconst renderSlotBackedProperties = (\n    context: ModuleContext,\n    iface: GirClass,\n    callables: Callables,\n): string | undefined => {\n    const members = invokerMembers(context, iface, callables);\n\n    const entries = iface.properties\n        .map((property) => renderSlotBackedProperty(property, members))\n        .filter((entry) => entry !== undefined);\n\n    return entries.length === 0 ? undefined : renderBraced(entries.join(\"\\n\"));\n};\n\nconst appendInterfaceTypes = (\n    context: ModuleContext,\n    iface: GirClass,\n    className: string,\n    callables: Callables,\n): string | undefined => {\n    const typeCode = renderInterfaceType(context, iface, className, callables);\n    context.module.appendDeclaration(typeCode, context.declaredType(className));\n    const implType = renderInterfaceImplType(context, iface, className);\n\n    if (implType === undefined) {\n        return undefined;\n    }\n\n    const implName = implTypeName(className);\n    context.module.appendDeclaration(implType, context.declaredType(className, implName));\n\n    return implName;\n};\n\nconst interfaceTypeExtends = (context: ModuleContext, iface: GirClass): string => {\n    const refs = iface.prerequisites\n        .map((name) => resolvePrerequisiteReference(context, name))\n        .filter((entry): entry is string => entry !== undefined);\n\n    if (refs.length > 0) {\n        return refs.join(\", \");\n    }\n\n    return context.qualify(\"GObject\", \"Object\");\n};\n\nconst renderInterfaceType = (\n    context: ModuleContext,\n    iface: GirClass,\n    className: string,\n    callables: Callables,\n): string => {\n    const members = renderInterfaceTypeMembers(context, iface, callables);\n\n    return `${getDoc(iface)}${renderBracedOrEmpty(\n        `export interface ${className} extends ${interfaceTypeExtends(context, iface)}`,\n        members.join(\"\\n\"),\n    )}`;\n};\n\nconst implTypeName = (className: string): string => `${className}Impl`;\n\nconst implTypeNote = (className: string): string =>\n    [\n        `Implementer side of \\`${className}\\`: the vtable slots a class fills to adopt the interface.`,\n        \"\",\n        `Declare it with \\`implements ${implTypeName(className)}\\` on a class passed to \\`registerClass\\``,\n        `with \\`${className}\\` in \\`implements\\`. The interface's methods, properties, and signals come from`,\n        \"GLib dispatch, so they are not part of this type.\",\n        \"\",\n        \"Every slot is optional: an unfilled one keeps whatever the interface installs by default, and a\",\n        \"GIR update can add one. Declaring a slot pins its signature; declaring it as a class field rather\",\n        \"than a method satisfies this type but never reaches the vtable.\",\n    ].join(\"\\n\");\n\nconst implPrerequisiteRefs = (context: ModuleContext, iface: GirClass): string[] => {\n    const prerequisites = resolveInterfaces(context.library, context.namespace.name, iface.prerequisites);\n    const refs: string[] = [];\n\n    for (const prerequisite of prerequisites) {\n        if (!hasCallableVfuncSlots(context, prerequisite.namespaceName, prerequisite.klass)) {\n            continue;\n        }\n\n        const name = implTypeName(pascalCase(prerequisite.klass.name));\n        refs.push(context.qualify(prerequisite.namespaceName, name));\n    }\n\n    return refs;\n};\n\nconst implTypeExtends = (context: ModuleContext, iface: GirClass): string => {\n    const refs = implPrerequisiteRefs(context, iface);\n\n    return refs.length > 0 ? ` extends ${refs.join(\", \")}` : \"\";\n};\n\nconst interfaceVfuncMembers = (context: ModuleContext, iface: GirClass, mode: VfuncMemberMode): string[] =>\n    renderVfuncMembers({ context, klass: iface, mode });\n\nconst renderInterfaceImplType = (\n    context: ModuleContext,\n    iface: GirClass,\n    className: string,\n): string | undefined => {\n    const members = interfaceVfuncMembers(context, iface, \"requirement\");\n\n    if (members.length === 0) {\n        return undefined;\n    }\n\n    return `${renderJsDoc(iface.doc, implTypeNote(className), annotationSpec(iface.annotations))}${renderBracedOrEmpty(\n        `export interface ${implTypeName(className)}${implTypeExtends(context, iface)}`,\n        members.join(\"\\n\"),\n    )}`;\n};\n\nconst collectMethodMembers = (options: MethodMemberOptions): string[] => {\n    const { context, className, scope, callables, renderers, claimedNames } = options;\n    const members: string[] = [];\n\n    for (const callable of callables.methods) {\n        const rename = reservedSignalMemberRename(className, callable);\n        const block = renderers.renderMethod(context, callable, scope, rename);\n\n        if (block === undefined) {\n            continue;\n        }\n\n        members.push(block);\n        claimedNames.add(rename ?? methodExportName(callable));\n    }\n\n    return members;\n};\n\nconst collectPropertyMembers = (options: PropertyMemberOptions): string[] => {\n    const { context, iface, scope, renderers, claimedNames } = options;\n    const members: string[] = [];\n\n    for (const property of iface.properties) {\n        const block = renderers.renderProperty({ context, property, claimedNames, methodByName: scope.methodByName });\n\n        if (block !== undefined) {\n            members.push(block);\n        }\n    }\n\n    return members;\n};\n\nconst renderInterfaceMembers = (\n    context: ModuleContext,\n    iface: GirClass,\n    callables: Callables,\n    renderers: InterfaceMemberRenderers,\n): string[] => {\n    const className = pascalCase(iface.name);\n    const scope = instanceScope(className, callables);\n    const claimedNames: Set<string> = new Set();\n    const methodMembers = collectMethodMembers({ context, className, scope, callables, renderers, claimedNames });\n    const propertyMembers = collectPropertyMembers({ context, iface, scope, renderers, claimedNames });\n\n    return [...methodMembers, ...propertyMembers];\n};\n\nconst renderInterfaceTypeMembers = (context: ModuleContext, iface: GirClass, callables: Callables): string[] => [\n    ...renderInterfaceMembers(context, iface, callables, {\n        renderMethod: renderInstanceMethodSignature,\n        renderProperty: renderPropertyAccessorSignature,\n    }),\n    ...interfaceVfuncMembers(context, iface, \"signature\"),\n];\n\nconst renderInterfaceClass = (context: ModuleContext, options: InterfaceClassOptions): string => {\n    const { iface, className, callables, gtypeExpr, implRef } = options;\n    const members: string[] = [];\n\n    if (gtypeExpr !== undefined) {\n        members.push(renderInterfaceHasInstance(context, className, gtypeExpr));\n    }\n\n    members.push(...renderStaticHead(context, callables, className), renderInterfaceBrand(context, implRef));\n\n    return `${getDoc(iface)}${renderBracedOrEmpty(\n        `export abstract class ${className}`,\n        members.join(\"\\n\\n\"),\n    )}`;\n};\n\nconst renderInterfaceBrand = (context: ModuleContext, implRef: string): string => {\n    context.addRuntimeTypeImport(\"Interface\");\n\n    return `${renderJsDoc(undefined, BRAND_NOTE)}declare static __impl__: Interface<${implRef}>[\"__impl__\"];`;\n};\n\nconst renderInterfaceHasInstance = (context: ModuleContext, className: string, gtypeExpr: string): string => {\n    context.addRuntimeImport(\"valueIsA\");\n\n    return renderBlock(\n        `static [Symbol.hasInstance](value: unknown): value is ${className}`,\n        `return valueIsA(value, ${gtypeExpr});`,\n    );\n};\n\nconst renderInterfaceMaker = (\n    context: ModuleContext,\n    iface: GirClass,\n    className: string,\n    callables: Callables,\n): string => {\n    context.addRuntimeTypeImport(\"Mixin\");\n    const members = renderInterfaceInstanceMembers(context, iface, callables);\n    const classExpression = renderBracedOrEmpty(\"class extends Base\", members.join(\"\\n\\n\"));\n\n    return `${getDoc(iface)}export const ${makerName(className)}: Mixin = (Base) =>\\n${classExpression};`;\n};\n\nconst renderInterfaceInstanceMembers = (context: ModuleContext, iface: GirClass, callables: Callables): string[] => [\n    ...renderInterfaceMembers(context, iface, callables, {\n        renderMethod: renderClassInstanceMember,\n        renderProperty: renderPropertyAccessor,\n    }),\n    ...interfaceVfuncMembers(context, iface, \"implementation\"),\n    ...renderSignalMembers(context, iface),\n];\n\nexport { generateInterface };\n"]}

package/dist/store/gi/item-comparators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"item-comparators.d.ts","sourceRoot":"","sources":["../../../src/store/gi/item-comparators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAsF7D,QAAA,MAAM,4BAA4B,GAC9B,SAAS,aAAa,EACtB,IAAI,WAAW,EACf,WAAW,YAAY,KACxB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAiBxB,CAAC;AAEF,QAAA,MAAM,oBAAoB,GACtB,SAAS,aAAa,EACtB,IAAI,WAAW,EACf,WAAW,YAAY,KACxB,MAAM,GAAG,SAmBX,CAAC;AAEF,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"item-comparators.d.ts","sourceRoot":"","sources":["../../../src/store/gi/item-comparators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAoF7D,QAAA,MAAM,4BAA4B,GAC9B,SAAS,aAAa,EACtB,IAAI,WAAW,EACf,WAAW,YAAY,KACxB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAiBxB,CAAC;AAEF,QAAA,MAAM,oBAAoB,GACtB,SAAS,aAAa,EACtB,IAAI,WAAW,EACf,WAAW,YAAY,KACxB,MAAM,GAAG,SAmBX,CAAC;AAEF,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/store/gi/item-comparators.js

@@ -1,7 +1,7 @@
 import { tObject } from "../../analysis/descriptor.js";
 import { inputParameters, parameterIdentifier } from "../../analysis/param-structure.js";
 import { renderTsType } from "../../analysis/ts-type.js";
-import { resolveInterface } from "../../gir/ancestry.js";
+import { resolveInterfaces } from "../../gir/ancestry.js";
 import { callbackAsFunction } from "../../gir/callback.js";
 const COMPARATOR_CALLBACK_TYPES = new Set([
     "GLib.CompareFunc",
@@ -19,10 +19,8 @@ const isListModelImplementor = (context, ref) => {
     if (resolved?.kind !== "class") {
         return false;
     }
-    return resolved.value.implements.some((interfaceName) => {
-        const iface = resolveInterface(context.library, resolved.namespace.name, interfaceName);
-        return iface?.namespaceName === "Gio" && iface.klass.name === "ListModel";
-    });
+    const interfaces = resolveInterfaces(context.library, resolved.namespace.name, resolved.value.implements);
+    return interfaces.some((iface) => iface.namespaceName === "Gio" && iface.klass.name === "ListModel");
 };
 const isObjectItemComparator = (context, fn) => {
     const ownerRef = fn.instance?.type ?? fn.returnValue.type;

package/dist/store/gi/item-comparators.js.map

@@ -1 +1 @@
-{"version":3,"file":"item-comparators.js","sourceRoot":"","sources":["../../../src/store/gi/item-comparators.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirFunction } from \"../../gir/function.js\";\nimport type { GirParameter } from \"../../gir/parameter.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { tObject } from \"../../analysis/descriptor.js\";\nimport { inputParameters, parameterIdentifier } from \"../../analysis/param-structure.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { resolveInterface } from \"../../gir/ancestry.js\";\nimport { callbackAsFunction, type GirCallback } from \"../../gir/callback.js\";\n\nconst COMPARATOR_CALLBACK_TYPES = new Set([\n    \"GLib.CompareFunc\",\n    \"GLib.CompareDataFunc\",\n    \"GLib.EqualFunc\",\n    \"GLib.EqualFuncFull\",\n]);\n\nconst OBJECT_ITEM_COMPARATOR_OWNERS = new Set([\"Gtk.CustomSorter\"]);\n\nconst qualifiedName = (context: ModuleContext, ref: TypeId): string | undefined => {\n    const name = context.library.nameFor(ref);\n\n    return name === undefined ? undefined : `${name.namespaceName}.${name.typeName}`;\n};\n\nconst isListModelImplementor = (context: ModuleContext, ref: TypeId): boolean => {\n    const resolved = context.library.typeFor(ref);\n\n    if (resolved?.kind !== \"class\") {\n        return false;\n    }\n\n    return resolved.value.implements.some((interfaceName) => {\n        const iface = resolveInterface(context.library, resolved.namespace.name, interfaceName);\n\n        return iface?.namespaceName === \"Gio\" && iface.klass.name === \"ListModel\";\n    });\n};\n\nconst isObjectItemComparator = (context: ModuleContext, fn: GirFunction): boolean => {\n    const ownerRef = fn.instance?.type ?? fn.returnValue.type;\n\n    if (ownerRef === undefined) {\n        return false;\n    }\n\n    const owner = qualifiedName(context, ownerRef);\n\n    if (owner !== undefined && OBJECT_ITEM_COMPARATOR_OWNERS.has(owner)) {\n        return true;\n    }\n\n    return isListModelImplementor(context, ownerRef);\n};\n\nconst isItemPointer = (context: ModuleContext, ref: TypeId | undefined): boolean => {\n    if (ref === undefined) {\n        return false;\n    }\n\n    const resolved = context.library.typeFor(ref);\n\n    return resolved?.kind === \"primitive\" && resolved.category === \"pointer\";\n};\n\nconst itemComparatorCallback = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): GirCallback | undefined => {\n    if (parameter.type === undefined) {\n        return undefined;\n    }\n\n    const resolved = context.library.typeFor(parameter.type);\n\n    if (resolved?.kind !== \"callback\") {\n        return undefined;\n    }\n\n    const name = qualifiedName(context, parameter.type);\n\n    if (name === undefined || !COMPARATOR_CALLBACK_TYPES.has(name)) {\n        return undefined;\n    }\n\n    return isObjectItemComparator(context, fn) ? resolved.value : undefined;\n};\n\nconst itemComparatorArgDescriptors = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): Map<number, string> | undefined => {\n    const callback = itemComparatorCallback(context, fn, parameter);\n\n    if (callback === undefined) {\n        return undefined;\n    }\n\n    const overrides: Map<number, string> = new Map();\n    const items = inputParameters(context.library, callbackAsFunction(callback));\n\n    for (const { parameter: item, index } of items) {\n        if (isItemPointer(context, item.type)) {\n            overrides.set(index, tObject(\"borrowed\"));\n        }\n    }\n\n    return overrides.size > 0 ? overrides : undefined;\n};\n\nconst itemComparatorTsType = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): string | undefined => {\n    const callback = itemComparatorCallback(context, fn, parameter);\n\n    if (callback === undefined) {\n        return undefined;\n    }\n\n    const itemType = `${context.qualify(\"GObject\", \"Object\")} | null`;\n\n    const args = inputParameters(context.library, callbackAsFunction(callback)).map(({ parameter: item, index }) => {\n        const tsType = isItemPointer(context, item.type) ? itemType : renderTsType(context, item.type, item.nullable);\n\n        return `${parameterIdentifier(item, index)}: ${tsType}`;\n    });\n\n    const returnType = renderTsType(context, callback.returnValue.type, callback.returnValue.nullable);\n    const fnType = `(${args.join(\", \")}) => ${returnType}`;\n\n    return parameter.nullable ? `(${fnType}) | null` : fnType;\n};\n\nexport { itemComparatorArgDescriptors, itemComparatorTsType };\n"]}
+{"version":3,"file":"item-comparators.js","sourceRoot":"","sources":["../../../src/store/gi/item-comparators.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirFunction } from \"../../gir/function.js\";\nimport type { GirParameter } from \"../../gir/parameter.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { tObject } from \"../../analysis/descriptor.js\";\nimport { inputParameters, parameterIdentifier } from \"../../analysis/param-structure.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { resolveInterfaces } from \"../../gir/ancestry.js\";\nimport { callbackAsFunction, type GirCallback } from \"../../gir/callback.js\";\n\nconst COMPARATOR_CALLBACK_TYPES = new Set([\n    \"GLib.CompareFunc\",\n    \"GLib.CompareDataFunc\",\n    \"GLib.EqualFunc\",\n    \"GLib.EqualFuncFull\",\n]);\n\nconst OBJECT_ITEM_COMPARATOR_OWNERS = new Set([\"Gtk.CustomSorter\"]);\n\nconst qualifiedName = (context: ModuleContext, ref: TypeId): string | undefined => {\n    const name = context.library.nameFor(ref);\n\n    return name === undefined ? undefined : `${name.namespaceName}.${name.typeName}`;\n};\n\nconst isListModelImplementor = (context: ModuleContext, ref: TypeId): boolean => {\n    const resolved = context.library.typeFor(ref);\n\n    if (resolved?.kind !== \"class\") {\n        return false;\n    }\n\n    const interfaces = resolveInterfaces(context.library, resolved.namespace.name, resolved.value.implements);\n\n    return interfaces.some((iface) => iface.namespaceName === \"Gio\" && iface.klass.name === \"ListModel\");\n};\n\nconst isObjectItemComparator = (context: ModuleContext, fn: GirFunction): boolean => {\n    const ownerRef = fn.instance?.type ?? fn.returnValue.type;\n\n    if (ownerRef === undefined) {\n        return false;\n    }\n\n    const owner = qualifiedName(context, ownerRef);\n\n    if (owner !== undefined && OBJECT_ITEM_COMPARATOR_OWNERS.has(owner)) {\n        return true;\n    }\n\n    return isListModelImplementor(context, ownerRef);\n};\n\nconst isItemPointer = (context: ModuleContext, ref: TypeId | undefined): boolean => {\n    if (ref === undefined) {\n        return false;\n    }\n\n    const resolved = context.library.typeFor(ref);\n\n    return resolved?.kind === \"primitive\" && resolved.category === \"pointer\";\n};\n\nconst itemComparatorCallback = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): GirCallback | undefined => {\n    if (parameter.type === undefined) {\n        return undefined;\n    }\n\n    const resolved = context.library.typeFor(parameter.type);\n\n    if (resolved?.kind !== \"callback\") {\n        return undefined;\n    }\n\n    const name = qualifiedName(context, parameter.type);\n\n    if (name === undefined || !COMPARATOR_CALLBACK_TYPES.has(name)) {\n        return undefined;\n    }\n\n    return isObjectItemComparator(context, fn) ? resolved.value : undefined;\n};\n\nconst itemComparatorArgDescriptors = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): Map<number, string> | undefined => {\n    const callback = itemComparatorCallback(context, fn, parameter);\n\n    if (callback === undefined) {\n        return undefined;\n    }\n\n    const overrides: Map<number, string> = new Map();\n    const items = inputParameters(context.library, callbackAsFunction(callback));\n\n    for (const { parameter: item, index } of items) {\n        if (isItemPointer(context, item.type)) {\n            overrides.set(index, tObject(\"borrowed\"));\n        }\n    }\n\n    return overrides.size > 0 ? overrides : undefined;\n};\n\nconst itemComparatorTsType = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): string | undefined => {\n    const callback = itemComparatorCallback(context, fn, parameter);\n\n    if (callback === undefined) {\n        return undefined;\n    }\n\n    const itemType = `${context.qualify(\"GObject\", \"Object\")} | null`;\n\n    const args = inputParameters(context.library, callbackAsFunction(callback)).map(({ parameter: item, index }) => {\n        const tsType = isItemPointer(context, item.type) ? itemType : renderTsType(context, item.type, item.nullable);\n\n        return `${parameterIdentifier(item, index)}: ${tsType}`;\n    });\n\n    const returnType = renderTsType(context, callback.returnValue.type, callback.returnValue.nullable);\n    const fnType = `(${args.join(\", \")}) => ${returnType}`;\n\n    return parameter.nullable ? `(${fnType}) | null` : fnType;\n};\n\nexport { itemComparatorArgDescriptors, itemComparatorTsType };\n"]}

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

@@ -1,5 +1,7 @@
 import type { GirFunction } from "../../gir/function.js";
 import type { ModuleContext } from "../../writer/context.js";
+import { type InputParameter } from "../../analysis/param-structure.js";
+import { type GirParameter } from "../../gir/parameter.js";
 type WriteMethodBodyOptions = {
     bindingExpression: string;
     returnTypeOverride?: string | undefined;
@@ -10,6 +12,7 @@ type CallArgPlan = {
 };
 declare const methodExportName: (fn: GirFunction) => string;
 declare const renderMethodSignature: (context: ModuleContext, fn: GirFunction) => string;
+declare const returnedOutParameters: (context: ModuleContext, fn: GirFunction) => InputParameter[];
 declare const renderMethodReturnType: (context: ModuleContext, fn: GirFunction) => string;
 declare const renderPromisifiedBody: (context: ModuleContext, asyncFn: GirFunction, finishExpression: string, bindingExpression: string) => string;
 declare const finishCallExpression: (asyncFn: GirFunction, finishFn: GirFunction, ownerName: string) => string;
@@ -17,8 +20,13 @@ declare const renderPromisifiedSignature: (context: ModuleContext, asyncFn: GirF
     signature: string;
     returnType: string;
 };
+declare const isCallbackParameter: (context: ModuleContext, parameter: GirParameter) => boolean;
 declare const renderMethodBody: (context: ModuleContext, fn: GirFunction, options: WriteMethodBodyOptions) => string;
 declare const renderReturnDescriptor: (context: ModuleContext, fn: GirFunction) => string;
 declare const planCallArgs: (context: ModuleContext, fn: GirFunction) => CallArgPlan[];
-export { methodExportName, renderMethodSignature, renderMethodReturnType, renderPromisifiedBody, finishCallExpression, renderPromisifiedSignature, renderMethodBody, renderReturnDescriptor, planCallArgs, };
+declare const constructibleName: (context: ModuleContext, ref: GirParameter["type"]) => {
+    namespaceName: string;
+    typeName: string;
+} | undefined;
+export { constructibleName, isCallbackParameter, methodExportName, renderMethodSignature, renderMethodReturnType, returnedOutParameters, renderPromisifiedBody, finishCallExpression, renderPromisifiedSignature, renderMethodBody, renderReturnDescriptor, planCallArgs, };
 //# sourceMappingURL=method.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../src/store/gi/method.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AA+B7D,KAAK,sBAAsB,GAAG;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,KAAK,WAAW,GAAG;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAC;AAsBF,QAAA,MAAM,gBAAgB,GAAI,IAAI,WAAW,KAAG,MAA4B,CAAC;AAQzE,QAAA,MAAM,qBAAqB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAMpE,CAAC;AA0CN,QAAA,MAAM,sBAAsB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAezE,CAAC;AAuDF,QAAA,MAAM,qBAAqB,GACvB,SAAS,aAAa,EACtB,SAAS,WAAW,EACpB,kBAAkB,MAAM,EACxB,mBAAmB,MAAM,KAC1B,MAuBF,CAAC;AAEF,QAAA,MAAM,oBAAoB,GAAI,SAAS,WAAW,EAAE,UAAU,WAAW,EAAE,WAAW,MAAM,KAAG,MAGtC,CAAC;AA2B1D,QAAA,MAAM,0BAA0B,GAC5B,SAAS,aAAa,EACtB,SAAS,WAAW,EACpB,UAAU,WAAW,KACtB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAWzC,CAAC;AAeF,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,EAAE,SAAS,sBAAsB,KAAG,MAWpG,CAAC;AAoBF,QAAA,MAAM,sBAAsB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAQzE,CAAC;AAEF,QAAA,MAAM,YAAY,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,WAAW,EAgC1E,CAAC;AA+QF,OAAO,EACH,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACpB,0BAA0B,EAC1B,gBAAgB,EAChB,sBAAsB,EACtB,YAAY,GACf,CAAC"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../src/store/gi/method.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAO7D,OAAO,EAMH,KAAK,cAAc,EAGtB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,KAAK,YAAY,EAA0D,MAAM,wBAAwB,CAAC;AAyBnH,KAAK,sBAAsB,GAAG;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,KAAK,WAAW,GAAG;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAC;AAsBF,QAAA,MAAM,gBAAgB,GAAI,IAAI,WAAW,KAAG,MAA4B,CAAC;AAQzE,QAAA,MAAM,qBAAqB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAInE,CAAC;AA2DP,QAAA,MAAM,qBAAqB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,cAAc,EAWtF,CAAC;AAEF,QAAA,MAAM,sBAAsB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAczE,CAAC;AAuDF,QAAA,MAAM,qBAAqB,GACvB,SAAS,aAAa,EACtB,SAAS,WAAW,EACpB,kBAAkB,MAAM,EACxB,mBAAmB,MAAM,KAC1B,MAuBF,CAAC;AAEF,QAAA,MAAM,oBAAoB,GAAI,SAAS,WAAW,EAAE,UAAU,WAAW,EAAE,WAAW,MAAM,KAAG,MAGtC,CAAC;AA2B1D,QAAA,MAAM,0BAA0B,GAC5B,SAAS,aAAa,EACtB,SAAS,WAAW,EACpB,UAAU,WAAW,KACtB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CASzC,CAAC;AAKF,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,EAAE,WAAW,YAAY,KAAG,OAQ9E,CAAC;AAEF,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,EAAE,SAAS,sBAAsB,KAAG,MAWpG,CAAC;AAoBF,QAAA,MAAM,sBAAsB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAQzE,CAAC;AAEF,QAAA,MAAM,YAAY,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,WAAW,EAgC1E,CAAC;AA8FF,QAAA,MAAM,iBAAiB,GACnB,SAAS,aAAa,EACtB,KAAK,YAAY,CAAC,MAAM,CAAC,KAC1B;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,SAehD,CAAC;AAiLF,OAAO,EACH,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,0BAA0B,EAC1B,gBAAgB,EAChB,sBAAsB,EACtB,YAAY,GACf,CAAC"}

package/dist/store/gi/method.js

@@ -4,69 +4,96 @@ import { arrayLengthSources, closureAndDestroyIndices, emittedArgIndices, folded
 import { renderTsType } from "../../analysis/ts-type.js";
 import { isCallerAllocatedOut, isInoutParameter, isOutParameter } from "../../gir/parameter.js";
 import { hasUnknownArrayLength } from "../../gir/type-id.js";
+import { areClosuresInvoked } from "./closure-invocation.js";
 import { itemComparatorArgDescriptors, itemComparatorTsType } from "./item-comparators.js";
-import { isCollectibleCallerOut, isHandlePassedInPlace, isHandlePassing } from "./param-marshal.js";
+import { isClosureType, isCollectibleCallerOut, isHandlePassedInPlace, isHandlePassing } from "./param-marshal.js";
 const methodExportName = (fn) => camelCase(fn.name);
 const arrayLengthArgument = (source, sourceIndex) => {
     const identifier = parameterIdentifier(source, sourceIndex);
     return source.nullable || source.optional ? `(${identifier}?.length ?? 0)` : `${identifier}.length`;
 };
-const renderMethodSignature = (context, fn) => renderInputParameters(context, fn, () => false, () => false);
-const parameterAnnotation = (context, fn, parameter) => itemComparatorTsType(context, fn, parameter) ?? renderTsType(context, parameter.type, parameter.nullable);
+const renderMethodSignature = (context, fn) => renderInputParameters(context, fn, {
+    shouldSkip: () => false,
+    isOptionalExtra: () => false,
+});
+const closureAnnotation = (context, base) => {
+    context.addRuntimeTypeImport("ClosureCallback");
+    return `${base} | ClosureCallback`;
+};
+const requiresClosureMarshal = (context, fn, ref) => isClosureType(context, ref) && areClosuresInvoked(fn);
+const requiresClosureAnnotation = (context, fn, parameter) => parameter.type !== undefined && requiresClosureMarshal(context, fn, parameter.type);
+const parameterAnnotation = (context, fn, parameter) => {
+    const comparator = itemComparatorTsType(context, fn, parameter);
+    if (comparator !== undefined) {
+        return comparator;
+    }
+    const base = renderTsType(context, parameter.type, parameter.nullable);
+    return requiresClosureAnnotation(context, fn, parameter) ? closureAnnotation(context, base) : base;
+};
 const isParameterOptional = (parameter, isOptionalExtra) => parameter.optional || isOptionalExtra(parameter);
 const formatParameterPart = (name, annotation, isOptional) => isOptional ? `${name}?: ${annotation}` : `${name}: ${annotation}`;
-const renderInputParameters = (context, fn, shouldSkip, isOptionalExtra) => {
+const renderInputParameters = (context, fn, options) => {
     const parts = [];
-    let isSawOptional = false;
+    let hasSeenOptional = false;
     for (const { parameter, index } of inputParameters(context.library, fn)) {
-        if (shouldSkip(parameter)) {
+        if (options.shouldSkip(parameter)) {
             continue;
         }
         const name = parameterIdentifier(parameter, index);
-        if (isParameterOptional(parameter, isOptionalExtra)) {
-            isSawOptional = true;
+        if (isParameterOptional(parameter, options.isOptionalExtra)) {
+            hasSeenOptional = true;
         }
-        parts.push(formatParameterPart(name, parameterAnnotation(context, fn, parameter), isSawOptional));
+        const annotation = parameterAnnotation(context, fn, parameter);
+        parts.push(formatParameterPart(name, annotation, hasSeenOptional));
     }
     return parts.join(", ");
 };
 const isReturnedOutParameter = (context, parameter) => isOutParameter(parameter) ||
     (isCallerAllocatedOut(parameter) && isCollectibleCallerOut(context, parameter)) ||
     isInoutParameter(parameter);
-const renderMethodReturnType = (context, fn) => {
+const returnedOutParameters = (context, fn) => {
     const folded = foldedLengthIndices(context.library, fn);
-    const outs = fn.parameters.filter((p, index) => isReturnedOutParameter(context, p) && !folded.has(index));
+    const result = [];
+    for (const [index, parameter] of fn.parameters.entries()) {
+        if (isReturnedOutParameter(context, parameter) && !folded.has(index)) {
+            result.push({ parameter, index });
+        }
+    }
+    return result;
+};
+const renderMethodReturnType = (context, fn) => {
+    const outs = returnedOutParameters(context, fn);
     const primary = shouldOmitPrimaryReturn(context.library, fn.returnValue)
         ? undefined
         : renderTsType(context, fn.returnValue.type, fn.returnValue.nullable);
     if (outs.length === 0) {
         return primary ?? "void";
     }
-    const outTypes = outs.map((parameter) => renderTsType(context, parameter.type, parameter.nullable));
+    const outTypes = outs.map(({ parameter }) => renderTsType(context, parameter.type, parameter.nullable));
     return foldOutParamShape(primary, outTypes);
 };
 const classifyPromisifiedParameter = (promisify, parameter, index, state) => {
     if (parameter.isVarargs) {
-        return { sawOptional: state.sawOptional, expression: undefined };
+        return { hasSeenOptional: state.hasSeenOptional, expression: undefined };
     }
     if (index === state.cancellableIndex) {
-        return { sawOptional: true, expression: undefined };
+        return { hasSeenOptional: true, expression: undefined };
     }
     if (shouldSkipPromisifiedParameter(promisify, parameter, index)) {
-        return { sawOptional: state.sawOptional, expression: undefined };
+        return { hasSeenOptional: state.hasSeenOptional, expression: undefined };
     }
-    const isSawOptional = state.sawOptional || parameter.optional;
-    return { sawOptional: isSawOptional, expression: promisifiedArgument(promisify, parameter, index, isSawOptional) };
+    const hasSeenOptional = state.hasSeenOptional || parameter.optional;
+    return { hasSeenOptional, expression: promisifiedArgument(promisify, parameter, index, hasSeenOptional) };
 };
 const collectPromisifiedArguments = (promisify, cancellableIndex) => {
     const expressions = [];
-    let isSawOptional = false;
+    let hasSeenOptional = false;
     for (const [index, parameter] of promisify.asyncFn.parameters.entries()) {
         const step = classifyPromisifiedParameter(promisify, parameter, index, {
             cancellableIndex,
-            sawOptional: isSawOptional,
+            hasSeenOptional,
         });
-        isSawOptional = step.sawOptional;
+        hasSeenOptional = step.hasSeenOptional;
         if (step.expression !== undefined) {
             expressions.push(step.expression);
         }
@@ -112,11 +139,14 @@ const promisifiedArgument = (promisify, parameter, index, hasSeenOptional) => {
     if (sourceIndex !== undefined && source !== undefined) {
         return arrayLengthArgument(source, sourceIndex);
     }
-    return parameterCallExpression(context, parameter, index, hasSeenOptional);
+    return parameterCallExpression(context, parameter, index, { fn: asyncFn, isForcedNullable: hasSeenOptional });
 };
 const findCancellableIndex = (context, parameters) => parameters.findIndex((parameter) => isCancellable(context, parameter));
 const renderPromisifiedSignature = (context, asyncFn, finishFn) => {
-    const signature = renderInputParameters(context, asyncFn, (parameter) => isCallbackParameter(context, parameter), (parameter) => isCancellable(context, parameter));
+    const signature = renderInputParameters(context, asyncFn, {
+        shouldSkip: (parameter) => isCallbackParameter(context, parameter),
+        isOptionalExtra: (parameter) => isCancellable(context, parameter),
+    });
     const finishReturn = renderMethodReturnType(context, finishFn);
     return { signature, returnType: `Promise<${finishReturn}>` };
 };
@@ -142,11 +172,11 @@ const paramDescriptorLiteral = (descriptor, options) => {
     if (options.direction !== undefined) {
         parts.push(`direction: ${sourceStringLiteral(options.direction)}`);
     }
-    if (options.callerAllocated === true) {
-        parts.push("callerAllocated: true");
+    if (options.isCallerAllocated === true) {
+        parts.push("isCallerAllocated: true");
     }
-    if (options.consumed === true) {
-        parts.push("consumed: true");
+    if (options.isConsumed === true) {
+        parts.push("isConsumed: true");
     }
     return `{ ${parts.join(", ")} }`;
 };
@@ -213,9 +243,10 @@ const planInoutArgument = (context, parameter, index, planContext) => {
         ? { source: lengthSourceParam, index: lengthSourceIndex }
         : undefined;
     return planInoutParam(context, parameter, {
+        fn,
         index,
         argIndex: planContext.argIndex,
-        consumed: folded.has(index),
+        isConsumed: folded.has(index),
         lengthSource,
     });
 };
@@ -228,9 +259,12 @@ const planLengthArgument = (context, parameter, sourceIndex, planContext) => {
     };
 };
 const planOutParam = (context, parameter, argIndex, isConsumed) => {
-    const descriptor = renderDescriptor(context, parameter.type, parameter.transferOwnership, argIndex);
+    const descriptor = renderDescriptor(context, parameter.type, parameter.transferOwnership, {
+        ...argIndex,
+        hasOutIndirection: true,
+    });
     return {
-        paramLiteral: paramDescriptorLiteral(descriptor, { direction: "out", consumed: isConsumed }),
+        paramLiteral: paramDescriptorLiteral(descriptor, { direction: "out", isConsumed }),
         inputExpr: undefined,
     };
 };
@@ -253,26 +287,33 @@ const planCallerOut = (context, parameter, argIndex) => {
         context.addRuntimeImport("getHandle");
         const classExpression = context.qualify(name.namespaceName, name.typeName);
         return {
-            paramLiteral: paramDescriptorLiteral(descriptor, { direction: "out", callerAllocated: true }),
+            paramLiteral: paramDescriptorLiteral(descriptor, { direction: "out", isCallerAllocated: true }),
             inputExpr: `new ${classExpression}()`,
         };
     }
     return { paramLiteral: paramDescriptorLiteral(descriptor, {}), inputExpr: "undefined" };
 };
 const planInoutParam = (context, parameter, options) => {
-    const { index, argIndex, consumed, lengthSource } = options;
+    const { fn, index, argIndex, isConsumed, lengthSource } = options;
     if (isHandlePassedInPlace(context, parameter)) {
         const descriptor = renderDescriptor(context, parameter.type, "none", argIndex);
         return {
-            paramLiteral: paramDescriptorLiteral(descriptor, { direction: "inout", callerAllocated: true, consumed }),
+            paramLiteral: paramDescriptorLiteral(descriptor, {
+                direction: "inout",
+                isCallerAllocated: true,
+                isConsumed,
+            }),
             inputExpr: parameterIdentifier(parameter, index),
         };
     }
-    const descriptor = renderDescriptor(context, parameter.type, parameter.transferOwnership, argIndex);
+    const descriptor = renderDescriptor(context, parameter.type, parameter.transferOwnership, {
+        ...argIndex,
+        hasOutIndirection: true,
+    });
     return {
-        paramLiteral: paramDescriptorLiteral(descriptor, { direction: "inout", consumed }),
+        paramLiteral: paramDescriptorLiteral(descriptor, { direction: "inout", isConsumed }),
         inputExpr: lengthSource === undefined
-            ? parameterCallExpression(context, parameter, index)
+            ? parameterCallExpression(context, parameter, index, { fn })
             : arrayLengthArgument(lengthSource.source, lengthSource.index),
     };
 };
@@ -283,21 +324,23 @@ const planInParam = (context, parameter, index, planContext) => {
         renderDescriptor(context, parameter.type, parameter.transferOwnership, planContext.argIndex);
     return {
         paramLiteral: paramDescriptorLiteral(descriptor, {}),
-        inputExpr: parameterCallExpression(context, parameter, index),
+        inputExpr: parameterCallExpression(context, parameter, index, { fn }),
     };
 };
+const nullableHandleExpression = (name) => `${name} == null ? null : getHandle(${name})`;
 const handleArgument = (context, name, isNullable) => {
-    if (isNullable) {
-        context.addRuntimeImport("tryGetHandle");
-        return `tryGetHandle(${name})`;
-    }
     context.addRuntimeImport("getHandle");
-    return `getHandle(${name})`;
+    return isNullable ? nullableHandleExpression(name) : `getHandle(${name})`;
+};
+const closureArgument = (context, name, isNullable) => {
+    const helper = isNullable ? "tryToClosure" : "toClosure";
+    context.addRuntimeImport(helper);
+    return `${helper}(${name})`;
 };
 const hashtableArgument = (context, valueRef, name) => {
     if (isHandlePassing(context, valueRef)) {
-        context.addRuntimeImport("tryGetHandle");
-        return `${name} ? globalThis.Array.from(${name}).map(([k, v]) => [k, tryGetHandle(v)]) : null`;
+        context.addRuntimeImport("getHandle");
+        return `${name} ? globalThis.Array.from(${name}).map(([k, v]) => [k, ${nullableHandleExpression("v")}]) : null`;
     }
     return `${name} ? globalThis.Array.from(${name}) : null`;
 };
@@ -312,26 +355,28 @@ const collectionArgument = (context, type, name, isNullable) => {
     context.addRuntimeImport("getHandle");
     return mapHandleExpression(name, isNullable);
 };
-// An array whose length nothing states is marshalled as the bare pointer it is, so there is nothing
-// to map over.
 const isMappableSequence = (context, type) => {
     if (type?.kind === "carray") {
         return !hasUnknownArrayLength(type) && isHandlePassing(context, type.element);
     }
     return type?.kind === "list" && isHandlePassing(context, type.element);
 };
-const parameterCallExpression = (context, parameter, index, isForcedNullable = false) => {
+const parameterCallExpression = (context, parameter, index, options) => {
+    const { fn, isForcedNullable = false } = options;
     const name = parameterIdentifier(parameter, index);
     const ref = parameter.type;
     if (ref === undefined) {
         return name;
     }
     const isNullable = parameter.nullable || parameter.optional || isForcedNullable;
+    if (requiresClosureMarshal(context, fn, ref)) {
+        return closureArgument(context, name, isNullable);
+    }
     if (isHandlePassing(context, ref)) {
         return handleArgument(context, name, isNullable);
     }
     const type = context.library.typeFor(ref);
     return collectionArgument(context, type, name, isNullable) ?? name;
 };
-export { methodExportName, renderMethodSignature, renderMethodReturnType, renderPromisifiedBody, finishCallExpression, renderPromisifiedSignature, renderMethodBody, renderReturnDescriptor, planCallArgs, };
+export { constructibleName, isCallbackParameter, methodExportName, renderMethodSignature, renderMethodReturnType, returnedOutParameters, renderPromisifiedBody, finishCallExpression, renderPromisifiedSignature, renderMethodBody, renderReturnDescriptor, planCallArgs, };
 //# sourceMappingURL=method.js.map