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

package/dist/store/gi/interface.js

@@ -1,27 +1,29 @@
-import { toPascalCase } from "@gtkx/utils";
+import { pascalCase } from "@gtkx/utils";
 import { reservedSignalMemberRename, resolvePrerequisiteReference } from "../../analysis/inheritance.js";
 import { renderJsDoc } from "../../writer/doc.js";
 import { renderBlock, renderBracedOrEmpty } from "../../writer/emit.js";
-import { dedupeCallables, generateBindings, indexMethodsByName, renderClassInstanceMember, renderInstanceMethodSignature, renderStaticHead, } from "./callables.js";
-import { gtypeExprFor } from "./gtype-binding.js";
+import { dedupeCallables, generateBindings, instanceScope, renderClassInstanceMember, renderInstanceMethodSignature, renderStaticHead, } from "./callables.js";
+import { renderSourceGtype } from "./gtype-binding.js";
 import { methodExportName } from "./method.js";
 import { renderPropertyAccessor, renderPropertyAccessorSignature, } from "./property-accessor.js";
 import { appendInterfaceRegistration } from "./registration.js";
 import { renderSignalDeclarations, renderSignalMembers } from "./signal.js";
 import { renderVfuncMetadata } from "./vtable.js";
-export const generateInterface = (context, iface) => {
-    if (!iface.introspectable)
+const generateInterface = (context, iface) => {
+    if (!iface.introspectable) {
         return;
-    if (iface.name.length === 0)
+    }
+    if (iface.name.length === 0) {
         return;
-    const className = toPascalCase(iface.name);
+    }
+    const className = pascalCase(iface.name);
     const callables = {
         constructors: dedupeCallables(iface.constructors),
         functions: dedupeCallables(iface.functions),
         methods: dedupeCallables(iface.methods),
     };
     generateBindings(context, callables);
-    const gtypeExpr = gtypeExprFor(context, iface);
+    const gtypeExpr = renderSourceGtype(context, iface);
     context.module.appendDeclaration(renderInterfaceType(context, iface, className, callables));
     context.module.appendDeclaration(renderInterfaceClass(context, className, callables, gtypeExpr));
     for (const declaration of renderSignalDeclarations(context, iface, className, true)) {
@@ -40,42 +42,57 @@ const interfaceTypeExtends = (context, iface) => {
     const refs = iface.prerequisites
         .map((name) => resolvePrerequisiteReference(context, name))
         .filter((entry) => entry !== undefined);
-    if (refs.length > 0)
+    if (refs.length > 0) {
         return refs.join(", ");
+    }
     return context.qualify("GObject", "Object");
 };
 const renderInterfaceType = (context, iface, className, callables) => {
     const members = renderInterfaceTypeMembers(context, iface, callables);
     return `${renderJsDoc(iface.doc)}${renderBracedOrEmpty(`export interface ${className} extends ${interfaceTypeExtends(context, iface)}`, members.join("\n"))}`;
 };
-const renderInterfaceMembers = (context, iface, callables, renderers) => {
-    const className = toPascalCase(iface.name);
+const collectMethodMembers = (options) => {
+    const { context, className, scope, callables, renderers, claimedNames } = options;
     const members = [];
-    const claimedNames = new Set();
-    const methodByName = indexMethodsByName(callables.methods);
     for (const callable of callables.methods) {
         const rename = reservedSignalMemberRename(className, callable);
-        const block = renderers.renderMethod(context, callable, methodByName, rename);
-        if (block === undefined)
+        const block = renderers.renderMethod(context, callable, scope, rename);
+        if (block === undefined) {
             continue;
+        }
         members.push(block);
         claimedNames.add(rename ?? methodExportName(callable));
     }
+    return members;
+};
+const collectPropertyMembers = (options) => {
+    const { context, iface, scope, renderers, claimedNames } = options;
+    const members = [];
     for (const property of iface.properties) {
-        const block = renderers.renderProperty({ context, property, claimedNames, methodByName });
-        if (block !== undefined)
+        const block = renderers.renderProperty({ context, property, claimedNames, methodByName: scope.methodByName });
+        if (block !== undefined) {
             members.push(block);
+        }
     }
     return members;
 };
+const renderInterfaceMembers = (context, iface, callables, renderers) => {
+    const className = pascalCase(iface.name);
+    const scope = instanceScope(className, callables);
+    const claimedNames = new Set();
+    const methodMembers = collectMethodMembers({ context, className, scope, callables, renderers, claimedNames });
+    const propertyMembers = collectPropertyMembers({ context, iface, scope, renderers, claimedNames });
+    return [...methodMembers, ...propertyMembers];
+};
 const renderInterfaceTypeMembers = (context, iface, callables) => renderInterfaceMembers(context, iface, callables, {
     renderMethod: renderInstanceMethodSignature,
     renderProperty: renderPropertyAccessorSignature,
 });
 const renderInterfaceClass = (context, className, callables, gtypeExpr) => {
     const members = [];
-    if (gtypeExpr !== undefined)
+    if (gtypeExpr !== undefined) {
         members.push(renderInterfaceHasInstance(context, className, gtypeExpr));
+    }
     members.push(...renderStaticHead(context, callables, className));
     return renderBracedOrEmpty(`export abstract class ${className}`, members.join("\n\n"));
 };
@@ -96,4 +113,5 @@ const renderInterfaceInstanceMembers = (context, iface, callables) => [
     }),
     ...renderSignalMembers(context, iface),
 ];
+export { generateInterface };
 //# sourceMappingURL=interface.js.map

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 { toPascalCase } from \"@gtkx/utils\";\nimport { reservedSignalMemberRename, resolvePrerequisiteReference } from \"../../analysis/inheritance.js\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { renderBlock, renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport {\n    type Callables,\n    dedupeCallables,\n    generateBindings,\n    indexMethodsByName,\n    renderClassInstanceMember,\n    renderInstanceMethodSignature,\n    renderStaticHead,\n} from \"./callables.js\";\nimport { gtypeExprFor } 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\nexport const generateInterface = (context: ModuleContext, iface: GirClass): void => {\n    if (!iface.introspectable) return;\n    if (iface.name.length === 0) return;\n    const className = toPascalCase(iface.name);\n    const callables: Callables = {\n        constructors: dedupeCallables(iface.constructors),\n        functions: dedupeCallables(iface.functions),\n        methods: dedupeCallables(iface.methods),\n    };\n    generateBindings(context, callables);\n\n    const gtypeExpr = gtypeExprFor(context, iface);\n\n    context.module.appendDeclaration(renderInterfaceType(context, iface, className, callables));\n    context.module.appendDeclaration(renderInterfaceClass(context, className, callables, gtypeExpr));\n    for (const declaration of renderSignalDeclarations(context, iface, className, true)) {\n        context.module.appendDeclaration(declaration);\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    if (refs.length > 0) return refs.join(\", \");\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    return `${renderJsDoc(iface.doc)}${renderBracedOrEmpty(\n        `export interface ${className} extends ${interfaceTypeExtends(context, iface)}`,\n        members.join(\"\\n\"),\n    )}`;\n};\n\ntype InterfaceMemberRenderers = {\n    renderMethod: (\n        context: ModuleContext,\n        callable: GirFunction,\n        methodByName: Map<string, GirFunction>,\n        nameOverride?: string,\n    ) => string | undefined;\n    renderProperty: (args: PropertyAccessorArgs) => string | undefined;\n};\n\nconst renderInterfaceMembers = (\n    context: ModuleContext,\n    iface: GirClass,\n    callables: Callables,\n    renderers: InterfaceMemberRenderers,\n): string[] => {\n    const className = toPascalCase(iface.name);\n    const members: string[] = [];\n    const claimedNames = new Set<string>();\n    const methodByName = indexMethodsByName(callables.methods);\n    for (const callable of callables.methods) {\n        const rename = reservedSignalMemberRename(className, callable);\n        const block = renderers.renderMethod(context, callable, methodByName, rename);\n        if (block === undefined) continue;\n        members.push(block);\n        claimedNames.add(rename ?? methodExportName(callable));\n    }\n    for (const property of iface.properties) {\n        const block = renderers.renderProperty({ context, property, claimedNames, methodByName });\n        if (block !== undefined) members.push(block);\n    }\n    return members;\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    if (gtypeExpr !== undefined) members.push(renderInterfaceHasInstance(context, className, gtypeExpr));\n    members.push(...renderStaticHead(context, callables, className));\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    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    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"]}
+{"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"]}

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

@@ -1,6 +1,7 @@
 import type { GirFunction } from "../../gir/function.js";
 import type { GirParameter } from "../../gir/parameter.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const itemComparatorArgDescriptors: (context: ModuleContext, fn: GirFunction, parameter: GirParameter) => Map<number, string> | undefined;
-export declare const itemComparatorTsType: (context: ModuleContext, fn: GirFunction, parameter: GirParameter) => string | undefined;
+declare const itemComparatorArgDescriptors: (context: ModuleContext, fn: GirFunction, parameter: GirParameter) => Map<number, string> | undefined;
+declare const itemComparatorTsType: (context: ModuleContext, fn: GirFunction, parameter: GirParameter) => string | undefined;
+export { itemComparatorArgDescriptors, itemComparatorTsType };
 //# sourceMappingURL=item-comparators.d.ts.map

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":"AAKA,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;AAoD7D,eAAO,MAAM,4BAA4B,YAC5B,aAAa,MAClB,WAAW,aACJ,YAAY,KACxB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAQxB,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACpB,aAAa,MAClB,WAAW,aACJ,YAAY,KACxB,MAAM,GAAG,SAWX,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;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"}

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":"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","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":"AAIA,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;AAE7E,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,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,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,sBAAsB,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE;IAC5E,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9C,IAAI,QAAQ,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,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;QAExF,OAAO,KAAK,EAAE,aAAa,KAAK,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;IAC9E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,EAAe,EAAW,EAAE;IAChF,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;IAE1D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE/C,IAAI,KAAK,KAAK,SAAS,IAAI,6BAA6B,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,OAAsB,EAAE,GAAuB,EAAW,EAAE;IAC/E,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9C,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,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEzD,IAAI,QAAQ,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAEpD,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,sBAAsB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,CACjC,OAAsB,EACtB,EAAe,EACf,SAAuB,EACQ,EAAE;IACjC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAEhE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,SAAS,GAAwB,IAAI,GAAG,EAAE,CAAC;IACjD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7E,KAAK,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC;QAC7C,IAAI,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CACzB,OAAsB,EACtB,EAAe,EACf,SAAuB,EACL,EAAE;IACpB,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAEhE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;IAElE,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;QAE9G,OAAO,GAAG,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,MAAM,EAAE,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,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;IAEvD,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;AAC9D,CAAC,CAAC;AAEF,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,CAAC","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,MAOzE,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"}