@gtkx/codegen 1.0.0-rc.4 → 1.1.0

package/dist/store/gi/function.js

@@ -1,9 +1,9 @@
 import { toCamelIdentifier } from "@gtkx/utils";
 import { tFn } from "../../analysis/descriptor.js";
-import { hasCallerAllocatedArrayLength } from "../../analysis/param-structure.js";
-import { renderJsDoc } from "../../writer/doc.js";
+import { hasUnmarshalableParam } from "../../analysis/param-capability.js";
 import { arrayLiteral, renderBlock } from "../../writer/emit.js";
 import { matchAsyncFinish } from "./async.js";
+import { callableDoc } from "./callable-doc.js";
 import { planCallArgs, renderMethodBody, renderMethodReturnType, renderMethodSignature, renderPromisifiedBody, renderPromisifiedSignature, renderReturnDescriptor, } from "./method.js";
 const renderFnExpression = (context, fn) => {
     if (fn.cIdentifier === undefined) {
@@ -15,8 +15,13 @@ const renderFnExpression = (context, fn) => {
     }
     context.addRuntimeImport("t");
     const params = planCallArgs(context, fn).map((arg) => arg.paramLiteral);
-    const ret = renderReturnDescriptor(context, fn);
-    return tFn(library, fn.cIdentifier, { args: arrayLiteral(params), returns: ret, canThrow: fn.throws });
+    const returnPlan = renderReturnDescriptor(context, fn);
+    return tFn(library, fn.cIdentifier, {
+        args: arrayLiteral(params),
+        returns: returnPlan.descriptor,
+        isReturnSkipped: returnPlan.isSkipped,
+        canThrow: fn.throws,
+    });
 };
 const isMovedOntoEmittedMember = (context, fn) => {
     const [typeName, memberName] = fn.movedTo?.split(".") ?? [];
@@ -34,7 +39,7 @@ const canEmitNamespaceFunction = (context, fn) => fn.introspectable &&
     !isMovedOntoEmittedMember(context, fn) &&
     fn.shadowedBy === undefined &&
     fn.cIdentifier !== undefined &&
-    !hasCallerAllocatedArrayLength(context.library, fn);
+    !hasUnmarshalableParam(context, fn);
 const generateNamespaceFunction = (context, fn) => {
     if (!canEmitNamespaceFunction(context, fn)) {
         return;
@@ -47,20 +52,43 @@ const generateNamespaceFunction = (context, fn) => {
     if (cIdentifier === undefined) {
         return;
     }
-    const bindingName = toCamelIdentifier(cIdentifier);
-    context.module.appendBinding(`const ${bindingName} = ${expression};`, cIdentifier);
     const exportName = namespaceFunctionExportName(cIdentifier, fn.name, context.namespace.cSymbolPrefixes);
-    const declaration = renderNamespaceFunctionDeclaration(context, fn, exportName, bindingName);
-    context.module.appendDeclaration(`${renderJsDoc(fn.doc)}${declaration}`);
+    if (exportName.length === 0) {
+        return;
+    }
+    const bindingName = namespaceBindingName(cIdentifier, exportName);
+    context.module.appendBinding(`const ${bindingName} = ${expression};`, cIdentifier);
+    const finish = matchNamespaceFinish(context, fn);
+    const declaration = renderNamespaceFunctionDeclaration({ context, fn, finish, exportName, bindingName });
+    const doc = callableDoc(context, fn, { finishFn: finish?.fn });
+    context.declare({ name: exportName, code: `${doc}${declaration}` });
+    appendBootstrapRegistration(context, fn, exportName);
 };
-const renderNamespaceFunctionDeclaration = (context, fn, exportName, bindingName) => {
+const namespaceBindingName = (cIdentifier, exportName) => {
+    const bindingName = toCamelIdentifier(cIdentifier);
+    return bindingName === exportName ? `_${bindingName}` : bindingName;
+};
+const matchNamespaceFinish = (context, fn) => {
     const finishFn = matchAsyncFinish(context.library, fn, context.namespace.functions);
-    const finishCIdentifier = finishFn?.cIdentifier;
-    if (finishFn !== undefined && finishCIdentifier !== undefined && canEmitNamespaceFunction(context, finishFn)) {
-        const finishExport = namespaceFunctionExportName(finishCIdentifier, finishFn.name, context.namespace.cSymbolPrefixes);
-        const { signature, returnType } = renderPromisifiedSignature(context, fn, finishFn);
-        const body = renderPromisifiedBody(context, fn, finishExport, bindingName);
-        return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);
+    const cIdentifier = finishFn?.cIdentifier;
+    if (finishFn === undefined || cIdentifier === undefined || !canEmitNamespaceFunction(context, finishFn)) {
+        return undefined;
+    }
+    return {
+        fn: finishFn,
+        exportName: namespaceFunctionExportName(cIdentifier, finishFn.name, context.namespace.cSymbolPrefixes),
+    };
+};
+const renderPromisifiedNamespaceFunction = (options, finish) => {
+    const { context, fn, exportName, bindingName } = options;
+    const { signature, returnType } = renderPromisifiedSignature(context, fn, finish.fn);
+    const body = renderPromisifiedBody(context, fn, finish.exportName, bindingName);
+    return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);
+};
+const renderNamespaceFunctionDeclaration = (options) => {
+    const { context, fn, finish, exportName, bindingName } = options;
+    if (finish !== undefined) {
+        return renderPromisifiedNamespaceFunction(options, finish);
     }
     const signature = renderMethodSignature(context, fn);
     const returnType = renderMethodReturnType(context, fn);
@@ -84,25 +112,18 @@ const stripLongestPrefix = (input, prefixes) => {
     }
     return best.length === 0 ? input : input.slice(best.length);
 };
-const isBootstrapFunction = (fn) => fn.parameters.length === 0 && fn.introspectable && fn.shadowedBy === undefined && fn.cIdentifier !== undefined;
 const appendBootstrapRegistration = (context, fn, exportName) => {
+    if (fn.parameters.length > 0) {
+        return;
+    }
     if (fn.name === "init") {
-        context.module.appendRegistration(`${exportName}();`);
+        context.module.appendRegistration(`${exportName}();`, [exportName]);
         return;
     }
     if (fn.name === "finalize") {
         context.addRuntimeImport("onExit");
-        context.module.appendRegistration(`onExit(${exportName});`);
-    }
-};
-const generateNamespaceBootstrap = (context, namespace) => {
-    for (const fn of namespace.functions) {
-        if (!isBootstrapFunction(fn) || fn.cIdentifier === undefined) {
-            continue;
-        }
-        const exportName = namespaceFunctionExportName(fn.cIdentifier, fn.name, context.namespace.cSymbolPrefixes);
-        appendBootstrapRegistration(context, fn, exportName);
+        context.module.appendRegistration(`onExit(${exportName});`, [exportName]);
     }
 };
-export { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName, generateNamespaceBootstrap };
+export { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName };
 //# sourceMappingURL=function.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/store/gi/function.ts"],"names":[],"mappings":"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","sourcesContent":["import { toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { GirNamespace } from \"../../gir/namespace.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { tFn } from \"../../analysis/descriptor.js\";\nimport { hasCallerAllocatedArrayLength } from \"../../analysis/param-structure.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { arrayLiteral, renderBlock } from \"../../writer/emit.js\";\nimport { matchAsyncFinish } from \"./async.js\";\nimport {\n    planCallArgs,\n    renderMethodBody,\n    renderMethodReturnType,\n    renderMethodSignature,\n    renderPromisifiedBody,\n    renderPromisifiedSignature,\n    renderReturnDescriptor,\n} from \"./method.js\";\n\nconst renderFnExpression = (context: ModuleContext, fn: GirFunction): string | undefined => {\n    if (fn.cIdentifier === undefined) {\n        return undefined;\n    }\n\n    const library = context.namespace.sharedLibrary;\n\n    if (library === undefined) {\n        return undefined;\n    }\n\n    context.addRuntimeImport(\"t\");\n    const params = planCallArgs(context, fn).map((arg) => arg.paramLiteral);\n    const ret = renderReturnDescriptor(context, fn);\n\n    return tFn(library, fn.cIdentifier, { args: arrayLiteral(params), returns: ret, canThrow: fn.throws });\n};\n\nconst isMovedOntoEmittedMember = (context: ModuleContext, fn: GirFunction): boolean => {\n    const [typeName, memberName] = fn.movedTo?.split(\".\") ?? [];\n\n    if (typeName === undefined || memberName === undefined) {\n        return false;\n    }\n\n    const resolved = context.library.resolveType(context.namespace.name, typeName);\n\n    if (resolved?.kind !== \"class\" && resolved?.kind !== \"interface\" && resolved?.kind !== \"record\") {\n        return false;\n    }\n\n    const members = [...resolved.value.methods, ...resolved.value.functions, ...resolved.value.constructors];\n\n    return members.some((member) => member.name === memberName);\n};\n\nconst canEmitNamespaceFunction = (context: ModuleContext, fn: GirFunction): boolean =>\n    fn.introspectable &&\n    !isMovedOntoEmittedMember(context, fn) &&\n    fn.shadowedBy === undefined &&\n    fn.cIdentifier !== undefined &&\n    !hasCallerAllocatedArrayLength(context.library, fn);\n\nconst generateNamespaceFunction = (context: ModuleContext, fn: GirFunction): void => {\n    if (!canEmitNamespaceFunction(context, fn)) {\n        return;\n    }\n\n    const expression = renderFnExpression(context, fn);\n\n    if (expression === undefined) {\n        return;\n    }\n\n    const cIdentifier = fn.cIdentifier;\n\n    if (cIdentifier === undefined) {\n        return;\n    }\n\n    const bindingName = toCamelIdentifier(cIdentifier);\n    context.module.appendBinding(`const ${bindingName} = ${expression};`, cIdentifier);\n    const exportName = namespaceFunctionExportName(cIdentifier, fn.name, context.namespace.cSymbolPrefixes);\n    const declaration = renderNamespaceFunctionDeclaration(context, fn, exportName, bindingName);\n    context.module.appendDeclaration(`${renderJsDoc(fn.doc)}${declaration}`);\n};\n\nconst renderNamespaceFunctionDeclaration = (\n    context: ModuleContext,\n    fn: GirFunction,\n    exportName: string,\n    bindingName: string,\n): string => {\n    const finishFn = matchAsyncFinish(context.library, fn, context.namespace.functions);\n    const finishCIdentifier = finishFn?.cIdentifier;\n\n    if (finishFn !== undefined && finishCIdentifier !== undefined && canEmitNamespaceFunction(context, finishFn)) {\n        const finishExport = namespaceFunctionExportName(\n            finishCIdentifier,\n            finishFn.name,\n            context.namespace.cSymbolPrefixes,\n        );\n\n        const { signature, returnType } = renderPromisifiedSignature(context, fn, finishFn);\n        const body = renderPromisifiedBody(context, fn, finishExport, bindingName);\n\n        return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);\n    }\n\n    const signature = renderMethodSignature(context, fn);\n    const returnType = renderMethodReturnType(context, fn);\n    const body = renderMethodBody(context, fn, { bindingExpression: bindingName });\n\n    return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);\n};\n\nconst namespaceFunctionExportName = (cIdentifier: string, girName: string, symbolPrefixes: string[]): string => {\n    if (girName.length > 0) {\n        return toCamelIdentifier(girName);\n    }\n\n    const stripped = stripLongestPrefix(cIdentifier, symbolPrefixes);\n\n    return toCamelIdentifier(stripped);\n};\n\nconst stripLongestPrefix = (input: string, prefixes: string[]): string => {\n    let best = \"\";\n\n    for (const prefix of prefixes) {\n        const candidate = `${prefix}_`;\n\n        if (input.startsWith(candidate) && candidate.length > best.length) {\n            best = candidate;\n        }\n    }\n\n    return best.length === 0 ? input : input.slice(best.length);\n};\n\nconst isBootstrapFunction = (fn: GirFunction): boolean =>\n    fn.parameters.length === 0 && fn.introspectable && fn.shadowedBy === undefined && fn.cIdentifier !== undefined;\n\nconst appendBootstrapRegistration = (context: ModuleContext, fn: GirFunction, exportName: string): void => {\n    if (fn.name === \"init\") {\n        context.module.appendRegistration(`${exportName}();`);\n\n        return;\n    }\n\n    if (fn.name === \"finalize\") {\n        context.addRuntimeImport(\"onExit\");\n        context.module.appendRegistration(`onExit(${exportName});`);\n    }\n};\n\nconst generateNamespaceBootstrap = (context: ModuleContext, namespace: GirNamespace): void => {\n    for (const fn of namespace.functions) {\n        if (!isBootstrapFunction(fn) || fn.cIdentifier === undefined) {\n            continue;\n        }\n\n        const exportName = namespaceFunctionExportName(fn.cIdentifier, fn.name, context.namespace.cSymbolPrefixes);\n        appendBootstrapRegistration(context, fn, exportName);\n    }\n};\n\nexport { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName, generateNamespaceBootstrap };\n"]}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/store/gi/function.ts"],"names":[],"mappings":"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","sourcesContent":["import { toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { tFn } from \"../../analysis/descriptor.js\";\nimport { hasUnmarshalableParam } from \"../../analysis/param-capability.js\";\nimport { arrayLiteral, renderBlock } from \"../../writer/emit.js\";\nimport { matchAsyncFinish } from \"./async.js\";\nimport { callableDoc } from \"./callable-doc.js\";\nimport {\n    planCallArgs,\n    renderMethodBody,\n    renderMethodReturnType,\n    renderMethodSignature,\n    renderPromisifiedBody,\n    renderPromisifiedSignature,\n    renderReturnDescriptor,\n} from \"./method.js\";\n\ntype NamespaceFinish = {\n    fn: GirFunction;\n    exportName: string;\n};\n\ntype NamespaceFunctionOptions = {\n    context: ModuleContext;\n    fn: GirFunction;\n    finish: NamespaceFinish | undefined;\n    exportName: string;\n    bindingName: string;\n};\n\nconst renderFnExpression = (context: ModuleContext, fn: GirFunction): string | undefined => {\n    if (fn.cIdentifier === undefined) {\n        return undefined;\n    }\n\n    const library = context.namespace.sharedLibrary;\n\n    if (library === undefined) {\n        return undefined;\n    }\n\n    context.addRuntimeImport(\"t\");\n    const params = planCallArgs(context, fn).map((arg) => arg.paramLiteral);\n    const returnPlan = renderReturnDescriptor(context, fn);\n\n    return tFn(library, fn.cIdentifier, {\n        args: arrayLiteral(params),\n        returns: returnPlan.descriptor,\n        isReturnSkipped: returnPlan.isSkipped,\n        canThrow: fn.throws,\n    });\n};\n\nconst isMovedOntoEmittedMember = (context: ModuleContext, fn: GirFunction): boolean => {\n    const [typeName, memberName] = fn.movedTo?.split(\".\") ?? [];\n\n    if (typeName === undefined || memberName === undefined) {\n        return false;\n    }\n\n    const resolved = context.library.resolveType(context.namespace.name, typeName);\n\n    if (resolved?.kind !== \"class\" && resolved?.kind !== \"interface\" && resolved?.kind !== \"record\") {\n        return false;\n    }\n\n    const members = [...resolved.value.methods, ...resolved.value.functions, ...resolved.value.constructors];\n\n    return members.some((member) => member.name === memberName);\n};\n\nconst canEmitNamespaceFunction = (context: ModuleContext, fn: GirFunction): boolean =>\n    fn.introspectable &&\n    !isMovedOntoEmittedMember(context, fn) &&\n    fn.shadowedBy === undefined &&\n    fn.cIdentifier !== undefined &&\n    !hasUnmarshalableParam(context, fn);\n\nconst generateNamespaceFunction = (context: ModuleContext, fn: GirFunction): void => {\n    if (!canEmitNamespaceFunction(context, fn)) {\n        return;\n    }\n\n    const expression = renderFnExpression(context, fn);\n\n    if (expression === undefined) {\n        return;\n    }\n\n    const cIdentifier = fn.cIdentifier;\n\n    if (cIdentifier === undefined) {\n        return;\n    }\n\n    const exportName = namespaceFunctionExportName(cIdentifier, fn.name, context.namespace.cSymbolPrefixes);\n\n    if (exportName.length === 0) {\n        return;\n    }\n\n    const bindingName = namespaceBindingName(cIdentifier, exportName);\n    context.module.appendBinding(`const ${bindingName} = ${expression};`, cIdentifier);\n    const finish = matchNamespaceFinish(context, fn);\n    const declaration = renderNamespaceFunctionDeclaration({ context, fn, finish, exportName, bindingName });\n    const doc = callableDoc(context, fn, { finishFn: finish?.fn });\n    context.declare({ name: exportName, code: `${doc}${declaration}` });\n    appendBootstrapRegistration(context, fn, exportName);\n};\n\nconst namespaceBindingName = (cIdentifier: string, exportName: string): string => {\n    const bindingName = toCamelIdentifier(cIdentifier);\n\n    return bindingName === exportName ? `_${bindingName}` : bindingName;\n};\n\nconst matchNamespaceFinish = (context: ModuleContext, fn: GirFunction): NamespaceFinish | undefined => {\n    const finishFn = matchAsyncFinish(context.library, fn, context.namespace.functions);\n    const cIdentifier = finishFn?.cIdentifier;\n\n    if (finishFn === undefined || cIdentifier === undefined || !canEmitNamespaceFunction(context, finishFn)) {\n        return undefined;\n    }\n\n    return {\n        fn: finishFn,\n        exportName: namespaceFunctionExportName(cIdentifier, finishFn.name, context.namespace.cSymbolPrefixes),\n    };\n};\n\nconst renderPromisifiedNamespaceFunction = (options: NamespaceFunctionOptions, finish: NamespaceFinish): string => {\n    const { context, fn, exportName, bindingName } = options;\n    const { signature, returnType } = renderPromisifiedSignature(context, fn, finish.fn);\n    const body = renderPromisifiedBody(context, fn, finish.exportName, bindingName);\n\n    return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);\n};\n\nconst renderNamespaceFunctionDeclaration = (options: NamespaceFunctionOptions): string => {\n    const { context, fn, finish, exportName, bindingName } = options;\n\n    if (finish !== undefined) {\n        return renderPromisifiedNamespaceFunction(options, finish);\n    }\n\n    const signature = renderMethodSignature(context, fn);\n    const returnType = renderMethodReturnType(context, fn);\n    const body = renderMethodBody(context, fn, { bindingExpression: bindingName });\n\n    return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);\n};\n\nconst namespaceFunctionExportName = (cIdentifier: string, girName: string, symbolPrefixes: string[]): string => {\n    if (girName.length > 0) {\n        return toCamelIdentifier(girName);\n    }\n\n    const stripped = stripLongestPrefix(cIdentifier, symbolPrefixes);\n\n    return toCamelIdentifier(stripped);\n};\n\nconst stripLongestPrefix = (input: string, prefixes: string[]): string => {\n    let best = \"\";\n\n    for (const prefix of prefixes) {\n        const candidate = `${prefix}_`;\n\n        if (input.startsWith(candidate) && candidate.length > best.length) {\n            best = candidate;\n        }\n    }\n\n    return best.length === 0 ? input : input.slice(best.length);\n};\n\nconst appendBootstrapRegistration = (context: ModuleContext, fn: GirFunction, exportName: string): void => {\n    if (fn.parameters.length > 0) {\n        return;\n    }\n\n    if (fn.name === \"init\") {\n        context.module.appendRegistration(`${exportName}();`, [exportName]);\n\n        return;\n    }\n\n    if (fn.name === \"finalize\") {\n        context.addRuntimeImport(\"onExit\");\n        context.module.appendRegistration(`onExit(${exportName});`, [exportName]);\n    }\n};\n\nexport { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName };\n"]}

package/dist/store/gi/gtype-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gtype-binding.d.ts","sourceRoot":"","sources":["../../../src/store/gi/gtype-binding.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,KAAK,UAAU,GAAG;IACd,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,QAAA,MAAM,WAAW,GAAI,SAAS,aAAa,KAAG,MAC6B,CAAC;AAE5E,QAAA,MAAM,sBAAsB,GAAI,SAAS,aAAa,KAAG,MAAsD,CAAC;AA4BhH,QAAA,MAAM,iBAAiB,GAAI,SAAS,aAAa,EAAE,QAAQ,UAAU,KAAG,MAAM,GAAG,SAGA,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"gtype-binding.d.ts","sourceRoot":"","sources":["../../../src/store/gi/gtype-binding.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,KAAK,UAAU,GAAG;IACd,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,QAAA,MAAM,WAAW,GAAI,SAAS,aAAa,KAAG,MAC6B,CAAC;AAE5E,QAAA,MAAM,sBAAsB,GAAI,SAAS,aAAa,KAAG,MAAsD,CAAC;AAiChH,QAAA,MAAM,iBAAiB,GAAI,SAAS,aAAa,EAAE,QAAQ,UAAU,KAAG,MAAM,GAAG,SAGA,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/store/gi/gtype-binding.js

@@ -12,8 +12,11 @@ const renderInternGtype = (context, typeName) => {
     return `typeFromName(${sourceStringLiteral(typeName)})`;
 };
 const renderResolveGtype = (context, typeFnName) => {
+    const lib = context.namespace.sharedLibrary;
+    if (lib === undefined) {
+        return undefined;
+    }
     context.addRuntimeImport("resolveType");
-    const lib = context.namespace.sharedLibrary ?? "";
     return `resolveType(${sourceStringLiteral(lib)}, ${sourceStringLiteral(typeFnName)})`;
 };
 const renderGtypeExpression = (context, typeFnName, typeName) => typeFnName === "intern" ? renderInternGtype(context, typeName) : renderResolveGtype(context, typeFnName);

package/dist/store/gi/gtype-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"gtype-binding.js","sourceRoot":"","sources":["../../../src/store/gi/gtype-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAO5D,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAU,EAAE,CACnD,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC;AAE5E,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAU,EAAE,CAAC,qBAAqB,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC;AAEhH,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAE,QAA4B,EAAsB,EAAE;IACnG,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,gBAAgB,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,UAAkB,EAAU,EAAE;IAC9E,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC;IAElD,OAAO,eAAe,mBAAmB,CAAC,GAAG,CAAC,KAAK,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC;AAC1F,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC1B,OAAsB,EACtB,UAAkB,EAClB,QAA4B,EACV,EAAE,CACpB,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AAE7G,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAE,MAAkB,EAAsB,EAAE,CACzF,MAAM,CAAC,WAAW,KAAK,SAAS;IAC5B,CAAC,CAAC,SAAS;IACX,CAAC,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { PRIMITIVE_TS_TYPE } from \"../../gir/primitives.js\";\n\ntype TypeSource = {\n    glibGetType: string | undefined;\n    glibTypeName: string | undefined;\n};\n\nconst gtypeTsType = (context: ModuleContext): string =>\n    context.namespace.name === \"GObject\" ? \"Type\" : PRIMITIVE_TS_TYPE.gtype;\n\nconst gtypeMemberDeclaration = (context: ModuleContext): string => `declare __type__: ${gtypeTsType(context)};`;\n\nconst renderInternGtype = (context: ModuleContext, typeName: string | undefined): string | undefined => {\n    if (typeName === undefined) {\n        return undefined;\n    }\n\n    if (context.namespace.name !== \"GObject\") {\n        context.addRuntimeImport(\"typeFromName\");\n    }\n\n    return `typeFromName(${sourceStringLiteral(typeName)})`;\n};\n\nconst renderResolveGtype = (context: ModuleContext, typeFnName: string): string => {\n    context.addRuntimeImport(\"resolveType\");\n    const lib = context.namespace.sharedLibrary ?? \"\";\n\n    return `resolveType(${sourceStringLiteral(lib)}, ${sourceStringLiteral(typeFnName)})`;\n};\n\nconst renderGtypeExpression = (\n    context: ModuleContext,\n    typeFnName: string,\n    typeName: string | undefined,\n): string | undefined =>\n    typeFnName === \"intern\" ? renderInternGtype(context, typeName) : renderResolveGtype(context, typeFnName);\n\nconst renderSourceGtype = (context: ModuleContext, source: TypeSource): string | undefined =>\n    source.glibGetType === undefined\n        ? undefined\n        : renderGtypeExpression(context, source.glibGetType, source.glibTypeName);\n\nexport { gtypeTsType, gtypeMemberDeclaration, renderSourceGtype };\n"]}
+{"version":3,"file":"gtype-binding.js","sourceRoot":"","sources":["../../../src/store/gi/gtype-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAO5D,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAU,EAAE,CACnD,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC;AAE5E,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAU,EAAE,CAAC,qBAAqB,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC;AAEhH,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAE,QAA4B,EAAsB,EAAE;IACnG,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,gBAAgB,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,UAAkB,EAAsB,EAAE;IAC1F,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC;IAE5C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAExC,OAAO,eAAe,mBAAmB,CAAC,GAAG,CAAC,KAAK,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC;AAC1F,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC1B,OAAsB,EACtB,UAAkB,EAClB,QAA4B,EACV,EAAE,CACpB,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AAE7G,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAE,MAAkB,EAAsB,EAAE,CACzF,MAAM,CAAC,WAAW,KAAK,SAAS;IAC5B,CAAC,CAAC,SAAS;IACX,CAAC,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { PRIMITIVE_TS_TYPE } from \"../../gir/primitives.js\";\n\ntype TypeSource = {\n    glibGetType: string | undefined;\n    glibTypeName: string | undefined;\n};\n\nconst gtypeTsType = (context: ModuleContext): string =>\n    context.namespace.name === \"GObject\" ? \"Type\" : PRIMITIVE_TS_TYPE.gtype;\n\nconst gtypeMemberDeclaration = (context: ModuleContext): string => `declare __type__: ${gtypeTsType(context)};`;\n\nconst renderInternGtype = (context: ModuleContext, typeName: string | undefined): string | undefined => {\n    if (typeName === undefined) {\n        return undefined;\n    }\n\n    if (context.namespace.name !== \"GObject\") {\n        context.addRuntimeImport(\"typeFromName\");\n    }\n\n    return `typeFromName(${sourceStringLiteral(typeName)})`;\n};\n\nconst renderResolveGtype = (context: ModuleContext, typeFnName: string): string | undefined => {\n    const lib = context.namespace.sharedLibrary;\n\n    if (lib === undefined) {\n        return undefined;\n    }\n\n    context.addRuntimeImport(\"resolveType\");\n\n    return `resolveType(${sourceStringLiteral(lib)}, ${sourceStringLiteral(typeFnName)})`;\n};\n\nconst renderGtypeExpression = (\n    context: ModuleContext,\n    typeFnName: string,\n    typeName: string | undefined,\n): string | undefined =>\n    typeFnName === \"intern\" ? renderInternGtype(context, typeName) : renderResolveGtype(context, typeFnName);\n\nconst renderSourceGtype = (context: ModuleContext, source: TypeSource): string | undefined =>\n    source.glibGetType === undefined\n        ? undefined\n        : renderGtypeExpression(context, source.glibGetType, source.glibTypeName);\n\nexport { gtypeTsType, gtypeMemberDeclaration, renderSourceGtype };\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/store/gi/interface.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAoD7D,QAAA,MAAM,iBAAiB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,IAkCpE,CAAC;AAoIF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/store/gi/interface.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAwE7D,QAAA,MAAM,iBAAiB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,IAkCpE,CAAC;AA+TF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/store/gi/interface.js

@@ -1,22 +1,28 @@
-import { pascalCase } from "@gtkx/utils";
+import { sanitizeTypeIdentifier, sourceStringLiteral } from "@gtkx/utils";
 import { reservedSignalMemberRename, resolvePrerequisiteReference } from "../../analysis/inheritance.js";
+import { omittedTypeRef, prerequisiteConflicts } from "../../analysis/interface-conflicts.js";
+import { resolveClassOrInterface, resolveInterfaces } from "../../gir/ancestry.js";
+import { isEmittableEntity } from "../../gir/emittable.js";
 import { renderJsDoc } from "../../writer/doc.js";
-import { renderBlock, renderBracedOrEmpty } from "../../writer/emit.js";
-import { dedupeCallables, generateBindings, instanceScope, renderClassInstanceMember, renderInstanceMethodSignature, renderStaticHead, } from "./callables.js";
+import { renderBlock, renderBraced, renderBracedOrEmpty } from "../../writer/emit.js";
+import { dedupeCallables, generateBindings, instanceScope, isEmittableCallable, renderClassInstanceMember, renderInstanceMethodSignature, renderStaticHead, } from "./callables.js";
+import { annotationSpec, getDoc } from "./doc-spec.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";
+import { hasCallableVfuncSlots, renderVfuncMembers, renderVfuncMetadata, } from "./vtable.js";
+const BRAND_NOTE = [
+    "Phantom link to the type a class fills to adopt the interface, which `registerClass` reads",
+    "through its `implements` option. It holds no value at runtime. `unknown` asks nothing of the",
+    "class, which is what an interface with no slot to fill carries.",
+].join("\n");
 const generateInterface = (context, iface) => {
-    if (!iface.introspectable) {
+    if (!isEmittableEntity(iface)) {
         return;
     }
-    if (iface.name.length === 0) {
-        return;
-    }
-    const className = pascalCase(iface.name);
+    const className = sanitizeTypeIdentifier(iface.name);
     const callables = {
         constructors: dedupeCallables(iface.constructors),
         functions: dedupeCallables(iface.functions),
@@ -24,32 +30,146 @@ const generateInterface = (context, iface) => {
     };
     generateBindings(context, callables);
     const gtypeExpr = renderSourceGtype(context, iface);
-    context.module.appendDeclaration(renderInterfaceType(context, iface, className, callables));
-    context.module.appendDeclaration(renderInterfaceClass(context, className, callables, gtypeExpr));
+    const implRef = appendInterfaceTypes(context, iface, className, callables) ?? "unknown";
+    const classCode = renderInterfaceClass(context, { iface, className, callables, gtypeExpr, implRef });
+    context.declare({ name: className, code: classCode, owner: iface.name });
     for (const declaration of renderSignalDeclarations(context, iface, className, true)) {
-        context.module.appendDeclaration(declaration);
+        context.declare(declaration);
     }
-    context.module.appendDeclaration(renderInterfaceMaker(context, iface, className, callables));
+    context.declare({
+        name: makerName(className),
+        code: renderInterfaceMaker(context, iface, className, callables),
+    });
     appendInterfaceRegistration(context, {
         className,
         makerName: makerName(className),
         gtypeExpr,
-        vfuncs: renderVfuncMetadata(context, iface),
+        layout: renderInterfaceLayout(context, iface, callables),
     });
 };
 const makerName = (className) => `make${className}`;
+const renderInterfaceLayout = (context, iface, callables) => {
+    const vfuncs = renderVfuncMetadata(context, iface);
+    const properties = renderSlotBackedProperties(context, iface, callables);
+    if (vfuncs === undefined && properties === undefined) {
+        return undefined;
+    }
+    const entries = [];
+    if (vfuncs !== undefined) {
+        entries.push(`vfuncs: ${vfuncs},`);
+    }
+    if (properties !== undefined) {
+        entries.push(`properties: ${properties},`);
+    }
+    return renderBraced(entries.join("\n"));
+};
+const invokerMembers = (context, iface, callables) => {
+    const className = sanitizeTypeIdentifier(iface.name);
+    const invokers = new Set(iface.vfuncs.map((vfunc) => vfunc.invoker).filter((invoker) => invoker !== undefined));
+    const members = new Map();
+    for (const callable of callables.methods) {
+        if (invokers.has(callable.name) && isEmittableCallable(context, callable)) {
+            members.set(callable.name, reservedSignalMemberRename(className, callable) ?? methodExportName(callable));
+        }
+    }
+    return members;
+};
+const renderSlotAccessor = (key, method, members) => {
+    const member = method === undefined ? undefined : members.get(method);
+    return member === undefined ? undefined : `${key}: ${sourceStringLiteral(member)},`;
+};
+const renderSlotBackedProperty = (property, members) => {
+    if (!property.introspectable) {
+        return undefined;
+    }
+    const fields = [
+        renderSlotAccessor("getter", property.getter, members),
+        renderSlotAccessor("setter", property.setter, members),
+    ].filter((field) => field !== undefined);
+    if (fields.length === 0) {
+        return undefined;
+    }
+    return `${sourceStringLiteral(property.name)}: ${renderBraced(fields.join("\n"))},`;
+};
+const renderSlotBackedProperties = (context, iface, callables) => {
+    const members = invokerMembers(context, iface, callables);
+    const entries = iface.properties
+        .map((property) => renderSlotBackedProperty(property, members))
+        .filter((entry) => entry !== undefined);
+    return entries.length === 0 ? undefined : renderBraced(entries.join("\n"));
+};
+const appendInterfaceTypes = (context, iface, className, callables) => {
+    const typeCode = renderInterfaceType(context, iface, className, callables);
+    context.declare({ name: className, code: typeCode, owner: iface.name });
+    const implType = renderInterfaceImplType(context, iface, className);
+    if (implType === undefined) {
+        return undefined;
+    }
+    const implName = implTypeName(className);
+    context.declare({ name: implName, code: implType, owner: iface.name });
+    return implName;
+};
+const prerequisiteRef = (context, iface, name) => {
+    const ref = resolvePrerequisiteReference(context, name);
+    const base = resolveClassOrInterface(context.library, context.namespace.name, name);
+    if (ref === undefined || base === undefined) {
+        return undefined;
+    }
+    return omittedTypeRef(ref, prerequisiteConflicts(context.library, iface, base));
+};
+const rootPrerequisiteRef = (context, iface) => {
+    const ref = context.qualify("GObject", "Object");
+    const base = resolveClassOrInterface(context.library, "GObject", "Object");
+    return base === undefined ? ref : omittedTypeRef(ref, prerequisiteConflicts(context.library, iface, base));
+};
 const interfaceTypeExtends = (context, iface) => {
     const refs = iface.prerequisites
-        .map((name) => resolvePrerequisiteReference(context, name))
+        .map((name) => prerequisiteRef(context, iface, name))
         .filter((entry) => entry !== undefined);
     if (refs.length > 0) {
         return refs.join(", ");
     }
-    return context.qualify("GObject", "Object");
+    return rootPrerequisiteRef(context, iface);
 };
 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"))}`;
+    return `${getDoc(iface)}${renderBracedOrEmpty(`export interface ${className} extends ${interfaceTypeExtends(context, iface)}`, members.join("\n"))}`;
+};
+const implTypeName = (className) => `${className}Impl`;
+const implTypeNote = (className) => [
+    `Implementer side of \`${className}\`: the vtable slots a class fills to adopt the interface.`,
+    "",
+    `Declare it with \`implements ${implTypeName(className)}\` on a class passed to \`registerClass\``,
+    `with \`${className}\` in \`implements\`. The interface's methods, properties, and signals come from`,
+    "GLib dispatch, so they are not part of this type.",
+    "",
+    "Every slot is optional: an unfilled one keeps whatever the interface installs by default, and a",
+    "GIR update can add one. Declaring a slot pins its signature; declaring it as a class field rather",
+    "than a method satisfies this type but never reaches the vtable.",
+].join("\n");
+const implPrerequisiteRefs = (context, iface) => {
+    const prerequisites = resolveInterfaces(context.library, context.namespace.name, iface.prerequisites);
+    const refs = [];
+    for (const prerequisite of prerequisites) {
+        if (!hasCallableVfuncSlots(context, prerequisite.namespaceName, prerequisite.klass)) {
+            continue;
+        }
+        const name = implTypeName(sanitizeTypeIdentifier(prerequisite.klass.name));
+        refs.push(context.qualify(prerequisite.namespaceName, name));
+    }
+    return refs;
+};
+const implTypeExtends = (context, iface) => {
+    const refs = implPrerequisiteRefs(context, iface);
+    return refs.length > 0 ? ` extends ${refs.join(", ")}` : "";
+};
+const interfaceVfuncMembers = (context, iface, mode) => renderVfuncMembers({ context, klass: iface, mode });
+const renderInterfaceImplType = (context, iface, className) => {
+    const members = interfaceVfuncMembers(context, iface, "requirement");
+    if (members.length === 0) {
+        return undefined;
+    }
+    return `${renderJsDoc(iface.doc, implTypeNote(className), annotationSpec(iface.annotations))}${renderBracedOrEmpty(`export interface ${implTypeName(className)}${implTypeExtends(context, iface)}`, members.join("\n"))}`;
 };
 const collectMethodMembers = (options) => {
     const { context, className, scope, callables, renderers, claimedNames } = options;
@@ -77,24 +197,32 @@ const collectPropertyMembers = (options) => {
     return members;
 };
 const renderInterfaceMembers = (context, iface, callables, renderers) => {
-    const className = pascalCase(iface.name);
+    const className = sanitizeTypeIdentifier(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 renderInterfaceTypeMembers = (context, iface, callables) => [
+    ...renderInterfaceMembers(context, iface, callables, {
+        renderMethod: renderInstanceMethodSignature,
+        renderProperty: renderPropertyAccessorSignature,
+    }),
+    ...interfaceVfuncMembers(context, iface, "signature"),
+];
+const renderInterfaceClass = (context, options) => {
+    const { iface, className, callables, gtypeExpr, implRef } = options;
     const members = [];
     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"));
+    members.push(...renderStaticHead(context, callables, className), renderInterfaceBrand(context, implRef));
+    return `${getDoc(iface)}${renderBracedOrEmpty(`export abstract class ${className}`, members.join("\n\n"))}`;
+};
+const renderInterfaceBrand = (context, implRef) => {
+    context.addRuntimeTypeImport("Interface");
+    return `${renderJsDoc(undefined, BRAND_NOTE)}declare static __impl__: Interface<${implRef}>["__impl__"];`;
 };
 const renderInterfaceHasInstance = (context, className, gtypeExpr) => {
     context.addRuntimeImport("valueIsA");
@@ -104,13 +232,14 @@ const renderInterfaceMaker = (context, iface, className, callables) => {
     context.addRuntimeTypeImport("Mixin");
     const members = renderInterfaceInstanceMembers(context, iface, callables);
     const classExpression = renderBracedOrEmpty("class extends Base", members.join("\n\n"));
-    return `export const ${makerName(className)}: Mixin = (Base) =>\n${classExpression};`;
+    return `${getDoc(iface)}export const ${makerName(className)}: Mixin = (Base) =>\n${classExpression};`;
 };
 const renderInterfaceInstanceMembers = (context, iface, callables) => [
     ...renderInterfaceMembers(context, iface, callables, {
         renderMethod: renderClassInstanceMember,
         renderProperty: renderPropertyAccessor,
     }),
+    ...interfaceVfuncMembers(context, iface, "implementation"),
     ...renderSignalMembers(context, iface),
 ];
 export { generateInterface };

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 { sanitizeTypeIdentifier, 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 { omittedTypeRef, prerequisiteConflicts } from \"../../analysis/interface-conflicts.js\";\nimport { resolveClassOrInterface, resolveInterfaces } from \"../../gir/ancestry.js\";\nimport { isEmittableEntity } from \"../../gir/emittable.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 (!isEmittableEntity(iface)) {\n        return;\n    }\n\n    const className = sanitizeTypeIdentifier(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.declare({ name: className, code: classCode, owner: iface.name });\n\n    for (const declaration of renderSignalDeclarations(context, iface, className, true)) {\n        context.declare(declaration);\n    }\n\n    context.declare({\n        name: makerName(className),\n        code: renderInterfaceMaker(context, iface, className, callables),\n    });\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 = sanitizeTypeIdentifier(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.declare({ name: className, code: typeCode, owner: iface.name });\n    const implType = renderInterfaceImplType(context, iface, className);\n\n    if (implType === undefined) {\n        return undefined;\n    }\n\n    const implName = implTypeName(className);\n    context.declare({ name: implName, code: implType, owner: iface.name });\n\n    return implName;\n};\n\nconst prerequisiteRef = (context: ModuleContext, iface: GirClass, name: string): string | undefined => {\n    const ref = resolvePrerequisiteReference(context, name);\n    const base = resolveClassOrInterface(context.library, context.namespace.name, name);\n\n    if (ref === undefined || base === undefined) {\n        return undefined;\n    }\n\n    return omittedTypeRef(ref, prerequisiteConflicts(context.library, iface, base));\n};\n\nconst rootPrerequisiteRef = (context: ModuleContext, iface: GirClass): string => {\n    const ref = context.qualify(\"GObject\", \"Object\");\n    const base = resolveClassOrInterface(context.library, \"GObject\", \"Object\");\n\n    return base === undefined ? ref : omittedTypeRef(ref, prerequisiteConflicts(context.library, iface, base));\n};\n\nconst interfaceTypeExtends = (context: ModuleContext, iface: GirClass): string => {\n    const refs = iface.prerequisites\n        .map((name) => prerequisiteRef(context, iface, name))\n        .filter((entry): entry is string => entry !== undefined);\n\n    if (refs.length > 0) {\n        return refs.join(\", \");\n    }\n\n    return rootPrerequisiteRef(context, iface);\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(sanitizeTypeIdentifier(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 = sanitizeTypeIdentifier(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;