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

package/dist/store/gi/class-struct-record.js

@@ -1,34 +1,52 @@
 const TYPE_STRUCT_ROOTS = new Set(["GObject.TypeClass", "GObject.TypeInterface"]);
 const EXPLICIT_CLASS_STRUCTS = new Set(["Pango.AttrClass"]);
 const qualify = (namespaceName, name) => `${namespaceName}.${name}`;
-export const isClassStructRecord = (library, namespaceName, record) => {
+const isClassStructRecord = (library, namespaceName, record) => {
     const qualified = qualify(namespaceName, record.name);
-    if (TYPE_STRUCT_ROOTS.has(qualified) || EXPLICIT_CLASS_STRUCTS.has(qualified))
+    if (TYPE_STRUCT_ROOTS.has(qualified) || EXPLICIT_CLASS_STRUCTS.has(qualified)) {
         return true;
+    }
     const first = record.fields[0];
-    if (first === undefined || first.type === undefined)
+    // A class struct embeds its parent vtable by value (`GTypeClass g_type_class`); an instance
+    // struct stores a pointer to it (`GTypeClass *g_class`). Only the first is a vtable.
+    if (first?.type === undefined || first.cType?.endsWith("*") === true) {
         return false;
-    const name = library.nameOf(first.type);
-    if (name === undefined)
+    }
+    const name = library.nameFor(first.type);
+    if (name === undefined) {
         return false;
+    }
     return TYPE_STRUCT_ROOTS.has(qualify(name.namespaceName, name.typeName));
 };
-export const refIsClassStruct = (context, ref) => {
-    if (ref === undefined)
+const isClassStructRef = (context, ref) => {
+    if (ref === undefined) {
         return false;
-    const type = context.library.typeOf(ref);
-    if (type === undefined)
+    }
+    const type = context.library.typeFor(ref);
+    if (type === undefined) {
         return false;
+    }
     switch (type.kind) {
-        case "record":
+        case "record": {
             return isClassStructRecord(context.library, type.namespace.name, type.value);
+        }
         case "carray":
-        case "list":
-            return refIsClassStruct(context, type.element);
-        default:
+        case "list": {
+            return isClassStructRef(context, type.element);
+        }
+        case "alias":
+        case "callback":
+        case "class":
+        case "enum":
+        case "hashtable":
+        case "interface":
+        case "primitive":
+        case "varargs": {
             return false;
+        }
     }
 };
-export const callableReferencesClassStruct = (context, fn) => refIsClassStruct(context, fn.returnValue.type) ||
-    fn.parameters.some((parameter) => refIsClassStruct(context, parameter.type));
+const hasClassStructReference = (context, fn) => isClassStructRef(context, fn.returnValue.type) ||
+    fn.parameters.some((parameter) => isClassStructRef(context, parameter.type));
+export { isClassStructRecord, isClassStructRef, hasClassStructReference };
 //# sourceMappingURL=class-struct-record.js.map

package/dist/store/gi/class-struct-record.js.map

@@ -1 +1 @@
-{"version":3,"file":"class-struct-record.js","sourceRoot":"","sources":["../../../src/store/gi/class-struct-record.ts"],"names":[],"mappings":"AAMA,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC,CAAC;AAElF,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAE5D,MAAM,OAAO,GAAG,CAAC,aAAqB,EAAE,IAAY,EAAU,EAAE,CAAC,GAAG,aAAa,IAAI,IAAI,EAAE,CAAC;AAE5F,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,aAAqB,EAAE,MAAiB,EAAW,EAAE;IACvG,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3F,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAClE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,OAAO,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC7E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,GAAuB,EAAW,EAAE;IACzF,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACpC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,QAAQ;YACT,OAAO,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACjF,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM;YACP,OAAO,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD;YACI,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,OAAsB,EAAE,EAAe,EAAW,EAAE,CAC9F,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;IAC9C,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC","sourcesContent":["import type { GirFunction } from \"../../gir/function.js\";\nimport type { Library } from \"../../gir/library.js\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\n\nconst TYPE_STRUCT_ROOTS = new Set([\"GObject.TypeClass\", \"GObject.TypeInterface\"]);\n\nconst EXPLICIT_CLASS_STRUCTS = new Set([\"Pango.AttrClass\"]);\n\nconst qualify = (namespaceName: string, name: string): string => `${namespaceName}.${name}`;\n\nexport const isClassStructRecord = (library: Library, namespaceName: string, record: GirRecord): boolean => {\n    const qualified = qualify(namespaceName, record.name);\n    if (TYPE_STRUCT_ROOTS.has(qualified) || EXPLICIT_CLASS_STRUCTS.has(qualified)) return true;\n    const first = record.fields[0];\n    if (first === undefined || first.type === undefined) return false;\n    const name = library.nameOf(first.type);\n    if (name === undefined) return false;\n    return TYPE_STRUCT_ROOTS.has(qualify(name.namespaceName, name.typeName));\n};\n\nexport const refIsClassStruct = (context: ModuleContext, ref: TypeId | undefined): boolean => {\n    if (ref === undefined) return false;\n    const type = context.library.typeOf(ref);\n    if (type === undefined) return false;\n    switch (type.kind) {\n        case \"record\":\n            return isClassStructRecord(context.library, type.namespace.name, type.value);\n        case \"carray\":\n        case \"list\":\n            return refIsClassStruct(context, type.element);\n        default:\n            return false;\n    }\n};\n\nexport const callableReferencesClassStruct = (context: ModuleContext, fn: GirFunction): boolean =>\n    refIsClassStruct(context, fn.returnValue.type) ||\n    fn.parameters.some((parameter) => refIsClassStruct(context, parameter.type));\n"]}
+{"version":3,"file":"class-struct-record.js","sourceRoot":"","sources":["../../../src/store/gi/class-struct-record.ts"],"names":[],"mappings":"AAMA,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC,CAAC;AAClF,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAE5D,MAAM,OAAO,GAAG,CAAC,aAAqB,EAAE,IAAY,EAAU,EAAE,CAAC,GAAG,aAAa,IAAI,IAAI,EAAE,CAAC;AAE5F,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,aAAqB,EAAE,MAAiB,EAAW,EAAE;IAChG,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAEtD,IAAI,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5E,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE/B,4FAA4F;IAC5F,qFAAqF;IACrF,IAAI,KAAK,EAAE,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QACnE,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC7E,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,GAAuB,EAAW,EAAE;IAClF,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACZ,OAAO,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACjF,CAAC;QACD,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC,CAAC,CAAC;YACV,OAAO,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,CAAC;QACD,KAAK,OAAO,CAAC;QACb,KAAK,UAAU,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS,CAAC,CAAC,CAAC;YACb,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,OAAsB,EAAE,EAAe,EAAW,EAAE,CACjF,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;IAC9C,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAEjF,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,CAAC","sourcesContent":["import type { GirFunction } from \"../../gir/function.js\";\nimport type { Library } from \"../../gir/library.js\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\n\nconst TYPE_STRUCT_ROOTS = new Set([\"GObject.TypeClass\", \"GObject.TypeInterface\"]);\nconst EXPLICIT_CLASS_STRUCTS = new Set([\"Pango.AttrClass\"]);\n\nconst qualify = (namespaceName: string, name: string): string => `${namespaceName}.${name}`;\n\nconst isClassStructRecord = (library: Library, namespaceName: string, record: GirRecord): boolean => {\n    const qualified = qualify(namespaceName, record.name);\n\n    if (TYPE_STRUCT_ROOTS.has(qualified) || EXPLICIT_CLASS_STRUCTS.has(qualified)) {\n        return true;\n    }\n\n    const first = record.fields[0];\n\n    // A class struct embeds its parent vtable by value (`GTypeClass g_type_class`); an instance\n    // struct stores a pointer to it (`GTypeClass *g_class`). Only the first is a vtable.\n    if (first?.type === undefined || first.cType?.endsWith(\"*\") === true) {\n        return false;\n    }\n\n    const name = library.nameFor(first.type);\n\n    if (name === undefined) {\n        return false;\n    }\n\n    return TYPE_STRUCT_ROOTS.has(qualify(name.namespaceName, name.typeName));\n};\n\nconst isClassStructRef = (context: ModuleContext, ref: TypeId | undefined): boolean => {\n    if (ref === undefined) {\n        return false;\n    }\n\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return false;\n    }\n\n    switch (type.kind) {\n        case \"record\": {\n            return isClassStructRecord(context.library, type.namespace.name, type.value);\n        }\n        case \"carray\":\n        case \"list\": {\n            return isClassStructRef(context, type.element);\n        }\n        case \"alias\":\n        case \"callback\":\n        case \"class\":\n        case \"enum\":\n        case \"hashtable\":\n        case \"interface\":\n        case \"primitive\":\n        case \"varargs\": {\n            return false;\n        }\n    }\n};\n\nconst hasClassStructReference = (context: ModuleContext, fn: GirFunction): boolean =>\n    isClassStructRef(context, fn.returnValue.type) ||\n    fn.parameters.some((parameter) => isClassStructRef(context, parameter.type));\n\nexport { isClassStructRecord, isClassStructRef, hasClassStructReference };\n"]}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["../../../src/store/gi/class.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AA4B7D,eAAO,MAAM,aAAa,YAAa,aAAa,SAAS,QAAQ,KAAG,IAmCvE,CAAC"}
+{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["../../../src/store/gi/class.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AA0D7D,QAAA,MAAM,aAAa,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,IAkChE,CAAC;AA8OF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/store/gi/class.js

@@ -1,24 +1,26 @@
-import { toCamelIdentifier, toPascalCase } from "@gtkx/utils";
+import { pascalCase, toCamelIdentifier } from "@gtkx/utils";
 import { collectInheritedMethods, collectInheritedPropertyTypes, collectInterfaceMergeOmissions, conflictRename, } from "../../analysis/inheritance.js";
 import { ancestorChain } from "../../gir/ancestry.js";
 import { splitOptionalNamespace } from "../../gir/type-ref.js";
 import { renderJsDoc } from "../../writer/doc.js";
 import { indentMembers } from "../../writer/emit.js";
-import { classConstructorMemberNames, dedupeCallables, generateBindings, indexMethodsByName, renderClassInstanceMember, renderStaticHead, } from "./callables.js";
+import { classConstructorMemberNames, dedupeCallables, generateBindings, instanceScope, renderClassInstanceMember, renderStaticHead, } from "./callables.js";
 import { renderClassConstructor, renderConstructorPropsInterface } from "./constructor-props.js";
-import { gtypeExprFor, gtypeMemberDeclaration } from "./gtype-binding.js";
+import { gtypeMemberDeclaration, renderSourceGtype } from "./gtype-binding.js";
 import { methodExportName } from "./method.js";
 import { renderPropertyDeclarations } from "./properties.js";
 import { renderResolvedPropertyAccessor, resolveAccessor } from "./property-accessor.js";
 import { appendWrapperClassRegistration } from "./registration.js";
 import { renderSignalDeclarations, renderSignalMembers } from "./signal.js";
 import { renderVfuncMetadata } from "./vtable.js";
-export const generateClass = (context, klass) => {
-    if (!klass.introspectable)
+const generateClass = (context, klass) => {
+    if (!klass.introspectable) {
         return;
-    if (klass.name.length === 0)
+    }
+    if (klass.name.length === 0) {
         return;
-    const className = toPascalCase(klass.name);
+    }
+    const className = pascalCase(klass.name);
     const callables = {
         constructors: dedupeCallables(klass.constructors),
         functions: dedupeCallables(klass.functions),
@@ -34,33 +36,42 @@ export const generateClass = (context, klass) => {
     const body = indentMembers(members);
     context.module.appendDeclaration(`${renderJsDoc(klass.doc)}export class ${className}${extendsClause}${implementsClause} {\n${body}\n}`);
     context.module.appendDeclaration(renderConstructorPropsInterface(context, klass, className));
+    appendMemberDeclarations({ context, klass, className, accessors, implemented });
+    appendInstallMixins(context, className, implemented);
+    appendClassRegistrations(context, klass, className);
+};
+const appendMemberDeclarations = (options) => {
+    const { context, klass, className, accessors, implemented } = options;
     for (const declaration of renderPropertyDeclarations(context, klass, className, accessors)) {
         context.module.appendDeclaration(declaration);
     }
     for (const declaration of renderSignalDeclarations(context, klass, className, false)) {
         context.module.appendDeclaration(declaration);
     }
-    if (typeRefs.length > 0) {
-        const mergeRefs = implemented.map((ref) => interfaceMergeRef(context, klass, ref));
-        context.module.appendDeclaration(`export interface ${className} extends ${mergeRefs.join(", ")} {}`);
+    appendInterfaceMerge(context, klass, className, implemented);
+};
+const appendInterfaceMerge = (context, klass, className, implemented) => {
+    if (implemented.length === 0) {
+        return;
     }
-    appendInstallMixins(context, className, implemented);
-    appendClassRegistrations(context, klass, className);
+    const mergeRefs = implemented.map((ref) => interfaceMergeRef(context, klass, ref));
+    context.module.appendDeclaration(`export interface ${className} extends ${mergeRefs.join(", ")} {}`);
 };
 const renderClassMembers = (context, klass, callables, hasParent) => {
-    const className = toPascalCase(klass.name);
+    const className = pascalCase(klass.name);
     const members = [gtypeMemberDeclaration(context)];
     const constructorBlock = renderClassConstructor(context, klass, className, hasParent);
-    if (constructorBlock !== undefined)
+    if (constructorBlock !== undefined) {
         members.push(constructorBlock);
+    }
     const claimedNames = new Set();
     members.push(...renderStaticHead(context, callables, className));
     const inherited = collectInheritedMethods(context, klass);
-    const methodByName = indexMethodsByName(callables.methods);
+    const scope = instanceScope(className, callables);
     appendInstanceMethods({
         context,
         methods: callables.methods,
-        methodByName,
+        scope,
         inherited,
         members,
         claimedNames,
@@ -70,9 +81,16 @@ const renderClassMembers = (context, klass, callables, hasParent) => {
     const accessors = [];
     for (const property of klass.properties) {
         const inheritedType = inheritedPropertyTypes.get(toCamelIdentifier(property.name));
-        const accessor = resolveAccessor({ context, property, claimedNames, methodByName, inheritedType });
-        if (accessor === undefined)
+        const accessor = resolveAccessor({
+            context,
+            property,
+            claimedNames,
+            methodByName: scope.methodByName,
+            inheritedType,
+        });
+        if (accessor === undefined) {
             continue;
+        }
         accessors.push(accessor);
         members.push(renderResolvedPropertyAccessor(context, property, accessor));
     }
@@ -80,44 +98,52 @@ const renderClassMembers = (context, klass, callables, hasParent) => {
     return { members, accessors };
 };
 const appendInstanceMethods = (options) => {
-    const { context, methods, methodByName, inherited, members, claimedNames, className } = options;
+    const { context, methods, scope, inherited, members, claimedNames, className } = options;
     for (const callable of methods) {
         const rename = conflictRename(context, callable, inherited, className);
-        const block = renderClassInstanceMember(context, callable, methodByName, rename);
-        if (block === undefined)
+        const block = renderClassInstanceMember(context, callable, scope, rename);
+        if (block === undefined) {
             continue;
+        }
         members.push(block);
         claimedNames.add(rename ?? methodExportName(callable));
     }
 };
 const appendInstallMixins = (context, className, implemented) => {
-    if (implemented.length === 0)
+    if (implemented.length === 0) {
         return;
+    }
     context.addRuntimeImport("installMixins");
     const makers = implemented.map((ref) => ref.makerRef).join(", ");
     context.module.appendRegistration(`installMixins(${className}, [${makers}]);`);
 };
 const appendClassRegistrations = (context, klass, className) => {
-    const gtypeExpr = gtypeExprFor(context, klass);
+    const gtypeExpr = renderSourceGtype(context, klass);
     appendWrapperClassRegistration(context, {
         className,
         gtypeExpr,
         vfuncs: renderVfuncMetadata(context, klass),
     });
 };
+const addAncestorInterfaceKeys = (context, ancestor, keys) => {
+    for (const name of ancestor.klass.implements) {
+        const resolved = context.library.resolveType(ancestor.namespaceName, name);
+        if (resolved?.kind === "interface") {
+            keys.add(`${resolved.namespace.name}.${resolved.value.name}`);
+        }
+    }
+};
 const inheritedInterfaceKeys = (context, klass) => {
     const keys = new Set();
-    if (klass.parent === undefined)
+    if (klass.parent === undefined) {
         return keys;
+    }
     const parent = context.library.resolveType(context.namespace.name, klass.parent);
-    if (parent === undefined || parent.kind !== "class")
+    if (parent?.kind !== "class") {
         return keys;
+    }
     for (const ancestor of ancestorChain(context.library, parent.value, parent.namespace.name)) {
-        for (const name of ancestor.klass.implements) {
-            const resolved = context.library.resolveType(ancestor.namespaceName, name);
-            if (resolved?.kind === "interface")
-                keys.add(`${resolved.namespace.name}.${resolved.value.name}`);
-        }
+        addAncestorInterfaceKeys(context, ancestor, keys);
     }
     return keys;
 };
@@ -126,44 +152,57 @@ const interfaceMergeRef = (context, klass, ref) => {
         klass: ref.interfaceKlass,
         namespaceName: ref.interfaceNamespace,
     });
-    if (omissions.length === 0)
+    if (omissions.length === 0) {
         return ref.typeRef;
+    }
     const keys = omissions.map((name) => JSON.stringify(name)).join(" | ");
     return `Omit<${ref.typeRef}, ${keys}>`;
 };
+const implementedRefFor = (context, name, inherited) => {
+    const resolved = context.library.resolveType(context.namespace.name, name);
+    if (resolved?.kind !== "interface") {
+        return undefined;
+    }
+    if (inherited.has(`${resolved.namespace.name}.${resolved.value.name}`)) {
+        return undefined;
+    }
+    const pascal = pascalCase(resolved.value.name);
+    return {
+        typeRef: context.qualify(resolved.namespace.name, pascal),
+        makerRef: context.qualify(resolved.namespace.name, `make${pascal}`),
+        interfaceKlass: resolved.value,
+        interfaceNamespace: resolved.namespace.name,
+    };
+};
 const resolveImplementedRefs = (context, klass) => {
     const inherited = inheritedInterfaceKeys(context, klass);
     const refs = [];
     for (const name of klass.implements) {
-        const resolved = context.library.resolveType(context.namespace.name, name);
-        if (resolved === undefined || resolved.kind !== "interface")
-            continue;
-        if (inherited.has(`${resolved.namespace.name}.${resolved.value.name}`))
-            continue;
-        const pascal = toPascalCase(resolved.value.name);
-        refs.push({
-            typeRef: context.qualify(resolved.namespace.name, pascal),
-            makerRef: context.qualify(resolved.namespace.name, `make${pascal}`),
-            interfaceKlass: resolved.value,
-            interfaceNamespace: resolved.namespace.name,
-        });
+        const ref = implementedRefFor(context, name, inherited);
+        if (ref !== undefined) {
+            refs.push(ref);
+        }
     }
     return refs;
 };
 const renderExtendsClause = (context, parentExpression, callables) => {
-    if (parentExpression === undefined)
+    if (parentExpression === undefined) {
         return "";
+    }
     const constructorNames = classConstructorMemberNames(context, callables);
-    if (constructorNames.length === 0)
+    if (constructorNames.length === 0) {
         return ` extends ${parentExpression}`;
+    }
     context.addRuntimeTypeImport("StaticBase");
     const omitted = constructorNames.map((name) => JSON.stringify(name)).join(" | ");
     return ` extends (${parentExpression} as StaticBase<typeof ${parentExpression}, ${omitted}>)`;
 };
 const resolveParent = (context, klass) => {
-    if (klass.parent === undefined)
+    if (klass.parent === undefined) {
         return undefined;
+    }
     const [namespace, typeName] = splitOptionalNamespace(klass.parent);
-    return context.qualify(namespace ?? context.namespace.name, toPascalCase(typeName));
+    return context.qualify(namespace ?? context.namespace.name, pascalCase(typeName));
 };
+export { generateClass };
 //# sourceMappingURL=class.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"class.js","sourceRoot":"","sources":["../../../src/store/gi/class.ts"],"names":[],"mappings":"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","sourcesContent":["import { toCamelIdentifier, toPascalCase } from \"@gtkx/utils\";\nimport {\n    collectInheritedMethods,\n    collectInheritedPropertyTypes,\n    collectInterfaceMergeOmissions,\n    conflictRename,\n    type InheritedMethods,\n} from \"../../analysis/inheritance.js\";\nimport { ancestorChain } from \"../../gir/ancestry.js\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport {\n    type Callables,\n    classConstructorMemberNames,\n    dedupeCallables,\n    generateBindings,\n    indexMethodsByName,\n    renderClassInstanceMember,\n    renderStaticHead,\n} from \"./callables.js\";\nimport { renderClassConstructor, renderConstructorPropsInterface } from \"./constructor-props.js\";\nimport { gtypeExprFor, gtypeMemberDeclaration } from \"./gtype-binding.js\";\nimport { methodExportName } from \"./method.js\";\nimport { renderPropertyDeclarations } from \"./properties.js\";\nimport { type ResolvedAccessor, renderResolvedPropertyAccessor, resolveAccessor } from \"./property-accessor.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\nimport { renderSignalDeclarations, renderSignalMembers } from \"./signal.js\";\nimport { renderVfuncMetadata } from \"./vtable.js\";\n\ntype ImplementedRef = {\n    typeRef: string;\n    makerRef: string;\n    interfaceKlass: GirClass;\n    interfaceNamespace: string;\n};\n\nexport const generateClass = (context: ModuleContext, klass: GirClass): void => {\n    if (!klass.introspectable) return;\n    if (klass.name.length === 0) return;\n    const className = toPascalCase(klass.name);\n    const callables: Callables = {\n        constructors: dedupeCallables(klass.constructors),\n        functions: dedupeCallables(klass.functions),\n        methods: dedupeCallables(klass.methods),\n    };\n    generateBindings(context, callables);\n\n    const parentExpression = resolveParent(context, klass);\n    const extendsClause = renderExtendsClause(context, parentExpression, callables);\n    const implemented = resolveImplementedRefs(context, klass);\n    const typeRefs = implemented.map((ref) => ref.typeRef);\n    const implementsClause = typeRefs.length === 0 ? \"\" : ` implements ${typeRefs.join(\", \")}`;\n    const { members, accessors } = renderClassMembers(context, klass, callables, parentExpression !== undefined);\n    const body = indentMembers(members);\n    context.module.appendDeclaration(\n        `${renderJsDoc(klass.doc)}export class ${className}${extendsClause}${implementsClause} {\\n${body}\\n}`,\n    );\n    context.module.appendDeclaration(renderConstructorPropsInterface(context, klass, className));\n    for (const declaration of renderPropertyDeclarations(context, klass, className, accessors)) {\n        context.module.appendDeclaration(declaration);\n    }\n    for (const declaration of renderSignalDeclarations(context, klass, className, false)) {\n        context.module.appendDeclaration(declaration);\n    }\n    if (typeRefs.length > 0) {\n        const mergeRefs = implemented.map((ref) => interfaceMergeRef(context, klass, ref));\n        context.module.appendDeclaration(`export interface ${className} extends ${mergeRefs.join(\", \")} {}`);\n    }\n\n    appendInstallMixins(context, className, implemented);\n    appendClassRegistrations(context, klass, className);\n};\n\ntype ClassMembers = { members: string[]; accessors: ResolvedAccessor[] };\n\nconst renderClassMembers = (\n    context: ModuleContext,\n    klass: GirClass,\n    callables: Callables,\n    hasParent: boolean,\n): ClassMembers => {\n    const className = toPascalCase(klass.name);\n    const members: string[] = [gtypeMemberDeclaration(context)];\n    const constructorBlock = renderClassConstructor(context, klass, className, hasParent);\n    if (constructorBlock !== undefined) members.push(constructorBlock);\n    const claimedNames = new Set<string>();\n    members.push(...renderStaticHead(context, callables, className));\n    const inherited = collectInheritedMethods(context, klass);\n    const methodByName = indexMethodsByName(callables.methods);\n    appendInstanceMethods({\n        context,\n        methods: callables.methods,\n        methodByName,\n        inherited,\n        members,\n        claimedNames,\n        className,\n    });\n    const inheritedPropertyTypes = collectInheritedPropertyTypes(context, klass);\n    const accessors: ResolvedAccessor[] = [];\n    for (const property of klass.properties) {\n        const inheritedType = inheritedPropertyTypes.get(toCamelIdentifier(property.name));\n        const accessor = resolveAccessor({ context, property, claimedNames, methodByName, inheritedType });\n        if (accessor === undefined) continue;\n        accessors.push(accessor);\n        members.push(renderResolvedPropertyAccessor(context, property, accessor));\n    }\n    members.push(...renderSignalMembers(context, klass));\n    return { members, accessors };\n};\n\ntype AppendInstanceMethodsOptions = {\n    context: ModuleContext;\n    methods: GirFunction[];\n    methodByName: Map<string, GirFunction>;\n    inherited: InheritedMethods;\n    members: string[];\n    claimedNames: Set<string>;\n    className: string;\n};\n\nconst appendInstanceMethods = (options: AppendInstanceMethodsOptions): void => {\n    const { context, methods, methodByName, inherited, members, claimedNames, className } = options;\n    for (const callable of methods) {\n        const rename = conflictRename(context, callable, inherited, className);\n        const block = renderClassInstanceMember(context, callable, methodByName, rename);\n        if (block === undefined) continue;\n        members.push(block);\n        claimedNames.add(rename ?? methodExportName(callable));\n    }\n};\n\nconst appendInstallMixins = (context: ModuleContext, className: string, implemented: ImplementedRef[]): void => {\n    if (implemented.length === 0) return;\n    context.addRuntimeImport(\"installMixins\");\n    const makers = implemented.map((ref) => ref.makerRef).join(\", \");\n    context.module.appendRegistration(`installMixins(${className}, [${makers}]);`);\n};\n\nconst appendClassRegistrations = (context: ModuleContext, klass: GirClass, className: string): void => {\n    const gtypeExpr = gtypeExprFor(context, klass);\n    appendWrapperClassRegistration(context, {\n        className,\n        gtypeExpr,\n        vfuncs: renderVfuncMetadata(context, klass),\n    });\n};\n\nconst inheritedInterfaceKeys = (context: ModuleContext, klass: GirClass): Set<string> => {\n    const keys = new Set<string>();\n    if (klass.parent === undefined) return keys;\n    const parent = context.library.resolveType(context.namespace.name, klass.parent);\n    if (parent === undefined || parent.kind !== \"class\") return keys;\n    for (const ancestor of ancestorChain(context.library, parent.value, parent.namespace.name)) {\n        for (const name of ancestor.klass.implements) {\n            const resolved = context.library.resolveType(ancestor.namespaceName, name);\n            if (resolved?.kind === \"interface\") keys.add(`${resolved.namespace.name}.${resolved.value.name}`);\n        }\n    }\n    return keys;\n};\n\nconst interfaceMergeRef = (context: ModuleContext, klass: GirClass, ref: ImplementedRef): string => {\n    const omissions = collectInterfaceMergeOmissions(context, klass, {\n        klass: ref.interfaceKlass,\n        namespaceName: ref.interfaceNamespace,\n    });\n    if (omissions.length === 0) return ref.typeRef;\n    const keys = omissions.map((name) => JSON.stringify(name)).join(\" | \");\n    return `Omit<${ref.typeRef}, ${keys}>`;\n};\n\nconst resolveImplementedRefs = (context: ModuleContext, klass: GirClass): ImplementedRef[] => {\n    const inherited = inheritedInterfaceKeys(context, klass);\n    const refs: ImplementedRef[] = [];\n    for (const name of klass.implements) {\n        const resolved = context.library.resolveType(context.namespace.name, name);\n        if (resolved === undefined || resolved.kind !== \"interface\") continue;\n        if (inherited.has(`${resolved.namespace.name}.${resolved.value.name}`)) continue;\n        const pascal = toPascalCase(resolved.value.name);\n        refs.push({\n            typeRef: context.qualify(resolved.namespace.name, pascal),\n            makerRef: context.qualify(resolved.namespace.name, `make${pascal}`),\n            interfaceKlass: resolved.value,\n            interfaceNamespace: resolved.namespace.name,\n        });\n    }\n    return refs;\n};\n\nconst renderExtendsClause = (\n    context: ModuleContext,\n    parentExpression: string | undefined,\n    callables: Callables,\n): string => {\n    if (parentExpression === undefined) return \"\";\n    const constructorNames = classConstructorMemberNames(context, callables);\n    if (constructorNames.length === 0) return ` extends ${parentExpression}`;\n    context.addRuntimeTypeImport(\"StaticBase\");\n    const omitted = constructorNames.map((name) => JSON.stringify(name)).join(\" | \");\n    return ` extends (${parentExpression} as StaticBase<typeof ${parentExpression}, ${omitted}>)`;\n};\n\nconst resolveParent = (context: ModuleContext, klass: GirClass): string | undefined => {\n    if (klass.parent === undefined) return undefined;\n    const [namespace, typeName] = splitOptionalNamespace(klass.parent);\n    return context.qualify(namespace ?? context.namespace.name, toPascalCase(typeName));\n};\n"]}
+{"version":3,"file":"class.js","sourceRoot":"","sources":["../../../src/store/gi/class.ts"],"names":[],"mappings":"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","sourcesContent":["import { pascalCase, toCamelIdentifier } 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 {\n    collectInheritedMethods,\n    collectInheritedPropertyTypes,\n    collectInterfaceMergeOmissions,\n    conflictRename,\n    type InheritedMethods,\n} from \"../../analysis/inheritance.js\";\nimport { ancestorChain, type ResolvedAncestor } from \"../../gir/ancestry.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport {\n    type Callables,\n    classConstructorMemberNames,\n    dedupeCallables,\n    generateBindings,\n    type InstanceScope,\n    instanceScope,\n    renderClassInstanceMember,\n    renderStaticHead,\n} from \"./callables.js\";\nimport { renderClassConstructor, renderConstructorPropsInterface } from \"./constructor-props.js\";\nimport { gtypeMemberDeclaration, renderSourceGtype } from \"./gtype-binding.js\";\nimport { methodExportName } from \"./method.js\";\nimport { renderPropertyDeclarations } from \"./properties.js\";\nimport { renderResolvedPropertyAccessor, resolveAccessor, type ResolvedAccessor } from \"./property-accessor.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\nimport { renderSignalDeclarations, renderSignalMembers } from \"./signal.js\";\nimport { renderVfuncMetadata } from \"./vtable.js\";\n\ntype ImplementedRef = {\n    typeRef: string;\n    makerRef: string;\n    interfaceKlass: GirClass;\n    interfaceNamespace: string;\n};\n\ntype MemberDeclarationsOptions = {\n    context: ModuleContext;\n    klass: GirClass;\n    className: string;\n    accessors: ResolvedAccessor[];\n    implemented: ImplementedRef[];\n};\n\ntype ClassMembers = { members: string[]; accessors: ResolvedAccessor[] };\n\ntype AppendInstanceMethodsOptions = {\n    context: ModuleContext;\n    methods: GirFunction[];\n    scope: InstanceScope;\n    inherited: InheritedMethods;\n    members: string[];\n    claimedNames: Set<string>;\n    className: string;\n};\n\nconst generateClass = (context: ModuleContext, klass: GirClass): void => {\n    if (!klass.introspectable) {\n        return;\n    }\n\n    if (klass.name.length === 0) {\n        return;\n    }\n\n    const className = pascalCase(klass.name);\n\n    const callables: Callables = {\n        constructors: dedupeCallables(klass.constructors),\n        functions: dedupeCallables(klass.functions),\n        methods: dedupeCallables(klass.methods),\n    };\n\n    generateBindings(context, callables);\n    const parentExpression = resolveParent(context, klass);\n    const extendsClause = renderExtendsClause(context, parentExpression, callables);\n    const implemented = resolveImplementedRefs(context, klass);\n    const typeRefs = implemented.map((ref) => ref.typeRef);\n    const implementsClause = typeRefs.length === 0 ? \"\" : ` implements ${typeRefs.join(\", \")}`;\n    const { members, accessors } = renderClassMembers(context, klass, callables, parentExpression !== undefined);\n    const body = indentMembers(members);\n\n    context.module.appendDeclaration(\n        `${renderJsDoc(klass.doc)}export class ${className}${extendsClause}${implementsClause} {\\n${body}\\n}`,\n    );\n\n    context.module.appendDeclaration(renderConstructorPropsInterface(context, klass, className));\n    appendMemberDeclarations({ context, klass, className, accessors, implemented });\n    appendInstallMixins(context, className, implemented);\n    appendClassRegistrations(context, klass, className);\n};\n\nconst appendMemberDeclarations = (options: MemberDeclarationsOptions): void => {\n    const { context, klass, className, accessors, implemented } = options;\n\n    for (const declaration of renderPropertyDeclarations(context, klass, className, accessors)) {\n        context.module.appendDeclaration(declaration);\n    }\n\n    for (const declaration of renderSignalDeclarations(context, klass, className, false)) {\n        context.module.appendDeclaration(declaration);\n    }\n\n    appendInterfaceMerge(context, klass, className, implemented);\n};\n\nconst appendInterfaceMerge = (\n    context: ModuleContext,\n    klass: GirClass,\n    className: string,\n    implemented: ImplementedRef[],\n): void => {\n    if (implemented.length === 0) {\n        return;\n    }\n\n    const mergeRefs = implemented.map((ref) => interfaceMergeRef(context, klass, ref));\n    context.module.appendDeclaration(`export interface ${className} extends ${mergeRefs.join(\", \")} {}`);\n};\n\nconst renderClassMembers = (\n    context: ModuleContext,\n    klass: GirClass,\n    callables: Callables,\n    hasParent: boolean,\n): ClassMembers => {\n    const className = pascalCase(klass.name);\n    const members: string[] = [gtypeMemberDeclaration(context)];\n    const constructorBlock = renderClassConstructor(context, klass, className, hasParent);\n\n    if (constructorBlock !== undefined) {\n        members.push(constructorBlock);\n    }\n\n    const claimedNames: Set<string> = new Set();\n    members.push(...renderStaticHead(context, callables, className));\n    const inherited = collectInheritedMethods(context, klass);\n    const scope = instanceScope(className, callables);\n\n    appendInstanceMethods({\n        context,\n        methods: callables.methods,\n        scope,\n        inherited,\n        members,\n        claimedNames,\n        className,\n    });\n\n    const inheritedPropertyTypes = collectInheritedPropertyTypes(context, klass);\n    const accessors: ResolvedAccessor[] = [];\n\n    for (const property of klass.properties) {\n        const inheritedType = inheritedPropertyTypes.get(toCamelIdentifier(property.name));\n\n        const accessor = resolveAccessor({\n            context,\n            property,\n            claimedNames,\n            methodByName: scope.methodByName,\n            inheritedType,\n        });\n\n        if (accessor === undefined) {\n            continue;\n        }\n\n        accessors.push(accessor);\n        members.push(renderResolvedPropertyAccessor(context, property, accessor));\n    }\n\n    members.push(...renderSignalMembers(context, klass));\n\n    return { members, accessors };\n};\n\nconst appendInstanceMethods = (options: AppendInstanceMethodsOptions): void => {\n    const { context, methods, scope, inherited, members, claimedNames, className } = options;\n\n    for (const callable of methods) {\n        const rename = conflictRename(context, callable, inherited, className);\n        const block = renderClassInstanceMember(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\nconst appendInstallMixins = (context: ModuleContext, className: string, implemented: ImplementedRef[]): void => {\n    if (implemented.length === 0) {\n        return;\n    }\n\n    context.addRuntimeImport(\"installMixins\");\n    const makers = implemented.map((ref) => ref.makerRef).join(\", \");\n    context.module.appendRegistration(`installMixins(${className}, [${makers}]);`);\n};\n\nconst appendClassRegistrations = (context: ModuleContext, klass: GirClass, className: string): void => {\n    const gtypeExpr = renderSourceGtype(context, klass);\n\n    appendWrapperClassRegistration(context, {\n        className,\n        gtypeExpr,\n        vfuncs: renderVfuncMetadata(context, klass),\n    });\n};\n\nconst addAncestorInterfaceKeys = (context: ModuleContext, ancestor: ResolvedAncestor, keys: Set<string>): void => {\n    for (const name of ancestor.klass.implements) {\n        const resolved = context.library.resolveType(ancestor.namespaceName, name);\n\n        if (resolved?.kind === \"interface\") {\n            keys.add(`${resolved.namespace.name}.${resolved.value.name}`);\n        }\n    }\n};\n\nconst inheritedInterfaceKeys = (context: ModuleContext, klass: GirClass): Set<string> => {\n    const keys: Set<string> = new Set();\n\n    if (klass.parent === undefined) {\n        return keys;\n    }\n\n    const parent = context.library.resolveType(context.namespace.name, klass.parent);\n\n    if (parent?.kind !== \"class\") {\n        return keys;\n    }\n\n    for (const ancestor of ancestorChain(context.library, parent.value, parent.namespace.name)) {\n        addAncestorInterfaceKeys(context, ancestor, keys);\n    }\n\n    return keys;\n};\n\nconst interfaceMergeRef = (context: ModuleContext, klass: GirClass, ref: ImplementedRef): string => {\n    const omissions = collectInterfaceMergeOmissions(context, klass, {\n        klass: ref.interfaceKlass,\n        namespaceName: ref.interfaceNamespace,\n    });\n\n    if (omissions.length === 0) {\n        return ref.typeRef;\n    }\n\n    const keys = omissions.map((name) => JSON.stringify(name)).join(\" | \");\n\n    return `Omit<${ref.typeRef}, ${keys}>`;\n};\n\nconst implementedRefFor = (\n    context: ModuleContext,\n    name: string,\n    inherited: Set<string>,\n): ImplementedRef | undefined => {\n    const resolved = context.library.resolveType(context.namespace.name, name);\n\n    if (resolved?.kind !== \"interface\") {\n        return undefined;\n    }\n\n    if (inherited.has(`${resolved.namespace.name}.${resolved.value.name}`)) {\n        return undefined;\n    }\n\n    const pascal = pascalCase(resolved.value.name);\n\n    return {\n        typeRef: context.qualify(resolved.namespace.name, pascal),\n        makerRef: context.qualify(resolved.namespace.name, `make${pascal}`),\n        interfaceKlass: resolved.value,\n        interfaceNamespace: resolved.namespace.name,\n    };\n};\n\nconst resolveImplementedRefs = (context: ModuleContext, klass: GirClass): ImplementedRef[] => {\n    const inherited = inheritedInterfaceKeys(context, klass);\n    const refs: ImplementedRef[] = [];\n\n    for (const name of klass.implements) {\n        const ref = implementedRefFor(context, name, inherited);\n\n        if (ref !== undefined) {\n            refs.push(ref);\n        }\n    }\n\n    return refs;\n};\n\nconst renderExtendsClause = (\n    context: ModuleContext,\n    parentExpression: string | undefined,\n    callables: Callables,\n): string => {\n    if (parentExpression === undefined) {\n        return \"\";\n    }\n\n    const constructorNames = classConstructorMemberNames(context, callables);\n\n    if (constructorNames.length === 0) {\n        return ` extends ${parentExpression}`;\n    }\n\n    context.addRuntimeTypeImport(\"StaticBase\");\n    const omitted = constructorNames.map((name) => JSON.stringify(name)).join(\" | \");\n\n    return ` extends (${parentExpression} as StaticBase<typeof ${parentExpression}, ${omitted}>)`;\n};\n\nconst resolveParent = (context: ModuleContext, klass: GirClass): string | undefined => {\n    if (klass.parent === undefined) {\n        return undefined;\n    }\n\n    const [namespace, typeName] = splitOptionalNamespace(klass.parent);\n\n    return context.qualify(namespace ?? context.namespace.name, pascalCase(typeName));\n};\n\nexport { generateClass };\n"]}

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

@@ -1,4 +1,5 @@
 import type { GirClass } from "../../gir/class.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const parentCompanionRef: (context: ModuleContext, klass: GirClass, suffix: string) => string | undefined;
+declare const parentCompanionRef: (context: ModuleContext, klass: GirClass, suffix: string) => string | undefined;
+export { parentCompanionRef };
 //# sourceMappingURL=companion.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"companion.d.ts","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,eAAO,MAAM,kBAAkB,YAAa,aAAa,SAAS,QAAQ,UAAU,MAAM,KAAG,MAAM,GAAG,SAOrG,CAAC"}
+{"version":3,"file":"companion.d.ts","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,QAAA,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,EAAE,QAAQ,MAAM,KAAG,MAAM,GAAG,SAc9F,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/store/gi/companion.js

@@ -1,13 +1,16 @@
-import { toPascalCase } from "@gtkx/utils";
+import { pascalCase } from "@gtkx/utils";
 import { splitOptionalNamespace } from "../../gir/type-ref.js";
-export const parentCompanionRef = (context, klass, suffix) => {
-    if (klass.parent === undefined)
+const parentCompanionRef = (context, klass, suffix) => {
+    if (klass.parent === undefined) {
         return undefined;
+    }
     const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);
     const namespaceName = parentNamespace ?? context.namespace.name;
-    const name = `${toPascalCase(typeName)}${suffix}`;
-    if (namespaceName === context.namespace.name)
+    const name = `${pascalCase(typeName)}${suffix}`;
+    if (namespaceName === context.namespace.name) {
         return name;
+    }
     return `${context.addCrossNamespaceImport(namespaceName)}.${name}`;
 };
+export { parentCompanionRef };
 //# sourceMappingURL=companion.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"companion.js","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAG/D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAE,MAAc,EAAsB,EAAE;IAC9G,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACjD,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;IAChE,MAAM,IAAI,GAAG,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC;IAClD,IAAI,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAC1D,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;AACvE,CAAC,CAAC","sourcesContent":["import { toPascalCase } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\n\nexport const parentCompanionRef = (context: ModuleContext, klass: GirClass, suffix: string): string | undefined => {\n    if (klass.parent === undefined) return undefined;\n    const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);\n    const namespaceName = parentNamespace ?? context.namespace.name;\n    const name = `${toPascalCase(typeName)}${suffix}`;\n    if (namespaceName === context.namespace.name) return name;\n    return `${context.addCrossNamespaceImport(namespaceName)}.${name}`;\n};\n"]}
+{"version":3,"file":"companion.js","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAE,MAAc,EAAsB,EAAE;IACvG,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;IAChE,MAAM,IAAI,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC;IAEhD,IAAI,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;AACvE,CAAC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC","sourcesContent":["import { pascalCase } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\n\nconst parentCompanionRef = (context: ModuleContext, klass: GirClass, suffix: string): string | undefined => {\n    if (klass.parent === undefined) {\n        return undefined;\n    }\n\n    const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);\n    const namespaceName = parentNamespace ?? context.namespace.name;\n    const name = `${pascalCase(typeName)}${suffix}`;\n\n    if (namespaceName === context.namespace.name) {\n        return name;\n    }\n\n    return `${context.addCrossNamespaceImport(namespaceName)}.${name}`;\n};\n\nexport { parentCompanionRef };\n"]}

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

@@ -1,5 +1,6 @@
 import type { GirConstant } from "../../gir/namespace.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const generateConstant: (context: ModuleContext, constant: GirConstant) => void;
-export declare const constantLiteral: (context: ModuleContext, constant: GirConstant) => string;
+declare const generateConstant: (context: ModuleContext, constant: GirConstant) => void;
+declare const constantLiteral: (context: ModuleContext, constant: GirConstant) => string;
+export { generateConstant, constantLiteral };
 //# sourceMappingURL=constant.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,eAAO,MAAM,gBAAgB,YAAa,aAAa,YAAY,WAAW,KAAG,IAIhF,CAAC;AAEF,eAAO,MAAM,eAAe,YAAa,aAAa,YAAY,WAAW,KAAG,MAG/E,CAAC"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAQ7D,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,UAAU,WAAW,KAAG,IAIzE,CAAC;AAEF,QAAA,MAAM,eAAe,GAAI,SAAS,aAAa,EAAE,UAAU,WAAW,KAAG,MAUxE,CAAC;AA6BF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC"}

package/dist/store/gi/constant.js

@@ -1,18 +1,35 @@
 import { sourceStringLiteral } from "@gtkx/utils";
 import { renderJsDoc } from "../../writer/doc.js";
-export const generateConstant = (context, constant) => {
+const TRUE_VALUES = new Set(["true", "1"]);
+// A `gint64`/`guint64` constant is typed `bigint`, and its decimal text does not survive a double:
+// G_MAXINT64 rounds to 2^63. The literal has to carry the BigInt suffix the type promises.
+const BIGINT_CATEGORIES = new Set(["bigint64", "biguint64", "gtype"]);
+const generateConstant = (context, constant) => {
     context.module.appendDeclaration(`${renderJsDoc(constant.doc)}export const ${constant.name} = ${constantLiteral(context, constant)};`);
 };
-export const constantLiteral = (context, constant) => {
-    if (isStringTyped(context, constant.type))
+const constantLiteral = (context, constant) => {
+    if (hasPrimitiveCategory(context, constant.type, "string")) {
         return sourceStringLiteral(constant.value);
-    return isNumericLiteral(constant.value) ? constant.value : sourceStringLiteral(constant.value);
+    }
+    if (hasPrimitiveCategory(context, constant.type, "boolean")) {
+        return TRUE_VALUES.has(constant.value) ? "true" : "false";
+    }
+    return numericConstantLiteral(context, constant);
 };
-const isStringTyped = (context, type) => {
-    if (type === undefined)
+const numericConstantLiteral = (context, constant) => {
+    if (!isNumericLiteral(constant.value)) {
+        return sourceStringLiteral(constant.value);
+    }
+    return isBigIntConstant(context, constant.type) ? `${constant.value}n` : constant.value;
+};
+const isBigIntConstant = (context, type) => [...BIGINT_CATEGORIES].some((category) => hasPrimitiveCategory(context, type, category));
+const hasPrimitiveCategory = (context, type, category) => {
+    if (type === undefined) {
         return false;
-    const resolved = context.library.typeOf(type);
-    return resolved?.kind === "primitive" && resolved.category === "string";
+    }
+    const resolved = context.library.typeFor(type);
+    return resolved?.kind === "primitive" && resolved.category === category;
 };
 const isNumericLiteral = (value) => /^-?(?:\d+|\d*\.\d+)$/.test(value);
+export { generateConstant, constantLiteral };
 //# sourceMappingURL=constant.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIlD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAQ,EAAE;IACpF,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAC5B,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,IAAI,MAAM,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CACvG,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAU,EAAE;IACrF,IAAI,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtF,OAAO,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnG,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,OAAsB,EAAE,IAAwB,EAAW,EAAE;IAChF,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9C,OAAO,QAAQ,EAAE,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAW,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirConstant } from \"../../gir/namespace.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\n\nexport const generateConstant = (context: ModuleContext, constant: GirConstant): void => {\n    context.module.appendDeclaration(\n        `${renderJsDoc(constant.doc)}export const ${constant.name} = ${constantLiteral(context, constant)};`,\n    );\n};\n\nexport const constantLiteral = (context: ModuleContext, constant: GirConstant): string => {\n    if (isStringTyped(context, constant.type)) return sourceStringLiteral(constant.value);\n    return isNumericLiteral(constant.value) ? constant.value : sourceStringLiteral(constant.value);\n};\n\nconst isStringTyped = (context: ModuleContext, type: TypeId | undefined): boolean => {\n    if (type === undefined) return false;\n    const resolved = context.library.typeOf(type);\n    return resolved?.kind === \"primitive\" && resolved.category === \"string\";\n};\n\nconst isNumericLiteral = (value: string): boolean => /^-?(?:\\d+|\\d*\\.\\d+)$/.test(value);\n"]}
+{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,WAAW,GAAgB,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;AACxD,mGAAmG;AACnG,2FAA2F;AAC3F,MAAM,iBAAiB,GAA2B,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAE9F,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAQ,EAAE;IAC7E,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAC5B,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,IAAI,MAAM,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CACvG,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAU,EAAE;IAC9E,IAAI,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;QACzD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;QAC1D,OAAO,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9D,CAAC;IAED,OAAO,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAU,EAAE;IACrF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;AAC5F,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,IAAwB,EAAW,EAAE,CACnF,CAAC,GAAG,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE7F,MAAM,oBAAoB,GAAG,CACzB,OAAsB,EACtB,IAAwB,EACxB,QAA2B,EACpB,EAAE;IACT,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C,OAAO,QAAQ,EAAE,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAW,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAExF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirConstant } from \"../../gir/namespace.js\";\nimport type { PrimitiveCategory } from \"../../gir/primitives.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\n\nconst TRUE_VALUES: Set<string> = new Set([\"true\", \"1\"]);\n// A `gint64`/`guint64` constant is typed `bigint`, and its decimal text does not survive a double:\n// G_MAXINT64 rounds to 2^63. The literal has to carry the BigInt suffix the type promises.\nconst BIGINT_CATEGORIES: Set<PrimitiveCategory> = new Set([\"bigint64\", \"biguint64\", \"gtype\"]);\n\nconst generateConstant = (context: ModuleContext, constant: GirConstant): void => {\n    context.module.appendDeclaration(\n        `${renderJsDoc(constant.doc)}export const ${constant.name} = ${constantLiteral(context, constant)};`,\n    );\n};\n\nconst constantLiteral = (context: ModuleContext, constant: GirConstant): string => {\n    if (hasPrimitiveCategory(context, constant.type, \"string\")) {\n        return sourceStringLiteral(constant.value);\n    }\n\n    if (hasPrimitiveCategory(context, constant.type, \"boolean\")) {\n        return TRUE_VALUES.has(constant.value) ? \"true\" : \"false\";\n    }\n\n    return numericConstantLiteral(context, constant);\n};\n\nconst numericConstantLiteral = (context: ModuleContext, constant: GirConstant): string => {\n    if (!isNumericLiteral(constant.value)) {\n        return sourceStringLiteral(constant.value);\n    }\n\n    return isBigIntConstant(context, constant.type) ? `${constant.value}n` : constant.value;\n};\n\nconst isBigIntConstant = (context: ModuleContext, type: TypeId | undefined): boolean =>\n    [...BIGINT_CATEGORIES].some((category) => hasPrimitiveCategory(context, type, category));\n\nconst hasPrimitiveCategory = (\n    context: ModuleContext,\n    type: TypeId | undefined,\n    category: PrimitiveCategory,\n): boolean => {\n    if (type === undefined) {\n        return false;\n    }\n\n    const resolved = context.library.typeFor(type);\n\n    return resolved?.kind === \"primitive\" && resolved.category === category;\n};\n\nconst isNumericLiteral = (value: string): boolean => /^-?(?:\\d+|\\d*\\.\\d+)$/.test(value);\n\nexport { generateConstant, constantLiteral };\n"]}

package/dist/store/gi/constructor-props.d.ts

@@ -1,5 +1,6 @@
 import type { GirClass } from "../../gir/class.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const renderConstructorPropsInterface: (context: ModuleContext, klass: GirClass, className: string) => string;
-export declare const renderClassConstructor: (context: ModuleContext, klass: GirClass, className: string, hasParent: boolean) => string | undefined;
+declare const renderConstructorPropsInterface: (context: ModuleContext, klass: GirClass, className: string) => string;
+declare const renderClassConstructor: (context: ModuleContext, klass: GirClass, className: string, hasParent: boolean) => string | undefined;
+export { renderConstructorPropsInterface, renderClassConstructor };
 //# sourceMappingURL=constructor-props.d.ts.map

package/dist/store/gi/constructor-props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constructor-props.d.ts","sourceRoot":"","sources":["../../../src/store/gi/constructor-props.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAyB7D,eAAO,MAAM,+BAA+B,YAAa,aAAa,SAAS,QAAQ,aAAa,MAAM,KAAG,MAQ5G,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACtB,aAAa,SACf,QAAQ,aACJ,MAAM,aACN,OAAO,KACnB,MAAM,GAAG,SAKX,CAAC"}
+{"version":3,"file":"constructor-props.d.ts","sourceRoot":"","sources":["../../../src/store/gi/constructor-props.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAyC7D,QAAA,MAAM,+BAA+B,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,EAAE,WAAW,MAAM,KAAG,MAUrG,CAAC;AAEF,QAAA,MAAM,sBAAsB,GACxB,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,WAAW,MAAM,EACjB,WAAW,OAAO,KACnB,MAAM,GAAG,SAYX,CAAC;AAmCF,OAAO,EAAE,+BAA+B,EAAE,sBAAsB,EAAE,CAAC"}