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

package/dist/store/gi/param-marshal.d.ts

@@ -1,9 +1,10 @@
-import { type GirParameter } from "../../gir/parameter.js";
 import type { TypeId } from "../../gir/type-id.js";
 import type { ModuleContext } from "../../writer/context.js";
-export declare const passesHandleInPlace: (context: ModuleContext, parameter: GirParameter) => boolean;
-export declare const isCollectibleCallerOut: (context: ModuleContext, parameter: GirParameter) => boolean;
-export declare const isRecordCallerOut: (context: ModuleContext, parameter: GirParameter) => boolean;
-export declare const isRecordInout: (context: ModuleContext, parameter: GirParameter) => boolean;
-export declare const isHandlePassing: (context: ModuleContext, ref: TypeId) => boolean;
+import { type GirParameter } from "../../gir/parameter.js";
+declare const isHandlePassedInPlace: (context: ModuleContext, parameter: GirParameter) => boolean;
+declare const isCollectibleCallerOut: (context: ModuleContext, parameter: GirParameter) => boolean;
+declare const isRecordCallerOut: (context: ModuleContext, parameter: GirParameter) => boolean;
+declare const isRecordInout: (context: ModuleContext, parameter: GirParameter) => boolean;
+declare const isHandlePassing: (context: ModuleContext, ref: TypeId) => boolean;
+export { isHandlePassedInPlace, isCollectibleCallerOut, isRecordCallerOut, isRecordInout, isHandlePassing };
 //# sourceMappingURL=param-marshal.d.ts.map

package/dist/store/gi/param-marshal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"param-marshal.d.ts","sourceRoot":"","sources":["../../../src/store/gi/param-marshal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,wBAAwB,CAAC;AAE7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,YAAa,aAAa,aAAa,YAAY,KAAG,OAOrF,CAAC;AAWF,eAAO,MAAM,sBAAsB,YAAa,aAAa,aAAa,YAAY,KAAG,OAGxF,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAa,aAAa,aAAa,YAAY,KAAG,OAC5B,CAAC;AAEzD,eAAO,MAAM,aAAa,YAAa,aAAa,aAAa,YAAY,KAAG,OACO,CAAC;AAExF,eAAO,MAAM,eAAe,YAAa,aAAa,OAAO,MAAM,KAAG,OAarE,CAAC"}
+{"version":3,"file":"param-marshal.d.ts","sourceRoot":"","sources":["../../../src/store/gi/param-marshal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,wBAAwB,CAAC;AAE7E,QAAA,MAAM,qBAAqB,GAAI,SAAS,aAAa,EAAE,WAAW,YAAY,KAAG,OAUhF,CAAC;AAeF,QAAA,MAAM,sBAAsB,GAAI,SAAS,aAAa,EAAE,WAAW,YAAY,KAAG,OAIjF,CAAC;AAEF,QAAA,MAAM,iBAAiB,GAAI,SAAS,aAAa,EAAE,WAAW,YAAY,KAAG,OACrB,CAAC;AAEzD,QAAA,MAAM,aAAa,GAAI,SAAS,aAAa,EAAE,WAAW,YAAY,KAAG,OACc,CAAC;AAExF,QAAA,MAAM,eAAe,GAAI,SAAS,aAAa,EAAE,KAAK,MAAM,KAAG,OA0B9D,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC"}

package/dist/store/gi/param-marshal.js

@@ -1,37 +1,50 @@
 import { isInoutParameter } from "../../gir/parameter.js";
-export const passesHandleInPlace = (context, parameter) => {
-    if (parameter.direction !== "out" && parameter.direction !== "inout")
+const isHandlePassedInPlace = (context, parameter) => {
+    if (parameter.direction !== "out" && parameter.direction !== "inout") {
         return false;
+    }
     return ((parameter.callerAllocates || parameter.direction === "inout") &&
         parameter.type !== undefined &&
         isHandlePassing(context, parameter.type));
 };
 const underlyingType = (context, ref) => {
-    const type = context.library.typeOf(ref);
-    if (type?.kind !== "alias")
+    const type = context.library.typeFor(ref);
+    if (type?.kind !== "alias") {
         return type;
+    }
     return type.value.target === undefined ? undefined : underlyingType(context, type.value.target);
 };
 const underlyingParamKind = (context, parameter) => parameter.type === undefined ? undefined : underlyingType(context, parameter.type)?.kind;
-export const isCollectibleCallerOut = (context, parameter) => {
+const isCollectibleCallerOut = (context, parameter) => {
     const kind = underlyingParamKind(context, parameter);
     return kind === "record" || kind === "class";
 };
-export const isRecordCallerOut = (context, parameter) => underlyingParamKind(context, parameter) === "record";
-export const isRecordInout = (context, parameter) => isInoutParameter(parameter) && underlyingParamKind(context, parameter) === "record";
-export const isHandlePassing = (context, ref) => {
-    const type = context.library.typeOf(ref);
-    if (type === undefined)
+const isRecordCallerOut = (context, parameter) => underlyingParamKind(context, parameter) === "record";
+const isRecordInout = (context, parameter) => isInoutParameter(parameter) && underlyingParamKind(context, parameter) === "record";
+const isHandlePassing = (context, ref) => {
+    const type = context.library.typeFor(ref);
+    if (type === undefined) {
         return true;
+    }
     switch (type.kind) {
         case "class":
         case "interface":
-        case "record":
+        case "record": {
             return true;
-        case "alias":
+        }
+        case "alias": {
             return type.value.target !== undefined && isHandlePassing(context, type.value.target);
-        default:
+        }
+        case "callback":
+        case "carray":
+        case "enum":
+        case "hashtable":
+        case "list":
+        case "primitive":
+        case "varargs": {
             return false;
+        }
     }
 };
+export { isHandlePassedInPlace, isCollectibleCallerOut, isRecordCallerOut, isRecordInout, isHandlePassing };
 //# sourceMappingURL=param-marshal.js.map

package/dist/store/gi/param-marshal.js.map

@@ -1 +1 @@
-{"version":3,"file":"param-marshal.js","sourceRoot":"","sources":["../../../src/store/gi/param-marshal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK7E,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE;IAC5F,IAAI,SAAS,CAAC,SAAS,KAAK,KAAK,IAAI,SAAS,CAAC,SAAS,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACnF,OAAO,CACH,CAAC,SAAS,CAAC,eAAe,IAAI,SAAS,CAAC,SAAS,KAAK,OAAO,CAAC;QAC9D,SAAS,CAAC,IAAI,KAAK,SAAS;QAC5B,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAC3C,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAuB,EAAE;IAChF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,EAAE,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACxC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACpG,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAA+B,EAAE,CACzG,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;AAE7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE;IAC/F,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACrD,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE,CAC1F,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,QAAQ,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE,CACtF,gBAAgB,CAAC,SAAS,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,QAAQ,CAAC;AAExF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE;IAC5E,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACpC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,WAAW,CAAC;QACjB,KAAK,QAAQ;YACT,OAAO,IAAI,CAAC;QAChB,KAAK,OAAO;YACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1F;YACI,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { type GirParameter, isInoutParameter } from \"../../gir/parameter.js\";\nimport type { GirType } from \"../../gir/type.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\n\nexport const passesHandleInPlace = (context: ModuleContext, parameter: GirParameter): boolean => {\n    if (parameter.direction !== \"out\" && parameter.direction !== \"inout\") return false;\n    return (\n        (parameter.callerAllocates || parameter.direction === \"inout\") &&\n        parameter.type !== undefined &&\n        isHandlePassing(context, parameter.type)\n    );\n};\n\nconst underlyingType = (context: ModuleContext, ref: TypeId): GirType | undefined => {\n    const type = context.library.typeOf(ref);\n    if (type?.kind !== \"alias\") return type;\n    return type.value.target === undefined ? undefined : underlyingType(context, type.value.target);\n};\n\nconst underlyingParamKind = (context: ModuleContext, parameter: GirParameter): GirType[\"kind\"] | undefined =>\n    parameter.type === undefined ? undefined : underlyingType(context, parameter.type)?.kind;\n\nexport const isCollectibleCallerOut = (context: ModuleContext, parameter: GirParameter): boolean => {\n    const kind = underlyingParamKind(context, parameter);\n    return kind === \"record\" || kind === \"class\";\n};\n\nexport const isRecordCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    underlyingParamKind(context, parameter) === \"record\";\n\nexport const isRecordInout = (context: ModuleContext, parameter: GirParameter): boolean =>\n    isInoutParameter(parameter) && underlyingParamKind(context, parameter) === \"record\";\n\nexport const isHandlePassing = (context: ModuleContext, ref: TypeId): boolean => {\n    const type = context.library.typeOf(ref);\n    if (type === undefined) return true;\n    switch (type.kind) {\n        case \"class\":\n        case \"interface\":\n        case \"record\":\n            return true;\n        case \"alias\":\n            return type.value.target !== undefined && isHandlePassing(context, type.value.target);\n        default:\n            return false;\n    }\n};\n"]}
+{"version":3,"file":"param-marshal.js","sourceRoot":"","sources":["../../../src/store/gi/param-marshal.ts"],"names":[],"mappings":"AAGA,OAAO,EAAqB,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE7E,MAAM,qBAAqB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE;IACvF,IAAI,SAAS,CAAC,SAAS,KAAK,KAAK,IAAI,SAAS,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;QACnE,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,CACH,CAAC,SAAS,CAAC,eAAe,IAAI,SAAS,CAAC,SAAS,KAAK,OAAO,CAAC;QAC9D,SAAS,CAAC,IAAI,KAAK,SAAS;QAC5B,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAC3C,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAuB,EAAE;IAChF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,IAAI,IAAI,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACpG,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAA+B,EAAE,CACzG,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;AAE7F,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE;IACxF,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAErD,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE,CACnF,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,QAAQ,CAAC;AAEzD,MAAM,aAAa,GAAG,CAAC,OAAsB,EAAE,SAAuB,EAAW,EAAE,CAC/E,gBAAgB,CAAC,SAAS,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,QAAQ,CAAC;AAExF,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE;IACrE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,WAAW,CAAC;QACjB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACX,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1F,CAAC;QACD,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS,CAAC,CAAC,CAAC;YACb,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import type { TypeId } from \"../../gir/type-id.js\";\nimport type { GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { type GirParameter, isInoutParameter } from \"../../gir/parameter.js\";\n\nconst isHandlePassedInPlace = (context: ModuleContext, parameter: GirParameter): boolean => {\n    if (parameter.direction !== \"out\" && parameter.direction !== \"inout\") {\n        return false;\n    }\n\n    return (\n        (parameter.callerAllocates || parameter.direction === \"inout\") &&\n        parameter.type !== undefined &&\n        isHandlePassing(context, parameter.type)\n    );\n};\n\nconst underlyingType = (context: ModuleContext, ref: TypeId): GirType | undefined => {\n    const type = context.library.typeFor(ref);\n\n    if (type?.kind !== \"alias\") {\n        return type;\n    }\n\n    return type.value.target === undefined ? undefined : underlyingType(context, type.value.target);\n};\n\nconst underlyingParamKind = (context: ModuleContext, parameter: GirParameter): GirType[\"kind\"] | undefined =>\n    parameter.type === undefined ? undefined : underlyingType(context, parameter.type)?.kind;\n\nconst isCollectibleCallerOut = (context: ModuleContext, parameter: GirParameter): boolean => {\n    const kind = underlyingParamKind(context, parameter);\n\n    return kind === \"record\" || kind === \"class\";\n};\n\nconst isRecordCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    underlyingParamKind(context, parameter) === \"record\";\n\nconst isRecordInout = (context: ModuleContext, parameter: GirParameter): boolean =>\n    isInoutParameter(parameter) && underlyingParamKind(context, parameter) === \"record\";\n\nconst isHandlePassing = (context: ModuleContext, ref: TypeId): boolean => {\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return true;\n    }\n\n    switch (type.kind) {\n        case \"class\":\n        case \"interface\":\n        case \"record\": {\n            return true;\n        }\n        case \"alias\": {\n            return type.value.target !== undefined && isHandlePassing(context, type.value.target);\n        }\n        case \"callback\":\n        case \"carray\":\n        case \"enum\":\n        case \"hashtable\":\n        case \"list\":\n        case \"primitive\":\n        case \"varargs\": {\n            return false;\n        }\n    }\n};\n\nexport { isHandlePassedInPlace, isCollectibleCallerOut, isRecordCallerOut, isRecordInout, isHandlePassing };\n"]}

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

@@ -1,4 +1,5 @@
 import type { Library } from "../../gir/library.js";
 import type { GirNamespace } from "../../gir/namespace.js";
-export declare const generateNamespaceModule: (namespace: GirNamespace, library: Library) => string;
+declare const generateNamespaceModule: (namespace: GirNamespace, library: Library) => string;
+export { generateNamespaceModule };
 //# sourceMappingURL=pipeline.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../src/store/gi/pipeline.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAarE,eAAO,MAAM,uBAAuB,cAAe,YAAY,WAAW,OAAO,KAAG,MA+BnF,CAAC"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../src/store/gi/pipeline.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBrE,QAAA,MAAM,uBAAuB,GAAI,WAAW,YAAY,EAAE,SAAS,OAAO,KAAG,MAO5E,CAAC;AAuGF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/store/gi/pipeline.js

@@ -10,9 +10,14 @@ import { generateEnum } from "./enum.js";
 import { generateNamespaceBootstrap, generateNamespaceFunction } from "./function.js";
 import { generateInterface } from "./interface.js";
 import { generateRecord } from "./record.js";
-export const generateNamespaceModule = (namespace, library) => {
+const generateNamespaceModule = (namespace, library) => {
     const context = new ModuleContext(namespace, library);
     context.addGObjectBootstrapImports();
+    generateNamespaceTypes(context, namespace);
+    generateNamespaceMembers(context, namespace);
+    return context.module.toSource();
+};
+const generateNamespaceTypes = (context, namespace) => {
     for (const enumeration of namespace.enums) {
         generateEnum(context, enumeration);
     }
@@ -25,6 +30,8 @@ export const generateNamespaceModule = (namespace, library) => {
     for (const iface of namespace.interfaces) {
         generateInterface(context, iface);
     }
+};
+const generateNamespaceMembers = (context, namespace) => {
     for (const callback of namespace.callbacks) {
         generateCallback(context, callback);
     }
@@ -38,43 +45,51 @@ export const generateNamespaceModule = (namespace, library) => {
     for (const alias of namespace.aliases) {
         generateAlias(context, alias);
     }
-    return context.module.toSource();
 };
 const generateAlias = (context, alias) => {
     const category = alias.cType === undefined ? undefined : primitiveCategory(alias.cType);
     const targetType = category === "gtype" ? PRIMITIVE_TS_TYPE.gtype : renderTsType(context, alias.target);
     context.module.appendDeclaration(`${renderJsDoc(alias.doc)}export type ${alias.name} = ${targetType};`);
 };
+const visitClass = (state, klass) => {
+    if (state.placed.has(klass) || state.visiting.has(klass)) {
+        return;
+    }
+    state.visiting.add(klass);
+    const parent = sameNamespaceParent(klass, state.namespaceName, state.byLocalName);
+    if (parent !== undefined) {
+        visitClass(state, parent);
+    }
+    state.visiting.delete(klass);
+    state.placed.add(klass);
+    state.result.push(klass);
+};
 const topologicalClassOrder = (classes, namespaceName) => {
     const byLocalName = new Map();
-    for (const klass of classes)
+    for (const klass of classes) {
         byLocalName.set(klass.name, klass);
-    const result = [];
-    const placed = new Set();
-    const visiting = new Set();
-    const visit = (klass) => {
-        if (placed.has(klass))
-            return;
-        if (visiting.has(klass))
-            return;
-        visiting.add(klass);
-        const parent = sameNamespaceParent(klass, namespaceName, byLocalName);
-        if (parent !== undefined)
-            visit(parent);
-        visiting.delete(klass);
-        placed.add(klass);
-        result.push(klass);
+    }
+    const state = {
+        namespaceName,
+        byLocalName,
+        placed: new Set(),
+        visiting: new Set(),
+        result: [],
     };
-    for (const klass of classes)
-        visit(klass);
-    return result;
+    for (const klass of classes) {
+        visitClass(state, klass);
+    }
+    return state.result;
 };
 const sameNamespaceParent = (klass, namespaceName, byLocalName) => {
-    if (klass.parent === undefined)
+    if (klass.parent === undefined) {
         return undefined;
+    }
     const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);
-    if (parentNamespace !== undefined && parentNamespace !== namespaceName)
+    if (parentNamespace !== undefined && parentNamespace !== namespaceName) {
         return undefined;
+    }
     return byLocalName.get(typeName);
 };
+export { generateNamespaceModule };
 //# sourceMappingURL=pipeline.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/store/gi/pipeline.ts"],"names":[],"mappings":"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","sourcesContent":["import { renderTsType } from \"../../analysis/ts-type.js\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { Library } from \"../../gir/library.js\";\nimport type { GirAlias, GirNamespace } from \"../../gir/namespace.js\";\nimport { PRIMITIVE_TS_TYPE, primitiveCategory } from \"../../gir/primitives.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\nimport { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { generateCallback } from \"./callback.js\";\nimport { generateClass } from \"./class.js\";\nimport { generateConstant } from \"./constant.js\";\nimport { generateEnum } from \"./enum.js\";\nimport { generateNamespaceBootstrap, generateNamespaceFunction } from \"./function.js\";\nimport { generateInterface } from \"./interface.js\";\nimport { generateRecord } from \"./record.js\";\n\nexport const generateNamespaceModule = (namespace: GirNamespace, library: Library): string => {\n    const context = new ModuleContext(namespace, library);\n    context.addGObjectBootstrapImports();\n\n    for (const enumeration of namespace.enums) {\n        generateEnum(context, enumeration);\n    }\n    for (const record of namespace.records) {\n        generateRecord(context, record);\n    }\n    for (const klass of topologicalClassOrder(namespace.classes, namespace.name)) {\n        generateClass(context, klass);\n    }\n    for (const iface of namespace.interfaces) {\n        generateInterface(context, iface);\n    }\n    for (const callback of namespace.callbacks) {\n        generateCallback(context, callback);\n    }\n    for (const fn of namespace.functions) {\n        generateNamespaceFunction(context, fn);\n    }\n    generateNamespaceBootstrap(context, namespace);\n    for (const constant of namespace.constants) {\n        generateConstant(context, constant);\n    }\n    for (const alias of namespace.aliases) {\n        generateAlias(context, alias);\n    }\n\n    return context.module.toSource();\n};\n\nconst generateAlias = (context: ModuleContext, alias: GirAlias): void => {\n    const category = alias.cType === undefined ? undefined : primitiveCategory(alias.cType);\n    const targetType = category === \"gtype\" ? PRIMITIVE_TS_TYPE.gtype : renderTsType(context, alias.target);\n    context.module.appendDeclaration(`${renderJsDoc(alias.doc)}export type ${alias.name} = ${targetType};`);\n};\n\nconst topologicalClassOrder = (classes: GirClass[], namespaceName: string): GirClass[] => {\n    const byLocalName = new Map<string, GirClass>();\n    for (const klass of classes) byLocalName.set(klass.name, klass);\n    const result: GirClass[] = [];\n    const placed = new Set<GirClass>();\n    const visiting = new Set<GirClass>();\n    const visit = (klass: GirClass): void => {\n        if (placed.has(klass)) return;\n        if (visiting.has(klass)) return;\n        visiting.add(klass);\n        const parent = sameNamespaceParent(klass, namespaceName, byLocalName);\n        if (parent !== undefined) visit(parent);\n        visiting.delete(klass);\n        placed.add(klass);\n        result.push(klass);\n    };\n    for (const klass of classes) visit(klass);\n    return result;\n};\n\nconst sameNamespaceParent = (\n    klass: GirClass,\n    namespaceName: string,\n    byLocalName: Map<string, GirClass>,\n): GirClass | undefined => {\n    if (klass.parent === undefined) return undefined;\n    const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);\n    if (parentNamespace !== undefined && parentNamespace !== namespaceName) return undefined;\n    return byLocalName.get(typeName);\n};\n"]}
+{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/store/gi/pipeline.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirClass } from \"../../gir/class.js\";\nimport type { Library } from \"../../gir/library.js\";\nimport type { GirAlias, GirNamespace } from \"../../gir/namespace.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { PRIMITIVE_TS_TYPE, primitiveCategory } from \"../../gir/primitives.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\nimport { ModuleContext } from \"../../writer/context.js\";\nimport { renderJsDoc } from \"../../writer/doc.js\";\nimport { generateCallback } from \"./callback.js\";\nimport { generateClass } from \"./class.js\";\nimport { generateConstant } from \"./constant.js\";\nimport { generateEnum } from \"./enum.js\";\nimport { generateNamespaceBootstrap, generateNamespaceFunction } from \"./function.js\";\nimport { generateInterface } from \"./interface.js\";\nimport { generateRecord } from \"./record.js\";\n\ntype TopologicalState = {\n    namespaceName: string;\n    byLocalName: Map<string, GirClass>;\n    placed: Set<GirClass>;\n    visiting: Set<GirClass>;\n    result: GirClass[];\n};\n\nconst generateNamespaceModule = (namespace: GirNamespace, library: Library): string => {\n    const context = new ModuleContext(namespace, library);\n    context.addGObjectBootstrapImports();\n    generateNamespaceTypes(context, namespace);\n    generateNamespaceMembers(context, namespace);\n\n    return context.module.toSource();\n};\n\nconst generateNamespaceTypes = (context: ModuleContext, namespace: GirNamespace): void => {\n    for (const enumeration of namespace.enums) {\n        generateEnum(context, enumeration);\n    }\n\n    for (const record of namespace.records) {\n        generateRecord(context, record);\n    }\n\n    for (const klass of topologicalClassOrder(namespace.classes, namespace.name)) {\n        generateClass(context, klass);\n    }\n\n    for (const iface of namespace.interfaces) {\n        generateInterface(context, iface);\n    }\n};\n\nconst generateNamespaceMembers = (context: ModuleContext, namespace: GirNamespace): void => {\n    for (const callback of namespace.callbacks) {\n        generateCallback(context, callback);\n    }\n\n    for (const fn of namespace.functions) {\n        generateNamespaceFunction(context, fn);\n    }\n\n    generateNamespaceBootstrap(context, namespace);\n\n    for (const constant of namespace.constants) {\n        generateConstant(context, constant);\n    }\n\n    for (const alias of namespace.aliases) {\n        generateAlias(context, alias);\n    }\n};\n\nconst generateAlias = (context: ModuleContext, alias: GirAlias): void => {\n    const category = alias.cType === undefined ? undefined : primitiveCategory(alias.cType);\n    const targetType = category === \"gtype\" ? PRIMITIVE_TS_TYPE.gtype : renderTsType(context, alias.target);\n    context.module.appendDeclaration(`${renderJsDoc(alias.doc)}export type ${alias.name} = ${targetType};`);\n};\n\nconst visitClass = (state: TopologicalState, klass: GirClass): void => {\n    if (state.placed.has(klass) || state.visiting.has(klass)) {\n        return;\n    }\n\n    state.visiting.add(klass);\n    const parent = sameNamespaceParent(klass, state.namespaceName, state.byLocalName);\n\n    if (parent !== undefined) {\n        visitClass(state, parent);\n    }\n\n    state.visiting.delete(klass);\n    state.placed.add(klass);\n    state.result.push(klass);\n};\n\nconst topologicalClassOrder = (classes: GirClass[], namespaceName: string): GirClass[] => {\n    const byLocalName: Map<string, GirClass> = new Map();\n\n    for (const klass of classes) {\n        byLocalName.set(klass.name, klass);\n    }\n\n    const state: TopologicalState = {\n        namespaceName,\n        byLocalName,\n        placed: new Set<GirClass>(),\n        visiting: new Set<GirClass>(),\n        result: [],\n    };\n\n    for (const klass of classes) {\n        visitClass(state, klass);\n    }\n\n    return state.result;\n};\n\nconst sameNamespaceParent = (\n    klass: GirClass,\n    namespaceName: string,\n    byLocalName: Map<string, GirClass>,\n): GirClass | undefined => {\n    if (klass.parent === undefined) {\n        return undefined;\n    }\n\n    const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);\n\n    if (parentNamespace !== undefined && parentNamespace !== namespaceName) {\n        return undefined;\n    }\n\n    return byLocalName.get(typeName);\n};\n\nexport { generateNamespaceModule };\n"]}

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

@@ -1,5 +1,6 @@
 import type { GirClass } from "../../gir/class.js";
 import type { ModuleContext } from "../../writer/context.js";
 import { type ResolvedAccessor } from "./property-accessor.js";
-export declare const renderPropertyDeclarations: (context: ModuleContext, klass: GirClass, className: string, accessors: ResolvedAccessor[]) => string[];
+declare const renderPropertyDeclarations: (context: ModuleContext, klass: GirClass, className: string, accessors: ResolvedAccessor[]) => string[];
+export { renderPropertyDeclarations };
 //# sourceMappingURL=properties.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../../../src/store/gi/properties.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,KAAK,gBAAgB,EAAwB,MAAM,wBAAwB,CAAC;AAgBrF,eAAO,MAAM,0BAA0B,YAC1B,aAAa,SACf,QAAQ,aACJ,MAAM,aACN,gBAAgB,EAAE,KAC9B,MAAM,EAYR,CAAC"}
+{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../../../src/store/gi/properties.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D,OAAO,EAAE,KAAK,gBAAgB,EAAwB,MAAM,wBAAwB,CAAC;AAsBrF,QAAA,MAAM,0BAA0B,GAC5B,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,WAAW,MAAM,EACjB,WAAW,gBAAgB,EAAE,KAC9B,MAAM,EAeR,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/store/gi/properties.js

@@ -8,23 +8,25 @@ const interfaceEntries = (context, klass) => {
     const entries = [];
     for (const { owner, property } of collectInterfaceProperties(context, klass)) {
         const accessor = resolveOwnerAccessor(context, property, owner.methods);
-        if (accessor === undefined || !accessor.hasGetter)
+        if (!accessor?.hasGetter) {
             continue;
+        }
         entries.push(propertyEntry(accessor));
     }
     return entries;
 };
-export const renderPropertyDeclarations = (context, klass, className, accessors) => {
+const renderPropertyDeclarations = (context, klass, className, accessors) => {
     const parentRef = parentCompanionRef(context, klass, PROPERTIES_SUFFIX);
     const extendsClause = parentRef === undefined ? "" : ` extends ${parentRef}`;
     const entries = [
-        ...accessors.filter((accessor) => accessor.hasGetter).map(propertyEntry),
+        ...accessors.filter((accessor) => accessor.hasGetter).map((accessor) => propertyEntry(accessor)),
         ...interfaceEntries(context, klass),
     ];
     const map = `${className}${PROPERTIES_SUFFIX}`;
     return [
         renderBracedOrEmpty(`export interface ${map}${extendsClause}`, entries.join("\n")),
-        renderBracedOrEmpty(`export interface ${className}`, `__properties__?: ${map};`),
+        renderBracedOrEmpty(`export interface ${className}`, `__properties__: ${map};`),
     ];
 };
+export { renderPropertyDeclarations };
 //# sourceMappingURL=properties.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../src/store/gi/properties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAG3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAyB,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAErF,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAEvC,MAAM,aAAa,GAAG,CAAC,QAA0B,EAAU,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;AAExG,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAY,EAAE;IAC3E,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,0BAA0B,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QAC3E,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACxE,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,SAAS;YAAE,SAAS;QAC5D,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACtC,OAAsB,EACtB,KAAe,EACf,SAAiB,EACjB,SAA6B,EACrB,EAAE;IACV,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,SAAS,EAAE,CAAC;IAC7E,MAAM,OAAO,GAAG;QACZ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC;QACxE,GAAG,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC;KACtC,CAAC;IACF,MAAM,GAAG,GAAG,GAAG,SAAS,GAAG,iBAAiB,EAAE,CAAC;IAC/C,OAAO;QACH,mBAAmB,CAAC,oBAAoB,GAAG,GAAG,aAAa,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClF,mBAAmB,CAAC,oBAAoB,SAAS,EAAE,EAAE,oBAAoB,GAAG,GAAG,CAAC;KACnF,CAAC;AACN,CAAC,CAAC","sourcesContent":["import { collectInterfaceProperties } from \"../../analysis/inheritance.js\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport { parentCompanionRef } from \"./companion.js\";\nimport { type ResolvedAccessor, resolveOwnerAccessor } from \"./property-accessor.js\";\n\nconst PROPERTIES_SUFFIX = \"Properties\";\n\nconst propertyEntry = (accessor: ResolvedAccessor): string => `${accessor.jsName}: ${accessor.tsType};`;\n\nconst interfaceEntries = (context: ModuleContext, klass: GirClass): string[] => {\n    const entries: string[] = [];\n    for (const { owner, property } of collectInterfaceProperties(context, klass)) {\n        const accessor = resolveOwnerAccessor(context, property, owner.methods);\n        if (accessor === undefined || !accessor.hasGetter) continue;\n        entries.push(propertyEntry(accessor));\n    }\n    return entries;\n};\n\nexport const renderPropertyDeclarations = (\n    context: ModuleContext,\n    klass: GirClass,\n    className: string,\n    accessors: ResolvedAccessor[],\n): string[] => {\n    const parentRef = parentCompanionRef(context, klass, PROPERTIES_SUFFIX);\n    const extendsClause = parentRef === undefined ? \"\" : ` extends ${parentRef}`;\n    const entries = [\n        ...accessors.filter((accessor) => accessor.hasGetter).map(propertyEntry),\n        ...interfaceEntries(context, klass),\n    ];\n    const map = `${className}${PROPERTIES_SUFFIX}`;\n    return [\n        renderBracedOrEmpty(`export interface ${map}${extendsClause}`, entries.join(\"\\n\")),\n        renderBracedOrEmpty(`export interface ${className}`, `__properties__?: ${map};`),\n    ];\n};\n"]}
+{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../src/store/gi/properties.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAyB,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAErF,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAEvC,MAAM,aAAa,GAAG,CAAC,QAA0B,EAAU,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;AAExG,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAY,EAAE;IAC3E,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,0BAA0B,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QAC3E,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAExE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;YACvB,SAAS;QACb,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAC/B,OAAsB,EACtB,KAAe,EACf,SAAiB,EACjB,SAA6B,EACrB,EAAE;IACV,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,SAAS,EAAE,CAAC;IAE7E,MAAM,OAAO,GAAG;QACZ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChG,GAAG,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC;KACtC,CAAC;IAEF,MAAM,GAAG,GAAG,GAAG,SAAS,GAAG,iBAAiB,EAAE,CAAC;IAE/C,OAAO;QACH,mBAAmB,CAAC,oBAAoB,GAAG,GAAG,aAAa,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClF,mBAAmB,CAAC,oBAAoB,SAAS,EAAE,EAAE,mBAAmB,GAAG,GAAG,CAAC;KAClF,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,CAAC","sourcesContent":["import type { GirClass } from \"../../gir/class.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { collectInterfaceProperties } from \"../../analysis/inheritance.js\";\nimport { renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport { parentCompanionRef } from \"./companion.js\";\nimport { type ResolvedAccessor, resolveOwnerAccessor } from \"./property-accessor.js\";\n\nconst PROPERTIES_SUFFIX = \"Properties\";\n\nconst propertyEntry = (accessor: ResolvedAccessor): string => `${accessor.jsName}: ${accessor.tsType};`;\n\nconst interfaceEntries = (context: ModuleContext, klass: GirClass): string[] => {\n    const entries: string[] = [];\n\n    for (const { owner, property } of collectInterfaceProperties(context, klass)) {\n        const accessor = resolveOwnerAccessor(context, property, owner.methods);\n\n        if (!accessor?.hasGetter) {\n            continue;\n        }\n\n        entries.push(propertyEntry(accessor));\n    }\n\n    return entries;\n};\n\nconst renderPropertyDeclarations = (\n    context: ModuleContext,\n    klass: GirClass,\n    className: string,\n    accessors: ResolvedAccessor[],\n): string[] => {\n    const parentRef = parentCompanionRef(context, klass, PROPERTIES_SUFFIX);\n    const extendsClause = parentRef === undefined ? \"\" : ` extends ${parentRef}`;\n\n    const entries = [\n        ...accessors.filter((accessor) => accessor.hasGetter).map((accessor) => propertyEntry(accessor)),\n        ...interfaceEntries(context, klass),\n    ];\n\n    const map = `${className}${PROPERTIES_SUFFIX}`;\n\n    return [\n        renderBracedOrEmpty(`export interface ${map}${extendsClause}`, entries.join(\"\\n\")),\n        renderBracedOrEmpty(`export interface ${className}`, `__properties__: ${map};`),\n    ];\n};\n\nexport { renderPropertyDeclarations };\n"]}

package/dist/store/gi/property-accessor.d.ts

@@ -1,26 +1,27 @@
 import type { GirFunction } from "../../gir/function.js";
-import { type GirProperty } from "../../gir/property.js";
 import type { ModuleContext } from "../../writer/context.js";
-export type ResolvedAccessor = {
+import { type GirProperty } from "../../gir/property.js";
+type ResolvedAccessor = {
     jsName: string;
     tsType: string;
     hasGetter: boolean;
     writable: boolean;
     getterMember: string | undefined;
-    getMethod: GirFunction | undefined;
+    getterMethod: GirFunction | undefined;
     setterMember: string | undefined;
 };
-export type PropertyAccessorArgs = {
+type PropertyAccessorArgs = {
     context: ModuleContext;
     property: GirProperty;
     claimedNames: Set<string>;
     methodByName: Map<string, GirFunction>;
     inheritedType?: string | undefined;
 };
-export declare const resolveAccessor: (args: PropertyAccessorArgs) => ResolvedAccessor | undefined;
-export declare const resolveOwnerAccessor: (context: ModuleContext, property: GirProperty, methods: GirFunction[]) => ResolvedAccessor | undefined;
-export declare const resolveAccessorType: (context: ModuleContext, property: GirProperty, methods: GirFunction[]) => string | undefined;
-export declare const renderResolvedPropertyAccessor: (context: ModuleContext, property: GirProperty, accessor: ResolvedAccessor) => string;
-export declare const renderPropertyAccessor: (args: PropertyAccessorArgs) => string | undefined;
-export declare const renderPropertyAccessorSignature: (args: PropertyAccessorArgs) => string | undefined;
+declare const resolveAccessor: (args: PropertyAccessorArgs) => ResolvedAccessor | undefined;
+declare const resolveOwnerAccessor: (context: ModuleContext, property: GirProperty, methods: GirFunction[]) => ResolvedAccessor | undefined;
+declare const resolveAccessorType: (context: ModuleContext, property: GirProperty, methods: GirFunction[]) => string | undefined;
+declare const renderResolvedPropertyAccessor: (context: ModuleContext, property: GirProperty, accessor: ResolvedAccessor) => string;
+declare const renderPropertyAccessor: (args: PropertyAccessorArgs) => string | undefined;
+declare const renderPropertyAccessorSignature: (args: PropertyAccessorArgs) => string | undefined;
+export { resolveAccessor, resolveOwnerAccessor, resolveAccessorType, renderResolvedPropertyAccessor, renderPropertyAccessor, renderPropertyAccessorSignature, type ResolvedAccessor, type PropertyAccessorArgs, };
 //# sourceMappingURL=property-accessor.d.ts.map

package/dist/store/gi/property-accessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"property-accessor.d.ts","sourceRoot":"","sources":["../../../src/store/gi/property-accessor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AAElF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAgB7D,MAAM,MAAM,gBAAgB,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IACnC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IACtB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,CAAC;AAyBF,eAAO,MAAM,eAAe,SAAU,oBAAoB,KAAG,gBAAgB,GAAG,SAwB/E,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACpB,aAAa,YACZ,WAAW,WACZ,WAAW,EAAE,KACvB,gBAAgB,GAAG,SASrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,YACnB,aAAa,YACZ,WAAW,WACZ,WAAW,EAAE,KACvB,MAAM,GAAG,SAAqE,CAAC;AAWlF,eAAO,MAAM,8BAA8B,YAC9B,aAAa,YACZ,WAAW,YACX,gBAAgB,KAC3B,MAeF,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAAU,oBAAoB,KAAG,MAAM,GAAG,SAC8B,CAAC;AAE5G,eAAO,MAAM,+BAA+B,SAAU,oBAAoB,KAAG,MAAM,GAAG,SAMhF,CAAC"}
+{"version":3,"file":"property-accessor.d.ts","sourceRoot":"","sources":["../../../src/store/gi/property-accessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AAMlF,KAAK,gBAAgB,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IACtB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,CAAC;AAqGF,QAAA,MAAM,eAAe,GAAI,MAAM,oBAAoB,KAAG,gBAAgB,GAAG,SAuBxE,CAAC;AAEF,QAAA,MAAM,oBAAoB,GACtB,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,SAAS,WAAW,EAAE,KACvB,gBAAgB,GAAG,SAcrB,CAAC;AAEF,QAAA,MAAM,mBAAmB,GACrB,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,SAAS,WAAW,EAAE,KACvB,MAAM,GAAG,SAAqE,CAAC;AAelF,QAAA,MAAM,8BAA8B,GAChC,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,UAAU,gBAAgB,KAC3B,MAiBF,CAAC;AAEF,QAAA,MAAM,sBAAsB,GAAI,MAAM,oBAAoB,KAAG,MAAM,GAAG,SACqC,CAAC;AAE5G,QAAA,MAAM,+BAA+B,GAAI,MAAM,oBAAoB,KAAG,MAAM,GAAG,SAazE,CAAC;AA2DP,OAAO,EACH,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,8BAA8B,EAC9B,sBAAsB,EACtB,+BAA+B,EAC/B,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,GAC5B,CAAC"}

package/dist/store/gi/property-accessor.js

@@ -1,4 +1,4 @@
-import { sourceStringLiteral, toCamelCase, toCamelIdentifier } from "@gtkx/utils";
+import { camelCase, sourceStringLiteral, toCamelIdentifier } from "@gtkx/utils";
 import { renderDescriptor } from "../../analysis/descriptor-render.js";
 import { inputParameters } from "../../analysis/param-structure.js";
 import { renderTsType } from "../../analysis/ts-type.js";
@@ -8,125 +8,151 @@ import { renderBlock } from "../../writer/emit.js";
 import { isEmittableCallable } from "./callables.js";
 import { methodExportName, renderMethodReturnType } from "./method.js";
 const isNullablePropertyType = (context, type) => {
-    if (type === undefined)
+    if (type === undefined) {
         return false;
-    const resolved = context.library.typeOf(type);
-    if (resolved === undefined)
+    }
+    const resolved = context.library.typeFor(type);
+    if (resolved === undefined) {
         return true;
-    if (resolved.kind === "primitive")
+    }
+    if (resolved.kind === "primitive") {
         return false;
-    if (resolved.kind === "enum")
+    }
+    if (resolved.kind === "enum") {
         return false;
-    if (resolved.kind === "alias")
+    }
+    if (resolved.kind === "alias") {
         return isNullablePropertyType(context, resolved.value.target);
+    }
     return true;
 };
+const resolveDelegate = (args, attribute, member, isDelegatable) => {
+    const method = member !== undefined && attribute !== undefined ? args.methodByName.get(attribute) : undefined;
+    const canDelegate = method === undefined || isDelegatable(method);
+    return canDelegate ? { member, method } : { member: undefined, method: undefined };
+};
 const resolveGetterDelegate = (args, jsName) => {
-    const { context, property, claimedNames, methodByName } = args;
+    const { context, property, claimedNames } = args;
     const member = delegateMember(property.getter, jsName, claimedNames);
-    const method = member !== undefined && property.getter !== undefined ? methodByName.get(property.getter) : undefined;
-    const delegatable = method === undefined ||
-        (inputParameters(context.library, method).length === 0 &&
-            !renderMethodReturnType(context, method).startsWith("["));
-    return delegatable ? { member, method } : { member: undefined, method: undefined };
+    return resolveDelegate(args, property.getter, member, (method) => inputParameters(context.library, method).length === 0 &&
+        !renderMethodReturnType(context, method).startsWith("["));
+};
+const resolveSetterDelegate = (args, jsName, isWritable) => {
+    const { context, property, claimedNames } = args;
+    const member = isWritable ? delegateMember(property.setter, jsName, claimedNames) : undefined;
+    return resolveDelegate(args, property.setter, member, (method) => inputParameters(context.library, method).length === 1);
 };
-const resolveSetterDelegate = (args, jsName, writable) => {
-    const { context, property, claimedNames, methodByName } = args;
-    const member = writable ? delegateMember(property.setter, jsName, claimedNames) : undefined;
-    const method = member !== undefined && property.setter !== undefined ? methodByName.get(property.setter) : undefined;
-    const delegatable = method === undefined || inputParameters(context.library, method).length === 1;
-    return delegatable ? { member, method } : { member: undefined, method: undefined };
+const resolveOwnType = (context, property, getterMethod, setterMethod) => {
+    const setterParam = setterMethod?.parameters[0];
+    if (setterParam !== undefined) {
+        return renderTsType(context, setterParam.type, setterParam.nullable || setterParam.optional);
+    }
+    if (getterMethod !== undefined) {
+        return renderMethodReturnType(context, getterMethod);
+    }
+    return renderTsType(context, property.type, isNullablePropertyType(context, property.type));
 };
-export const resolveAccessor = (args) => {
+const isSkippedAccessor = (property, jsName, claimedNames) => !property.introspectable || claimedNames.has(jsName) || jsName === "constructor";
+const resolveTsType = (inheritedType, ownType) => inheritedType !== undefined && inheritedType !== ownType ? inheritedType : ownType;
+const resolveAccessor = (args) => {
     const { context, property, claimedNames } = args;
     const jsName = toCamelIdentifier(property.name);
-    if (claimedNames.has(jsName))
-        return undefined;
-    if (jsName === "constructor")
+    if (isSkippedAccessor(property, jsName, claimedNames)) {
         return undefined;
-    const writable = isConstructableProperty(property);
-    const { member: getterMember, method: getMethod } = resolveGetterDelegate(args, jsName);
-    const { member: setterMember, method: setMethod } = resolveSetterDelegate(args, jsName, writable);
-    const setParam = setMethod?.parameters[0];
+    }
+    // `g_object_set_property` rejects a construct-only pspec with a critical and drops the write, so
+    // the property is settable at construction time only and must not advertise a setter.
+    const isWritable = isConstructableProperty(property) && !property.constructOnly;
+    const { member: getterMember, method: getterMethod } = resolveGetterDelegate(args, jsName);
+    const { member: setterMember, method: setterMethod } = resolveSetterDelegate(args, jsName, isWritable);
     const hasGetter = property.readable || getterMember !== undefined;
-    if (!hasGetter && !writable)
+    if (!hasGetter && !isWritable) {
         return undefined;
-    const ownType = setParam !== undefined
-        ? renderTsType(context, setParam.type, setParam.nullable || setParam.optional)
-        : getMethod !== undefined
-            ? renderMethodReturnType(context, getMethod)
-            : renderTsType(context, property.type, isNullablePropertyType(context, property.type));
-    const tsType = args.inheritedType !== undefined && args.inheritedType !== ownType ? args.inheritedType : ownType;
-    return { jsName, tsType, hasGetter, writable, getterMember, getMethod, setterMember };
+    }
+    const ownType = resolveOwnType(context, property, getterMethod, setterMethod);
+    const tsType = resolveTsType(args.inheritedType, ownType);
+    return { jsName, tsType, hasGetter, writable: isWritable, getterMember, getterMethod, setterMember };
 };
-export const resolveOwnerAccessor = (context, property, methods) => {
+const resolveOwnerAccessor = (context, property, methods) => {
     const methodByName = new Map();
     const claimedNames = new Set();
     for (const method of methods) {
-        if (!isEmittableCallable(context, method))
+        if (!isEmittableCallable(context, method)) {
             continue;
+        }
         methodByName.set(method.name, method);
         claimedNames.add(methodExportName(method));
     }
     return resolveAccessor({ context, property, claimedNames, methodByName });
 };
-export const resolveAccessorType = (context, property, methods) => resolveOwnerAccessor(context, property, methods)?.tsType;
+const resolveAccessorType = (context, property, methods) => resolveOwnerAccessor(context, property, methods)?.tsType;
 const withAccessor = (args, render) => {
     const accessor = resolveAccessor(args);
-    if (accessor === undefined)
+    if (accessor === undefined) {
         return undefined;
+    }
     return render(accessor);
 };
-export const renderResolvedPropertyAccessor = (context, property, accessor) => {
-    const { jsName, tsType, hasGetter, writable, getterMember, getMethod, setterMember } = accessor;
+const renderResolvedPropertyAccessor = (context, property, accessor) => {
+    const { jsName, tsType, hasGetter, writable, getterMember, getterMethod, setterMember } = accessor;
     const blocks = [];
     if (hasGetter) {
-        const getBody = renderGetterBody({ context, property, getterMember, getMethod, tsType });
-        blocks.push(renderBlock(`get ${jsName}(): ${tsType}`, getBody));
+        const getterBody = renderGetterBody({ context, property, getterMember, getterMethod, tsType });
+        blocks.push(renderBlock(`get ${jsName}(): ${tsType}`, getterBody));
     }
     if (writable) {
-        const setBody = setterMember !== undefined ? `this.${setterMember}(value);` : renderGenericSetBody(context, property);
-        blocks.push(renderBlock(`set ${jsName}(value: ${tsType})`, setBody));
+        const setterBody = setterMember === undefined ? renderGenericSetBody(context, property) : `this.${setterMember}(value);`;
+        blocks.push(renderBlock(`set ${jsName}(value: ${tsType})`, setterBody));
     }
     return `${renderJsDoc(property.doc)}${blocks.join("\n\n")}`;
 };
-export const renderPropertyAccessor = (args) => withAccessor(args, (accessor) => renderResolvedPropertyAccessor(args.context, args.property, accessor));
-export const renderPropertyAccessorSignature = (args) => withAccessor(args, ({ jsName, tsType, hasGetter, writable }) => {
+const renderPropertyAccessor = (args) => withAccessor(args, (accessor) => renderResolvedPropertyAccessor(args.context, args.property, accessor));
+const renderPropertyAccessorSignature = (args) => withAccessor(args, ({ jsName, tsType, hasGetter, writable }) => {
     const doc = renderJsDoc(args.property.doc);
-    if (hasGetter && writable)
+    if (hasGetter && writable) {
         return `${doc}${jsName}: ${tsType};`;
-    if (hasGetter)
+    }
+    if (hasGetter) {
         return `${doc}get ${jsName}(): ${tsType};`;
+    }
     return `${doc}set ${jsName}(value: ${tsType});`;
 });
 const renderPropertyDescriptor = (context, property) => renderDescriptor(context, property.type, property.transferOwnership);
 const renderGenericGetBody = (context, property, tsType) => {
     context.addRuntimeImport("getObjectProperty");
     context.addRuntimeImport("t");
-    return `return getObjectProperty(this, ${sourceStringLiteral(property.name)}, ${renderPropertyDescriptor(context, property)}) as ${tsType};`;
+    const descriptor = renderPropertyDescriptor(context, property);
+    return `return getObjectProperty(this, ${sourceStringLiteral(property.name)}, ${descriptor}) as ${tsType};`;
 };
 const renderGenericSetBody = (context, property) => {
     context.addRuntimeImport("setObjectProperty");
     context.addRuntimeImport("t");
-    return `setObjectProperty(this, ${sourceStringLiteral(property.name)}, ${renderPropertyDescriptor(context, property)}, value);`;
+    const descriptor = renderPropertyDescriptor(context, property);
+    return `setObjectProperty(this, ${sourceStringLiteral(property.name)}, ${descriptor}, value);`;
 };
 const renderGetterBody = (options) => {
-    const { context, property, getterMember, getMethod, tsType } = options;
-    if (getterMember === undefined)
+    const { context, property, getterMember, getterMethod, tsType } = options;
+    if (getterMember === undefined) {
         return renderGenericGetBody(context, property, tsType);
-    if (getMethod === undefined)
+    }
+    if (getterMethod === undefined) {
         return `return this.${getterMember}() as ${tsType};`;
-    const getType = renderMethodReturnType(context, getMethod);
-    return getType === tsType ? `return this.${getterMember}();` : `return this.${getterMember}() as ${tsType};`;
+    }
+    const getterType = renderMethodReturnType(context, getterMethod);
+    return getterType === tsType ? `return this.${getterMember}();` : `return this.${getterMember}() as ${tsType};`;
 };
 const delegateMember = (attribute, accessorName, claimedNames) => {
-    if (attribute === undefined)
+    if (attribute === undefined) {
         return undefined;
-    const member = toCamelCase(attribute);
-    if (member === accessorName)
+    }
+    const member = camelCase(attribute);
+    if (member === accessorName) {
         return undefined;
-    if (!claimedNames.has(member))
+    }
+    if (!claimedNames.has(member)) {
         return undefined;
+    }
     return member;
 };
+export { resolveAccessor, resolveOwnerAccessor, resolveAccessorType, renderResolvedPropertyAccessor, renderPropertyAccessor, renderPropertyAccessorSignature, };
 //# sourceMappingURL=property-accessor.js.map