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

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

@@ -11,59 +11,70 @@ const COMPARATOR_CALLBACK_TYPES = new Set([
 ]);
 const OBJECT_ITEM_COMPARATOR_OWNERS = new Set(["Gtk.CustomSorter"]);
 const qualifiedName = (context, ref) => {
-    const name = context.library.nameOf(ref);
+    const name = context.library.nameFor(ref);
     return name === undefined ? undefined : `${name.namespaceName}.${name.typeName}`;
 };
-const implementsListModel = (context, ref) => {
-    const resolved = context.library.typeOf(ref);
-    if (resolved?.kind !== "class")
+const isListModelImplementor = (context, ref) => {
+    const resolved = context.library.typeFor(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 comparesObjectItems = (context, fn) => {
+const isObjectItemComparator = (context, fn) => {
     const ownerRef = fn.instance?.type ?? fn.returnValue.type;
-    if (ownerRef === undefined)
+    if (ownerRef === undefined) {
         return false;
+    }
     const owner = qualifiedName(context, ownerRef);
-    if (owner !== undefined && OBJECT_ITEM_COMPARATOR_OWNERS.has(owner))
+    if (owner !== undefined && OBJECT_ITEM_COMPARATOR_OWNERS.has(owner)) {
         return true;
-    return implementsListModel(context, ownerRef);
+    }
+    return isListModelImplementor(context, ownerRef);
 };
 const isItemPointer = (context, ref) => {
-    if (ref === undefined)
+    if (ref === undefined) {
         return false;
-    const resolved = context.library.typeOf(ref);
+    }
+    const resolved = context.library.typeFor(ref);
     return resolved?.kind === "primitive" && resolved.category === "pointer";
 };
 const itemComparatorCallback = (context, fn, parameter) => {
-    if (parameter.type === undefined)
+    if (parameter.type === undefined) {
         return undefined;
-    const resolved = context.library.typeOf(parameter.type);
-    if (resolved?.kind !== "callback")
+    }
+    const resolved = context.library.typeFor(parameter.type);
+    if (resolved?.kind !== "callback") {
         return undefined;
+    }
     const name = qualifiedName(context, parameter.type);
-    if (name === undefined || !COMPARATOR_CALLBACK_TYPES.has(name))
+    if (name === undefined || !COMPARATOR_CALLBACK_TYPES.has(name)) {
         return undefined;
-    return comparesObjectItems(context, fn) ? resolved.value : undefined;
+    }
+    return isObjectItemComparator(context, fn) ? resolved.value : undefined;
 };
-export const itemComparatorArgDescriptors = (context, fn, parameter) => {
+const itemComparatorArgDescriptors = (context, fn, parameter) => {
     const callback = itemComparatorCallback(context, fn, parameter);
-    if (callback === undefined)
+    if (callback === undefined) {
         return undefined;
+    }
     const overrides = new Map();
-    for (const { parameter: item, index } of inputParameters(context.library, callbackAsFunction(callback))) {
-        if (isItemPointer(context, item.type))
+    const items = inputParameters(context.library, callbackAsFunction(callback));
+    for (const { parameter: item, index } of items) {
+        if (isItemPointer(context, item.type)) {
             overrides.set(index, tObject("borrowed"));
+        }
     }
     return overrides.size > 0 ? overrides : undefined;
 };
-export const itemComparatorTsType = (context, fn, parameter) => {
+const itemComparatorTsType = (context, fn, parameter) => {
     const callback = itemComparatorCallback(context, fn, parameter);
-    if (callback === undefined)
+    if (callback === undefined) {
         return undefined;
+    }
     const itemType = `${context.qualify("GObject", "Object")} | null`;
     const args = inputParameters(context.library, callbackAsFunction(callback)).map(({ parameter: item, index }) => {
         const tsType = isItemPointer(context, item.type) ? itemType : renderTsType(context, item.type, item.nullable);
@@ -73,4 +84,5 @@ export const itemComparatorTsType = (context, fn, parameter) => {
     const fnType = `(${args.join(", ")}) => ${returnType}`;
     return parameter.nullable ? `(${fnType}) | null` : fnType;
 };
+export { itemComparatorArgDescriptors, itemComparatorTsType };
 //# sourceMappingURL=item-comparators.js.map

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":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAoB,MAAM,uBAAuB,CAAC;AAM7E,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC;IACtC,kBAAkB;IAClB,sBAAsB;IACtB,gBAAgB;IAChB,oBAAoB;CACvB,CAAC,CAAC;AAEH,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAEpE,MAAM,aAAa,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAsB,EAAE;IAC9E,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzC,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE;IACzE,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,QAAQ,EAAE,IAAI,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IAC7C,OAAO,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE;QACpD,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACxF,OAAO,KAAK,EAAE,aAAa,KAAK,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;IAC9E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAsB,EAAE,EAAe,EAAW,EAAE;IAC7E,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;IAC1D,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACzC,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/C,IAAI,KAAK,KAAK,SAAS,IAAI,6BAA6B,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACjF,OAAO,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,OAAsB,EAAE,GAAuB,EAAW,EAAE;IAC/E,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7C,OAAO,QAAQ,EAAE,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS,CAAC;AAC7E,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC3B,OAAsB,EACtB,EAAe,EACf,SAAuB,EACA,EAAE;IACzB,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,QAAQ,EAAE,IAAI,KAAK,UAAU;QAAE,OAAO,SAAS,CAAC;IACpD,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IACpD,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACjF,OAAO,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CACxC,OAAsB,EACtB,EAAe,EACf,SAAuB,EACQ,EAAE;IACjC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAChE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,KAAK,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QACtG,IAAI,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC;YAAE,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAChC,OAAsB,EACtB,EAAe,EACf,SAAuB,EACL,EAAE;IACpB,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAChE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7C,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;IAClE,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3G,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9G,OAAO,GAAG,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,MAAM,EAAE,CAAC;IAC5D,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnG,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,UAAU,EAAE,CAAC;IACvD,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;AAC9D,CAAC,CAAC","sourcesContent":["import { 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\";\nimport 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\";\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.nameOf(ref);\n    return name === undefined ? undefined : `${name.namespaceName}.${name.typeName}`;\n};\n\nconst implementsListModel = (context: ModuleContext, ref: TypeId): boolean => {\n    const resolved = context.library.typeOf(ref);\n    if (resolved?.kind !== \"class\") return false;\n    return resolved.value.implements.some((interfaceName) => {\n        const iface = resolveInterface(context.library, resolved.namespace.name, interfaceName);\n        return iface?.namespaceName === \"Gio\" && iface.klass.name === \"ListModel\";\n    });\n};\n\nconst comparesObjectItems = (context: ModuleContext, fn: GirFunction): boolean => {\n    const ownerRef = fn.instance?.type ?? fn.returnValue.type;\n    if (ownerRef === undefined) return false;\n    const owner = qualifiedName(context, ownerRef);\n    if (owner !== undefined && OBJECT_ITEM_COMPARATOR_OWNERS.has(owner)) return true;\n    return implementsListModel(context, ownerRef);\n};\n\nconst isItemPointer = (context: ModuleContext, ref: TypeId | undefined): boolean => {\n    if (ref === undefined) return false;\n    const resolved = context.library.typeOf(ref);\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) return undefined;\n    const resolved = context.library.typeOf(parameter.type);\n    if (resolved?.kind !== \"callback\") return undefined;\n    const name = qualifiedName(context, parameter.type);\n    if (name === undefined || !COMPARATOR_CALLBACK_TYPES.has(name)) return undefined;\n    return comparesObjectItems(context, fn) ? resolved.value : undefined;\n};\n\nexport const itemComparatorArgDescriptors = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): Map<number, string> | undefined => {\n    const callback = itemComparatorCallback(context, fn, parameter);\n    if (callback === undefined) return undefined;\n    const overrides = new Map<number, string>();\n    for (const { parameter: item, index } of inputParameters(context.library, callbackAsFunction(callback))) {\n        if (isItemPointer(context, item.type)) overrides.set(index, tObject(\"borrowed\"));\n    }\n    return overrides.size > 0 ? overrides : undefined;\n};\n\nexport const itemComparatorTsType = (\n    context: ModuleContext,\n    fn: GirFunction,\n    parameter: GirParameter,\n): string | undefined => {\n    const callback = itemComparatorCallback(context, fn, parameter);\n    if (callback === undefined) return undefined;\n    const itemType = `${context.qualify(\"GObject\", \"Object\")} | null`;\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        return `${parameterIdentifier(item, index)}: ${tsType}`;\n    });\n    const returnType = renderTsType(context, callback.returnValue.type, callback.returnValue.nullable);\n    const fnType = `(${args.join(\", \")}) => ${returnType}`;\n    return parameter.nullable ? `(${fnType}) | null` : fnType;\n};\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 { 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"]}

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

@@ -1,24 +1,24 @@
 import type { GirFunction } from "../../gir/function.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const methodExportName: (fn: GirFunction) => string;
-export declare const renderMethodSignature: (context: ModuleContext, fn: GirFunction) => string;
-export declare const renderMethodReturnType: (context: ModuleContext, fn: GirFunction) => string;
-export declare const renderPromisifiedBody: (context: ModuleContext, asyncFn: GirFunction, finishExpression: string, bindingExpression: string) => string;
-export declare const boundFinishExpression: (finishFn: GirFunction) => string;
-export declare const renderPromisifiedSignature: (context: ModuleContext, asyncFn: GirFunction, finishFn: GirFunction) => {
-    signature: string;
-    returnType: string;
-};
 type WriteMethodBodyOptions = {
     bindingExpression: string;
     returnTypeOverride?: string | undefined;
 };
-export declare const renderMethodBody: (context: ModuleContext, fn: GirFunction, options: WriteMethodBodyOptions) => string;
 type CallArgPlan = {
     paramLiteral: string;
     inputExpr: string | undefined;
 };
-export declare const renderReturnDescriptor: (context: ModuleContext, fn: GirFunction) => string;
-export declare const planCallArgs: (context: ModuleContext, fn: GirFunction) => CallArgPlan[];
-export {};
+declare const methodExportName: (fn: GirFunction) => string;
+declare const renderMethodSignature: (context: ModuleContext, fn: GirFunction) => string;
+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;
+declare const renderPromisifiedSignature: (context: ModuleContext, asyncFn: GirFunction, finishFn: GirFunction) => {
+    signature: string;
+    returnType: string;
+};
+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, };
 //# 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":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D,eAAO,MAAM,gBAAgB,OAAQ,WAAW,KAAG,MAA8B,CAAC;AAOlF,eAAO,MAAM,qBAAqB,YAAa,aAAa,MAAM,WAAW,KAAG,MAM3E,CAAC;AAuBN,eAAO,MAAM,sBAAsB,YAAa,aAAa,MAAM,WAAW,KAAG,MAkBhF,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACrB,aAAa,WACb,WAAW,oBACF,MAAM,qBACL,MAAM,KAC1B,MA0BF,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAc,WAAW,KAAG,MAAyD,CAAC;AAoCxH,eAAO,MAAM,0BAA0B,YAC1B,aAAa,WACb,WAAW,YACV,WAAW,KACtB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CASzC,CAAC;AAWF,KAAK,sBAAsB,GAAG;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,aAAa,MAAM,WAAW,WAAW,sBAAsB,KAAG,MAQ3G,CAAC;AAEF,KAAK,WAAW,GAAG;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAC;AAgBF,eAAO,MAAM,sBAAsB,YAAa,aAAa,MAAM,WAAW,KAAG,MAKhF,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,aAAa,MAAM,WAAW,KAAG,WAAW,EAqBjF,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;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"}