@gtkx/codegen 1.1.0 → 1.2.1

package/dist/store/gi/record-constructor.js.map

@@ -1 +1 @@
-{"version":3,"file":"record-constructor.js","sourceRoot":"","sources":["../../../src/store/gi/record-constructor.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral, toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirField } from \"../../gir/field.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { inputParameters, parameterIdentifier } from \"../../analysis/param-structure.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { renderBlock, renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport { type Callables, staticMembers } from \"./callables.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { renderSourceGtype } from \"./gtype-binding.js\";\nimport { emitFieldWrite, isEmittableField, isInlineField } from \"./record-field-accessor.js\";\nimport { computeRecordFieldSlots, type RecordFieldSlot } from \"./record-layout.js\";\nimport { isConstructibleRecord } from \"./value-marshalable.js\";\n\ntype WritableFieldSlot = RecordFieldSlot & { field: GirField & { type: TypeId } };\n\ntype RecordConstructorSpec = {\n    record: GirRecord;\n    className: string;\n    callables: Callables;\n    isErrorSubclass: boolean;\n};\n\nconst isWritableFieldSlot = (context: ModuleContext, entry: RecordFieldSlot): entry is WritableFieldSlot =>\n    entry.field.writable && isEmittableField(context, entry.field);\n\nconst renderRecordConstructorPropsInterface = (\n    context: ModuleContext,\n    record: GirRecord,\n    className: string,\n): string => {\n    const head = `export interface ${className}ConstructorProps`;\n    const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    const lines = slots\n        .filter((entry): entry is WritableFieldSlot => isWritableFieldSlot(context, entry))\n        .map(\n            (entry) =>\n                `${getDoc(entry.field)}${toCamelIdentifier(entry.field.name)}?: ` +\n                `${renderTsType(context, entry.field.type, true)};`,\n        );\n\n    return renderBracedOrEmpty(head, lines.join(\"\\n\"));\n};\n\nconst isSelfReturning = (context: ModuleContext, record: GirRecord, callable: GirFunction): boolean => {\n    const ref = callable.returnValue.type;\n    const name = ref === undefined ? undefined : context.library.nameFor(ref);\n\n    return name?.namespaceName === context.namespace.name && name.typeName === record.name;\n};\n\nconst renderStaticCall = (context: ModuleContext, callable: GirFunction, name: string): string => {\n    const args = inputParameters(context.library, callable).map(({ parameter, index }) =>\n        parameterIdentifier(parameter, index));\n\n    return `${name}(${args.join(\", \")})`;\n};\n\nconst constructionHint = (context: ModuleContext, spec: RecordConstructorSpec): string | undefined => {\n    const candidates = staticMembers(context, spec.callables).filter(({ callable }) =>\n        isSelfReturning(context, spec.record, callable));\n\n    const candidate = candidates.find(({ name }) => name === \"new\") ?? candidates[0];\n\n    return candidate === undefined ? undefined : renderStaticCall(context, candidate.callable, candidate.name);\n};\n\nconst unconstructibleMessage = (context: ModuleContext, spec: RecordConstructorSpec): string => {\n    const qualified = `${context.namespace.name}.${spec.className}`;\n    const hint = constructionHint(context, spec);\n\n    return hint === undefined\n        ? `Cannot construct ${qualified} with new: its instances come from the functions that return them.`\n        : `Cannot construct ${qualified} with new: use ${qualified}.${hint} instead.`;\n};\n\nconst renderUnconstructibleGuard = (context: ModuleContext, spec: RecordConstructorSpec): string => {\n    const superCall = spec.isErrorSubclass ? [\"super();\"] : [];\n    const message = sourceStringLiteral(unconstructibleMessage(context, spec));\n\n    return renderBlock(\"constructor()\", [...superCall, `throw new globalThis.Error(${message});`].join(\"\\n\"));\n};\n\nconst renderEmptyConstructor = (className: string, isErrorSubclass: boolean): string =>\n    isErrorSubclass\n        ? renderBlock(`constructor(props: ${className}ConstructorProps = {})`, \"super();\")\n        : `constructor(props: ${className}ConstructorProps = {}) {}`;\n\nconst renderFieldWrites = (context: ModuleContext, slots: RecordFieldSlot[]): string[] => {\n    const statements: string[] = [];\n\n    for (const entry of slots) {\n        if (isWritableFieldSlot(context, entry)) {\n            statements.push(renderFieldWrite(context, entry));\n        }\n    }\n\n    return statements;\n};\n\nconst renderRecordConstructor = (context: ModuleContext, spec: RecordConstructorSpec): string => {\n    const { record, className, isErrorSubclass } = spec;\n\n    if (!isConstructibleRecord(context, context.namespace.name, record)) {\n        return renderUnconstructibleGuard(context, spec);\n    }\n\n    const superCall = isErrorSubclass ? [\"super();\"] : [];\n    const { slots, size } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    if (size === 0) {\n        return renderEmptyConstructor(className, isErrorSubclass);\n    }\n\n    context.addRuntimeImport(\"alloc\");\n    context.addRuntimeImport(\"setHandle\");\n\n    const statements = [\n        ...superCall,\n        `const handle = alloc(${allocArgs(context, record, size).join(\", \")});`,\n        ...renderFieldWrites(context, slots),\n        \"setHandle(this, handle);\",\n    ];\n\n    return renderBlock(`constructor(props: ${className}ConstructorProps = {})`, statements.join(\"\\n\"));\n};\n\nconst allocArgs = (context: ModuleContext, record: GirRecord, size: number): string[] => {\n    const args = [String(size)];\n\n    if (renderSourceGtype(context, record) !== undefined) {\n        args.push(\"this.__type__\");\n    }\n\n    return args;\n};\n\nconst renderFieldWrite = (context: ModuleContext, entry: WritableFieldSlot): string => {\n    context.addRuntimeImport(\"t\");\n\n    const descriptor = context.hoistDescriptor(\n        renderDescriptor(context, entry.field.type, \"none\", { isInline: isInlineField(context, entry.field) }),\n    );\n\n    const name = toCamelIdentifier(entry.field.name);\n\n    const write = emitFieldWrite(context, {\n        descriptor,\n        slot: entry.slot,\n        targetExpr: \"handle\",\n        valueExpr: `props.${name}`,\n    });\n\n    return `if (props.${name} !== undefined) ${write}`;\n};\n\nexport { renderRecordConstructorPropsInterface, renderRecordConstructor };\n"]}
+{"version":3,"file":"record-constructor.js","sourceRoot":"","sources":["../../../src/store/gi/record-constructor.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral, toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirField } from \"../../gir/field.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { inputParameters, parameterIdentifier } from \"../../analysis/param-structure.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { renderBlock, renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport { type Callables, staticMembers } from \"./callables.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { renderSourceGtype } from \"./gtype-binding.js\";\nimport { emitFieldWrite, isEmittableField, isInlineField, isStorableFieldType } from \"./record-field-accessor.js\";\nimport { computeRecordFieldSlots, type RecordFieldSlot } from \"./record-layout.js\";\nimport { isConstructibleRecord } from \"./value-marshalable.js\";\n\ntype WritableFieldSlot = RecordFieldSlot & { field: GirField & { type: TypeId } };\n\ntype RecordConstructorSpec = {\n    record: GirRecord;\n    className: string;\n    callables: Callables;\n    isErrorSubclass: boolean;\n};\n\nconst isWritableFieldSlot = (context: ModuleContext, entry: RecordFieldSlot): entry is WritableFieldSlot =>\n    entry.field.writable &&\n    isEmittableField(context, entry.field) &&\n    isStorableFieldType(context, entry.field.type);\n\nconst renderRecordConstructorPropsInterface = (\n    context: ModuleContext,\n    record: GirRecord,\n    className: string,\n): string => {\n    const head = `export interface ${className}ConstructorProps`;\n    const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    const lines = slots\n        .filter((entry): entry is WritableFieldSlot => isWritableFieldSlot(context, entry))\n        .map(\n            (entry) =>\n                `${getDoc(entry.field)}${toCamelIdentifier(entry.field.name)}?: ` +\n                `${renderTsType(context, entry.field.type, true)};`,\n        );\n\n    return renderBracedOrEmpty(head, lines.join(\"\\n\"));\n};\n\nconst isSelfReturning = (context: ModuleContext, record: GirRecord, callable: GirFunction): boolean => {\n    const ref = callable.returnValue.type;\n    const name = ref === undefined ? undefined : context.library.nameFor(ref);\n\n    return name?.namespaceName === context.namespace.name && name.typeName === record.name;\n};\n\nconst renderStaticCall = (context: ModuleContext, callable: GirFunction, name: string): string => {\n    const args = inputParameters(context.library, callable).map(({ parameter, index }) =>\n        parameterIdentifier(parameter, index));\n\n    return `${name}(${args.join(\", \")})`;\n};\n\nconst constructionHint = (context: ModuleContext, spec: RecordConstructorSpec): string | undefined => {\n    const candidates = staticMembers(context, spec.callables).filter(({ callable }) =>\n        isSelfReturning(context, spec.record, callable));\n\n    const candidate = candidates.find(({ name }) => name === \"new\") ?? candidates[0];\n\n    return candidate === undefined ? undefined : renderStaticCall(context, candidate.callable, candidate.name);\n};\n\nconst unconstructibleMessage = (context: ModuleContext, spec: RecordConstructorSpec): string => {\n    const qualified = `${context.namespace.name}.${spec.className}`;\n    const hint = constructionHint(context, spec);\n\n    return hint === undefined\n        ? `Cannot construct ${qualified} with new: its instances come from the functions that return them.`\n        : `Cannot construct ${qualified} with new: use ${qualified}.${hint} instead.`;\n};\n\nconst renderUnconstructibleGuard = (context: ModuleContext, spec: RecordConstructorSpec): string => {\n    const superCall = spec.isErrorSubclass ? [\"super();\"] : [];\n    const message = sourceStringLiteral(unconstructibleMessage(context, spec));\n\n    return renderBlock(\"constructor()\", [...superCall, `throw new globalThis.Error(${message});`].join(\"\\n\"));\n};\n\nconst renderEmptyConstructor = (className: string, isErrorSubclass: boolean): string =>\n    isErrorSubclass\n        ? renderBlock(`constructor(props: ${className}ConstructorProps = {})`, \"super();\")\n        : `constructor(props: ${className}ConstructorProps = {}) {}`;\n\nconst renderFieldWrites = (context: ModuleContext, slots: RecordFieldSlot[]): string[] => {\n    const statements: string[] = [];\n\n    for (const entry of slots) {\n        if (isWritableFieldSlot(context, entry)) {\n            statements.push(renderFieldWrite(context, entry));\n        }\n    }\n\n    return statements;\n};\n\nconst renderRecordConstructor = (context: ModuleContext, spec: RecordConstructorSpec): string => {\n    const { record, className, isErrorSubclass } = spec;\n\n    if (!isConstructibleRecord(context, context.namespace.name, record)) {\n        return renderUnconstructibleGuard(context, spec);\n    }\n\n    const superCall = isErrorSubclass ? [\"super();\"] : [];\n    const { slots, size } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    if (size === 0) {\n        return renderEmptyConstructor(className, isErrorSubclass);\n    }\n\n    context.addRuntimeImport(\"alloc\");\n    context.addRuntimeImport(\"setHandle\");\n\n    const statements = [\n        ...superCall,\n        `const __handle = alloc(${allocArgs(context, record, size).join(\", \")});`,\n        ...renderFieldWrites(context, slots),\n        \"setHandle(this, __handle);\",\n    ];\n\n    return renderBlock(`constructor(props: ${className}ConstructorProps = {})`, statements.join(\"\\n\"));\n};\n\nconst allocArgs = (context: ModuleContext, record: GirRecord, size: number): string[] => {\n    const args = [String(size)];\n\n    if (renderSourceGtype(context, record) !== undefined) {\n        args.push(\"this.__type__\");\n    }\n\n    return args;\n};\n\nconst renderFieldWrite = (context: ModuleContext, entry: WritableFieldSlot): string => {\n    context.addRuntimeImport(\"t\");\n\n    const descriptor = context.hoistDescriptor(\n        renderDescriptor(context, entry.field.type, \"none\", { isInline: isInlineField(context, entry.field) }),\n    );\n\n    const name = toCamelIdentifier(entry.field.name);\n\n    const write = emitFieldWrite(context, {\n        descriptor,\n        slot: entry.slot,\n        targetExpr: \"__handle\",\n        valueExpr: `props.${name}`,\n    });\n\n    return `if (props.${name} !== undefined) ${write}`;\n};\n\nexport { renderRecordConstructorPropsInterface, renderRecordConstructor };\n"]}

package/dist/store/gi/record-field-accessor.d.ts

@@ -21,8 +21,9 @@ declare const isEmittableField: (context: ModuleContext, field: GirField) => fie
     type: TypeId;
 };
 declare const emitFieldWrite: (context: ModuleContext, spec: FieldWriteSpec) => string;
-declare const resolveRecordFieldEntry: (context: ModuleContext, slot: RecordFieldSlot, claimedNames: Set<string>) => RecordFieldEntry | undefined;
+declare const isStorableFieldType: (context: ModuleContext, ref: TypeId) => boolean;
+declare const resolveRecordFieldEntry: (context: ModuleContext, slot: RecordFieldSlot, claimedNames: Set<string>, siblingFields: GirField[]) => RecordFieldEntry | undefined;
 declare const renderRecordFieldAccessor: (context: ModuleContext, slot: RecordFieldSlot, claimedNames: Set<string>, siblingFields: GirField[]) => string | undefined;
 declare const isInlineField: (context: ModuleContext, field: GirField) => boolean;
-export { isEmittableField, isInlineField, emitFieldWrite, resolveRecordFieldEntry, renderRecordFieldAccessor, };
+export { isEmittableField, isInlineField, isStorableFieldType, emitFieldWrite, resolveRecordFieldEntry, renderRecordFieldAccessor, };
 //# sourceMappingURL=record-field-accessor.d.ts.map

package/dist/store/gi/record-field-accessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"record-field-accessor.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record-field-accessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,OAAO,EAAmD,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAI3G,KAAK,cAAc,GAAG;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAOF,KAAK,gBAAgB,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,WAAW,EAAE,cAAc,CAAC;CAC/B,CAAC;AA2EF,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,KAAK,IAAI,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAIhE,CAAC;AAEvC,QAAA,MAAM,cAAc,GAAI,SAAS,aAAa,EAAE,MAAM,cAAc,KAAG,MAuBtE,CAAC;AA8BF,QAAA,MAAM,uBAAuB,GACzB,SAAS,aAAa,EACtB,MAAM,eAAe,EACrB,cAAc,GAAG,CAAC,MAAM,CAAC,KAC1B,gBAAgB,GAAG,SAcrB,CAAC;AAEF,QAAA,MAAM,yBAAyB,GAC3B,SAAS,aAAa,EACtB,MAAM,eAAe,EACrB,cAAc,GAAG,CAAC,MAAM,CAAC,EACzB,eAAe,QAAQ,EAAE,KAC1B,MAAM,GAAG,SA2CX,CAAC;AAkCF,QAAA,MAAM,aAAa,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,OACwC,CAAC;AA8W1G,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,uBAAuB,EACvB,yBAAyB,GAC5B,CAAC"}
+{"version":3,"file":"record-field-accessor.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record-field-accessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAO7D,OAAO,EAAmD,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAI3G,KAAK,cAAc,GAAG;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAWF,KAAK,gBAAgB,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,WAAW,EAAE,cAAc,CAAC;CAC/B,CAAC;AA2EF,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,KAAK,IAAI,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAIhE,CAAC;AAEvC,QAAA,MAAM,cAAc,GAAI,SAAS,aAAa,EAAE,MAAM,cAAc,KAAG,MAuBtE,CAAC;AAuCF,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,EAAE,KAAK,MAAM,KAAG,OAIlE,CAAC;AAuBF,QAAA,MAAM,uBAAuB,GACzB,SAAS,aAAa,EACtB,MAAM,eAAe,EACrB,cAAc,GAAG,CAAC,MAAM,CAAC,EACzB,eAAe,QAAQ,EAAE,KAC1B,gBAAgB,GAAG,SAcrB,CAAC;AAEF,QAAA,MAAM,yBAAyB,GAC3B,SAAS,aAAa,EACtB,MAAM,eAAe,EACrB,cAAc,GAAG,CAAC,MAAM,CAAC,EACzB,eAAe,QAAQ,EAAE,KAC1B,MAAM,GAAG,SAqCX,CAAC;AAkCF,QAAA,MAAM,aAAa,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,OACwC,CAAC;AA6X1G,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,yBAAyB,GAC5B,CAAC"}

package/dist/store/gi/record-field-accessor.js

@@ -2,6 +2,7 @@ import { toCamelIdentifier } from "@gtkx/utils";
 import { isInlineCallbackRef, renderDescriptor } from "../../analysis/descriptor-render.js";
 import { tStruct } from "../../analysis/descriptor.js";
 import { renderTsType } from "../../analysis/ts-type.js";
+import { isUnboundedArray } from "../../analysis/type-shape.js";
 import { indent, renderBlock } from "../../writer/emit.js";
 import { getDoc } from "./doc-spec.js";
 import { bitMask, computeRecordFieldSlots, mergeBitfield } from "./record-layout.js";
@@ -50,21 +51,42 @@ const admitField = (context, slot, claimedNames) => {
     }
     return { field, jsName };
 };
-const resolveRecordFieldEntry = (context, slot, claimedNames) => {
+const isNullTerminatedArrayField = (context, ref) => {
+    const type = context.library.typeFor(ref);
+    return type?.kind === "carray" && isUnboundedArray(type) && type.elementCType?.endsWith("*") === true;
+};
+const isAccessibleFieldType = (context, ref) => isAccessorEligibleType(context, ref) || isNullTerminatedArrayField(context, ref);
+const isStorableFieldType = (context, ref) => {
+    const kind = context.library.typeFor(ref)?.kind;
+    return kind !== "carray" && kind !== "list" && kind !== "hashtable";
+};
+const admitAccessibleField = (context, slot, claimedNames, siblingFields) => {
     const admitted = admitField(context, slot, claimedNames);
     if (admitted === undefined) {
         return undefined;
     }
+    const { field, jsName } = admitted;
+    const target = { field, jsName, slot: slot.slot, siblingFields };
+    const hasStructArray = resolveStructArray(context, target) !== undefined;
+    const hasAccessor = hasStructArray || isAccessibleFieldType(context, field.type);
+    const isSettable = field.writable && (hasStructArray || isStorableFieldType(context, field.type));
+    return hasAccessor ? { ...admitted, isSettable } : undefined;
+};
+const resolveRecordFieldEntry = (context, slot, claimedNames, siblingFields) => {
+    const admitted = admitAccessibleField(context, slot, claimedNames, siblingFields);
+    if (admitted === undefined) {
+        return undefined;
+    }
     return {
         jsName: admitted.jsName,
         tsType: renderTsType(context, admitted.field.type, false),
-        isWritable: admitted.field.writable,
+        isWritable: admitted.isSettable,
         doc: admitted.field.doc,
         annotations: admitted.field.annotations,
     };
 };
 const renderRecordFieldAccessor = (context, slot, claimedNames, siblingFields) => {
-    const admitted = admitField(context, slot, claimedNames);
+    const admitted = admitAccessibleField(context, slot, claimedNames, siblingFields);
     if (admitted === undefined) {
         return undefined;
     }
@@ -74,10 +96,6 @@ const renderRecordFieldAccessor = (context, slot, claimedNames, siblingFields) =
     if (structArray !== undefined) {
         return `${doc}${structArray}`;
     }
-    if (!isAccessorEligibleType(context, field.type)) {
-        const tsType = renderTsType(context, field.type, false);
-        return `${doc}declare ${jsName}: ${tsType};`;
-    }
     const descriptor = context.hoistDescriptor(renderDescriptor(context, field.type, "none", { isInline: isInlineField(context, field) }));
     const tsType = renderTsType(context, field.type, false);
     const accessorOptions = {
@@ -89,7 +107,7 @@ const renderRecordFieldAccessor = (context, slot, claimedNames, siblingFields) =
         fieldType: field.type,
     };
     const blocks = [getterBlock(accessorOptions)];
-    if (field.writable) {
+    if (admitted.isSettable) {
         blocks.push(setterBlock(accessorOptions));
     }
     return `${doc}${blocks.join("\n\n")}`;
@@ -180,6 +198,18 @@ const visitInlineStructFields = (context, fields, baseOffset, visitors) => {
         visitInlineStructSlot(context, entry, baseOffset, visitors);
     }
 };
+const inlineLeafCount = (context, fields) => {
+    let count = 0;
+    visitInlineStructFields(context, fields, 0, {
+        leaf: () => {
+            count += 1;
+        },
+        nested: (_jsName, nested) => {
+            count += inlineLeafCount(context, nested);
+        },
+    });
+    return count;
+};
 const elementAccessExpr = (descriptor, offset) => `read(__array, ${descriptor}, __base + ${String(offset)})`;
 const renderElementReadEntry = (context, visit) => {
     const { jsName, descriptor, offset, slot, type } = visit;
@@ -243,7 +273,7 @@ const structArrayGetterBlock = (options) => {
     return renderBlock(`get ${jsName}(): ${tsType}`, body);
 };
 const structArraySetterStatements = (context, options) => {
-    const { elementDescriptor, offset, elementSize, elementFields } = options;
+    const { elementDescriptor, offset, elementSize, elementFields, lengthExpr } = options;
     const writes = [];
     appendElementWriteStatements(context, {
         fields: elementFields,
@@ -256,7 +286,7 @@ const structArraySetterStatements = (context, options) => {
         `const __descriptor = ${elementDescriptor};`,
         `const __array = read(getHandle(this), __descriptor, ${String(offset)}) as ReturnType<typeof getHandle>;`,
         "for (const [__index, __element] of __value.entries()) {",
-        indent(loop, 1),
+        indent(`if (__index >= ${lengthExpr}) {\n    break;\n}\n\n${loop}`, 1),
         "}",
         `write(getHandle(this), __descriptor, ${String(offset)}, __array);`,
     ].join("\n");
@@ -302,7 +332,7 @@ const resolveStructArray = (context, target) => {
         return undefined;
     }
     const shape = resolveStructArrayShape(context, elements, siblingFields);
-    if (shape === undefined) {
+    if (shape === undefined || inlineLeafCount(context, elements.elementFields) === 0) {
         return undefined;
     }
     return {
@@ -371,5 +401,5 @@ const setterBody = (context, descriptor, slot) => {
     return emitFieldWrite(context, { descriptor, slot, targetExpr: "getHandle(this)", valueExpr: "value" });
 };
 const setterBlock = (options) => renderBlock(`set ${options.jsName}(value: ${options.tsType})`, setterBody(options.context, options.descriptor, options.slot));
-export { isEmittableField, isInlineField, emitFieldWrite, resolveRecordFieldEntry, renderRecordFieldAccessor, };
+export { isEmittableField, isInlineField, isStorableFieldType, emitFieldWrite, resolveRecordFieldEntry, renderRecordFieldAccessor, };
 //# sourceMappingURL=record-field-accessor.js.map

package/dist/store/gi/record-field-accessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"record-field-accessor.js","sourceRoot":"","sources":["../../../src/store/gi/record-field-accessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirAnnotations } from \"../../gir/annotations.js\";\nimport type { GirField } from \"../../gir/field.js\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { FieldSlot } from \"../../gir/size.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { isInlineCallbackRef, renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { tStruct } from \"../../analysis/descriptor.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { indent, renderBlock } from \"../../writer/emit.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { bitMask, computeRecordFieldSlots, mergeBitfield, type RecordFieldSlot } from \"./record-layout.js\";\nimport { wrapReturnValue } from \"./return-wrap.js\";\nimport { isValueMarshalable } from \"./value-marshalable.js\";\n\ntype FieldWriteSpec = {\n    descriptor: string;\n    slot: FieldSlot;\n    targetExpr: string;\n    valueExpr: string;\n};\n\ntype AdmittedField = {\n    field: GirField & { type: TypeId };\n    jsName: string;\n};\n\ntype RecordFieldEntry = {\n    jsName: string;\n    tsType: string;\n    isWritable: boolean;\n    doc: string | undefined;\n    annotations: GirAnnotations;\n};\n\ntype InlineFieldVisit = {\n    jsName: string;\n    descriptor: string;\n    offset: number;\n    slot: FieldSlot;\n    type: TypeId;\n};\n\ntype InlineFieldVisitors = {\n    leaf: (visit: InlineFieldVisit) => void;\n    nested: (jsName: string, nested: GirField[], offset: number) => void;\n};\n\ntype ElementWriteOptions = {\n    fields: GirField[];\n    baseOffset: number;\n    valuePath: string;\n    out: string[];\n};\n\ntype StructArrayTarget = {\n    field: GirField;\n    jsName: string;\n    slot: FieldSlot;\n    siblingFields: GirField[];\n};\n\ntype StructArrayAccessorOptions = {\n    context: ModuleContext;\n    jsName: string;\n    tsType: string;\n    elementDescriptor: string;\n    offset: number;\n    lengthExpr: string;\n    elementSize: number;\n    elementFields: GirField[];\n};\n\ntype StructArrayResolution = {\n    fieldType: TypeId;\n    elementFields: GirField[];\n    lengthExpr: string;\n    elementSize: number;\n};\n\ntype StructArrayElements = {\n    arrayType: Extract<GirType, { kind: \"carray\" }>;\n    elementFields: GirField[];\n};\n\ntype AccessorOptions = {\n    context: ModuleContext;\n    jsName: string;\n    tsType: string;\n    descriptor: string;\n    slot: FieldSlot;\n    fieldType: TypeId;\n};\n\nconst isMarshalableField = (context: ModuleContext, field: GirField): boolean => {\n    if (field.cType?.endsWith(\"*\") === true) {\n        return true;\n    }\n\n    const type = field.type === undefined ? undefined : context.library.typeFor(field.type);\n\n    if (type?.kind !== \"record\") {\n        return true;\n    }\n\n    return isValueMarshalable(context, type.namespace.name, type.value);\n};\n\nconst isEmittableField = (context: ModuleContext, field: GirField): field is GirField & { type: TypeId } =>\n    !field.private &&\n    field.type !== undefined &&\n    !isInlineCallbackRef(context.library, field.type) &&\n    isMarshalableField(context, field);\n\nconst emitFieldWrite = (context: ModuleContext, spec: FieldWriteSpec): string => {\n    const { descriptor, slot, targetExpr, valueExpr } = spec;\n    context.addRuntimeImport(\"write\");\n\n    if (slot.bitWidth === undefined) {\n        context.addRuntimeImport(\"toNative\");\n\n        return (\n            `write(${targetExpr}, ${descriptor}, ${String(slot.byteOffset)}, ` +\n            `toNative(${descriptor}, ${valueExpr}));`\n        );\n    }\n\n    context.addRuntimeImport(\"read\");\n\n    const merged = mergeBitfield(\n        `(read(${targetExpr}, ${descriptor}, ${String(slot.byteOffset)}) as number)`,\n        valueExpr,\n        bitMask(slot.bitWidth),\n        slot.bitOffset ?? 0,\n    );\n\n    return `write(${targetExpr}, ${descriptor}, ${String(slot.byteOffset)}, ${merged});`;\n};\n\nconst admitField = (\n    context: ModuleContext,\n    slot: RecordFieldSlot,\n    claimedNames: Set<string>,\n): AdmittedField | undefined => {\n    const { field } = slot;\n\n    if (!field.readable && !field.writable) {\n        return undefined;\n    }\n\n    if (!isEmittableField(context, field)) {\n        return undefined;\n    }\n\n    const jsName = toCamelIdentifier(field.name);\n\n    if (claimedNames.has(jsName)) {\n        return undefined;\n    }\n\n    if (jsName === \"constructor\") {\n        return undefined;\n    }\n\n    return { field, jsName };\n};\n\nconst resolveRecordFieldEntry = (\n    context: ModuleContext,\n    slot: RecordFieldSlot,\n    claimedNames: Set<string>,\n): RecordFieldEntry | undefined => {\n    const admitted = admitField(context, slot, claimedNames);\n\n    if (admitted === undefined) {\n        return undefined;\n    }\n\n    return {\n        jsName: admitted.jsName,\n        tsType: renderTsType(context, admitted.field.type, false),\n        isWritable: admitted.field.writable,\n        doc: admitted.field.doc,\n        annotations: admitted.field.annotations,\n    };\n};\n\nconst renderRecordFieldAccessor = (\n    context: ModuleContext,\n    slot: RecordFieldSlot,\n    claimedNames: Set<string>,\n    siblingFields: GirField[],\n): string | undefined => {\n    const admitted = admitField(context, slot, claimedNames);\n\n    if (admitted === undefined) {\n        return undefined;\n    }\n\n    const { field, jsName } = admitted;\n    const doc = getDoc(field);\n    const structArray = renderStructArrayAccessor(context, { field, jsName, slot: slot.slot, siblingFields });\n\n    if (structArray !== undefined) {\n        return `${doc}${structArray}`;\n    }\n\n    if (!isAccessorEligibleType(context, field.type)) {\n        const tsType = renderTsType(context, field.type, false);\n\n        return `${doc}declare ${jsName}: ${tsType};`;\n    }\n\n    const descriptor = context.hoistDescriptor(\n        renderDescriptor(context, field.type, \"none\", { isInline: isInlineField(context, field) }),\n    );\n\n    const tsType = renderTsType(context, field.type, false);\n\n    const accessorOptions: AccessorOptions = {\n        context,\n        jsName,\n        tsType,\n        descriptor,\n        slot: slot.slot,\n        fieldType: field.type,\n    };\n\n    const blocks: string[] = [getterBlock(accessorOptions)];\n\n    if (field.writable) {\n        blocks.push(setterBlock(accessorOptions));\n    }\n\n    return `${doc}${blocks.join(\"\\n\\n\")}`;\n};\n\nconst isAccessorEligibleType = (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 \"primitive\": {\n            return type.category !== \"void\" && type.category !== \"unichar\";\n        }\n        case \"class\":\n        case \"interface\":\n        case \"record\":\n        case \"enum\":\n        case \"alias\": {\n            return true;\n        }\n        case \"callback\": {\n            return context.library.nameFor(ref) !== undefined;\n        }\n        case \"carray\": {\n            return type.fixedSize !== undefined;\n        }\n        case \"list\":\n        case \"hashtable\":\n        case \"varargs\": {\n            return false;\n        }\n    }\n};\n\nconst isInlineField = (context: ModuleContext, field: GirField): boolean =>\n    field.type !== undefined && resolveInlineStructFields(context, field.type, field.cType) !== undefined;\n\nconst resolveInlineStructFields = (\n    context: ModuleContext,\n    ref: TypeId | undefined,\n    occurrenceCType: string | undefined,\n): GirField[] | undefined => {\n    if (ref === undefined) {\n        return undefined;\n    }\n\n    if (occurrenceCType?.endsWith(\"*\") === true) {\n        return undefined;\n    }\n\n    const type = context.library.typeFor(ref);\n\n    if (type?.kind !== \"record\") {\n        return undefined;\n    }\n\n    if (type.value.cType?.endsWith(\"*\") === true) {\n        return undefined;\n    }\n\n    if (type.value.fields.length === 0) {\n        return undefined;\n    }\n\n    return type.value.fields;\n};\n\nconst arrayLengthExpression = (\n    arrayRef: Extract<GirType, { kind: \"carray\" }>,\n    siblingFields: GirField[],\n): string | undefined => {\n    if (arrayRef.fixedSize !== undefined) {\n        return String(arrayRef.fixedSize);\n    }\n\n    if (arrayRef.lengthParameterIndex === undefined) {\n        return undefined;\n    }\n\n    const lengthField = siblingFields.filter((field) => !field.private)[arrayRef.lengthParameterIndex];\n\n    if (lengthField === undefined) {\n        return undefined;\n    }\n\n    return `this.${toCamelIdentifier(lengthField.name)}`;\n};\n\nconst visitInlineStructSlot = (\n    context: ModuleContext,\n    entry: RecordFieldSlot,\n    baseOffset: number,\n    visitors: InlineFieldVisitors,\n): void => {\n    const { field, slot } = entry;\n\n    if (field.private || field.type === undefined || isInlineCallbackRef(context.library, field.type)) {\n        return;\n    }\n\n    const jsName = toCamelIdentifier(field.name);\n    const offset = baseOffset + slot.byteOffset;\n    const nested = resolveInlineStructFields(context, field.type, field.cType);\n\n    if (nested !== undefined) {\n        visitors.nested(jsName, nested, offset);\n\n        return;\n    }\n\n    if (!isAccessorEligibleType(context, field.type)) {\n        return;\n    }\n\n    const descriptor = context.hoistDescriptor(renderDescriptor(context, field.type, \"none\"));\n    visitors.leaf({ jsName, descriptor, offset, slot, type: field.type });\n};\n\nconst visitInlineStructFields = (\n    context: ModuleContext,\n    fields: GirField[],\n    baseOffset: number,\n    visitors: InlineFieldVisitors,\n): void => {\n    const { slots } = computeRecordFieldSlots(context, fields);\n\n    for (const entry of slots) {\n        visitInlineStructSlot(context, entry, baseOffset, visitors);\n    }\n};\n\nconst elementAccessExpr = (descriptor: string, offset: number): string =>\n    `read(__array, ${descriptor}, __base + ${String(offset)})`;\n\nconst renderElementReadEntry = (context: ModuleContext, visit: InlineFieldVisit): string => {\n    const { jsName, descriptor, offset, slot, type } = visit;\n    const access = elementAccessExpr(descriptor, offset);\n\n    if (slot.bitWidth === undefined) {\n        return `${jsName}: ${access} as ${renderTsType(context, type, false)}`;\n    }\n\n    const shift = slot.bitOffset ?? 0;\n\n    return `${jsName}: (((${access} as number) >>> ${String(shift)}) & ${String(bitMask(slot.bitWidth))})`;\n};\n\nconst renderElementReadObject = (context: ModuleContext, fields: GirField[], baseOffset: number): string => {\n    const entries: string[] = [];\n\n    visitInlineStructFields(context, fields, baseOffset, {\n        leaf: (visit) => {\n            entries.push(renderElementReadEntry(context, visit));\n        },\n        nested: (jsName, nested, offset) => {\n            entries.push(`${jsName}: ${renderElementReadObject(context, nested, offset)}`);\n        },\n    });\n\n    return `{ ${entries.join(\", \")} }`;\n};\n\nconst renderElementWriteStatement = (visit: InlineFieldVisit, valuePath: string): string => {\n    const { jsName, descriptor, offset, slot } = visit;\n    const valueExpr = `${valuePath}.${jsName}`;\n\n    if (slot.bitWidth === undefined) {\n        return `write(__array, ${descriptor}, __base + ${String(offset)}, ${valueExpr});`;\n    }\n\n    const merged = mergeBitfield(\n        `(${elementAccessExpr(descriptor, offset)} as number)`,\n        valueExpr,\n        bitMask(slot.bitWidth),\n        slot.bitOffset ?? 0,\n    );\n\n    return `write(__array, ${descriptor}, __base + ${String(offset)}, ${merged});`;\n};\n\nconst appendElementWriteStatements = (context: ModuleContext, options: ElementWriteOptions): void => {\n    const { fields, baseOffset, valuePath, out } = options;\n\n    visitInlineStructFields(context, fields, baseOffset, {\n        leaf: (visit) => {\n            out.push(renderElementWriteStatement(visit, valuePath));\n        },\n        nested: (jsName, nested, offset) => {\n            appendElementWriteStatements(context, {\n                fields: nested,\n                baseOffset: offset,\n                valuePath: `${valuePath}.${jsName}`,\n                out,\n            });\n        },\n    });\n};\n\nconst structArrayGetterBlock = (options: StructArrayAccessorOptions): string => {\n    const { context, jsName, tsType, elementDescriptor, offset, lengthExpr, elementSize, elementFields } = options;\n    const element = renderElementReadObject(context, elementFields, 0);\n    const loop = [`const __base = __index * ${String(elementSize)};`, `__result.push(${element});`].join(\"\\n\");\n    const handleType = \"ReturnType<typeof getHandle>\";\n\n    const body = [\n        `const __array = read(getHandle(this), ${elementDescriptor}, ${String(offset)}) as ${handleType};`,\n        `const __result: ${tsType} = [];`,\n        `for (let __index = 0; __index < ${lengthExpr}; __index++) {`,\n        indent(loop, 1),\n        \"}\",\n        \"return __result;\",\n    ].join(\"\\n\");\n\n    return renderBlock(`get ${jsName}(): ${tsType}`, body);\n};\n\nconst structArraySetterStatements = (context: ModuleContext, options: StructArrayAccessorOptions): string => {\n    const { elementDescriptor, offset, elementSize, elementFields } = options;\n    const writes: string[] = [];\n\n    appendElementWriteStatements(context, {\n        fields: elementFields,\n        baseOffset: 0,\n        valuePath: \"__element\",\n        out: writes,\n    });\n\n    const loop = [`const __base = __index * ${String(elementSize)};`, ...writes].join(\"\\n\");\n\n    return [\n        `const __descriptor = ${elementDescriptor};`,\n        `const __array = read(getHandle(this), __descriptor, ${String(offset)}) as ReturnType<typeof getHandle>;`,\n        \"for (const [__index, __element] of __value.entries()) {\",\n        indent(loop, 1),\n        \"}\",\n        `write(getHandle(this), __descriptor, ${String(offset)}, __array);`,\n    ].join(\"\\n\");\n};\n\nconst structArraySetterBlock = (options: StructArrayAccessorOptions): string =>\n    renderBlock(\n        `set ${options.jsName}(__value: ${options.tsType})`,\n        structArraySetterStatements(options.context, options),\n    );\n\nconst isPlainDataRecord = (record: GirRecord): boolean =>\n    record.glibGetType === undefined &&\n    record.constructors.length === 0 &&\n    record.functions.length === 0 &&\n    record.methods.length === 0;\n\nconst resolveStructArrayElements = (context: ModuleContext, fieldType: TypeId): StructArrayElements | undefined => {\n    const arrayType = context.library.typeFor(fieldType);\n\n    if (arrayType?.kind !== \"carray\") {\n        return undefined;\n    }\n\n    const elementType = context.library.typeFor(arrayType.element);\n\n    if (elementType?.kind === \"record\" && !isPlainDataRecord(elementType.value)) {\n        return undefined;\n    }\n\n    const elementFields = resolveInlineStructFields(context, arrayType.element, arrayType.elementCType);\n\n    if (elementFields === undefined) {\n        return undefined;\n    }\n\n    return { arrayType, elementFields };\n};\n\nconst resolveStructArrayShape = (\n    context: ModuleContext,\n    elements: StructArrayElements,\n    siblingFields: GirField[],\n): { lengthExpr: string; elementSize: number } | undefined => {\n    const lengthExpr = arrayLengthExpression(elements.arrayType, siblingFields);\n\n    if (lengthExpr === undefined) {\n        return undefined;\n    }\n\n    const elementSize = computeRecordFieldSlots(context, elements.elementFields).size;\n\n    if (elementSize === 0) {\n        return undefined;\n    }\n\n    return { lengthExpr, elementSize };\n};\n\nconst resolveStructArray = (context: ModuleContext, target: StructArrayTarget): StructArrayResolution | undefined => {\n    const { field, slot, siblingFields } = target;\n\n    if (field.type === undefined || slot.bitWidth !== undefined) {\n        return undefined;\n    }\n\n    const elements = resolveStructArrayElements(context, field.type);\n\n    if (elements === undefined) {\n        return undefined;\n    }\n\n    const shape = resolveStructArrayShape(context, elements, siblingFields);\n\n    if (shape === undefined) {\n        return undefined;\n    }\n\n    return {\n        fieldType: field.type,\n        elementFields: elements.elementFields,\n        lengthExpr: shape.lengthExpr,\n        elementSize: shape.elementSize,\n    };\n};\n\nconst renderStructArrayAccessor = (context: ModuleContext, target: StructArrayTarget): string | undefined => {\n    const resolution = resolveStructArray(context, target);\n\n    if (resolution === undefined) {\n        return undefined;\n    }\n\n    const { field, jsName, slot } = target;\n    const { fieldType, elementFields, lengthExpr, elementSize } = resolution;\n    context.addRuntimeImport(\"read\");\n    context.addRuntimeImport(\"getHandle\");\n    context.addRuntimeImport(\"t\");\n\n    const options: StructArrayAccessorOptions = {\n        context,\n        jsName,\n        tsType: renderTsType(context, fieldType, false),\n        elementDescriptor: tStruct(\"borrowed\", {\n            size: `${lengthExpr} * ${String(elementSize)}`,\n            wrapperClass: undefined,\n            isCallerAllocated: false,\n        }),\n        offset: slot.byteOffset,\n        lengthExpr,\n        elementSize,\n        elementFields,\n    };\n\n    const blocks: string[] = [];\n\n    if (field.readable) {\n        blocks.push(structArrayGetterBlock(options));\n    }\n\n    if (field.writable) {\n        context.addRuntimeImport(\"write\");\n        blocks.push(structArraySetterBlock(options));\n    }\n\n    return blocks.length === 0 ? undefined : blocks.join(\"\\n\\n\");\n};\n\nconst getterBlock = (options: AccessorOptions): string => {\n    const { context, jsName, tsType, descriptor, slot, fieldType } = options;\n    context.addRuntimeImport(\"read\");\n    context.addRuntimeImport(\"getHandle\");\n\n    if (slot.bitWidth === undefined) {\n        const valueExpression = `read(getHandle(this), ${descriptor}, ${String(slot.byteOffset)})`;\n\n        const wrapped = wrapReturnValue(context, {\n            ref: fieldType,\n            isNullable: false,\n            valueExpression,\n        });\n\n        const body = `return ${wrapped};`;\n\n        return renderBlock(`get ${jsName}(): ${tsType}`, body);\n    }\n\n    const mask = bitMask(slot.bitWidth);\n    const shift = slot.bitOffset ?? 0;\n    const readUnit = `const __unit = read(getHandle(this), ${descriptor}, ${String(slot.byteOffset)}) as number;`;\n    const body = `${readUnit}\\nreturn (((__unit >>> ${String(shift)}) & ${String(mask)}) >>> 0) as ${tsType};`;\n\n    return renderBlock(`get ${jsName}(): ${tsType}`, body);\n};\n\nconst setterBody = (context: ModuleContext, descriptor: string, slot: FieldSlot): string => {\n    context.addRuntimeImport(\"getHandle\");\n\n    return emitFieldWrite(context, { descriptor, slot, targetExpr: \"getHandle(this)\", valueExpr: \"value\" });\n};\n\nconst setterBlock = (options: AccessorOptions): string =>\n    renderBlock(\n        `set ${options.jsName}(value: ${options.tsType})`,\n        setterBody(options.context, options.descriptor, options.slot),\n    );\n\nexport {\n    isEmittableField,\n    isInlineField,\n    emitFieldWrite,\n    resolveRecordFieldEntry,\n    renderRecordFieldAccessor,\n};\n"]}
+{"version":3,"file":"record-field-accessor.js","sourceRoot":"","sources":["../../../src/store/gi/record-field-accessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAQhD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AAC3G,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAqF5D,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAW,EAAE;IAC5E,IAAI,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAExF,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAwC,EAAE,CACvG,CAAC,KAAK,CAAC,OAAO;IACd,KAAK,CAAC,IAAI,KAAK,SAAS;IACxB,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC;IACjD,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAEvC,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,IAAoB,EAAU,EAAE;IAC5E,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IACzD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAElC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAErC,OAAO,CACH,SAAS,UAAU,KAAK,UAAU,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI;YAClE,YAAY,UAAU,KAAK,SAAS,KAAK,CAC5C,CAAC;IACN,CAAC;IAED,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,MAAM,GAAG,aAAa,CACxB,SAAS,UAAU,KAAK,UAAU,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAC5E,SAAS,EACT,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EACtB,IAAI,CAAC,SAAS,IAAI,CAAC,CACtB,CAAC;IAEF,OAAO,SAAS,UAAU,KAAK,UAAU,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,MAAM,IAAI,CAAC;AACzF,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CACf,OAAsB,EACtB,IAAqB,EACrB,YAAyB,EACA,EAAE;IAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvB,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE7C,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE;IAChF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,IAAI,EAAE,IAAI,KAAK,QAAQ,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AAC1G,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE,CAC3E,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,0BAA0B,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AAErF,MAAM,mBAAmB,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE;IACzE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;IAEhD,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,WAAW,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CACzB,OAAsB,EACtB,IAAqB,EACrB,YAAyB,EACzB,aAAyB,EACE,EAAE;IAC7B,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAEzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACnC,MAAM,MAAM,GAAsB,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC;IACpF,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,SAAS,CAAC;IACzE,MAAM,WAAW,GAAG,cAAc,IAAI,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACjF,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,IAAI,CAAC,cAAc,IAAI,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAElG,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC5B,OAAsB,EACtB,IAAqB,EACrB,YAAyB,EACzB,aAAyB,EACG,EAAE;IAC9B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAElF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO;QACH,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;QACzD,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG;QACvB,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,WAAW;KAC1C,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAC9B,OAAsB,EACtB,IAAqB,EACrB,YAAyB,EACzB,aAAyB,EACP,EAAE;IACpB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAElF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1B,MAAM,WAAW,GAAG,yBAAyB,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;IAE1G,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,GAAG,GAAG,GAAG,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CACtC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAC7F,CAAC;IAEF,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAExD,MAAM,eAAe,GAAoB;QACrC,OAAO;QACP,MAAM;QACN,MAAM;QACN,UAAU;QACV,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,SAAS,EAAE,KAAK,CAAC,IAAI;KACxB,CAAC;IAEF,MAAM,MAAM,GAAa,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;IAExD,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,GAAW,EAAW,EAAE;IAC5E,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,WAAW,CAAC,CAAC,CAAC;YACf,OAAO,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC;QACnE,CAAC;QACD,KAAK,OAAO,CAAC;QACb,KAAK,WAAW,CAAC;QACjB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC,CAAC,CAAC;YACX,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,KAAK,UAAU,CAAC,CAAC,CAAC;YACd,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;QACtD,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACZ,OAAO,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC;QACxC,CAAC;QACD,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,MAAM,aAAa,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAW,EAAE,CACvE,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,yBAAyB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAE1G,MAAM,yBAAyB,GAAG,CAC9B,OAAsB,EACtB,GAAuB,EACvB,eAAmC,EACb,EAAE;IACxB,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,eAAe,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC1B,QAA8C,EAC9C,aAAyB,EACP,EAAE;IACpB,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEnG,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,QAAQ,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC1B,OAAsB,EACtB,KAAsB,EACtB,UAAkB,EAClB,QAA6B,EACzB,EAAE;IACN,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAE9B,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAChG,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IAC5C,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAE3E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAExC,OAAO;IACX,CAAC;IAED,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,OAAO;IACX,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1F,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC5B,OAAsB,EACtB,MAAkB,EAClB,UAAkB,EAClB,QAA6B,EACzB,EAAE;IACN,MAAM,EAAE,KAAK,EAAE,GAAG,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAE3D,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QACxB,qBAAqB,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,MAAkB,EAAU,EAAE;IAC3E,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE;QACxC,IAAI,EAAE,GAAG,EAAE;YACP,KAAK,IAAI,CAAC,CAAC;QACf,CAAC;QACD,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxB,KAAK,IAAI,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;KACJ,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,MAAc,EAAU,EAAE,CACrE,iBAAiB,UAAU,cAAc,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;AAE/D,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,KAAuB,EAAU,EAAE;IACvF,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACzD,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,GAAG,MAAM,KAAK,MAAM,OAAO,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;IAC3E,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;IAElC,OAAO,GAAG,MAAM,QAAQ,MAAM,mBAAmB,MAAM,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC;AAC3G,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,OAAsB,EAAE,MAAkB,EAAE,UAAkB,EAAU,EAAE;IACvG,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;QACjD,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,KAAK,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC;KACJ,CAAC,CAAC;IAEH,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,KAAuB,EAAE,SAAiB,EAAU,EAAE;IACvF,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACnD,MAAM,SAAS,GAAG,GAAG,SAAS,IAAI,MAAM,EAAE,CAAC;IAE3C,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,kBAAkB,UAAU,cAAc,MAAM,CAAC,MAAM,CAAC,KAAK,SAAS,IAAI,CAAC;IACtF,CAAC;IAED,MAAM,MAAM,GAAG,aAAa,CACxB,IAAI,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,aAAa,EACtD,SAAS,EACT,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EACtB,IAAI,CAAC,SAAS,IAAI,CAAC,CACtB,CAAC;IAEF,OAAO,kBAAkB,UAAU,cAAc,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,IAAI,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,CAAC,OAAsB,EAAE,OAA4B,EAAQ,EAAE;IAChG,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAEvD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;QACjD,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACZ,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC/B,4BAA4B,CAAC,OAAO,EAAE;gBAClC,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,MAAM;gBAClB,SAAS,EAAE,GAAG,SAAS,IAAI,MAAM,EAAE;gBACnC,GAAG;aACN,CAAC,CAAC;QACP,CAAC;KACJ,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAmC,EAAU,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC/G,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,CAAC,4BAA4B,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,iBAAiB,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3G,MAAM,UAAU,GAAG,8BAA8B,CAAC;IAElD,MAAM,IAAI,GAAG;QACT,yCAAyC,iBAAiB,KAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,UAAU,GAAG;QAClG,mBAAmB,MAAM,QAAQ;QACjC,mCAAmC,UAAU,gBAAgB;QAC7D,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACf,GAAG;QACH,kBAAkB;KACrB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,OAAO,WAAW,CAAC,OAAO,MAAM,OAAO,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,OAAsB,EAAE,OAAmC,EAAU,EAAE;IACxG,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACtF,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,4BAA4B,CAAC,OAAO,EAAE;QAClC,MAAM,EAAE,aAAa;QACrB,UAAU,EAAE,CAAC;QACb,SAAS,EAAE,WAAW;QACtB,GAAG,EAAE,MAAM;KACd,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,CAAC,4BAA4B,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAExF,OAAO;QACH,wBAAwB,iBAAiB,GAAG;QAC5C,uDAAuD,MAAM,CAAC,MAAM,CAAC,oCAAoC;QACzG,yDAAyD;QACzD,MAAM,CAAC,kBAAkB,UAAU,yBAAyB,IAAI,EAAE,EAAE,CAAC,CAAC;QACtE,GAAG;QACH,wCAAwC,MAAM,CAAC,MAAM,CAAC,aAAa;KACtE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAmC,EAAU,EAAE,CAC3E,WAAW,CACP,OAAO,OAAO,CAAC,MAAM,aAAa,OAAO,CAAC,MAAM,GAAG,EACnD,2BAA2B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CACxD,CAAC;AAEN,MAAM,iBAAiB,GAAG,CAAC,MAAiB,EAAW,EAAE,CACrD,MAAM,CAAC,WAAW,KAAK,SAAS;IAChC,MAAM,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;IAChC,MAAM,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;AAEhC,MAAM,0BAA0B,GAAG,CAAC,OAAsB,EAAE,SAAiB,EAAmC,EAAE;IAC9G,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAErD,IAAI,SAAS,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/D,IAAI,WAAW,EAAE,IAAI,KAAK,QAAQ,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1E,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,yBAAyB,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAEpG,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC5B,OAAsB,EACtB,QAA6B,EAC7B,aAAyB,EAC8B,EAAE;IACzD,MAAM,UAAU,GAAG,qBAAqB,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAE5E,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC;IAElF,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,MAAyB,EAAqC,EAAE;IAChH,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAE9C,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC1D,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,0BAA0B,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEjE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAExE,IAAI,KAAK,KAAK,SAAS,IAAI,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAChF,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO;QACH,SAAS,EAAE,KAAK,CAAC,IAAI;QACrB,aAAa,EAAE,QAAQ,CAAC,aAAa;QACrC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;KACjC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,OAAsB,EAAE,MAAyB,EAAsB,EAAE;IACxG,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAEvD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC;IACzE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACtC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE9B,MAAM,OAAO,GAA+B;QACxC,OAAO;QACP,MAAM;QACN,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC;QAC/C,iBAAiB,EAAE,OAAO,CAAC,UAAU,EAAE;YACnC,IAAI,EAAE,GAAG,UAAU,MAAM,MAAM,CAAC,WAAW,CAAC,EAAE;YAC9C,YAAY,EAAE,SAAS;YACvB,iBAAiB,EAAE,KAAK;SAC3B,CAAC;QACF,MAAM,EAAE,IAAI,CAAC,UAAU;QACvB,UAAU;QACV,WAAW;QACX,aAAa;KAChB,CAAC;IAEF,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAwB,EAAU,EAAE;IACrD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACzE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAEtC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,eAAe,GAAG,yBAAyB,UAAU,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAE3F,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE;YACrC,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,KAAK;YACjB,eAAe;SAClB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,UAAU,OAAO,GAAG,CAAC;QAElC,OAAO,WAAW,CAAC,OAAO,MAAM,OAAO,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAG,wCAAwC,UAAU,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;IAC9G,MAAM,IAAI,GAAG,GAAG,QAAQ,0BAA0B,MAAM,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,eAAe,MAAM,GAAG,CAAC;IAE3G,OAAO,WAAW,CAAC,OAAO,MAAM,OAAO,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,OAAsB,EAAE,UAAkB,EAAE,IAAe,EAAU,EAAE;IACvF,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAEtC,OAAO,cAAc,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC5G,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAwB,EAAU,EAAE,CACrD,WAAW,CACP,OAAO,OAAO,CAAC,MAAM,WAAW,OAAO,CAAC,MAAM,GAAG,EACjD,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAChE,CAAC;AAEN,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,yBAAyB,GAC5B,CAAC","sourcesContent":["import { toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirAnnotations } from \"../../gir/annotations.js\";\nimport type { GirField } from \"../../gir/field.js\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { FieldSlot } from \"../../gir/size.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { isInlineCallbackRef, renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { tStruct } from \"../../analysis/descriptor.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { isUnboundedArray } from \"../../analysis/type-shape.js\";\nimport { indent, renderBlock } from \"../../writer/emit.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { bitMask, computeRecordFieldSlots, mergeBitfield, type RecordFieldSlot } from \"./record-layout.js\";\nimport { wrapReturnValue } from \"./return-wrap.js\";\nimport { isValueMarshalable } from \"./value-marshalable.js\";\n\ntype FieldWriteSpec = {\n    descriptor: string;\n    slot: FieldSlot;\n    targetExpr: string;\n    valueExpr: string;\n};\n\ntype AdmittedField = {\n    field: GirField & { type: TypeId };\n    jsName: string;\n};\n\ntype AccessibleField = AdmittedField & {\n    isSettable: boolean;\n};\n\ntype RecordFieldEntry = {\n    jsName: string;\n    tsType: string;\n    isWritable: boolean;\n    doc: string | undefined;\n    annotations: GirAnnotations;\n};\n\ntype InlineFieldVisit = {\n    jsName: string;\n    descriptor: string;\n    offset: number;\n    slot: FieldSlot;\n    type: TypeId;\n};\n\ntype InlineFieldVisitors = {\n    leaf: (visit: InlineFieldVisit) => void;\n    nested: (jsName: string, nested: GirField[], offset: number) => void;\n};\n\ntype ElementWriteOptions = {\n    fields: GirField[];\n    baseOffset: number;\n    valuePath: string;\n    out: string[];\n};\n\ntype StructArrayTarget = {\n    field: GirField;\n    jsName: string;\n    slot: FieldSlot;\n    siblingFields: GirField[];\n};\n\ntype StructArrayAccessorOptions = {\n    context: ModuleContext;\n    jsName: string;\n    tsType: string;\n    elementDescriptor: string;\n    offset: number;\n    lengthExpr: string;\n    elementSize: number;\n    elementFields: GirField[];\n};\n\ntype StructArrayResolution = {\n    fieldType: TypeId;\n    elementFields: GirField[];\n    lengthExpr: string;\n    elementSize: number;\n};\n\ntype StructArrayElements = {\n    arrayType: Extract<GirType, { kind: \"carray\" }>;\n    elementFields: GirField[];\n};\n\ntype AccessorOptions = {\n    context: ModuleContext;\n    jsName: string;\n    tsType: string;\n    descriptor: string;\n    slot: FieldSlot;\n    fieldType: TypeId;\n};\n\nconst isMarshalableField = (context: ModuleContext, field: GirField): boolean => {\n    if (field.cType?.endsWith(\"*\") === true) {\n        return true;\n    }\n\n    const type = field.type === undefined ? undefined : context.library.typeFor(field.type);\n\n    if (type?.kind !== \"record\") {\n        return true;\n    }\n\n    return isValueMarshalable(context, type.namespace.name, type.value);\n};\n\nconst isEmittableField = (context: ModuleContext, field: GirField): field is GirField & { type: TypeId } =>\n    !field.private &&\n    field.type !== undefined &&\n    !isInlineCallbackRef(context.library, field.type) &&\n    isMarshalableField(context, field);\n\nconst emitFieldWrite = (context: ModuleContext, spec: FieldWriteSpec): string => {\n    const { descriptor, slot, targetExpr, valueExpr } = spec;\n    context.addRuntimeImport(\"write\");\n\n    if (slot.bitWidth === undefined) {\n        context.addRuntimeImport(\"toNative\");\n\n        return (\n            `write(${targetExpr}, ${descriptor}, ${String(slot.byteOffset)}, ` +\n            `toNative(${descriptor}, ${valueExpr}));`\n        );\n    }\n\n    context.addRuntimeImport(\"read\");\n\n    const merged = mergeBitfield(\n        `(read(${targetExpr}, ${descriptor}, ${String(slot.byteOffset)}) as number)`,\n        valueExpr,\n        bitMask(slot.bitWidth),\n        slot.bitOffset ?? 0,\n    );\n\n    return `write(${targetExpr}, ${descriptor}, ${String(slot.byteOffset)}, ${merged});`;\n};\n\nconst admitField = (\n    context: ModuleContext,\n    slot: RecordFieldSlot,\n    claimedNames: Set<string>,\n): AdmittedField | undefined => {\n    const { field } = slot;\n\n    if (!field.readable && !field.writable) {\n        return undefined;\n    }\n\n    if (!isEmittableField(context, field)) {\n        return undefined;\n    }\n\n    const jsName = toCamelIdentifier(field.name);\n\n    if (claimedNames.has(jsName)) {\n        return undefined;\n    }\n\n    if (jsName === \"constructor\") {\n        return undefined;\n    }\n\n    return { field, jsName };\n};\n\nconst isNullTerminatedArrayField = (context: ModuleContext, ref: TypeId): boolean => {\n    const type = context.library.typeFor(ref);\n\n    return type?.kind === \"carray\" && isUnboundedArray(type) && type.elementCType?.endsWith(\"*\") === true;\n};\n\nconst isAccessibleFieldType = (context: ModuleContext, ref: TypeId): boolean =>\n    isAccessorEligibleType(context, ref) || isNullTerminatedArrayField(context, ref);\n\nconst isStorableFieldType = (context: ModuleContext, ref: TypeId): boolean => {\n    const kind = context.library.typeFor(ref)?.kind;\n\n    return kind !== \"carray\" && kind !== \"list\" && kind !== \"hashtable\";\n};\n\nconst admitAccessibleField = (\n    context: ModuleContext,\n    slot: RecordFieldSlot,\n    claimedNames: Set<string>,\n    siblingFields: GirField[],\n): AccessibleField | undefined => {\n    const admitted = admitField(context, slot, claimedNames);\n\n    if (admitted === undefined) {\n        return undefined;\n    }\n\n    const { field, jsName } = admitted;\n    const target: StructArrayTarget = { field, jsName, slot: slot.slot, siblingFields };\n    const hasStructArray = resolveStructArray(context, target) !== undefined;\n    const hasAccessor = hasStructArray || isAccessibleFieldType(context, field.type);\n    const isSettable = field.writable && (hasStructArray || isStorableFieldType(context, field.type));\n\n    return hasAccessor ? { ...admitted, isSettable } : undefined;\n};\n\nconst resolveRecordFieldEntry = (\n    context: ModuleContext,\n    slot: RecordFieldSlot,\n    claimedNames: Set<string>,\n    siblingFields: GirField[],\n): RecordFieldEntry | undefined => {\n    const admitted = admitAccessibleField(context, slot, claimedNames, siblingFields);\n\n    if (admitted === undefined) {\n        return undefined;\n    }\n\n    return {\n        jsName: admitted.jsName,\n        tsType: renderTsType(context, admitted.field.type, false),\n        isWritable: admitted.isSettable,\n        doc: admitted.field.doc,\n        annotations: admitted.field.annotations,\n    };\n};\n\nconst renderRecordFieldAccessor = (\n    context: ModuleContext,\n    slot: RecordFieldSlot,\n    claimedNames: Set<string>,\n    siblingFields: GirField[],\n): string | undefined => {\n    const admitted = admitAccessibleField(context, slot, claimedNames, siblingFields);\n\n    if (admitted === undefined) {\n        return undefined;\n    }\n\n    const { field, jsName } = admitted;\n    const doc = getDoc(field);\n    const structArray = renderStructArrayAccessor(context, { field, jsName, slot: slot.slot, siblingFields });\n\n    if (structArray !== undefined) {\n        return `${doc}${structArray}`;\n    }\n\n    const descriptor = context.hoistDescriptor(\n        renderDescriptor(context, field.type, \"none\", { isInline: isInlineField(context, field) }),\n    );\n\n    const tsType = renderTsType(context, field.type, false);\n\n    const accessorOptions: AccessorOptions = {\n        context,\n        jsName,\n        tsType,\n        descriptor,\n        slot: slot.slot,\n        fieldType: field.type,\n    };\n\n    const blocks: string[] = [getterBlock(accessorOptions)];\n\n    if (admitted.isSettable) {\n        blocks.push(setterBlock(accessorOptions));\n    }\n\n    return `${doc}${blocks.join(\"\\n\\n\")}`;\n};\n\nconst isAccessorEligibleType = (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 \"primitive\": {\n            return type.category !== \"void\" && type.category !== \"unichar\";\n        }\n        case \"class\":\n        case \"interface\":\n        case \"record\":\n        case \"enum\":\n        case \"alias\": {\n            return true;\n        }\n        case \"callback\": {\n            return context.library.nameFor(ref) !== undefined;\n        }\n        case \"carray\": {\n            return type.fixedSize !== undefined;\n        }\n        case \"list\":\n        case \"hashtable\":\n        case \"varargs\": {\n            return false;\n        }\n    }\n};\n\nconst isInlineField = (context: ModuleContext, field: GirField): boolean =>\n    field.type !== undefined && resolveInlineStructFields(context, field.type, field.cType) !== undefined;\n\nconst resolveInlineStructFields = (\n    context: ModuleContext,\n    ref: TypeId | undefined,\n    occurrenceCType: string | undefined,\n): GirField[] | undefined => {\n    if (ref === undefined) {\n        return undefined;\n    }\n\n    if (occurrenceCType?.endsWith(\"*\") === true) {\n        return undefined;\n    }\n\n    const type = context.library.typeFor(ref);\n\n    if (type?.kind !== \"record\") {\n        return undefined;\n    }\n\n    if (type.value.cType?.endsWith(\"*\") === true) {\n        return undefined;\n    }\n\n    if (type.value.fields.length === 0) {\n        return undefined;\n    }\n\n    return type.value.fields;\n};\n\nconst arrayLengthExpression = (\n    arrayRef: Extract<GirType, { kind: \"carray\" }>,\n    siblingFields: GirField[],\n): string | undefined => {\n    if (arrayRef.fixedSize !== undefined) {\n        return String(arrayRef.fixedSize);\n    }\n\n    if (arrayRef.lengthParameterIndex === undefined) {\n        return undefined;\n    }\n\n    const lengthField = siblingFields.filter((field) => !field.private)[arrayRef.lengthParameterIndex];\n\n    if (lengthField === undefined) {\n        return undefined;\n    }\n\n    return `this.${toCamelIdentifier(lengthField.name)}`;\n};\n\nconst visitInlineStructSlot = (\n    context: ModuleContext,\n    entry: RecordFieldSlot,\n    baseOffset: number,\n    visitors: InlineFieldVisitors,\n): void => {\n    const { field, slot } = entry;\n\n    if (field.private || field.type === undefined || isInlineCallbackRef(context.library, field.type)) {\n        return;\n    }\n\n    const jsName = toCamelIdentifier(field.name);\n    const offset = baseOffset + slot.byteOffset;\n    const nested = resolveInlineStructFields(context, field.type, field.cType);\n\n    if (nested !== undefined) {\n        visitors.nested(jsName, nested, offset);\n\n        return;\n    }\n\n    if (!isAccessorEligibleType(context, field.type)) {\n        return;\n    }\n\n    const descriptor = context.hoistDescriptor(renderDescriptor(context, field.type, \"none\"));\n    visitors.leaf({ jsName, descriptor, offset, slot, type: field.type });\n};\n\nconst visitInlineStructFields = (\n    context: ModuleContext,\n    fields: GirField[],\n    baseOffset: number,\n    visitors: InlineFieldVisitors,\n): void => {\n    const { slots } = computeRecordFieldSlots(context, fields);\n\n    for (const entry of slots) {\n        visitInlineStructSlot(context, entry, baseOffset, visitors);\n    }\n};\n\nconst inlineLeafCount = (context: ModuleContext, fields: GirField[]): number => {\n    let count = 0;\n\n    visitInlineStructFields(context, fields, 0, {\n        leaf: () => {\n            count += 1;\n        },\n        nested: (_jsName, nested) => {\n            count += inlineLeafCount(context, nested);\n        },\n    });\n\n    return count;\n};\n\nconst elementAccessExpr = (descriptor: string, offset: number): string =>\n    `read(__array, ${descriptor}, __base + ${String(offset)})`;\n\nconst renderElementReadEntry = (context: ModuleContext, visit: InlineFieldVisit): string => {\n    const { jsName, descriptor, offset, slot, type } = visit;\n    const access = elementAccessExpr(descriptor, offset);\n\n    if (slot.bitWidth === undefined) {\n        return `${jsName}: ${access} as ${renderTsType(context, type, false)}`;\n    }\n\n    const shift = slot.bitOffset ?? 0;\n\n    return `${jsName}: (((${access} as number) >>> ${String(shift)}) & ${String(bitMask(slot.bitWidth))})`;\n};\n\nconst renderElementReadObject = (context: ModuleContext, fields: GirField[], baseOffset: number): string => {\n    const entries: string[] = [];\n\n    visitInlineStructFields(context, fields, baseOffset, {\n        leaf: (visit) => {\n            entries.push(renderElementReadEntry(context, visit));\n        },\n        nested: (jsName, nested, offset) => {\n            entries.push(`${jsName}: ${renderElementReadObject(context, nested, offset)}`);\n        },\n    });\n\n    return `{ ${entries.join(\", \")} }`;\n};\n\nconst renderElementWriteStatement = (visit: InlineFieldVisit, valuePath: string): string => {\n    const { jsName, descriptor, offset, slot } = visit;\n    const valueExpr = `${valuePath}.${jsName}`;\n\n    if (slot.bitWidth === undefined) {\n        return `write(__array, ${descriptor}, __base + ${String(offset)}, ${valueExpr});`;\n    }\n\n    const merged = mergeBitfield(\n        `(${elementAccessExpr(descriptor, offset)} as number)`,\n        valueExpr,\n        bitMask(slot.bitWidth),\n        slot.bitOffset ?? 0,\n    );\n\n    return `write(__array, ${descriptor}, __base + ${String(offset)}, ${merged});`;\n};\n\nconst appendElementWriteStatements = (context: ModuleContext, options: ElementWriteOptions): void => {\n    const { fields, baseOffset, valuePath, out } = options;\n\n    visitInlineStructFields(context, fields, baseOffset, {\n        leaf: (visit) => {\n            out.push(renderElementWriteStatement(visit, valuePath));\n        },\n        nested: (jsName, nested, offset) => {\n            appendElementWriteStatements(context, {\n                fields: nested,\n                baseOffset: offset,\n                valuePath: `${valuePath}.${jsName}`,\n                out,\n            });\n        },\n    });\n};\n\nconst structArrayGetterBlock = (options: StructArrayAccessorOptions): string => {\n    const { context, jsName, tsType, elementDescriptor, offset, lengthExpr, elementSize, elementFields } = options;\n    const element = renderElementReadObject(context, elementFields, 0);\n    const loop = [`const __base = __index * ${String(elementSize)};`, `__result.push(${element});`].join(\"\\n\");\n    const handleType = \"ReturnType<typeof getHandle>\";\n\n    const body = [\n        `const __array = read(getHandle(this), ${elementDescriptor}, ${String(offset)}) as ${handleType};`,\n        `const __result: ${tsType} = [];`,\n        `for (let __index = 0; __index < ${lengthExpr}; __index++) {`,\n        indent(loop, 1),\n        \"}\",\n        \"return __result;\",\n    ].join(\"\\n\");\n\n    return renderBlock(`get ${jsName}(): ${tsType}`, body);\n};\n\nconst structArraySetterStatements = (context: ModuleContext, options: StructArrayAccessorOptions): string => {\n    const { elementDescriptor, offset, elementSize, elementFields, lengthExpr } = options;\n    const writes: string[] = [];\n\n    appendElementWriteStatements(context, {\n        fields: elementFields,\n        baseOffset: 0,\n        valuePath: \"__element\",\n        out: writes,\n    });\n\n    const loop = [`const __base = __index * ${String(elementSize)};`, ...writes].join(\"\\n\");\n\n    return [\n        `const __descriptor = ${elementDescriptor};`,\n        `const __array = read(getHandle(this), __descriptor, ${String(offset)}) as ReturnType<typeof getHandle>;`,\n        \"for (const [__index, __element] of __value.entries()) {\",\n        indent(`if (__index >= ${lengthExpr}) {\\n    break;\\n}\\n\\n${loop}`, 1),\n        \"}\",\n        `write(getHandle(this), __descriptor, ${String(offset)}, __array);`,\n    ].join(\"\\n\");\n};\n\nconst structArraySetterBlock = (options: StructArrayAccessorOptions): string =>\n    renderBlock(\n        `set ${options.jsName}(__value: ${options.tsType})`,\n        structArraySetterStatements(options.context, options),\n    );\n\nconst isPlainDataRecord = (record: GirRecord): boolean =>\n    record.glibGetType === undefined &&\n    record.constructors.length === 0 &&\n    record.functions.length === 0 &&\n    record.methods.length === 0;\n\nconst resolveStructArrayElements = (context: ModuleContext, fieldType: TypeId): StructArrayElements | undefined => {\n    const arrayType = context.library.typeFor(fieldType);\n\n    if (arrayType?.kind !== \"carray\") {\n        return undefined;\n    }\n\n    const elementType = context.library.typeFor(arrayType.element);\n\n    if (elementType?.kind === \"record\" && !isPlainDataRecord(elementType.value)) {\n        return undefined;\n    }\n\n    const elementFields = resolveInlineStructFields(context, arrayType.element, arrayType.elementCType);\n\n    if (elementFields === undefined) {\n        return undefined;\n    }\n\n    return { arrayType, elementFields };\n};\n\nconst resolveStructArrayShape = (\n    context: ModuleContext,\n    elements: StructArrayElements,\n    siblingFields: GirField[],\n): { lengthExpr: string; elementSize: number } | undefined => {\n    const lengthExpr = arrayLengthExpression(elements.arrayType, siblingFields);\n\n    if (lengthExpr === undefined) {\n        return undefined;\n    }\n\n    const elementSize = computeRecordFieldSlots(context, elements.elementFields).size;\n\n    if (elementSize === 0) {\n        return undefined;\n    }\n\n    return { lengthExpr, elementSize };\n};\n\nconst resolveStructArray = (context: ModuleContext, target: StructArrayTarget): StructArrayResolution | undefined => {\n    const { field, slot, siblingFields } = target;\n\n    if (field.type === undefined || slot.bitWidth !== undefined) {\n        return undefined;\n    }\n\n    const elements = resolveStructArrayElements(context, field.type);\n\n    if (elements === undefined) {\n        return undefined;\n    }\n\n    const shape = resolveStructArrayShape(context, elements, siblingFields);\n\n    if (shape === undefined || inlineLeafCount(context, elements.elementFields) === 0) {\n        return undefined;\n    }\n\n    return {\n        fieldType: field.type,\n        elementFields: elements.elementFields,\n        lengthExpr: shape.lengthExpr,\n        elementSize: shape.elementSize,\n    };\n};\n\nconst renderStructArrayAccessor = (context: ModuleContext, target: StructArrayTarget): string | undefined => {\n    const resolution = resolveStructArray(context, target);\n\n    if (resolution === undefined) {\n        return undefined;\n    }\n\n    const { field, jsName, slot } = target;\n    const { fieldType, elementFields, lengthExpr, elementSize } = resolution;\n    context.addRuntimeImport(\"read\");\n    context.addRuntimeImport(\"getHandle\");\n    context.addRuntimeImport(\"t\");\n\n    const options: StructArrayAccessorOptions = {\n        context,\n        jsName,\n        tsType: renderTsType(context, fieldType, false),\n        elementDescriptor: tStruct(\"borrowed\", {\n            size: `${lengthExpr} * ${String(elementSize)}`,\n            wrapperClass: undefined,\n            isCallerAllocated: false,\n        }),\n        offset: slot.byteOffset,\n        lengthExpr,\n        elementSize,\n        elementFields,\n    };\n\n    const blocks: string[] = [];\n\n    if (field.readable) {\n        blocks.push(structArrayGetterBlock(options));\n    }\n\n    if (field.writable) {\n        context.addRuntimeImport(\"write\");\n        blocks.push(structArraySetterBlock(options));\n    }\n\n    return blocks.length === 0 ? undefined : blocks.join(\"\\n\\n\");\n};\n\nconst getterBlock = (options: AccessorOptions): string => {\n    const { context, jsName, tsType, descriptor, slot, fieldType } = options;\n    context.addRuntimeImport(\"read\");\n    context.addRuntimeImport(\"getHandle\");\n\n    if (slot.bitWidth === undefined) {\n        const valueExpression = `read(getHandle(this), ${descriptor}, ${String(slot.byteOffset)})`;\n\n        const wrapped = wrapReturnValue(context, {\n            ref: fieldType,\n            isNullable: false,\n            valueExpression,\n        });\n\n        const body = `return ${wrapped};`;\n\n        return renderBlock(`get ${jsName}(): ${tsType}`, body);\n    }\n\n    const mask = bitMask(slot.bitWidth);\n    const shift = slot.bitOffset ?? 0;\n    const readUnit = `const __unit = read(getHandle(this), ${descriptor}, ${String(slot.byteOffset)}) as number;`;\n    const body = `${readUnit}\\nreturn (((__unit >>> ${String(shift)}) & ${String(mask)}) >>> 0) as ${tsType};`;\n\n    return renderBlock(`get ${jsName}(): ${tsType}`, body);\n};\n\nconst setterBody = (context: ModuleContext, descriptor: string, slot: FieldSlot): string => {\n    context.addRuntimeImport(\"getHandle\");\n\n    return emitFieldWrite(context, { descriptor, slot, targetExpr: \"getHandle(this)\", valueExpr: \"value\" });\n};\n\nconst setterBlock = (options: AccessorOptions): string =>\n    renderBlock(\n        `set ${options.jsName}(value: ${options.tsType})`,\n        setterBody(options.context, options.descriptor, options.slot),\n    );\n\nexport {\n    isEmittableField,\n    isInlineField,\n    isStorableFieldType,\n    emitFieldWrite,\n    resolveRecordFieldEntry,\n    renderRecordFieldAccessor,\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAe7D,QAAA,MAAM,cAAc,GAAI,SAAS,aAAa,EAAE,QAAQ,SAAS,KAAG,IAyCnE,CAAC;AAmCF,OAAO,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAuB7D,QAAA,MAAM,cAAc,GAAI,SAAS,aAAa,EAAE,QAAQ,SAAS,KAAG,IAwCnE,CAAC;AAwBF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/store/gi/record.js

@@ -22,7 +22,8 @@ const generateRecord = (context, record) => {
         methods: dedupeCallables(record.methods),
     };
     generateBindings(context, callables);
-    const members = renderRecordMembers(context, record, className, callables);
+    const gtypeExpr = renderSourceGtype(context, record);
+    const members = renderRecordMembers({ context, record, className, callables, gtypeExpr });
     const body = indentMembers(members);
     const heritage = isErrorSubclass ? " extends globalThis.Error" : "";
     const doc = getDoc(record);
@@ -39,20 +40,15 @@ const generateRecord = (context, record) => {
             code: renderRecordConstructorPropsInterface(context, record, className),
         });
     }
-    const gtypeExpr = renderSourceGtype(context, record);
     appendWrapperClassRegistration(context, {
         className,
         gtypeExpr,
     });
 };
-const renderRecordMembers = (context, record, className, callables) => {
+const renderRecordMembers = (options) => {
+    const { context, record, className, callables, gtypeExpr } = options;
     const isErrorSubclass = isGErrorRecord(context, record);
-    const { members, claimedNames } = renderPlainTypeMembers({
-        context,
-        className,
-        callables,
-        hasGtype: record.glibGetType !== undefined,
-    });
+    const { members, claimedNames } = renderPlainTypeMembers({ context, className, callables, gtypeExpr });
     members.unshift(renderRecordConstructor(context, { record, className, callables, isErrorSubclass }));
     const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);
     for (const slot of slots) {

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

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAkB,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC3G,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,qCAAqC,EAAE,MAAM,yBAAyB,CAAC;AACzG,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,MAAiB,EAAW,EAAE,CAC1E,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,WAAW,KAAK,kBAAkB,CAAC;AAEnF,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,MAAiB,EAAQ,EAAE;IACvE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,OAAO;IACX,CAAC;IAED,MAAM,SAAS,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAExD,MAAM,SAAS,GAAc;QACzB,YAAY,EAAE,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC;QAClD,SAAS,EAAE,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC;QAC5C,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC;KAC3C,CAAC;IAEF,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3B,MAAM,eAAe,GAAG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvF,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAEpD,OAAO,CAAC,OAAO,CAAC;QACZ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,GAAG,GAAG,UAAU,QAAQ,SAAS,SAAS,GAAG,QAAQ,OAAO,IAAI,KAAK;QAC3E,KAAK,EAAE,MAAM,CAAC,IAAI;KACrB,CAAC,CAAC;IAEH,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,CAAC,OAAO,CAAC;YACZ,IAAI,EAAE,GAAG,SAAS,kBAAkB;YACpC,IAAI,EAAE,qCAAqC,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC;SAC1E,CAAC,CAAC;IACP,CAAC;IAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAErD,8BAA8B,CAAC,OAAO,EAAE;QACpC,SAAS;QACT,SAAS;KACZ,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CACxB,OAAsB,EACtB,MAAiB,EACjB,SAAiB,EACjB,SAAoB,EACZ,EAAE;IACV,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAExD,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,sBAAsB,CAAC;QACrD,OAAO;QACP,SAAS;QACT,SAAS;QACT,QAAQ,EAAE,MAAM,CAAC,WAAW,KAAK,SAAS;KAC7C,CAAC,CAAC;IAEH,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;IACrG,MAAM,EAAE,KAAK,EAAE,GAAG,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAElF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,yBAAyB,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAEpF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;IACL,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC","sourcesContent":["import { sanitizeTypeIdentifier } from \"@gtkx/utils\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { isEmittableEntity } from \"../../gir/emittable.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport { type Callables, dedupeCallables, generateBindings, renderPlainTypeMembers } from \"./callables.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { renderSourceGtype } from \"./gtype-binding.js\";\nimport { renderRecordConstructor, renderRecordConstructorPropsInterface } from \"./record-constructor.js\";\nimport { renderRecordFieldAccessor } from \"./record-field-accessor.js\";\nimport { computeRecordFieldSlots } from \"./record-layout.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\nimport { isConstructibleRecord } from \"./value-marshalable.js\";\n\nconst isGErrorRecord = (context: ModuleContext, record: GirRecord): boolean =>\n    context.namespace.name === \"GLib\" && record.glibGetType === \"g_error_get_type\";\n\nconst generateRecord = (context: ModuleContext, record: GirRecord): void => {\n    if (!isEmittableEntity(record)) {\n        return;\n    }\n\n    const className = sanitizeTypeIdentifier(record.name);\n    const isErrorSubclass = isGErrorRecord(context, record);\n\n    const callables: Callables = {\n        constructors: dedupeCallables(record.constructors),\n        functions: dedupeCallables(record.functions),\n        methods: dedupeCallables(record.methods),\n    };\n\n    generateBindings(context, callables);\n    const members = renderRecordMembers(context, record, className, callables);\n    const body = indentMembers(members);\n    const heritage = isErrorSubclass ? \" extends globalThis.Error\" : \"\";\n    const doc = getDoc(record);\n    const isConstructible = isConstructibleRecord(context, context.namespace.name, record);\n    const modifier = isConstructible ? \"\" : \"abstract \";\n\n    context.declare({\n        name: className,\n        code: `${doc}export ${modifier}class ${className}${heritage} {\\n${body}\\n}`,\n        owner: record.name,\n    });\n\n    if (isConstructible) {\n        context.declare({\n            name: `${className}ConstructorProps`,\n            code: renderRecordConstructorPropsInterface(context, record, className),\n        });\n    }\n\n    const gtypeExpr = renderSourceGtype(context, record);\n\n    appendWrapperClassRegistration(context, {\n        className,\n        gtypeExpr,\n    });\n};\n\nconst renderRecordMembers = (\n    context: ModuleContext,\n    record: GirRecord,\n    className: string,\n    callables: Callables,\n): string[] => {\n    const isErrorSubclass = isGErrorRecord(context, record);\n\n    const { members, claimedNames } = renderPlainTypeMembers({\n        context,\n        className,\n        callables,\n        hasGtype: record.glibGetType !== undefined,\n    });\n\n    members.unshift(renderRecordConstructor(context, { record, className, callables, isErrorSubclass }));\n    const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    for (const slot of slots) {\n        const block = renderRecordFieldAccessor(context, slot, claimedNames, record.fields);\n\n        if (block !== undefined) {\n            members.push(block);\n        }\n    }\n\n    if (isErrorSubclass) {\n        members.push('get name(): string {\\n    return \"GLib.Error\";\\n}');\n    }\n\n    return members;\n};\n\nexport { generateRecord };\n"]}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/store/gi/record.ts"],"names":[],"mappings":"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","sourcesContent":["import { sanitizeTypeIdentifier } from \"@gtkx/utils\";\nimport type { GirRecord } from \"../../gir/record.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { isEmittableEntity } from \"../../gir/emittable.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport { type Callables, dedupeCallables, generateBindings, renderPlainTypeMembers } from \"./callables.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { renderSourceGtype } from \"./gtype-binding.js\";\nimport { renderRecordConstructor, renderRecordConstructorPropsInterface } from \"./record-constructor.js\";\nimport { renderRecordFieldAccessor } from \"./record-field-accessor.js\";\nimport { computeRecordFieldSlots } from \"./record-layout.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\nimport { isConstructibleRecord } from \"./value-marshalable.js\";\n\ntype RecordMembersOptions = {\n    context: ModuleContext;\n    record: GirRecord;\n    className: string;\n    callables: Callables;\n    gtypeExpr: string | undefined;\n};\n\nconst isGErrorRecord = (context: ModuleContext, record: GirRecord): boolean =>\n    context.namespace.name === \"GLib\" && record.glibGetType === \"g_error_get_type\";\n\nconst generateRecord = (context: ModuleContext, record: GirRecord): void => {\n    if (!isEmittableEntity(record)) {\n        return;\n    }\n\n    const className = sanitizeTypeIdentifier(record.name);\n    const isErrorSubclass = isGErrorRecord(context, record);\n\n    const callables: Callables = {\n        constructors: dedupeCallables(record.constructors),\n        functions: dedupeCallables(record.functions),\n        methods: dedupeCallables(record.methods),\n    };\n\n    generateBindings(context, callables);\n    const gtypeExpr = renderSourceGtype(context, record);\n    const members = renderRecordMembers({ context, record, className, callables, gtypeExpr });\n    const body = indentMembers(members);\n    const heritage = isErrorSubclass ? \" extends globalThis.Error\" : \"\";\n    const doc = getDoc(record);\n    const isConstructible = isConstructibleRecord(context, context.namespace.name, record);\n    const modifier = isConstructible ? \"\" : \"abstract \";\n\n    context.declare({\n        name: className,\n        code: `${doc}export ${modifier}class ${className}${heritage} {\\n${body}\\n}`,\n        owner: record.name,\n    });\n\n    if (isConstructible) {\n        context.declare({\n            name: `${className}ConstructorProps`,\n            code: renderRecordConstructorPropsInterface(context, record, className),\n        });\n    }\n\n    appendWrapperClassRegistration(context, {\n        className,\n        gtypeExpr,\n    });\n};\n\nconst renderRecordMembers = (options: RecordMembersOptions): string[] => {\n    const { context, record, className, callables, gtypeExpr } = options;\n    const isErrorSubclass = isGErrorRecord(context, record);\n    const { members, claimedNames } = renderPlainTypeMembers({ context, className, callables, gtypeExpr });\n    members.unshift(renderRecordConstructor(context, { record, className, callables, isErrorSubclass }));\n    const { slots } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    for (const slot of slots) {\n        const block = renderRecordFieldAccessor(context, slot, claimedNames, record.fields);\n\n        if (block !== undefined) {\n            members.push(block);\n        }\n    }\n\n    if (isErrorSubclass) {\n        members.push('get name(): string {\\n    return \"GLib.Error\";\\n}');\n    }\n\n    return members;\n};\n\nexport { generateRecord };\n"]}

package/dist/store/gi/return-wrap.js

@@ -1,6 +1,6 @@
 import { renderDescriptor } from "../../analysis/descriptor-render.js";
 import { renderTsType } from "../../analysis/ts-type.js";
-const BIGINT_CATEGORIES = new Set(["gtype", "bigint64", "biguint64"]);
+const BIGINT_CATEGORIES = new Set(["gtype", "bigint64", "biguint64", "pointer"]);
 const wrapReturnValue = (context, options) => {
     const { ref, isNullable, valueExpression } = options;
     if (ref === undefined) {

package/dist/store/gi/return-wrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"return-wrap.js","sourceRoot":"","sources":["../../../src/store/gi/return-wrap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PrimitiveCategory } from \"../../gir/primitives.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\n\ntype WrapReturnOptions = {\n    ref: TypeId | undefined;\n    isNullable: boolean;\n    valueExpression: string;\n};\n\nconst BIGINT_CATEGORIES: Set<PrimitiveCategory> = new Set([\"gtype\", \"bigint64\", \"biguint64\"]);\n\nconst wrapReturnValue = (context: ModuleContext, options: WrapReturnOptions): string => {\n    const { ref, isNullable, valueExpression } = options;\n\n    if (ref === undefined) {\n        return valueExpression;\n    }\n\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return wrapValue(context, ref, valueExpression);\n    }\n\n    switch (type.kind) {\n        case \"primitive\": {\n            return wrapPrimitive(type.category, isNullable, valueExpression);\n        }\n        case \"varargs\": {\n            return `(${valueExpression} as unknown[])`;\n        }\n        case \"callback\": {\n            return wrapCallback(context, ref, valueExpression);\n        }\n        case \"enum\": {\n            return `(${valueExpression} as number)`;\n        }\n        case \"alias\": {\n            return wrapAlias(context, type.value.target, isNullable, valueExpression);\n        }\n        case \"carray\":\n        case \"class\":\n        case \"hashtable\":\n        case \"interface\":\n        case \"list\":\n        case \"record\": {\n            return wrapValue(context, ref, valueExpression);\n        }\n    }\n};\n\nconst wrapCallback = (context: ModuleContext, ref: TypeId, valueExpression: string): string =>\n    context.library.nameFor(ref) === undefined\n        ? `(${valueExpression} as unknown[])`\n        : `(${valueExpression} as ${renderTsType(context, ref, false)})`;\n\nconst wrapAlias = (\n    context: ModuleContext,\n    target: TypeId | undefined,\n    isNullable: boolean,\n    valueExpression: string,\n): string =>\n    target === undefined\n        ? valueExpression\n        : wrapReturnValue(context, { ref: target, isNullable, valueExpression });\n\nconst wrapValue = (context: ModuleContext, ref: TypeId, valueExpression: string): string => {\n    context.addRuntimeImport(\"fromNative\");\n    const descriptor = context.hoistDescriptor(renderDescriptor(context, ref, \"none\"));\n\n    return `(fromNative(${descriptor}, ${valueExpression}) as ${renderTsType(context, ref, false)})`;\n};\n\nconst wrapStringPrimitive = (isNullable: boolean, valueExpression: string): string =>\n    `(${valueExpression} as ${isNullable ? \"string | null\" : \"string\"})`;\n\nconst wrapPrimitive = (category: PrimitiveCategory, isNullable: boolean, valueExpression: string): string => {\n    if (category === \"void\") {\n        return valueExpression;\n    }\n\n    if (category === \"string\") {\n        return wrapStringPrimitive(isNullable, valueExpression);\n    }\n\n    if (category === \"boolean\") {\n        return `Boolean(${valueExpression})`;\n    }\n\n    if (BIGINT_CATEGORIES.has(category)) {\n        return `(${valueExpression} as bigint)`;\n    }\n\n    return `(${valueExpression} as number)`;\n};\n\nexport { wrapReturnValue };\n"]}
+{"version":3,"file":"return-wrap.js","sourceRoot":"","sources":["../../../src/store/gi/return-wrap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PrimitiveCategory } from \"../../gir/primitives.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\n\ntype WrapReturnOptions = {\n    ref: TypeId | undefined;\n    isNullable: boolean;\n    valueExpression: string;\n};\n\nconst BIGINT_CATEGORIES: Set<PrimitiveCategory> = new Set([\"gtype\", \"bigint64\", \"biguint64\", \"pointer\"]);\n\nconst wrapReturnValue = (context: ModuleContext, options: WrapReturnOptions): string => {\n    const { ref, isNullable, valueExpression } = options;\n\n    if (ref === undefined) {\n        return valueExpression;\n    }\n\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return wrapValue(context, ref, valueExpression);\n    }\n\n    switch (type.kind) {\n        case \"primitive\": {\n            return wrapPrimitive(type.category, isNullable, valueExpression);\n        }\n        case \"varargs\": {\n            return `(${valueExpression} as unknown[])`;\n        }\n        case \"callback\": {\n            return wrapCallback(context, ref, valueExpression);\n        }\n        case \"enum\": {\n            return `(${valueExpression} as number)`;\n        }\n        case \"alias\": {\n            return wrapAlias(context, type.value.target, isNullable, valueExpression);\n        }\n        case \"carray\":\n        case \"class\":\n        case \"hashtable\":\n        case \"interface\":\n        case \"list\":\n        case \"record\": {\n            return wrapValue(context, ref, valueExpression);\n        }\n    }\n};\n\nconst wrapCallback = (context: ModuleContext, ref: TypeId, valueExpression: string): string =>\n    context.library.nameFor(ref) === undefined\n        ? `(${valueExpression} as unknown[])`\n        : `(${valueExpression} as ${renderTsType(context, ref, false)})`;\n\nconst wrapAlias = (\n    context: ModuleContext,\n    target: TypeId | undefined,\n    isNullable: boolean,\n    valueExpression: string,\n): string =>\n    target === undefined\n        ? valueExpression\n        : wrapReturnValue(context, { ref: target, isNullable, valueExpression });\n\nconst wrapValue = (context: ModuleContext, ref: TypeId, valueExpression: string): string => {\n    context.addRuntimeImport(\"fromNative\");\n    const descriptor = context.hoistDescriptor(renderDescriptor(context, ref, \"none\"));\n\n    return `(fromNative(${descriptor}, ${valueExpression}) as ${renderTsType(context, ref, false)})`;\n};\n\nconst wrapStringPrimitive = (isNullable: boolean, valueExpression: string): string =>\n    `(${valueExpression} as ${isNullable ? \"string | null\" : \"string\"})`;\n\nconst wrapPrimitive = (category: PrimitiveCategory, isNullable: boolean, valueExpression: string): string => {\n    if (category === \"void\") {\n        return valueExpression;\n    }\n\n    if (category === \"string\") {\n        return wrapStringPrimitive(isNullable, valueExpression);\n    }\n\n    if (category === \"boolean\") {\n        return `Boolean(${valueExpression})`;\n    }\n\n    if (BIGINT_CATEGORIES.has(category)) {\n        return `(${valueExpression} as bigint)`;\n    }\n\n    return `(${valueExpression} as number)`;\n};\n\nexport { wrapReturnValue };\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../../src/store/gi/signal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AA6C1D,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,MAAM,EAsC5E,CAAC;AAEF,QAAA,MAAM,wBAAwB,GAC1B,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,WAAW,MAAM,EACjB,4BAA4B,OAAO,KACpC,WAAW,EAyBb,CAAC;AAsUF,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../../src/store/gi/signal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,oBAAoB,CAAC;AAG9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AA4D1D,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,MAAM,EAsC5E,CAAC;AAEF,QAAA,MAAM,wBAAwB,GAC1B,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,WAAW,MAAM,EACjB,4BAA4B,OAAO,KACpC,WAAW,EAyBb,CAAC;AA8UF,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,CAAC"}

package/dist/store/gi/signal.js

@@ -14,6 +14,17 @@ import { isAllocatableCallerOut, isRecordInout, renderCallerOutInstance } from "
 const SIGNAL_HANDLER_TYPE = "(...args: any[]) => any";
 const SIGNALS_SUFFIX = "Signals";
 const SIGNAL_EMIT_SUFFIX = "SignalEmit";
+const DEPRECATED_SIGNAL_ALIASES = new Map([
+    ["addEventListener", "on"],
+    ["removeEventListener", "off"],
+]);
+const deprecatedAliasDoc = (method) => {
+    const replacement = DEPRECATED_SIGNAL_ALIASES.get(method);
+    if (replacement === undefined) {
+        return "";
+    }
+    return `/** @deprecated Since 1.2. Use \`${replacement}\` instead. Removed in v2. */\n`;
+};
 const renderSignalMembers = (context, klass) => {
     if (klass.glibGetType === undefined) {
         return [];
@@ -30,7 +41,7 @@ const renderSignalMembers = (context, klass) => {
     const emitCases = signals.map((signal) => renderEmitCase(context, signal));
     const connectDefault = isRootObject
         ? "default:\n    throw new globalThis.Error(\"Unknown signal '\" + signal + \"'\");"
-        : "default:\n    return super.connect(signal, handler, isAfter);";
+        : "default:\n    return super.connect(signal as never, handler as never, isAfter);";
     const emitDefault = isRootObject
         ? "default:\n    throw new globalThis.Error(\"Unknown signal '\" + sigName + \"'\");"
         : "default:\n    return super.emit(sigName, ...args);";
@@ -68,7 +79,15 @@ const renderSignalMap = (spec) => {
     const { context, klass, className, isParentlessObjectSubclass, suffix, renderEntry } = spec;
     const extendsRefs = signalMapParentRefs(context, klass, isParentlessObjectSubclass, suffix);
     const extendsClause = extendsRefs.length === 0 ? "" : ` extends ${extendsRefs.join(", ")}`;
-    const signalEntries = collectClassSignals(context, klass).map((signal) => `${signalDoc(signal)}${sourceStringLiteral(signal.name)}: ${renderEntry(context, signal)};`);
+    const signals = collectClassSignals(context, klass);
+    const signalEntries = signals.flatMap((signal) => {
+        const value = renderEntry(context, signal);
+        const entry = `${signalDoc(signal)}${sourceStringLiteral(signal.name)}: ${value};`;
+        if (!signal.isDetailed) {
+            return [entry];
+        }
+        return [entry, `[detail: \`${signal.name}::\${string}\`]: ${value};`];
+    });
     const entries = [...signalEntries, ...renderNotifyDetailEntries(context, klass, suffix)];
     return renderBracedOrEmpty(`export interface ${className}${suffix}${extendsClause}`, entries.join("\n"));
 };
@@ -110,14 +129,16 @@ const renderSignalConnectInterface = (className, isRootObject) => {
     const lines = [
         `__signals__?: ${map};`,
         `connect<K extends keyof ${map}>(signal: K, handler: ${map}[K], isAfter?: boolean): number;`,
-        `connect(signal: string, handler: ${SIGNAL_HANDLER_TYPE}, isAfter?: boolean): number;`,
         `emit<K extends keyof ${emitMap}>(sigName: K, ...args: ${emitMap}[K]["args"]): ${emitMap}[K]["result"];`,
-        "emit(sigName: string, ...args: unknown[]): unknown;",
     ];
-    if (!isRootObject) {
+    if (isRootObject) {
+        lines.push("emit(sigName: string, ...args: unknown[]): unknown;");
+    }
+    else {
         const chainable = (methods, trailing) => {
             for (const method of methods) {
-                lines.push(`${method}<K extends keyof ${map}>(signal: K, handler: ${map}[K]${trailing}): this;`, `${method}(signal: string, handler: ${SIGNAL_HANDLER_TYPE}${trailing}): this;`);
+                lines.push(deprecatedAliasDoc(method) +
+                    `${method}<K extends keyof ${map}>(signal: K, handler: ${map}[K]${trailing}): this;`);
             }
         };
         chainable(["on", "once", "addEventListener"], ", isAfter?: boolean");