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

package/dist/store/gi/enum.js

@@ -1,32 +1,34 @@
 import { sourceStringLiteral } from "@gtkx/utils";
 import { renderJsDoc } from "../../writer/doc.js";
 import { indent } from "../../writer/emit.js";
-export const generateEnum = (context, enumeration) => {
-    if (!enumeration.introspectable)
+const generateEnum = (context, enumeration) => {
+    if (!enumeration.introspectable) {
         return;
+    }
     const name = enumeration.name;
-    const memberKeys = enumeration.members.map((member) => enumMemberKey(member.name));
+    const members = enumeration.members.map((member) => ({ ...member, key: enumMemberKey(member.name) }));
     if (enumeration.errorDomain !== undefined) {
-        const memberEntries = enumeration.members.map((member, index) => `${memberKeys[index]}: ${member.value}`);
-        const typeFields = memberKeys.map((key) => `${key}: number`).join("; ");
+        const memberEntries = members.map((member) => `${member.key}: ${member.value}`);
+        const typeFields = members.map((member) => `${member.key}: number`).join("; ");
         context.addRuntimeImport("createErrorDomain");
         context.addRuntimeImport("ErrorDomain");
         const quarkExpression = renderQuarkExpression(context, enumeration.errorDomain);
         context.module.appendDeclaration(`${renderJsDoc(enumeration.doc)}export type ${name} = number;`);
-        context.module.appendDeclaration(`export const ${name}: ErrorDomain<{ ${typeFields} }> = createErrorDomain(${quarkExpression}, { ${memberEntries.join(", ")} });`);
+        context.module.appendDeclaration(`export const ${name}: ErrorDomain<{ ${typeFields} }> = ` +
+            `createErrorDomain(${quarkExpression}, { ${memberEntries.join(", ")} });`);
         return;
     }
-    if (enumeration.members.some((member) => member.doc !== undefined)) {
-        const memberBlocks = enumeration.members.map((member, index) => `${renderJsDoc(member.doc)}${memberKeys[index]} = ${member.value},`);
+    if (members.some((member) => member.doc !== undefined)) {
+        const memberBlocks = members.map((member) => `${renderJsDoc(member.doc)}${member.key} = ${member.value},`);
         context.module.appendDeclaration(`${renderJsDoc(enumeration.doc)}export enum ${name} {\n${indent(memberBlocks.join("\n"), 1)}\n}`);
         return;
     }
-    const memberDeclarations = enumeration.members.map((member, index) => `${memberKeys[index]} = ${member.value}`);
+    const memberDeclarations = members.map((member) => `${member.key} = ${member.value}`);
     context.module.appendDeclaration(`${renderJsDoc(enumeration.doc)}export enum ${name} { ${memberDeclarations.join(", ")} }`);
 };
-export const enumMemberKey = (name) => {
+const enumMemberKey = (name) => {
     const upper = name.toUpperCase().replaceAll("-", "_");
-    return /^[0-9]/.test(upper) ? `_${upper}` : upper;
+    return /^\d/.test(upper) ? `_${upper}` : upper;
 };
 const renderQuarkExpression = (context, errorDomain) => {
     if (context.namespace.name === "GLib") {
@@ -35,4 +37,5 @@ const renderQuarkExpression = (context, errorDomain) => {
     const alias = context.addCrossNamespaceImport("GLib");
     return `() => ${alias}.quarkFromString(${sourceStringLiteral(errorDomain)})`;
 };
+export { generateEnum, enumMemberKey };
 //# sourceMappingURL=enum.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/store/gi/enum.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirEnum } from \"../../gir/enum.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { indent } from \"../../writer/emit.js\";\n\nexport const generateEnum = (context: ModuleContext, enumeration: GirEnum): void => {\n    if (!enumeration.introspectable) return;\n    const name = enumeration.name;\n    const memberKeys = enumeration.members.map((member) => enumMemberKey(member.name));\n    if (enumeration.errorDomain !== undefined) {\n        const memberEntries = enumeration.members.map((member, index) => `${memberKeys[index]}: ${member.value}`);\n        const typeFields = memberKeys.map((key) => `${key}: number`).join(\"; \");\n        context.addRuntimeImport(\"createErrorDomain\");\n        context.addRuntimeImport(\"ErrorDomain\");\n        const quarkExpression = renderQuarkExpression(context, enumeration.errorDomain);\n        context.module.appendDeclaration(`${renderJsDoc(enumeration.doc)}export type ${name} = number;`);\n        context.module.appendDeclaration(\n            `export const ${name}: ErrorDomain<{ ${typeFields} }> = createErrorDomain(${quarkExpression}, { ${memberEntries.join(\", \")} });`,\n        );\n        return;\n    }\n    if (enumeration.members.some((member) => member.doc !== undefined)) {\n        const memberBlocks = enumeration.members.map(\n            (member, index) => `${renderJsDoc(member.doc)}${memberKeys[index]} = ${member.value},`,\n        );\n        context.module.appendDeclaration(\n            `${renderJsDoc(enumeration.doc)}export enum ${name} {\\n${indent(memberBlocks.join(\"\\n\"), 1)}\\n}`,\n        );\n        return;\n    }\n    const memberDeclarations = enumeration.members.map((member, index) => `${memberKeys[index]} = ${member.value}`);\n    context.module.appendDeclaration(\n        `${renderJsDoc(enumeration.doc)}export enum ${name} { ${memberDeclarations.join(\", \")} }`,\n    );\n};\n\nexport const enumMemberKey = (name: string): string => {\n    const upper = name.toUpperCase().replaceAll(\"-\", \"_\");\n    return /^[0-9]/.test(upper) ? `_${upper}` : upper;\n};\n\nconst renderQuarkExpression = (context: ModuleContext, errorDomain: string): string => {\n    if (context.namespace.name === \"GLib\") {\n        return `() => quarkFromString(${sourceStringLiteral(errorDomain)})`;\n    }\n    const alias = context.addCrossNamespaceImport(\"GLib\");\n    return `() => ${alias}.quarkFromString(${sourceStringLiteral(errorDomain)})`;\n};\n"]}
+{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/store/gi/enum.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirEnum } from \"../../gir/enum.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { indent } from \"../../writer/emit.js\";\n\nconst generateEnum = (context: ModuleContext, enumeration: GirEnum): void => {\n    if (!enumeration.introspectable) {\n        return;\n    }\n\n    const name = enumeration.name;\n    const members = enumeration.members.map((member) => ({ ...member, key: enumMemberKey(member.name) }));\n\n    if (enumeration.errorDomain !== undefined) {\n        const memberEntries = members.map((member) => `${member.key}: ${member.value}`);\n        const typeFields = members.map((member) => `${member.key}: number`).join(\"; \");\n        context.addRuntimeImport(\"createErrorDomain\");\n        context.addRuntimeImport(\"ErrorDomain\");\n        const quarkExpression = renderQuarkExpression(context, enumeration.errorDomain);\n        context.module.appendDeclaration(`${renderJsDoc(enumeration.doc)}export type ${name} = number;`);\n\n        context.module.appendDeclaration(\n            `export const ${name}: ErrorDomain<{ ${typeFields} }> = ` +\n            `createErrorDomain(${quarkExpression}, { ${memberEntries.join(\", \")} });`,\n        );\n\n        return;\n    }\n\n    if (members.some((member) => member.doc !== undefined)) {\n        const memberBlocks = members.map((member) => `${renderJsDoc(member.doc)}${member.key} = ${member.value},`);\n\n        context.module.appendDeclaration(\n            `${renderJsDoc(enumeration.doc)}export enum ${name} {\\n${indent(memberBlocks.join(\"\\n\"), 1)}\\n}`,\n        );\n\n        return;\n    }\n\n    const memberDeclarations = members.map((member) => `${member.key} = ${member.value}`);\n\n    context.module.appendDeclaration(\n        `${renderJsDoc(enumeration.doc)}export enum ${name} { ${memberDeclarations.join(\", \")} }`,\n    );\n};\n\nconst enumMemberKey = (name: string): string => {\n    const upper = name.toUpperCase().replaceAll(\"-\", \"_\");\n\n    return /^\\d/.test(upper) ? `_${upper}` : upper;\n};\n\nconst renderQuarkExpression = (context: ModuleContext, errorDomain: string): string => {\n    if (context.namespace.name === \"GLib\") {\n        return `() => quarkFromString(${sourceStringLiteral(errorDomain)})`;\n    }\n\n    const alias = context.addCrossNamespaceImport(\"GLib\");\n\n    return `() => ${alias}.quarkFromString(${sourceStringLiteral(errorDomain)})`;\n};\n\nexport { generateEnum, enumMemberKey };\n"]}

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

@@ -1,8 +1,9 @@
 import type { GirFunction } from "../../gir/function.js";
 import type { GirNamespace } from "../../gir/namespace.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const renderFnExpression: (context: ModuleContext, fn: GirFunction) => string | undefined;
-export declare const generateNamespaceFunction: (context: ModuleContext, fn: GirFunction) => void;
-export declare const namespaceFunctionExportName: (cIdentifier: string, girName: string, symbolPrefixes: string[]) => string;
-export declare const generateNamespaceBootstrap: (context: ModuleContext, namespace: GirNamespace) => void;
+declare const renderFnExpression: (context: ModuleContext, fn: GirFunction) => string | undefined;
+declare const generateNamespaceFunction: (context: ModuleContext, fn: GirFunction) => void;
+declare const namespaceFunctionExportName: (cIdentifier: string, girName: string, symbolPrefixes: string[]) => string;
+declare const generateNamespaceBootstrap: (context: ModuleContext, namespace: GirNamespace) => void;
+export { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName, generateNamespaceBootstrap };
 //# sourceMappingURL=function.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../src/store/gi/function.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAe7D,eAAO,MAAM,kBAAkB,YAAa,aAAa,MAAM,WAAW,KAAG,MAAM,GAAG,SAQrF,CAAC;AASF,eAAO,MAAM,yBAAyB,YAAa,aAAa,MAAM,WAAW,KAAG,IAYnF,CAAC;AA0BF,eAAO,MAAM,2BAA2B,gBAAiB,MAAM,WAAW,MAAM,kBAAkB,MAAM,EAAE,KAAG,MAM5G,CAAC;AAaF,eAAO,MAAM,0BAA0B,YAAa,aAAa,aAAa,YAAY,KAAG,IAY5F,CAAC"}
+{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../src/store/gi/function.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAgB7D,QAAA,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAAM,GAAG,SAgB9E,CAAC;AA+BF,QAAA,MAAM,yBAAyB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,IAsB5E,CAAC;AA+BF,QAAA,MAAM,2BAA2B,GAAI,aAAa,MAAM,EAAE,SAAS,MAAM,EAAE,gBAAgB,MAAM,EAAE,KAAG,MAQrG,CAAC;AAgCF,QAAA,MAAM,0BAA0B,GAAI,SAAS,aAAa,EAAE,WAAW,YAAY,KAAG,IASrF,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/store/gi/function.js

@@ -4,33 +4,53 @@ import { hasCallerAllocatedArrayLength } from "../../analysis/param-structure.js
 import { renderJsDoc } from "../../writer/doc.js";
 import { arrayLiteral, renderBlock } from "../../writer/emit.js";
 import { matchAsyncFinish } from "./async.js";
-import { callableReferencesClassStruct } from "./class-struct-record.js";
 import { planCallArgs, renderMethodBody, renderMethodReturnType, renderMethodSignature, renderPromisifiedBody, renderPromisifiedSignature, renderReturnDescriptor, } from "./method.js";
-export const renderFnExpression = (context, fn) => {
-    if (fn.cIdentifier === undefined)
+const renderFnExpression = (context, fn) => {
+    if (fn.cIdentifier === undefined) {
         return undefined;
+    }
     const library = context.namespace.sharedLibrary;
-    if (library === undefined)
+    if (library === undefined) {
         return undefined;
+    }
     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, throws: fn.throws });
 };
-const namespaceFunctionEmittable = (context, fn) => fn.introspectable &&
+// `moved-to` names the type member this function is also reachable as, so the namespace-level copy
+// is a second export of one binding. Suppressing it is only right when that member is really
+// emitted: 15 of Gtk-4.0's 28 `moved-to` targets are enum or error-domain members codegen emits no
+// static for, and dropping those would delete API with nothing to replace it.
+const isMovedOntoEmittedMember = (context, fn) => {
+    const [typeName, memberName] = fn.movedTo?.split(".") ?? [];
+    if (typeName === undefined || memberName === undefined) {
+        return false;
+    }
+    const resolved = context.library.resolveType(context.namespace.name, typeName);
+    if (resolved?.kind !== "class" && resolved?.kind !== "interface" && resolved?.kind !== "record") {
+        return false;
+    }
+    const members = [...resolved.value.methods, ...resolved.value.functions, ...resolved.value.constructors];
+    return members.some((member) => member.name === memberName);
+};
+const canEmitNamespaceFunction = (context, fn) => fn.introspectable &&
+    !isMovedOntoEmittedMember(context, fn) &&
     fn.shadowedBy === undefined &&
     fn.cIdentifier !== undefined &&
-    !callableReferencesClassStruct(context, fn) &&
     !hasCallerAllocatedArrayLength(context.library, fn);
-export const generateNamespaceFunction = (context, fn) => {
-    if (!namespaceFunctionEmittable(context, fn))
+const generateNamespaceFunction = (context, fn) => {
+    if (!canEmitNamespaceFunction(context, fn)) {
         return;
+    }
     const expression = renderFnExpression(context, fn);
-    if (expression === undefined)
+    if (expression === undefined) {
         return;
+    }
     const cIdentifier = fn.cIdentifier;
-    if (cIdentifier === undefined)
+    if (cIdentifier === undefined) {
         return;
+    }
     const bindingName = toCamelIdentifier(cIdentifier);
     context.module.appendBinding(`const ${bindingName} = ${expression};`, cIdentifier);
     const exportName = namespaceFunctionExportName(cIdentifier, fn.name, context.namespace.cSymbolPrefixes);
@@ -40,7 +60,7 @@ export const generateNamespaceFunction = (context, fn) => {
 const renderNamespaceFunctionDeclaration = (context, fn, exportName, bindingName) => {
     const finishFn = matchAsyncFinish(context.library, fn, context.namespace.functions);
     const finishCIdentifier = finishFn?.cIdentifier;
-    if (finishFn !== undefined && finishCIdentifier !== undefined && namespaceFunctionEmittable(context, finishFn)) {
+    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);
@@ -51,7 +71,7 @@ const renderNamespaceFunctionDeclaration = (context, fn, exportName, bindingName
     const body = renderMethodBody(context, fn, { bindingExpression: bindingName });
     return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);
 };
-export const namespaceFunctionExportName = (cIdentifier, girName, symbolPrefixes) => {
+const namespaceFunctionExportName = (cIdentifier, girName, symbolPrefixes) => {
     if (girName.length > 0) {
         return toCamelIdentifier(girName);
     }
@@ -68,20 +88,25 @@ const stripLongestPrefix = (input, prefixes) => {
     }
     return best.length === 0 ? input : input.slice(best.length);
 };
-export const generateNamespaceBootstrap = (context, namespace) => {
+const isBootstrapFunction = (fn) => fn.parameters.length === 0 && fn.introspectable && fn.shadowedBy === undefined && fn.cIdentifier !== undefined;
+const appendBootstrapRegistration = (context, fn, exportName) => {
+    if (fn.name === "init") {
+        context.module.appendRegistration(`${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 (fn.parameters.length > 0)
+        if (!isBootstrapFunction(fn) || fn.cIdentifier === undefined) {
             continue;
-        if (!fn.introspectable || fn.shadowedBy !== undefined || fn.cIdentifier === undefined)
-            continue;
-        const exportName = namespaceFunctionExportName(fn.cIdentifier, fn.name, context.namespace.cSymbolPrefixes);
-        if (fn.name === "init") {
-            context.module.appendRegistration(`${exportName}();`);
-        }
-        else if (fn.name === "finalize") {
-            context.addRuntimeImport("onExit");
-            context.module.appendRegistration(`onExit(${exportName});`);
         }
+        const exportName = namespaceFunctionExportName(fn.cIdentifier, fn.name, context.namespace.cSymbolPrefixes);
+        appendBootstrapRegistration(context, fn, exportName);
     }
 };
+export { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName, generateNamespaceBootstrap };
 //# 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 { tFn } from \"../../analysis/descriptor.js\";\nimport { hasCallerAllocatedArrayLength } from \"../../analysis/param-structure.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { GirNamespace } from \"../../gir/namespace.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { arrayLiteral, renderBlock } from \"../../writer/emit.js\";\nimport { matchAsyncFinish } from \"./async.js\";\nimport { callableReferencesClassStruct } from \"./class-struct-record.js\";\nimport {\n    planCallArgs,\n    renderMethodBody,\n    renderMethodReturnType,\n    renderMethodSignature,\n    renderPromisifiedBody,\n    renderPromisifiedSignature,\n    renderReturnDescriptor,\n} from \"./method.js\";\n\nexport const renderFnExpression = (context: ModuleContext, fn: GirFunction): string | undefined => {\n    if (fn.cIdentifier === undefined) return undefined;\n    const library = context.namespace.sharedLibrary;\n    if (library === undefined) return undefined;\n    context.addRuntimeImport(\"t\");\n    const params = planCallArgs(context, fn).map((arg) => arg.paramLiteral);\n    const ret = renderReturnDescriptor(context, fn);\n    return tFn(library, fn.cIdentifier, { args: arrayLiteral(params), returns: ret, throws: fn.throws });\n};\n\nconst namespaceFunctionEmittable = (context: ModuleContext, fn: GirFunction): boolean =>\n    fn.introspectable &&\n    fn.shadowedBy === undefined &&\n    fn.cIdentifier !== undefined &&\n    !callableReferencesClassStruct(context, fn) &&\n    !hasCallerAllocatedArrayLength(context.library, fn);\n\nexport const generateNamespaceFunction = (context: ModuleContext, fn: GirFunction): void => {\n    if (!namespaceFunctionEmittable(context, fn)) return;\n    const expression = renderFnExpression(context, fn);\n    if (expression === undefined) return;\n    const cIdentifier = fn.cIdentifier;\n    if (cIdentifier === undefined) return;\n    const bindingName = toCamelIdentifier(cIdentifier);\n    context.module.appendBinding(`const ${bindingName} = ${expression};`, cIdentifier);\n\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    if (finishFn !== undefined && finishCIdentifier !== undefined && namespaceFunctionEmittable(context, finishFn)) {\n        const finishExport = namespaceFunctionExportName(\n            finishCIdentifier,\n            finishFn.name,\n            context.namespace.cSymbolPrefixes,\n        );\n        const { signature, returnType } = renderPromisifiedSignature(context, fn, finishFn);\n        const body = renderPromisifiedBody(context, fn, finishExport, bindingName);\n        return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);\n    }\n    const signature = renderMethodSignature(context, fn);\n    const returnType = renderMethodReturnType(context, fn);\n    const body = renderMethodBody(context, fn, { bindingExpression: bindingName });\n    return renderBlock(`export function ${exportName}(${signature}): ${returnType}`, body);\n};\n\nexport const namespaceFunctionExportName = (cIdentifier: string, girName: string, symbolPrefixes: string[]): string => {\n    if (girName.length > 0) {\n        return toCamelIdentifier(girName);\n    }\n    const stripped = stripLongestPrefix(cIdentifier, symbolPrefixes);\n    return toCamelIdentifier(stripped);\n};\n\nconst stripLongestPrefix = (input: string, prefixes: string[]): string => {\n    let best = \"\";\n    for (const prefix of prefixes) {\n        const candidate = `${prefix}_`;\n        if (input.startsWith(candidate) && candidate.length > best.length) {\n            best = candidate;\n        }\n    }\n    return best.length === 0 ? input : input.slice(best.length);\n};\n\nexport const generateNamespaceBootstrap = (context: ModuleContext, namespace: GirNamespace): void => {\n    for (const fn of namespace.functions) {\n        if (fn.parameters.length > 0) continue;\n        if (!fn.introspectable || fn.shadowedBy !== undefined || fn.cIdentifier === undefined) continue;\n        const exportName = namespaceFunctionExportName(fn.cIdentifier, fn.name, context.namespace.cSymbolPrefixes);\n        if (fn.name === \"init\") {\n            context.module.appendRegistration(`${exportName}();`);\n        } else if (fn.name === \"finalize\") {\n            context.addRuntimeImport(\"onExit\");\n            context.module.appendRegistration(`onExit(${exportName});`);\n        }\n    }\n};\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 { 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, throws: fn.throws });\n};\n\n// `moved-to` names the type member this function is also reachable as, so the namespace-level copy\n// is a second export of one binding. Suppressing it is only right when that member is really\n// emitted: 15 of Gtk-4.0's 28 `moved-to` targets are enum or error-domain members codegen emits no\n// static for, and dropping those would delete API with nothing to replace it.\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"]}

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

@@ -1,10 +1,10 @@
 import type { ModuleContext } from "../../writer/context.js";
-export declare const gtypeTsType: (context: ModuleContext) => string;
-export declare const gtypeMemberDeclaration: (context: ModuleContext) => string;
 type TypeSource = {
     glibGetType: string | undefined;
     glibTypeName: string | undefined;
 };
-export declare const gtypeExprFor: (context: ModuleContext, source: TypeSource) => string | undefined;
-export {};
+declare const gtypeTsType: (context: ModuleContext) => string;
+declare const gtypeMemberDeclaration: (context: ModuleContext) => string;
+declare const renderSourceGtype: (context: ModuleContext, source: TypeSource) => string | undefined;
+export { gtypeTsType, gtypeMemberDeclaration, renderSourceGtype };
 //# sourceMappingURL=gtype-binding.d.ts.map

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":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,eAAO,MAAM,WAAW,YAAa,aAAa,KAAG,MACsB,CAAC;AAE5E,eAAO,MAAM,sBAAsB,YAAa,aAAa,KAAG,MAAsD,CAAC;AAiBvH,KAAK,UAAU,GAAG;IACd,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,aAAa,UAAU,UAAU,KAAG,MAAM,GAAG,SAGF,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;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"}

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

@@ -1,20 +1,24 @@
 import { sourceStringLiteral } from "@gtkx/utils";
 import { PRIMITIVE_TS_TYPE } from "../../gir/primitives.js";
-export const gtypeTsType = (context) => context.namespace.name === "GObject" ? "Type" : PRIMITIVE_TS_TYPE.gtype;
-export const gtypeMemberDeclaration = (context) => `declare __type__: ${gtypeTsType(context)};`;
-const renderGtypeExpression = (context, getType, typeName) => {
-    if (getType === "intern") {
-        if (typeName === undefined)
-            return undefined;
-        if (context.namespace.name !== "GObject")
-            context.addRuntimeImport("typeFromName");
-        return `typeFromName(${sourceStringLiteral(typeName)})`;
+const gtypeTsType = (context) => context.namespace.name === "GObject" ? "Type" : PRIMITIVE_TS_TYPE.gtype;
+const gtypeMemberDeclaration = (context) => `declare __type__: ${gtypeTsType(context)};`;
+const renderInternGtype = (context, typeName) => {
+    if (typeName === undefined) {
+        return undefined;
     }
+    if (context.namespace.name !== "GObject") {
+        context.addRuntimeImport("typeFromName");
+    }
+    return `typeFromName(${sourceStringLiteral(typeName)})`;
+};
+const renderResolveGtype = (context, typeFnName) => {
     context.addRuntimeImport("resolveType");
     const lib = context.namespace.sharedLibrary ?? "";
-    return `resolveType(${sourceStringLiteral(lib)}, ${sourceStringLiteral(getType)})`;
+    return `resolveType(${sourceStringLiteral(lib)}, ${sourceStringLiteral(typeFnName)})`;
 };
-export const gtypeExprFor = (context, source) => source.glibGetType === undefined
+const renderGtypeExpression = (context, typeFnName, typeName) => typeFnName === "intern" ? renderInternGtype(context, typeName) : renderResolveGtype(context, typeFnName);
+const renderSourceGtype = (context, source) => source.glibGetType === undefined
     ? undefined
     : renderGtypeExpression(context, source.glibGetType, source.glibTypeName);
+export { gtypeTsType, gtypeMemberDeclaration, renderSourceGtype };
 //# sourceMappingURL=gtype-binding.js.map

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;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAU,EAAE,CAC1D,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC;AAE5E,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAU,EAAE,CAAC,qBAAqB,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC;AAEvH,MAAM,qBAAqB,GAAG,CAC1B,OAAsB,EACtB,OAAe,EACf,QAA4B,EACV,EAAE;IACpB,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACvB,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC7C,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QACnF,OAAO,gBAAgB,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC;IAC5D,CAAC;IACD,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC;IAClD,OAAO,eAAe,mBAAmB,CAAC,GAAG,CAAC,KAAK,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC;AACvF,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAsB,EAAE,MAAkB,EAAsB,EAAE,CAC3F,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","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport { PRIMITIVE_TS_TYPE } from \"../../gir/primitives.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\n\nexport const gtypeTsType = (context: ModuleContext): string =>\n    context.namespace.name === \"GObject\" ? \"Type\" : PRIMITIVE_TS_TYPE.gtype;\n\nexport const gtypeMemberDeclaration = (context: ModuleContext): string => `declare __type__: ${gtypeTsType(context)};`;\n\nconst renderGtypeExpression = (\n    context: ModuleContext,\n    getType: string,\n    typeName: string | undefined,\n): string | undefined => {\n    if (getType === \"intern\") {\n        if (typeName === undefined) return undefined;\n        if (context.namespace.name !== \"GObject\") context.addRuntimeImport(\"typeFromName\");\n        return `typeFromName(${sourceStringLiteral(typeName)})`;\n    }\n    context.addRuntimeImport(\"resolveType\");\n    const lib = context.namespace.sharedLibrary ?? \"\";\n    return `resolveType(${sourceStringLiteral(lib)}, ${sourceStringLiteral(getType)})`;\n};\n\ntype TypeSource = {\n    glibGetType: string | undefined;\n    glibTypeName: string | undefined;\n};\n\nexport const gtypeExprFor = (context: ModuleContext, source: TypeSource): string | undefined =>\n    source.glibGetType === undefined\n        ? undefined\n        : renderGtypeExpression(context, source.glibGetType, source.glibTypeName);\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,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"]}

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

@@ -1,4 +1,5 @@
 import type { GirClass } from "../../gir/class.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const generateInterface: (context: ModuleContext, iface: GirClass) => void;
+declare const generateInterface: (context: ModuleContext, iface: GirClass) => void;
+export { generateInterface };
 //# sourceMappingURL=interface.d.ts.map

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":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAuB7D,eAAO,MAAM,iBAAiB,YAAa,aAAa,SAAS,QAAQ,KAAG,IA0B3E,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;AAoD7D,QAAA,MAAM,iBAAiB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,IAkCpE,CAAC;AAoIF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

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":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAEH,eAAe,EACf,gBAAgB,EAEhB,aAAa,EACb,yBAAyB,EACzB,6BAA6B,EAC7B,gBAAgB,GACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAEH,sBAAsB,EACtB,+BAA+B,GAClC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AA6BlD,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAQ,EAAE;IACxE,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;QACxB,OAAO;IACX,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;IACX,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEzC,MAAM,SAAS,GAAc;QACzB,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC,YAAY,CAAC;QACjD,SAAS,EAAE,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC;QAC3C,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC;KAC1C,CAAC;IAEF,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAC5F,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAEjG,KAAK,MAAM,WAAW,IAAI,wBAAwB,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;QAClF,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAE7F,2BAA2B,CAAC,OAAO,EAAE;QACjC,SAAS;QACT,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC;QAC/B,SAAS;QACT,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC;KAC9C,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,SAAiB,EAAU,EAAE,CAAC,OAAO,SAAS,EAAE,CAAC;AAEpE,MAAM,oBAAoB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAU,EAAE;IAC7E,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa;SAC3B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,4BAA4B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SAC1D,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAE7D,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CACxB,OAAsB,EACtB,KAAe,EACf,SAAiB,EACjB,SAAoB,EACd,EAAE;IACR,MAAM,OAAO,GAAG,0BAA0B,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAEtE,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAClD,oBAAoB,SAAS,YAAY,oBAAoB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAC/E,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CACrB,EAAE,CAAC;AACR,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,OAA4B,EAAY,EAAE;IACpE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAClF,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,0BAA0B,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAEvE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,SAAS;QACb,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,YAAY,CAAC,GAAG,CAAC,MAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAA8B,EAAY,EAAE;IACxE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QAE9G,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC3B,OAAsB,EACtB,KAAe,EACf,SAAoB,EACpB,SAAmC,EAC3B,EAAE;IACV,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAClD,MAAM,YAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,oBAAoB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,sBAAsB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;IAEnG,OAAO,CAAC,GAAG,aAAa,EAAE,GAAG,eAAe,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAE,SAAoB,EAAY,EAAE,CAC3G,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE;IAC9C,YAAY,EAAE,6BAA6B;IAC3C,cAAc,EAAE,+BAA+B;CAClD,CAAC,CAAC;AAEP,MAAM,oBAAoB,GAAG,CACzB,OAAsB,EACtB,SAAiB,EACjB,SAAoB,EACpB,SAA6B,EACvB,EAAE;IACR,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAEjE,OAAO,mBAAmB,CAAC,yBAAyB,SAAS,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3F,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,OAAsB,EAAE,SAAiB,EAAE,SAAiB,EAAU,EAAE;IACxG,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAErC,OAAO,WAAW,CACd,yDAAyD,SAAS,EAAE,EACpE,0BAA0B,SAAS,IAAI,CAC1C,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CACzB,OAAsB,EACtB,KAAe,EACf,SAAiB,EACjB,SAAoB,EACd,EAAE;IACR,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,8BAA8B,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAC1E,MAAM,eAAe,GAAG,mBAAmB,CAAC,oBAAoB,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAExF,OAAO,gBAAgB,SAAS,CAAC,SAAS,CAAC,wBAAwB,eAAe,GAAG,CAAC;AAC1F,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAE,SAAoB,EAAY,EAAE,CAAC;IAChH,GAAG,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE;QACjD,YAAY,EAAE,yBAAyB;QACvC,cAAc,EAAE,sBAAsB;KACzC,CAAC;IACF,GAAG,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC;CACzC,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC","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"}