@gtkx/codegen 1.2.1 → 1.2.2

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

@@ -1 +1 @@
-{"version":3,"file":"record-layout.js","sourceRoot":"","sources":["../../../src/store/gi/record-layout.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirField } from \"../../gir/field.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { EntityType, GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport {\n    computeFieldSlots,\n    type FieldLayout,\n    type FieldLayoutInput,\n    type FieldSlot,\n    layoutOfPrimitive,\n} from \"../../gir/size.js\";\n\ntype ResolvedRecordValue = Extract<EntityType, { kind: \"record\" }>[\"value\"];\n\ntype RecordFieldSlot = {\n    field: GirField;\n    slot: FieldSlot;\n};\n\nconst POINTER_LAYOUT: FieldLayout = { size: 8, align: 8 };\nconst recordLayoutCache: Map<string, FieldLayout> = new Map();\n\nconst ALIGNMENT_OVERRIDES: Map<string, FieldLayout> = new Map([\n    [\"graphene_simd4f_t\", { size: 16, align: 16 }],\n    [\"graphene_simd4x4f_t\", { size: 64, align: 16 }],\n]);\n\nconst computeRecordFieldSlots = (\n    context: ModuleContext,\n    fields: GirField[],\n    isUnion = false,\n): { slots: RecordFieldSlot[]; size: number } => {\n    const inputs: FieldLayoutInput[] = Array.from(fields, (field) => fieldLayoutInput(context, field, new Set()));\n    const result = computeFieldSlots(inputs, isUnion);\n\n    const slots = result.slots.map((slot, index) => {\n        const field = fields[index];\n\n        if (field === undefined) {\n            throw new Error(\"computeRecordFieldSlots: parallel arrays diverged\");\n        }\n\n        return { field, slot };\n    });\n\n    return { slots, size: result.size };\n};\n\nconst recordInlineSize = (context: ModuleContext, record: ResolvedRecordValue): number | undefined => {\n    if (record.opaque || record.disguised || record.fields.length === 0) {\n        return undefined;\n    }\n\n    const { size } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    return size > 0 ? size : undefined;\n};\n\nconst bitMask = (width: number): number => {\n    if (width >= 32) {\n        return 0xFF_FF_FF_FF;\n    }\n\n    return (1 << width) - 1;\n};\n\nconst mergeBitfield = (readExpr: string, valueExpr: string, mask: number, shift: number): string => {\n    const maskExpr = String(mask);\n    const shiftExpr = String(shift);\n\n    return (\n        `((${readExpr} & ~(${maskExpr} << ${shiftExpr})) | ` +\n        `((Number(${valueExpr}) & ${maskExpr}) << ${shiftExpr})) >>> 0`\n    );\n};\n\nconst fieldLayoutInput = (context: ModuleContext, field: GirField, visited: Set<string>): FieldLayoutInput => {\n    if (field.inlineMembers !== undefined) {\n        const layout = inlineMemberLayout(context, field.inlineMembers, field.isInlineUnion, visited);\n\n        return { layout, bits: undefined };\n    }\n\n    if (field.type === undefined) {\n        return { layout: POINTER_LAYOUT, bits: undefined };\n    }\n\n    return { layout: layoutOfType(context, field.type, field.cType, visited), bits: field.bits };\n};\n\nconst inlineMemberLayout = (\n    context: ModuleContext,\n    members: GirField[],\n    isUnion: boolean,\n    visited: Set<string>,\n): FieldLayout => {\n    const inputs = Array.from(members, (member) => fieldLayoutInput(context, member, visited));\n\n    if (inputs.length === 0) {\n        return { size: 0, align: 1 };\n    }\n\n    const { size } = computeFieldSlots(inputs, isUnion);\n\n    return { size, align: Math.max(1, ...inputs.map((input) => input.layout.align)) };\n};\n\nconst pointerOr = (occurrenceCType: string | undefined, otherwise: () => FieldLayout): FieldLayout =>\n    occurrenceCType?.endsWith(\"*\") === true ? POINTER_LAYOUT : otherwise();\n\nconst layoutOfType = (\n    context: ModuleContext,\n    ref: TypeId,\n    occurrenceCType: string | undefined,\n    visited: Set<string>,\n): FieldLayout => {\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    switch (type.kind) {\n        case \"primitive\": {\n            return pointerOr(occurrenceCType, () => layoutOfPrimitive(type.category));\n        }\n        case \"carray\": {\n            return arrayLayout(context, type, visited);\n        }\n        case \"list\":\n        case \"hashtable\":\n        case \"callback\":\n        case \"varargs\":\n        case \"class\":\n        case \"interface\": {\n            return POINTER_LAYOUT;\n        }\n        case \"enum\": {\n            return pointerOr(occurrenceCType, () => layoutOfPrimitive(\"int32\"));\n        }\n        case \"record\": {\n            return pointerOr(occurrenceCType, () => layoutOfRecord(context, type, visited));\n        }\n        case \"alias\": {\n            return pointerOr(occurrenceCType, () => resolveAliasLayout(context, type, visited));\n        }\n    }\n};\n\nconst arrayLayout = (\n    context: ModuleContext,\n    ref: Extract<GirType, { kind: \"carray\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    if (ref.fixedSize === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    const elementLayout = layoutOfType(context, ref.element, ref.elementCType, visited);\n\n    return { size: elementLayout.size * ref.fixedSize, align: elementLayout.align };\n};\n\nconst declaredLayout = (record: ResolvedRecordValue): FieldLayout | undefined => {\n    if (record.cType?.endsWith(\"*\") === true) {\n        return POINTER_LAYOUT;\n    }\n\n    return record.cType === undefined ? undefined : ALIGNMENT_OVERRIDES.get(record.cType);\n};\n\nconst layoutOfRecord = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"record\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    const declared = declaredLayout(resolved.value);\n\n    if (declared !== undefined) {\n        return declared;\n    }\n\n    const key = `${resolved.namespace.name}.${resolved.value.name}`;\n\n    if (visited.has(key)) {\n        return POINTER_LAYOUT;\n    }\n\n    const cached = recordLayoutCache.get(key);\n\n    if (cached !== undefined) {\n        return cached;\n    }\n\n    const nextVisited = new Set(visited);\n    nextVisited.add(key);\n\n    const inputs: FieldLayoutInput[] = Array.from(resolved.value.fields, (field) =>\n        fieldLayoutInput(context, field, nextVisited));\n\n    if (inputs.length === 0) {\n        return POINTER_LAYOUT;\n    }\n\n    const { size } = computeFieldSlots(inputs, resolved.value.isUnion);\n    const align = Math.max(1, ...inputs.map((input) => input.layout.align));\n    const layout: FieldLayout = { size, align };\n    recordLayoutCache.set(key, layout);\n\n    return layout;\n};\n\nconst resolveAliasLayout = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"alias\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    const ref = resolved.value.target;\n\n    if (ref === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    return layoutOfType(context, ref, resolved.value.targetCType, visited);\n};\n\nexport { computeRecordFieldSlots, recordInlineSize, bitMask, mergeBitfield, type RecordFieldSlot };\n"]}
+{"version":3,"file":"record-layout.js","sourceRoot":"","sources":["../../../src/store/gi/record-layout.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirField } from \"../../gir/field.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { EntityType, GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport {\n    computeFieldSlots,\n    type FieldLayout,\n    type FieldLayoutInput,\n    type FieldSlot,\n    layoutOfPrimitive,\n} from \"../../gir/size.js\";\n\ntype ResolvedRecordValue = Extract<EntityType, { kind: \"record\" }>[\"value\"];\n\ntype RecordFieldSlot = {\n    field: GirField;\n    slot: FieldSlot;\n};\n\nconst POINTER_LAYOUT: FieldLayout = { size: 8, align: 8 };\nconst recordLayoutCache: Map<string, FieldLayout> = new Map();\n\nconst ALIGNMENT_OVERRIDES: Map<string, FieldLayout> = new Map([\n    [\"graphene_simd4f_t\", { size: 16, align: 16 }],\n    [\"graphene_simd4x4f_t\", { size: 64, align: 16 }],\n]);\n\nconst computeRecordFieldSlots = (\n    context: ModuleContext,\n    fields: GirField[],\n    isUnion = false,\n): { slots: RecordFieldSlot[]; size: number } => {\n    const inputs: FieldLayoutInput[] = Array.from(fields, (field) => fieldLayoutInput(context, field, new Set()));\n    const result = computeFieldSlots(inputs, isUnion);\n\n    const slots = result.slots.map((slot, index) => {\n        const field = fields[index];\n\n        if (field === undefined) {\n            throw new Error(\"computeRecordFieldSlots: parallel arrays diverged\");\n        }\n\n        return { field, slot };\n    });\n\n    return { slots, size: result.size };\n};\n\nconst recordInlineSize = (context: ModuleContext, record: ResolvedRecordValue): number | undefined => {\n    if (record.opaque || record.disguised || record.fields.length === 0) {\n        return undefined;\n    }\n\n    const { size } = computeRecordFieldSlots(context, record.fields, record.isUnion);\n\n    return size > 0 ? size : undefined;\n};\n\nconst inlineArrayStride = (context: ModuleContext, array: Extract<GirType, { kind: \"carray\" }>): number =>\n    layoutOfType(context, array.element, array.elementCType, new Set()).size;\n\nconst bitMask = (width: number): number => {\n    if (width >= 32) {\n        return 0xFF_FF_FF_FF;\n    }\n\n    return (1 << width) - 1;\n};\n\nconst mergeBitfield = (readExpr: string, valueExpr: string, mask: number, shift: number): string => {\n    const maskExpr = String(mask);\n    const shiftExpr = String(shift);\n\n    return (\n        `((${readExpr} & ~(${maskExpr} << ${shiftExpr})) | ` +\n        `((Number(${valueExpr}) & ${maskExpr}) << ${shiftExpr})) >>> 0`\n    );\n};\n\nconst fieldLayoutInput = (context: ModuleContext, field: GirField, visited: Set<string>): FieldLayoutInput => {\n    if (field.inlineMembers !== undefined) {\n        const layout = inlineMemberLayout(context, field.inlineMembers, field.isInlineUnion, visited);\n\n        return { layout, bits: undefined };\n    }\n\n    if (field.type === undefined) {\n        return { layout: POINTER_LAYOUT, bits: undefined };\n    }\n\n    return { layout: layoutOfType(context, field.type, field.cType, visited), bits: field.bits };\n};\n\nconst inlineMemberLayout = (\n    context: ModuleContext,\n    members: GirField[],\n    isUnion: boolean,\n    visited: Set<string>,\n): FieldLayout => {\n    const inputs = Array.from(members, (member) => fieldLayoutInput(context, member, visited));\n\n    if (inputs.length === 0) {\n        return { size: 0, align: 1 };\n    }\n\n    const { size } = computeFieldSlots(inputs, isUnion);\n\n    return { size, align: Math.max(1, ...inputs.map((input) => input.layout.align)) };\n};\n\nconst pointerOr = (occurrenceCType: string | undefined, otherwise: () => FieldLayout): FieldLayout =>\n    occurrenceCType?.endsWith(\"*\") === true ? POINTER_LAYOUT : otherwise();\n\nconst layoutOfType = (\n    context: ModuleContext,\n    ref: TypeId,\n    occurrenceCType: string | undefined,\n    visited: Set<string>,\n): FieldLayout => {\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    switch (type.kind) {\n        case \"primitive\": {\n            return pointerOr(occurrenceCType, () => layoutOfPrimitive(type.category));\n        }\n        case \"carray\": {\n            return arrayLayout(context, type, visited);\n        }\n        case \"list\":\n        case \"hashtable\":\n        case \"callback\":\n        case \"varargs\":\n        case \"class\":\n        case \"interface\": {\n            return POINTER_LAYOUT;\n        }\n        case \"enum\": {\n            return pointerOr(occurrenceCType, () => layoutOfPrimitive(\"int32\"));\n        }\n        case \"record\": {\n            return pointerOr(occurrenceCType, () => layoutOfRecord(context, type, visited));\n        }\n        case \"alias\": {\n            return pointerOr(occurrenceCType, () => resolveAliasLayout(context, type, visited));\n        }\n    }\n};\n\nconst arrayLayout = (\n    context: ModuleContext,\n    ref: Extract<GirType, { kind: \"carray\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    if (ref.fixedSize === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    const elementLayout = layoutOfType(context, ref.element, ref.elementCType, visited);\n\n    return { size: elementLayout.size * ref.fixedSize, align: elementLayout.align };\n};\n\nconst declaredLayout = (record: ResolvedRecordValue): FieldLayout | undefined => {\n    if (record.cType?.endsWith(\"*\") === true) {\n        return POINTER_LAYOUT;\n    }\n\n    return record.cType === undefined ? undefined : ALIGNMENT_OVERRIDES.get(record.cType);\n};\n\nconst layoutOfRecord = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"record\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    const declared = declaredLayout(resolved.value);\n\n    if (declared !== undefined) {\n        return declared;\n    }\n\n    const key = `${resolved.namespace.name}.${resolved.value.name}`;\n\n    if (visited.has(key)) {\n        return POINTER_LAYOUT;\n    }\n\n    const cached = recordLayoutCache.get(key);\n\n    if (cached !== undefined) {\n        return cached;\n    }\n\n    const nextVisited = new Set(visited);\n    nextVisited.add(key);\n\n    const inputs: FieldLayoutInput[] = Array.from(resolved.value.fields, (field) =>\n        fieldLayoutInput(context, field, nextVisited));\n\n    if (inputs.length === 0) {\n        return POINTER_LAYOUT;\n    }\n\n    const { size } = computeFieldSlots(inputs, resolved.value.isUnion);\n    const align = Math.max(1, ...inputs.map((input) => input.layout.align));\n    const layout: FieldLayout = { size, align };\n    recordLayoutCache.set(key, layout);\n\n    return layout;\n};\n\nconst resolveAliasLayout = (\n    context: ModuleContext,\n    resolved: Extract<EntityType, { kind: \"alias\" }>,\n    visited: Set<string>,\n): FieldLayout => {\n    const ref = resolved.value.target;\n\n    if (ref === undefined) {\n        return POINTER_LAYOUT;\n    }\n\n    return layoutOfType(context, ref, resolved.value.targetCType, visited);\n};\n\nexport {\n    computeRecordFieldSlots,\n    inlineArrayStride,\n    recordInlineSize,\n    bitMask,\n    mergeBitfield,\n    type RecordFieldSlot,\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;AAuB7D,QAAA,MAAM,cAAc,GAAI,SAAS,aAAa,EAAE,QAAQ,SAAS,KAAG,IAwCnE,CAAC;AAwBF,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;AAe7D,QAAA,MAAM,cAAc,GAAI,SAAS,aAAa,EAAE,QAAQ,SAAS,KAAG,IAyCnE,CAAC;AAmCF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/store/gi/record.js

@@ -22,8 +22,7 @@ const generateRecord = (context, record) => {
         methods: dedupeCallables(record.methods),
     };
     generateBindings(context, callables);
-    const gtypeExpr = renderSourceGtype(context, record);
-    const members = renderRecordMembers({ context, record, className, callables, gtypeExpr });
+    const members = renderRecordMembers(context, record, className, callables);
     const body = indentMembers(members);
     const heritage = isErrorSubclass ? " extends globalThis.Error" : "";
     const doc = getDoc(record);
@@ -40,15 +39,20 @@ const generateRecord = (context, record) => {
             code: renderRecordConstructorPropsInterface(context, record, className),
         });
     }
+    const gtypeExpr = renderSourceGtype(context, record);
     appendWrapperClassRegistration(context, {
         className,
         gtypeExpr,
     });
 };
-const renderRecordMembers = (options) => {
-    const { context, record, className, callables, gtypeExpr } = options;
+const renderRecordMembers = (context, record, className, callables) => {
     const isErrorSubclass = isGErrorRecord(context, record);
-    const { members, claimedNames } = renderPlainTypeMembers({ context, className, callables, gtypeExpr });
+    const { members, claimedNames } = renderPlainTypeMembers({
+        context,
+        className,
+        callables,
+        hasGtype: record.glibGetType !== undefined,
+    });
     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":"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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"]}
+{"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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/codegen",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Generates the typed GTKX bindings and API reference from GIR and OpenGL registry data",
   "keywords": [
     "gtkx",
@@ -58,8 +58,8 @@
     "fast-xml-parser": "^5.10.1",
     "fast-xml-validator": "^1.4.1",
     "typescript": "^6.0.3",
-    "@gtkx/react": "1.2.1",
-    "@gtkx/utils": "1.2.1"
+    "@gtkx/utils": "1.2.2",
+    "@gtkx/react": "1.2.2"
   },
   "scripts": {
     "release": "tsx ../../scripts/release-package.ts"

package/src/store/gi/callables.ts

@@ -7,7 +7,7 @@ import { renderBlock } from "../../writer/emit.js";
 import { matchAsyncFinish } from "./async.js";
 import { callableDoc, callableSpec } from "./callable-doc.js";
 import { renderFnExpression } from "./function.js";
-import { gtypeMemberDeclaration, gtypeStaticMember } from "./gtype-binding.js";
+import { gtypeMemberDeclaration } from "./gtype-binding.js";
 import {
     finishCallExpression,
     memberName,
@@ -66,7 +66,7 @@ type PlainTypeMembersOptions = {
     context: ModuleContext;
     className: string;
     callables: Callables;
-    gtypeExpr: string | undefined;
+    hasGtype: boolean;
 };
 
 const RUNTIME_OWNED_LIFETIME_METHODS: Set<string> = new Set([
@@ -514,11 +514,11 @@ const renderPlainInstanceMethods = (
 const renderPlainTypeMembers = (
     options: PlainTypeMembersOptions,
 ): { members: string[]; claimedNames: Set<string> } => {
-    const { context, className, callables, gtypeExpr } = options;
+    const { context, className, callables, hasGtype } = options;
     const claimedNames: Set<string> = new Set();
 
     const members: string[] = [
-        ...(gtypeExpr === undefined ? [] : [gtypeMemberDeclaration(context), gtypeStaticMember(context)]),
+        ...(hasGtype ? [gtypeMemberDeclaration(context)] : []),
         ...renderStaticHead(context, callables, className),
         ...renderPlainInstanceMethods(context, callables.methods, claimedNames),
     ];

package/src/store/gi/class.ts

@@ -34,7 +34,7 @@ import {
 } from "./callables.js";
 import { renderClassConstructor, renderConstructorPropsInterface } from "./constructor-props.js";
 import { getDoc } from "./doc-spec.js";
-import { gtypeMemberDeclaration, gtypeStaticMember, renderSourceGtype } from "./gtype-binding.js";
+import { gtypeMemberDeclaration, renderSourceGtype } from "./gtype-binding.js";
 import { methodExportName } from "./method.js";
 import { renderPropertyDeclarations } from "./properties.js";
 import { renderResolvedPropertyAccessor, resolveAccessor, type ResolvedAccessor } from "./property-accessor.js";
@@ -60,14 +60,6 @@ type MemberDeclarationsOptions = {
 
 type ClassMembers = { members: string[]; accessors: ResolvedAccessor[] };
 
-type ClassMembersOptions = {
-    context: ModuleContext;
-    klass: GirClass;
-    callables: Callables;
-    gtypeExpr: string | undefined;
-    hasParent: boolean;
-};
-
 type ImplementedRefOptions = {
     context: ModuleContext;
     klass: GirClass;
@@ -105,16 +97,7 @@ const generateClass = (context: ModuleContext, klass: GirClass): void => {
     const implemented = resolveImplementedRefs(context, klass);
     const typeRefs = implemented.map((ref) => omittedTypeRef(ref.typeRef, ref.conflicts));
     const implementsClause = typeRefs.length === 0 ? "" : ` implements ${typeRefs.join(", ")}`;
-    const gtypeExpr = renderSourceGtype(context, klass);
-
-    const { members, accessors } = renderClassMembers({
-        context,
-        klass,
-        callables,
-        gtypeExpr,
-        hasParent: parentExpression !== undefined,
-    });
-
+    const { members, accessors } = renderClassMembers(context, klass, callables, parentExpression !== undefined);
     const body = indentMembers(members);
     const doc = getDoc(klass);
     const modifier = klass.isAbstract ? "abstract " : "";
@@ -132,7 +115,7 @@ const generateClass = (context: ModuleContext, klass: GirClass): void => {
 
     appendMemberDeclarations({ context, klass, className, accessors, implemented });
     appendInstallMixins(context, className, implemented);
-    appendClassRegistrations(context, klass, className, gtypeExpr);
+    appendClassRegistrations(context, klass, className);
 };
 
 const appendMemberDeclarations = (options: MemberDeclarationsOptions): void => {
@@ -167,14 +150,15 @@ const appendInterfaceMerge = (
     });
 };
 
-const renderClassMembers = (options: ClassMembersOptions): ClassMembers => {
-    const { context, klass, callables, gtypeExpr } = options;
+const renderClassMembers = (
+    context: ModuleContext,
+    klass: GirClass,
+    callables: Callables,
+    hasParent: boolean,
+): ClassMembers => {
     const className = sanitizeTypeIdentifier(klass.name);
-
-    const members: string[] =
-        gtypeExpr === undefined ? [] : [gtypeMemberDeclaration(context), gtypeStaticMember(context)];
-
-    const constructorBlock = renderClassConstructor(context, klass, className, options.hasParent);
+    const members: string[] = [gtypeMemberDeclaration(context)];
+    const constructorBlock = renderClassConstructor(context, klass, className, hasParent);
 
     if (constructorBlock !== undefined) {
         members.push(constructorBlock);
@@ -255,12 +239,9 @@ const appendInstallMixins = (context: ModuleContext, className: string, implemen
     ]);
 };
 
-const appendClassRegistrations = (
-    context: ModuleContext,
-    klass: GirClass,
-    className: string,
-    gtypeExpr: string | undefined,
-): void => {
+const appendClassRegistrations = (context: ModuleContext, klass: GirClass, className: string): void => {
+    const gtypeExpr = renderSourceGtype(context, klass);
+
     appendWrapperClassRegistration(context, {
         className,
         gtypeExpr,

package/src/store/gi/gtype-binding.ts

@@ -1,32 +1,17 @@
 import { sourceStringLiteral } from "@gtkx/utils";
 import type { ModuleContext } from "../../writer/context.js";
 import { PRIMITIVE_TS_TYPE } from "../../gir/primitives.js";
-import { renderJsDoc } from "../../writer/doc.js";
-import { renderBlock } from "../../writer/emit.js";
 
 type TypeSource = {
     glibGetType: string | undefined;
     glibTypeName: string | undefined;
 };
 
-const GTYPE_NOTE = [
-    "The GType this class is registered under, read off the class it is accessed on rather than",
-    "inherited, so a subclass `registerClass` created reports its own type and one that never went",
-    "through `registerClass` reports the invalid type.",
-].join("\n");
-
 const gtypeTsType = (context: ModuleContext): string =>
     context.namespace.name === "GObject" ? "Type" : PRIMITIVE_TS_TYPE.gtype;
 
 const gtypeMemberDeclaration = (context: ModuleContext): string => `declare __type__: ${gtypeTsType(context)};`;
 
-const gtypeStaticMember = (context: ModuleContext): string => {
-    context.addRuntimeImport("getClassType");
-    const block = renderBlock(`static get __gtype__(): ${gtypeTsType(context)}`, "return getClassType(this);");
-
-    return `${renderJsDoc(undefined, GTYPE_NOTE)}${block}`;
-};
-
 const renderInternGtype = (context: ModuleContext, typeName: string | undefined): string | undefined => {
     if (typeName === undefined) {
         return undefined;
@@ -63,4 +48,4 @@ const renderSourceGtype = (context: ModuleContext, source: TypeSource): string |
         ? undefined
         : renderGtypeExpression(context, source.glibGetType, source.glibTypeName);
 
-export { gtypeTsType, gtypeMemberDeclaration, gtypeStaticMember, renderSourceGtype };
+export { gtypeTsType, gtypeMemberDeclaration, renderSourceGtype };

package/src/store/gi/interface.ts

@@ -21,7 +21,7 @@ import {
     renderStaticHead,
 } from "./callables.js";
 import { annotationSpec, getDoc } from "./doc-spec.js";
-import { gtypeStaticMember, renderSourceGtype } from "./gtype-binding.js";
+import { gtypeMemberDeclaration, renderSourceGtype } from "./gtype-binding.js";
 import { methodExportName } from "./method.js";
 import {
     type PropertyAccessorArgs,
@@ -378,7 +378,7 @@ const renderInterfaceClass = (context: ModuleContext, options: InterfaceClassOpt
     const members: string[] = [];
 
     if (gtypeExpr !== undefined) {
-        members.push(renderInterfaceHasInstance(context, className, gtypeExpr), gtypeStaticMember(context));
+        members.push(gtypeMemberDeclaration(context), renderInterfaceHasInstance(context, className, gtypeExpr));
     }
 
     members.push(...renderStaticHead(context, callables, className), renderInterfaceBrand(context, implRef));

package/src/store/gi/record-field-accessor.ts

@@ -1,6 +1,7 @@
 import { toCamelIdentifier } from "@gtkx/utils";
 import type { GirAnnotations } from "../../gir/annotations.js";
 import type { GirField } from "../../gir/field.js";
+import type { PrimitiveCategory } from "../../gir/primitives.js";
 import type { GirRecord } from "../../gir/record.js";
 import type { FieldSlot } from "../../gir/size.js";
 import type { TypeId } from "../../gir/type-id.js";
@@ -9,10 +10,16 @@ import type { ModuleContext } from "../../writer/context.js";
 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 { isByteSequence, isUnboundedArray } from "../../analysis/type-shape.js";
 import { indent, renderBlock } from "../../writer/emit.js";
 import { getDoc } from "./doc-spec.js";
-import { bitMask, computeRecordFieldSlots, mergeBitfield, type RecordFieldSlot } from "./record-layout.js";
+import {
+    bitMask,
+    computeRecordFieldSlots,
+    inlineArrayStride,
+    mergeBitfield,
+    type RecordFieldSlot,
+} from "./record-layout.js";
 import { wrapReturnValue } from "./return-wrap.js";
 import { isValueMarshalable } from "./value-marshalable.js";
 
@@ -99,6 +106,22 @@ type AccessorOptions = {
     fieldType: TypeId;
 };
 
+type InlineArrayResolution = {
+    element: TypeId;
+    count: number;
+    stride: number;
+    isTypedByteArray: boolean;
+};
+
+type InlineArrayAccessorOptions = {
+    context: ModuleContext;
+    jsName: string;
+    tsType: string;
+    descriptor: string;
+    offset: number;
+    resolution: InlineArrayResolution;
+};
+
 const isMarshalableField = (context: ModuleContext, field: GirField): boolean => {
     if (field.cType?.endsWith("*") === true) {
         return true;
@@ -187,6 +210,9 @@ const isStorableFieldType = (context: ModuleContext, ref: TypeId): boolean => {
     return kind !== "carray" && kind !== "list" && kind !== "hashtable";
 };
 
+const hasArrayAccessor = (context: ModuleContext, target: StructArrayTarget): boolean =>
+    resolveInlineArray(context, target) !== undefined || resolveStructArray(context, target) !== undefined;
+
 const admitAccessibleField = (
     context: ModuleContext,
     slot: RecordFieldSlot,
@@ -201,9 +227,9 @@ const admitAccessibleField = (
 
     const { field, jsName } = admitted;
     const target: StructArrayTarget = { 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));
+    const hasArray = hasArrayAccessor(context, target);
+    const hasAccessor = hasArray || isAccessibleFieldType(context, field.type);
+    const isSettable = field.writable && (hasArray || isStorableFieldType(context, field.type));
 
     return hasAccessor ? { ...admitted, isSettable } : undefined;
 };
@@ -243,10 +269,11 @@ const renderRecordFieldAccessor = (
 
     const { field, jsName } = admitted;
     const doc = getDoc(field);
-    const structArray = renderStructArrayAccessor(context, { field, jsName, slot: slot.slot, siblingFields });
+    const target: StructArrayTarget = { field, jsName, slot: slot.slot, siblingFields };
+    const arrayAccessor = renderInlineArrayAccessor(context, target) ?? renderStructArrayAccessor(context, target);
 
-    if (structArray !== undefined) {
-        return `${doc}${structArray}`;
+    if (arrayAccessor !== undefined) {
+        return `${doc}${arrayAccessor}`;
     }
 
     const descriptor = context.hoistDescriptor(
@@ -295,7 +322,7 @@ const isAccessorEligibleType = (context: ModuleContext, ref: TypeId): boolean =>
             return context.library.nameFor(ref) !== undefined;
         }
         case "carray": {
-            return type.fixedSize !== undefined;
+            return type.fixedSize !== undefined && type.arrayCType?.endsWith("*") === true;
         }
         case "list":
         case "hashtable":
@@ -338,15 +365,96 @@ const resolveInlineStructFields = (
     return type.value.fields;
 };
 
+const isInlineScalarCategory = (category: PrimitiveCategory, isBehindPointer: boolean): boolean => {
+    if (category === "pointer") {
+        return true;
+    }
+
+    return !isBehindPointer && category !== "void" && category !== "unichar" && category !== "string";
+};
+
+const isInlineArrayElement = (context: ModuleContext, ref: TypeId | undefined, cType: string | undefined): boolean => {
+    const type = ref === undefined ? undefined : context.library.typeFor(ref);
+
+    if (type === undefined) {
+        return false;
+    }
+
+    const isBehindPointer = cType?.endsWith("*") === true;
+
+    switch (type.kind) {
+        case "primitive": {
+            return isInlineScalarCategory(type.category, isBehindPointer);
+        }
+        case "enum": {
+            return !isBehindPointer;
+        }
+        case "record": {
+            return (
+                resolveInlineStructFields(context, ref, cType) !== undefined &&
+                isValueMarshalable(context, type.namespace.name, type.value)
+            );
+        }
+        case "alias": {
+            return isInlineArrayElement(context, type.value.target, cType ?? type.value.targetCType);
+        }
+        case "callback":
+        case "carray":
+        case "class":
+        case "hashtable":
+        case "interface":
+        case "list":
+        case "varargs": {
+            return false;
+        }
+    }
+};
+
+const inlineArrayType = (
+    context: ModuleContext,
+    target: StructArrayTarget,
+): Extract<GirType, { kind: "carray" }> | undefined => {
+    const { field, slot } = target;
+
+    if (field.type === undefined || slot.bitWidth !== undefined) {
+        return undefined;
+    }
+
+    const type = context.library.typeFor(field.type);
+
+    if (type?.kind !== "carray" || type.fixedSize === undefined) {
+        return undefined;
+    }
+
+    return type.arrayCType?.endsWith("*") === true ? undefined : type;
+};
+
+const resolveInlineArray = (context: ModuleContext, target: StructArrayTarget): InlineArrayResolution | undefined => {
+    const type = inlineArrayType(context, target);
+
+    if (type?.fixedSize === undefined || !isInlineArrayElement(context, type.element, type.elementCType)) {
+        return undefined;
+    }
+
+    const stride = inlineArrayStride(context, type);
+
+    if (stride === 0) {
+        return undefined;
+    }
+
+    return {
+        element: type.element,
+        count: type.fixedSize,
+        stride,
+        isTypedByteArray: context.library.isByteArrayTyped && isByteSequence(context.library, type),
+    };
+};
+
 const arrayLengthExpression = (
     arrayRef: Extract<GirType, { kind: "carray" }>,
     siblingFields: GirField[],
 ): string | undefined => {
-    if (arrayRef.fixedSize !== undefined) {
-        return String(arrayRef.fixedSize);
-    }
-
-    if (arrayRef.lengthParameterIndex === undefined) {
+    if (arrayRef.fixedSize !== undefined || arrayRef.lengthParameterIndex === undefined) {
         return undefined;
     }
 
@@ -606,6 +714,82 @@ const resolveStructArray = (context: ModuleContext, target: StructArrayTarget):
     };
 };
 
+const inlineArrayElementOffset = (options: InlineArrayAccessorOptions): string =>
+    `${String(options.offset)} + __index * ${String(options.resolution.stride)}`;
+
+const inlineArrayGetterBlock = (options: InlineArrayAccessorOptions): string => {
+    const { context, jsName, tsType, descriptor, resolution } = options;
+    const container = resolution.isTypedByteArray ? `new ${tsType}(${String(resolution.count)})` : "[]";
+
+    const element = wrapReturnValue(context, {
+        ref: resolution.element,
+        isNullable: false,
+        valueExpression: `read(getHandle(this), ${descriptor}, ${inlineArrayElementOffset(options)})`,
+    });
+
+    const body = [
+        `const __result: ${tsType} = ${container};`,
+        `for (let __index = 0; __index < ${String(resolution.count)}; __index++) {`,
+        indent(`__result[__index] = ${element};`, 1),
+        "}",
+        "return __result;",
+    ].join("\n");
+
+    return renderBlock(`get ${jsName}(): ${tsType}`, body);
+};
+
+const inlineArraySetterBlock = (options: InlineArrayAccessorOptions): string => {
+    const { jsName, tsType, descriptor, resolution } = options;
+
+    const write =
+        `write(getHandle(this), ${descriptor}, ${inlineArrayElementOffset(options)}, ` +
+        `toNative(${descriptor}, __element));`;
+
+    const body = [
+        "for (const [__index, __element] of __value.entries()) {",
+        indent(`if (__index >= ${String(resolution.count)}) {\n    break;\n}\n\n${write}`, 1),
+        "}",
+    ].join("\n");
+
+    return renderBlock(`set ${jsName}(__value: ${tsType})`, body);
+};
+
+const renderInlineArrayAccessor = (context: ModuleContext, target: StructArrayTarget): string | undefined => {
+    const resolution = resolveInlineArray(context, target);
+
+    if (resolution === undefined) {
+        return undefined;
+    }
+
+    const { field, jsName, slot } = target;
+    context.addRuntimeImport("read");
+    context.addRuntimeImport("getHandle");
+    context.addRuntimeImport("t");
+
+    const options: InlineArrayAccessorOptions = {
+        context,
+        jsName,
+        tsType: renderTsType(context, field.type, false),
+        descriptor: context.hoistDescriptor(renderDescriptor(context, resolution.element, "none", { isInline: true })),
+        offset: slot.byteOffset,
+        resolution,
+    };
+
+    const blocks: string[] = [];
+
+    if (field.readable) {
+        blocks.push(inlineArrayGetterBlock(options));
+    }
+
+    if (field.writable) {
+        context.addRuntimeImport("write");
+        context.addRuntimeImport("toNative");
+        blocks.push(inlineArraySetterBlock(options));
+    }
+
+    return blocks.length === 0 ? undefined : blocks.join("\n\n");
+};
+
 const renderStructArrayAccessor = (context: ModuleContext, target: StructArrayTarget): string | undefined => {
     const resolution = resolveStructArray(context, target);
 

package/src/store/gi/record-layout.ts

@@ -56,6 +56,9 @@ const recordInlineSize = (context: ModuleContext, record: ResolvedRecordValue):
     return size > 0 ? size : undefined;
 };
 
+const inlineArrayStride = (context: ModuleContext, array: Extract<GirType, { kind: "carray" }>): number =>
+    layoutOfType(context, array.element, array.elementCType, new Set()).size;
+
 const bitMask = (width: number): number => {
     if (width >= 32) {
         return 0xFF_FF_FF_FF;
@@ -224,4 +227,11 @@ const resolveAliasLayout = (
     return layoutOfType(context, ref, resolved.value.targetCType, visited);
 };
 
-export { computeRecordFieldSlots, recordInlineSize, bitMask, mergeBitfield, type RecordFieldSlot };
+export {
+    computeRecordFieldSlots,
+    inlineArrayStride,
+    recordInlineSize,
+    bitMask,
+    mergeBitfield,
+    type RecordFieldSlot,
+};