@gtkx/codegen 1.0.0-rc.4 → 1.1.0

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

@@ -1,4 +1,7 @@
+import { sanitizeTypeIdentifier } from "@gtkx/utils";
 import { isInoutParameter } from "../../gir/parameter.js";
+import { recordInlineSize } from "./record-layout.js";
+import { isConstructibleRecord } from "./value-marshalable.js";
 const isHandlePassedInPlace = (context, parameter) => {
     if (parameter.direction !== "out" && parameter.direction !== "inout") {
         return false;
@@ -15,11 +18,53 @@ const underlyingType = (context, ref) => {
     return type.value.target === undefined ? undefined : underlyingType(context, type.value.target);
 };
 const underlyingParamKind = (context, parameter) => parameter.type === undefined ? undefined : underlyingType(context, parameter.type)?.kind;
-const isCollectibleCallerOut = (context, parameter) => {
-    const kind = underlyingParamKind(context, parameter);
-    return kind === "record" || kind === "class";
+const resolvedTypeName = (context, ref) => {
+    let current = ref;
+    while (current !== undefined) {
+        const resolved = context.library.typeFor(current);
+        if (resolved?.kind === "alias" && resolved.value.target !== undefined) {
+            current = resolved.value.target;
+            continue;
+        }
+        return context.library.nameFor(current);
+    }
+    return undefined;
+};
+const recordCallerOutAllocation = (context, name, type) => {
+    const size = recordInlineSize(context, type.value);
+    if (size === undefined) {
+        return undefined;
+    }
+    return isConstructibleRecord(context, type.namespace.name, type.value)
+        ? { ...name, strategy: "construct" }
+        : { ...name, strategy: "allocate", size };
 };
-const isRecordCallerOut = (context, parameter) => underlyingParamKind(context, parameter) === "record";
+const callerOutAllocation = (context, parameter) => {
+    const name = resolvedTypeName(context, parameter.type);
+    const type = parameter.type === undefined ? undefined : underlyingType(context, parameter.type);
+    if (name === undefined || type === undefined) {
+        return undefined;
+    }
+    if (type.kind === "class") {
+        return { ...name, strategy: "construct" };
+    }
+    return type.kind === "record" ? recordCallerOutAllocation(context, name, type) : undefined;
+};
+const renderCallerOutInstance = (context, parameter) => {
+    const allocation = callerOutAllocation(context, parameter);
+    if (allocation === undefined) {
+        throw new Error("renderCallerOutInstance: expected a caller-allocated out-parameter with a known layout");
+    }
+    const classExpression = context.qualify(allocation.namespaceName, sanitizeTypeIdentifier(allocation.typeName));
+    if (allocation.strategy === "construct") {
+        return `new ${classExpression}()`;
+    }
+    context.addRuntimeImport("alloc");
+    context.addRuntimeImport("wrapHandle");
+    return `wrapHandle(alloc(${String(allocation.size)}), ${classExpression})`;
+};
+const isCollectibleCallerOut = (context, parameter) => callerOutAllocation(context, parameter) !== undefined;
+const isAllocatableCallerOut = (context, parameter) => underlyingParamKind(context, parameter) === "record" && isCollectibleCallerOut(context, parameter);
 const isRecordInout = (context, parameter) => isInoutParameter(parameter) && underlyingParamKind(context, parameter) === "record";
 const isHandlePassing = (context, ref) => {
     const type = context.library.typeFor(ref);
@@ -46,5 +91,9 @@ const isHandlePassing = (context, ref) => {
         }
     }
 };
-export { isHandlePassedInPlace, isCollectibleCallerOut, isRecordCallerOut, isRecordInout, isHandlePassing };
+const isClosureType = (context, ref) => {
+    const name = context.library.nameFor(ref);
+    return name?.namespaceName === "GObject" && name.typeName === "Closure";
+};
+export { isAllocatableCallerOut, isClosureType, isHandlePassedInPlace, isCollectibleCallerOut, isRecordInout, isHandlePassing, renderCallerOutInstance, underlyingType, };
 //# 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":"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"]}
+{"version":3,"file":"param-marshal.js","sourceRoot":"","sources":["../../../src/store/gi/param-marshal.ts"],"names":[],"mappings":"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","sourcesContent":["import { sanitizeTypeIdentifier } from \"@gtkx/utils\";\nimport 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\";\nimport { recordInlineSize } from \"./record-layout.js\";\nimport { isConstructibleRecord } from \"./value-marshalable.js\";\n\ntype TypeName = { namespaceName: string; typeName: string };\ntype CallerOutAllocation = TypeName & ({ strategy: \"construct\" } | { strategy: \"allocate\"; size: number });\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 resolvedTypeName = (context: ModuleContext, ref: TypeId | undefined): TypeName | undefined => {\n    let current = ref;\n\n    while (current !== undefined) {\n        const resolved = context.library.typeFor(current);\n\n        if (resolved?.kind === \"alias\" && resolved.value.target !== undefined) {\n            current = resolved.value.target;\n            continue;\n        }\n\n        return context.library.nameFor(current);\n    }\n\n    return undefined;\n};\n\nconst recordCallerOutAllocation = (\n    context: ModuleContext,\n    name: TypeName,\n    type: Extract<GirType, { kind: \"record\" }>,\n): CallerOutAllocation | undefined => {\n    const size = recordInlineSize(context, type.value);\n\n    if (size === undefined) {\n        return undefined;\n    }\n\n    return isConstructibleRecord(context, type.namespace.name, type.value)\n        ? { ...name, strategy: \"construct\" }\n        : { ...name, strategy: \"allocate\", size };\n};\n\nconst callerOutAllocation = (context: ModuleContext, parameter: GirParameter): CallerOutAllocation | undefined => {\n    const name = resolvedTypeName(context, parameter.type);\n    const type = parameter.type === undefined ? undefined : underlyingType(context, parameter.type);\n\n    if (name === undefined || type === undefined) {\n        return undefined;\n    }\n\n    if (type.kind === \"class\") {\n        return { ...name, strategy: \"construct\" };\n    }\n\n    return type.kind === \"record\" ? recordCallerOutAllocation(context, name, type) : undefined;\n};\n\nconst renderCallerOutInstance = (context: ModuleContext, parameter: GirParameter): string => {\n    const allocation = callerOutAllocation(context, parameter);\n\n    if (allocation === undefined) {\n        throw new Error(\"renderCallerOutInstance: expected a caller-allocated out-parameter with a known layout\");\n    }\n\n    const classExpression = context.qualify(allocation.namespaceName, sanitizeTypeIdentifier(allocation.typeName));\n\n    if (allocation.strategy === \"construct\") {\n        return `new ${classExpression}()`;\n    }\n\n    context.addRuntimeImport(\"alloc\");\n    context.addRuntimeImport(\"wrapHandle\");\n\n    return `wrapHandle(alloc(${String(allocation.size)}), ${classExpression})`;\n};\n\nconst isCollectibleCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    callerOutAllocation(context, parameter) !== undefined;\n\nconst isAllocatableCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    underlyingParamKind(context, parameter) === \"record\" && isCollectibleCallerOut(context, parameter);\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\nconst isClosureType = (context: ModuleContext, ref: TypeId): boolean => {\n    const name = context.library.nameFor(ref);\n\n    return name?.namespaceName === \"GObject\" && name.typeName === \"Closure\";\n};\n\nexport {\n    isAllocatableCallerOut,\n    isClosureType,\n    isHandlePassedInPlace,\n    isCollectibleCallerOut,\n    isRecordInout,\n    isHandlePassing,\n    renderCallerOutInstance,\n    underlyingType,\n};\n"]}

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":"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"}
+{"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;AAuBrE,QAAA,MAAM,uBAAuB,GAAI,WAAW,YAAY,EAAE,SAAS,OAAO,KAAG,MAe5E,CAAC;AA4GF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/store/gi/pipeline.js

@@ -1,13 +1,15 @@
+import { sanitizeTypeIdentifier } from "@gtkx/utils";
 import { renderTsType } from "../../analysis/ts-type.js";
+import { getParentRef } from "../../gir/ancestry.js";
+import { isEmittableEntity } from "../../gir/emittable.js";
 import { PRIMITIVE_TS_TYPE, primitiveCategory } from "../../gir/primitives.js";
-import { splitOptionalNamespace } from "../../gir/type-ref.js";
 import { ModuleContext } from "../../writer/context.js";
-import { renderJsDoc } from "../../writer/doc.js";
 import { generateCallback } from "./callback.js";
 import { generateClass } from "./class.js";
 import { generateConstant } from "./constant.js";
+import { getDoc } from "./doc-spec.js";
 import { generateEnum } from "./enum.js";
-import { generateNamespaceBootstrap, generateNamespaceFunction } from "./function.js";
+import { generateNamespaceFunction } from "./function.js";
 import { generateInterface } from "./interface.js";
 import { generateRecord } from "./record.js";
 const generateNamespaceModule = (namespace, library) => {
@@ -15,6 +17,11 @@ const generateNamespaceModule = (namespace, library) => {
     context.addGObjectBootstrapImports();
     generateNamespaceTypes(context, namespace);
     generateNamespaceMembers(context, namespace);
+    if (!context.module.hasExports()) {
+        throw new Error(`GIR file at ${namespace.girFile} has nothing to generate: its ${namespace.name} namespace produces a ` +
+            "module with no exports, so the file is empty, truncated, or declares only entries GIR marks as not " +
+            "introspectable");
+    }
     return context.module.toSource();
 };
 const generateNamespaceTypes = (context, namespace) => {
@@ -38,7 +45,6 @@ const generateNamespaceMembers = (context, namespace) => {
     for (const fn of namespace.functions) {
         generateNamespaceFunction(context, fn);
     }
-    generateNamespaceBootstrap(context, namespace);
     for (const constant of namespace.constants) {
         generateConstant(context, constant);
     }
@@ -47,9 +53,18 @@ const generateNamespaceMembers = (context, namespace) => {
     }
 };
 const generateAlias = (context, alias) => {
+    if (!isEmittableEntity(alias)) {
+        return;
+    }
     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 doc = getDoc(alias);
+    const name = sanitizeTypeIdentifier(alias.name);
+    context.declare({
+        name,
+        code: `${doc}export type ${name} = ${targetType};`,
+        owner: alias.name,
+    });
 };
 const visitClass = (state, klass) => {
     if (state.placed.has(klass) || state.visiting.has(klass)) {
@@ -82,14 +97,11 @@ const topologicalClassOrder = (classes, namespaceName) => {
     return state.result;
 };
 const sameNamespaceParent = (klass, namespaceName, byLocalName) => {
-    if (klass.parent === undefined) {
-        return undefined;
-    }
-    const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);
-    if (parentNamespace !== undefined && parentNamespace !== namespaceName) {
+    const parent = getParentRef(klass);
+    if (parent === undefined || (parent.namespaceName !== undefined && parent.namespaceName !== namespaceName)) {
         return undefined;
     }
-    return byLocalName.get(typeName);
+    return byLocalName.get(parent.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 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"]}
+{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/store/gi/pipeline.ts"],"names":[],"mappings":"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","sourcesContent":["import { sanitizeTypeIdentifier } from \"@gtkx/utils\";\nimport 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 { getParentRef } from \"../../gir/ancestry.js\";\nimport { isEmittableEntity } from \"../../gir/emittable.js\";\nimport { PRIMITIVE_TS_TYPE, primitiveCategory } from \"../../gir/primitives.js\";\nimport { ModuleContext } from \"../../writer/context.js\";\nimport { generateCallback } from \"./callback.js\";\nimport { generateClass } from \"./class.js\";\nimport { generateConstant } from \"./constant.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { generateEnum } from \"./enum.js\";\nimport { 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    if (!context.module.hasExports()) {\n        throw new Error(\n            `GIR file at ${namespace.girFile} has nothing to generate: its ${namespace.name} namespace produces a ` +\n            \"module with no exports, so the file is empty, truncated, or declares only entries GIR marks as not \" +\n            \"introspectable\",\n        );\n    }\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    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    if (!isEmittableEntity(alias)) {\n        return;\n    }\n\n    const category = alias.cType === undefined ? undefined : primitiveCategory(alias.cType);\n    const targetType = category === \"gtype\" ? PRIMITIVE_TS_TYPE.gtype : renderTsType(context, alias.target);\n    const doc = getDoc(alias);\n    const name = sanitizeTypeIdentifier(alias.name);\n\n    context.declare({\n        name,\n        code: `${doc}export type ${name} = ${targetType};`,\n        owner: alias.name,\n    });\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    const parent = getParentRef(klass);\n\n    if (parent === undefined || (parent.namespaceName !== undefined && parent.namespaceName !== namespaceName)) {\n        return undefined;\n    }\n\n    return byLocalName.get(parent.typeName);\n};\n\nexport { generateNamespaceModule };\n"]}

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

@@ -1,6 +1,7 @@
 import type { GirClass } from "../../gir/class.js";
 import type { ModuleContext } from "../../writer/context.js";
+import type { Declaration } from "../../writer/module.js";
 import { type ResolvedAccessor } from "./property-accessor.js";
-declare const renderPropertyDeclarations: (context: ModuleContext, klass: GirClass, className: string, accessors: ResolvedAccessor[]) => string[];
+declare const renderPropertyDeclarations: (context: ModuleContext, klass: GirClass, className: string, accessors: ResolvedAccessor[]) => Declaration[];
 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":"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"}
+{"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;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAAe,KAAK,gBAAgB,EAAwB,MAAM,wBAAwB,CAAC;AAuBlG,QAAA,MAAM,0BAA0B,GAC5B,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,WAAW,MAAM,EACjB,WAAW,gBAAgB,EAAE,KAC9B,WAAW,EAkBb,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/store/gi/properties.js

@@ -1,9 +1,9 @@
 import { collectInterfaceProperties } from "../../analysis/inheritance.js";
 import { renderBracedOrEmpty } from "../../writer/emit.js";
 import { parentCompanionRef } from "./companion.js";
-import { resolveOwnerAccessor } from "./property-accessor.js";
+import { propertyDoc, resolveOwnerAccessor } from "./property-accessor.js";
 const PROPERTIES_SUFFIX = "Properties";
-const propertyEntry = (accessor) => `${accessor.jsName}: ${accessor.tsType};`;
+const propertyEntry = (accessor) => `${propertyDoc(accessor.property)}${accessor.jsName}: ${accessor.readType};`;
 const interfaceEntries = (context, klass) => {
     const entries = [];
     for (const { owner, property } of collectInterfaceProperties(context, klass)) {
@@ -24,8 +24,11 @@ const renderPropertyDeclarations = (context, klass, className, accessors) => {
     ];
     const map = `${className}${PROPERTIES_SUFFIX}`;
     return [
-        renderBracedOrEmpty(`export interface ${map}${extendsClause}`, entries.join("\n")),
-        renderBracedOrEmpty(`export interface ${className}`, `__properties__: ${map};`),
+        { name: map, code: renderBracedOrEmpty(`export interface ${map}${extendsClause}`, entries.join("\n")) },
+        {
+            name: className,
+            code: renderBracedOrEmpty(`export interface ${className}`, `__properties__: ${map};`),
+        },
     ];
 };
 export { renderPropertyDeclarations };

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

@@ -1 +1 @@
-{"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"]}
+{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../src/store/gi/properties.ts"],"names":[],"mappings":"AAGA,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,EAAE,WAAW,EAAyB,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAElG,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAEvC,MAAM,aAAa,GAAG,CAAC,QAA0B,EAAU,EAAE,CACzD,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,QAAQ,GAAG,CAAC;AAEjF,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,EAChB,EAAE;IACf,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,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,mBAAmB,CAAC,oBAAoB,GAAG,GAAG,aAAa,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;QACvG;YACI,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,mBAAmB,CAAC,oBAAoB,SAAS,EAAE,EAAE,mBAAmB,GAAG,GAAG,CAAC;SACxF;KACJ,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 type { Declaration } from \"../../writer/module.js\";\nimport { collectInterfaceProperties } from \"../../analysis/inheritance.js\";\nimport { renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport { parentCompanionRef } from \"./companion.js\";\nimport { propertyDoc, type ResolvedAccessor, resolveOwnerAccessor } from \"./property-accessor.js\";\n\nconst PROPERTIES_SUFFIX = \"Properties\";\n\nconst propertyEntry = (accessor: ResolvedAccessor): string =>\n    `${propertyDoc(accessor.property)}${accessor.jsName}: ${accessor.readType};`;\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): Declaration[] => {\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        { name: map, code: renderBracedOrEmpty(`export interface ${map}${extendsClause}`, entries.join(\"\\n\")) },\n        {\n            name: className,\n            code: renderBracedOrEmpty(`export interface ${className}`, `__properties__: ${map};`),\n        },\n    ];\n};\n\nexport { renderPropertyDeclarations };\n"]}

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

@@ -1,13 +1,18 @@
 import type { GirFunction } from "../../gir/function.js";
 import type { ModuleContext } from "../../writer/context.js";
 import { type GirProperty } from "../../gir/property.js";
+type InheritedAccessorTypes = {
+    readType: string | undefined;
+    writeType: string | undefined;
+};
 type ResolvedAccessor = {
+    property: GirProperty;
     jsName: string;
-    tsType: string;
+    readType: string;
+    writeType: string;
     hasGetter: boolean;
     isWritable: boolean;
     getterMember: string | undefined;
-    getterMethod: GirFunction | undefined;
     setterMember: string | undefined;
 };
 type PropertyAccessorArgs = {
@@ -15,13 +20,15 @@ type PropertyAccessorArgs = {
     property: GirProperty;
     claimedNames: Set<string>;
     methodByName: Map<string, GirFunction>;
-    inheritedType?: string | undefined;
+    inheritedTypes?: InheritedAccessorTypes | undefined;
+    inheritedNames?: Set<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 resolveAccessorTypes: (context: ModuleContext, property: GirProperty, methods: GirFunction[]) => InheritedAccessorTypes | undefined;
 declare const renderResolvedPropertyAccessor: (context: ModuleContext, property: GirProperty, accessor: ResolvedAccessor) => string;
+declare const propertyDoc: (property: GirProperty) => 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, };
+export { propertyDoc, resolveAccessor, resolveOwnerAccessor, resolveAccessorTypes, renderResolvedPropertyAccessor, renderPropertyAccessor, renderPropertyAccessorSignature, type InheritedAccessorTypes, 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":"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,UAAU,EAAE,OAAO,CAAC;IACpB,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,SAqBxE,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"}
+{"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;AAYlF,KAAK,sBAAsB,GAAG;IAC1B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,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,cAAc,CAAC,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CAC5C,CAAC;AAiKF,QAAA,MAAM,eAAe,GAAI,MAAM,oBAAoB,KAAG,gBAAgB,GAAG,SA0BxE,CAAC;AAEF,QAAA,MAAM,oBAAoB,GACtB,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,SAAS,WAAW,EAAE,KACvB,gBAAgB,GAAG,SAcrB,CAAC;AAEF,QAAA,MAAM,oBAAoB,GACtB,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,SAAS,WAAW,EAAE,KACvB,sBAAsB,GAAG,SAW3B,CAAC;AAeF,QAAA,MAAM,8BAA8B,GAChC,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,UAAU,gBAAgB,KAC3B,MAgBF,CAAC;AAEF,QAAA,MAAM,WAAW,GAAI,UAAU,WAAW,KAAG,MACzB,CAAC;AAErB,QAAA,MAAM,sBAAsB,GAAI,MAAM,oBAAoB,KAAG,MAAM,GAAG,SACqC,CAAC;AAoB5G,QAAA,MAAM,+BAA+B,GAAI,MAAM,oBAAoB,KAAG,MAAM,GAAG,SAC8B,CAAC;AAgD9G,OAAO,EACH,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACpB,8BAA8B,EAC9B,sBAAsB,EACtB,+BAA+B,EAC/B,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,GAC5B,CAAC"}

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

@@ -3,10 +3,12 @@ import { renderDescriptor } from "../../analysis/descriptor-render.js";
 import { inputParameters } from "../../analysis/param-structure.js";
 import { renderTsType } from "../../analysis/ts-type.js";
 import { isConstructableProperty } from "../../gir/property.js";
-import { renderJsDoc } from "../../writer/doc.js";
+import { comparisonContextFor } from "../../writer/comparison-context.js";
 import { renderBlock } from "../../writer/emit.js";
 import { isEmittableCallable } from "./callables.js";
+import { getDoc } from "./doc-spec.js";
 import { methodExportName, renderMethodReturnType } from "./method.js";
+const NULLABLE_SUFFIX = " | null";
 const isNullablePropertyType = (context, type) => {
     if (type === undefined) {
         return false;
@@ -28,8 +30,10 @@ const isNullablePropertyType = (context, type) => {
 };
 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 };
+    if (member === undefined || method === undefined || !isDelegatable(method)) {
+        return undefined;
+    }
+    return { member, method };
 };
 const resolveGetterDelegate = (args, jsName) => {
     const { context, property, claimedNames } = args;
@@ -42,34 +46,77 @@ const resolveSetterDelegate = (args, jsName, isWritable) => {
     const member = isWritable ? delegateMember(property.setter, jsName, claimedNames) : undefined;
     return resolveDelegate(args, property.setter, member, (method) => inputParameters(context.library, method).length === 1);
 };
-const resolveOwnType = (context, property, getterMethod, setterMethod) => {
-    const setterParam = setterMethod?.parameters[0];
-    if (setterParam !== undefined) {
-        return renderTsType(context, setterParam.type, setterParam.nullable || setterParam.optional);
+const baseTypeName = (type) => type.endsWith(NULLABLE_SUFFIX) ? type.slice(0, -NULLABLE_SUFFIX.length) : type;
+const areDelegateBaseTypesAgreeing = (context, getter, setter) => {
+    const setterParam = setter?.method.parameters[0];
+    if (setterParam === undefined || getter === undefined) {
+        return true;
     }
-    if (getterMethod !== undefined) {
-        return renderMethodReturnType(context, getterMethod);
+    const scratch = comparisonContextFor(context);
+    const read = baseTypeName(renderMethodReturnType(scratch, getter.method));
+    const written = baseTypeName(renderTsType(scratch, setterParam.type, false));
+    return read === written;
+};
+const resolveDelegates = (args, jsName, isWritable) => {
+    const getter = resolveGetterDelegate(args, jsName);
+    const setter = resolveSetterDelegate(args, jsName, isWritable);
+    if (areDelegateBaseTypesAgreeing(args.context, getter, setter)) {
+        return { getter, setter };
     }
-    return renderTsType(context, property.type, isNullablePropertyType(context, property.type));
+    return { getter, setter: undefined };
+};
+const declaredPropertyType = (context, property) => renderTsType(context, property.type, isNullablePropertyType(context, property.type));
+const resolveOwnTypes = (context, property, delegates) => {
+    const getterMethod = delegates.getter?.method;
+    const setterParam = delegates.setter?.method.parameters[0];
+    return {
+        readType: getterMethod === undefined
+            ? declaredPropertyType(context, property)
+            : renderMethodReturnType(context, getterMethod),
+        writeType: setterParam === undefined
+            ? declaredPropertyType(context, property)
+            : renderTsType(context, setterParam.type, setterParam.nullable || setterParam.optional),
+    };
 };
-const isSkippedAccessor = (property, jsName, claimedNames) => !property.introspectable || claimedNames.has(jsName) || jsName === "constructor";
-const resolveTsType = (inheritedType, ownType) => inheritedType !== undefined && inheritedType !== ownType ? inheritedType : ownType;
+const isAssignableType = (source, target) => source === target || baseTypeName(target) === source;
+const agreeingDelegates = (delegates, ownTypes, declaredTypes) => ({
+    getter: isAssignableType(ownTypes.readType, declaredTypes.readType) ? delegates.getter : undefined,
+    setter: isAssignableType(declaredTypes.writeType, ownTypes.writeType) ? delegates.setter : undefined,
+});
+const resolveTypedDelegates = (args, resolved) => {
+    const ownTypes = resolveOwnTypes(args.context, args.property, resolved);
+    const types = {
+        readType: args.inheritedTypes?.readType ?? ownTypes.readType,
+        writeType: args.inheritedTypes?.writeType ?? ownTypes.writeType,
+    };
+    return { types, delegates: agreeingDelegates(resolved, ownTypes, types) };
+};
+const isSkippedAccessor = (args, jsName) => !args.property.introspectable ||
+    args.claimedNames.has(jsName) ||
+    args.inheritedNames?.has(jsName) === true ||
+    jsName === "constructor";
 const resolveAccessor = (args) => {
-    const { context, property, claimedNames } = args;
+    const { property } = args;
     const jsName = toCamelIdentifier(property.name);
-    if (isSkippedAccessor(property, jsName, claimedNames)) {
+    if (isSkippedAccessor(args, jsName)) {
         return undefined;
     }
     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;
+    const { types, delegates } = resolveTypedDelegates(args, resolveDelegates(args, jsName, isWritable));
+    const hasGetter = property.readable || delegates.getter !== undefined;
     if (!hasGetter && !isWritable) {
         return undefined;
     }
-    const ownType = resolveOwnType(context, property, getterMethod, setterMethod);
-    const tsType = resolveTsType(args.inheritedType, ownType);
-    return { jsName, tsType, hasGetter, isWritable, getterMember, getterMethod, setterMember };
+    return {
+        property,
+        jsName,
+        readType: types.readType,
+        writeType: types.writeType,
+        hasGetter,
+        isWritable,
+        getterMember: delegates.getter?.member,
+        setterMember: delegates.setter?.member,
+    };
 };
 const resolveOwnerAccessor = (context, property, methods) => {
     const methodByName = new Map();
@@ -83,7 +130,16 @@ const resolveOwnerAccessor = (context, property, methods) => {
     }
     return resolveAccessor({ context, property, claimedNames, methodByName });
 };
-const resolveAccessorType = (context, property, methods) => resolveOwnerAccessor(context, property, methods)?.tsType;
+const resolveAccessorTypes = (context, property, methods) => {
+    const accessor = resolveOwnerAccessor(context, property, methods);
+    if (accessor === undefined) {
+        return undefined;
+    }
+    return {
+        readType: accessor.hasGetter ? accessor.readType : undefined,
+        writeType: accessor.isWritable ? accessor.writeType : undefined,
+    };
+};
 const withAccessor = (args, render) => {
     const accessor = resolveAccessor(args);
     if (accessor === undefined) {
@@ -92,29 +148,33 @@ const withAccessor = (args, render) => {
     return render(accessor);
 };
 const renderResolvedPropertyAccessor = (context, property, accessor) => {
-    const { jsName, tsType, hasGetter, isWritable, getterMember, getterMethod, setterMember } = accessor;
+    const { jsName, readType, writeType, hasGetter, isWritable, setterMember } = accessor;
     const blocks = [];
     if (hasGetter) {
-        const getterBody = renderGetterBody({ context, property, getterMember, getterMethod, tsType });
-        blocks.push(renderBlock(`get ${jsName}(): ${tsType}`, getterBody));
+        blocks.push(renderBlock(`get ${jsName}(): ${readType}`, renderGetterBody(context, property, accessor)));
     }
     if (isWritable) {
         const setterBody = setterMember === undefined ? renderGenericSetBody(context, property) : `this.${setterMember}(value);`;
-        blocks.push(renderBlock(`set ${jsName}(value: ${tsType})`, setterBody));
+        blocks.push(renderBlock(`set ${jsName}(value: ${writeType})`, setterBody));
     }
-    return `${renderJsDoc(property.doc)}${blocks.join("\n\n")}`;
+    return `${propertyDoc(property)}${blocks.join("\n\n")}`;
 };
+const propertyDoc = (property) => getDoc(property);
 const renderPropertyAccessor = (args) => withAccessor(args, (accessor) => renderResolvedPropertyAccessor(args.context, args.property, accessor));
-const renderPropertyAccessorSignature = (args) => withAccessor(args, ({ jsName, tsType, hasGetter, isWritable }) => {
-    const doc = renderJsDoc(args.property.doc);
-    if (hasGetter && isWritable) {
-        return `${doc}${jsName}: ${tsType};`;
+const renderAccessorPairSignature = (accessor) => {
+    const { jsName, readType, writeType, hasGetter, isWritable } = accessor;
+    if (!hasGetter) {
+        return `set ${jsName}(value: ${writeType});`;
     }
-    if (hasGetter) {
-        return `${doc}get ${jsName}(): ${tsType};`;
+    if (!isWritable) {
+        return `get ${jsName}(): ${readType};`;
     }
-    return `${doc}set ${jsName}(value: ${tsType});`;
-});
+    if (readType === writeType) {
+        return `${jsName}: ${readType};`;
+    }
+    return `get ${jsName}(): ${readType};\nset ${jsName}(value: ${writeType});`;
+};
+const renderPropertyAccessorSignature = (args) => withAccessor(args, (accessor) => `${propertyDoc(args.property)}${renderAccessorPairSignature(accessor)}`);
 const renderPropertyDescriptor = (context, property) => renderDescriptor(context, property.type, property.transferOwnership);
 const renderGenericGetBody = (context, property, tsType) => {
     context.addRuntimeImport("getObjectProperty");
@@ -128,17 +188,9 @@ const renderGenericSetBody = (context, property) => {
     const descriptor = renderPropertyDescriptor(context, property);
     return `setObjectProperty(this, ${sourceStringLiteral(property.name)}, ${descriptor}, value);`;
 };
-const renderGetterBody = (options) => {
-    const { context, property, getterMember, getterMethod, tsType } = options;
-    if (getterMember === undefined) {
-        return renderGenericGetBody(context, property, tsType);
-    }
-    if (getterMethod === undefined) {
-        return `return this.${getterMember}() as ${tsType};`;
-    }
-    const getterType = renderMethodReturnType(context, getterMethod);
-    return getterType === tsType ? `return this.${getterMember}();` : `return this.${getterMember}() as ${tsType};`;
-};
+const renderGetterBody = (context, property, accessor) => accessor.getterMember === undefined
+    ? renderGenericGetBody(context, property, accessor.readType)
+    : `return this.${accessor.getterMember}();`;
 const delegateMember = (attribute, accessorName, claimedNames) => {
     if (attribute === undefined) {
         return undefined;
@@ -152,5 +204,5 @@ const delegateMember = (attribute, accessorName, claimedNames) => {
     }
     return member;
 };
-export { resolveAccessor, resolveOwnerAccessor, resolveAccessorType, renderResolvedPropertyAccessor, renderPropertyAccessor, renderPropertyAccessorSignature, };
+export { propertyDoc, resolveAccessor, resolveOwnerAccessor, resolveAccessorTypes, renderResolvedPropertyAccessor, renderPropertyAccessor, renderPropertyAccessorSignature, };
 //# sourceMappingURL=property-accessor.js.map