@gtkx/codegen 1.2.1 → 1.3.0

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

@@ -1,5 +1,5 @@
 import { sanitizeTypeIdentifier } from "@gtkx/utils";
-import { isInoutParameter } from "../../gir/parameter.js";
+import { isCallerAllocatedOut, isInoutParameter } from "../../gir/parameter.js";
 import { recordInlineSize } from "./record-layout.js";
 import { isConstructibleRecord } from "./value-marshalable.js";
 const isHandlePassedInPlace = (context, parameter) => {
@@ -64,6 +64,51 @@ const renderCallerOutInstance = (context, parameter) => {
     return `wrapHandle(alloc(${String(allocation.size)}), ${classExpression})`;
 };
 const isCollectibleCallerOut = (context, parameter) => callerOutAllocation(context, parameter) !== undefined;
+const hasInlineElementStride = (context, array) => {
+    if (array.elementCType?.includes("*") === true) {
+        return false;
+    }
+    const element = underlyingType(context, array.element);
+    if (element === undefined) {
+        return false;
+    }
+    switch (element.kind) {
+        case "primitive": {
+            return (element.category !== "void" &&
+                element.category !== "string" &&
+                element.category !== "pointer" &&
+                element.category !== "unichar" &&
+                element.category !== "gtype");
+        }
+        case "enum": {
+            return true;
+        }
+        case "record": {
+            return recordInlineSize(context, element.value) !== undefined;
+        }
+        case "alias":
+        case "callback":
+        case "carray":
+        case "class":
+        case "hashtable":
+        case "interface":
+        case "list":
+        case "varargs": {
+            return false;
+        }
+    }
+};
+const isFixedArrayCallerOut = (context, parameter) => {
+    if (!isCallerAllocatedOut(parameter)) {
+        return false;
+    }
+    const type = parameter.type === undefined ? undefined : underlyingType(context, parameter.type);
+    return (type?.kind === "carray" &&
+        type.fixedSize !== undefined &&
+        type.fixedSize > 0 &&
+        type.lengthParameterIndex === undefined &&
+        hasInlineElementStride(context, type));
+};
 const isAllocatableCallerOut = (context, parameter) => underlyingParamKind(context, parameter) === "record" && isCollectibleCallerOut(context, parameter);
 const isRecordInout = (context, parameter) => isInoutParameter(parameter) && underlyingParamKind(context, parameter) === "record";
 const isHandlePassing = (context, ref) => {
@@ -91,9 +136,12 @@ const isHandlePassing = (context, ref) => {
         }
     }
 };
-const isClosureType = (context, ref) => {
+const isGObjectTypeNamed = (context, ref, typeName) => {
     const name = context.library.nameFor(ref);
-    return name?.namespaceName === "GObject" && name.typeName === "Closure";
+    return name?.namespaceName === "GObject" && name.typeName === typeName;
 };
-export { isAllocatableCallerOut, isClosureType, isHandlePassedInPlace, isCollectibleCallerOut, isRecordInout, isHandlePassing, renderCallerOutInstance, underlyingType, };
+const isClosureType = (context, ref) => isGObjectTypeNamed(context, ref, "Closure");
+const isValueType = (context, ref) => isGObjectTypeNamed(context, ref, "Value");
+const isValueTypeName = (name) => name.namespaceName === "GObject" && name.typeName === "Value";
+export { isAllocatableCallerOut, isClosureType, isValueType, isValueTypeName, isHandlePassedInPlace, isCollectibleCallerOut, isFixedArrayCallerOut, isRecordInout, isHandlePassing, renderCallerOutInstance, underlyingType, };
 //# sourceMappingURL=param-marshal.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"param-marshal.js","sourceRoot":"","sources":["../../../src/store/gi/param-marshal.ts"],"names":[],"mappings":"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","sourcesContent":["import { sanitizeTypeIdentifier } from \"@gtkx/utils\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { type GirParameter, isInoutParameter } from \"../../gir/parameter.js\";\nimport { recordInlineSize } from \"./record-layout.js\";\nimport { isConstructibleRecord } from \"./value-marshalable.js\";\n\ntype TypeName = { namespaceName: string; typeName: string };\ntype CallerOutAllocation = TypeName & ({ strategy: \"construct\" } | { strategy: \"allocate\"; size: number });\n\nconst isHandlePassedInPlace = (context: ModuleContext, parameter: GirParameter): boolean => {\n    if (parameter.direction !== \"out\" && parameter.direction !== \"inout\") {\n        return false;\n    }\n\n    return (\n        (parameter.callerAllocates || parameter.direction === \"inout\") &&\n        parameter.type !== undefined &&\n        isHandlePassing(context, parameter.type)\n    );\n};\n\nconst underlyingType = (context: ModuleContext, ref: TypeId): GirType | undefined => {\n    const type = context.library.typeFor(ref);\n\n    if (type?.kind !== \"alias\") {\n        return type;\n    }\n\n    return type.value.target === undefined ? undefined : underlyingType(context, type.value.target);\n};\n\nconst underlyingParamKind = (context: ModuleContext, parameter: GirParameter): GirType[\"kind\"] | undefined =>\n    parameter.type === undefined ? undefined : underlyingType(context, parameter.type)?.kind;\n\nconst resolvedTypeName = (context: ModuleContext, ref: TypeId | undefined): TypeName | undefined => {\n    let current = ref;\n\n    while (current !== undefined) {\n        const resolved = context.library.typeFor(current);\n\n        if (resolved?.kind === \"alias\" && resolved.value.target !== undefined) {\n            current = resolved.value.target;\n            continue;\n        }\n\n        return context.library.nameFor(current);\n    }\n\n    return undefined;\n};\n\nconst recordCallerOutAllocation = (\n    context: ModuleContext,\n    name: TypeName,\n    type: Extract<GirType, { kind: \"record\" }>,\n): CallerOutAllocation | undefined => {\n    const size = recordInlineSize(context, type.value);\n\n    if (size === undefined) {\n        return undefined;\n    }\n\n    return isConstructibleRecord(context, type.namespace.name, type.value)\n        ? { ...name, strategy: \"construct\" }\n        : { ...name, strategy: \"allocate\", size };\n};\n\nconst callerOutAllocation = (context: ModuleContext, parameter: GirParameter): CallerOutAllocation | undefined => {\n    const name = resolvedTypeName(context, parameter.type);\n    const type = parameter.type === undefined ? undefined : underlyingType(context, parameter.type);\n\n    if (name === undefined || type === undefined) {\n        return undefined;\n    }\n\n    if (type.kind === \"class\") {\n        return { ...name, strategy: \"construct\" };\n    }\n\n    return type.kind === \"record\" ? recordCallerOutAllocation(context, name, type) : undefined;\n};\n\nconst renderCallerOutInstance = (context: ModuleContext, parameter: GirParameter): string => {\n    const allocation = callerOutAllocation(context, parameter);\n\n    if (allocation === undefined) {\n        throw new Error(\"renderCallerOutInstance: expected a caller-allocated out-parameter with a known layout\");\n    }\n\n    const classExpression = context.qualify(allocation.namespaceName, sanitizeTypeIdentifier(allocation.typeName));\n\n    if (allocation.strategy === \"construct\") {\n        return `new ${classExpression}()`;\n    }\n\n    context.addRuntimeImport(\"alloc\");\n    context.addRuntimeImport(\"wrapHandle\");\n\n    return `wrapHandle(alloc(${String(allocation.size)}), ${classExpression})`;\n};\n\nconst isCollectibleCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    callerOutAllocation(context, parameter) !== undefined;\n\nconst isAllocatableCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    underlyingParamKind(context, parameter) === \"record\" && isCollectibleCallerOut(context, parameter);\n\nconst isRecordInout = (context: ModuleContext, parameter: GirParameter): boolean =>\n    isInoutParameter(parameter) && underlyingParamKind(context, parameter) === \"record\";\n\nconst isHandlePassing = (context: ModuleContext, ref: TypeId): boolean => {\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return true;\n    }\n\n    switch (type.kind) {\n        case \"class\":\n        case \"interface\":\n        case \"record\": {\n            return true;\n        }\n        case \"alias\": {\n            return type.value.target !== undefined && isHandlePassing(context, type.value.target);\n        }\n        case \"callback\":\n        case \"carray\":\n        case \"enum\":\n        case \"hashtable\":\n        case \"list\":\n        case \"primitive\":\n        case \"varargs\": {\n            return false;\n        }\n    }\n};\n\nconst isClosureType = (context: ModuleContext, ref: TypeId): boolean => {\n    const name = context.library.nameFor(ref);\n\n    return name?.namespaceName === \"GObject\" && name.typeName === \"Closure\";\n};\n\nexport {\n    isAllocatableCallerOut,\n    isClosureType,\n    isHandlePassedInPlace,\n    isCollectibleCallerOut,\n    isRecordInout,\n    isHandlePassing,\n    renderCallerOutInstance,\n    underlyingType,\n};\n"]}
+{"version":3,"file":"param-marshal.js","sourceRoot":"","sources":["../../../src/store/gi/param-marshal.ts"],"names":[],"mappings":"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","sourcesContent":["import { sanitizeTypeIdentifier } from \"@gtkx/utils\";\nimport type { CArrayType, TypeId } from \"../../gir/type-id.js\";\nimport type { GirType } from \"../../gir/type.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { type GirParameter, isCallerAllocatedOut, isInoutParameter } from \"../../gir/parameter.js\";\nimport { recordInlineSize } from \"./record-layout.js\";\nimport { isConstructibleRecord } from \"./value-marshalable.js\";\n\ntype TypeName = { namespaceName: string; typeName: string };\ntype CallerOutAllocation = TypeName & ({ strategy: \"construct\" } | { strategy: \"allocate\"; size: number });\n\nconst isHandlePassedInPlace = (context: ModuleContext, parameter: GirParameter): boolean => {\n    if (parameter.direction !== \"out\" && parameter.direction !== \"inout\") {\n        return false;\n    }\n\n    return (\n        (parameter.callerAllocates || parameter.direction === \"inout\") &&\n        parameter.type !== undefined &&\n        isHandlePassing(context, parameter.type)\n    );\n};\n\nconst underlyingType = (context: ModuleContext, ref: TypeId): GirType | undefined => {\n    const type = context.library.typeFor(ref);\n\n    if (type?.kind !== \"alias\") {\n        return type;\n    }\n\n    return type.value.target === undefined ? undefined : underlyingType(context, type.value.target);\n};\n\nconst underlyingParamKind = (context: ModuleContext, parameter: GirParameter): GirType[\"kind\"] | undefined =>\n    parameter.type === undefined ? undefined : underlyingType(context, parameter.type)?.kind;\n\nconst resolvedTypeName = (context: ModuleContext, ref: TypeId | undefined): TypeName | undefined => {\n    let current = ref;\n\n    while (current !== undefined) {\n        const resolved = context.library.typeFor(current);\n\n        if (resolved?.kind === \"alias\" && resolved.value.target !== undefined) {\n            current = resolved.value.target;\n            continue;\n        }\n\n        return context.library.nameFor(current);\n    }\n\n    return undefined;\n};\n\nconst recordCallerOutAllocation = (\n    context: ModuleContext,\n    name: TypeName,\n    type: Extract<GirType, { kind: \"record\" }>,\n): CallerOutAllocation | undefined => {\n    const size = recordInlineSize(context, type.value);\n\n    if (size === undefined) {\n        return undefined;\n    }\n\n    return isConstructibleRecord(context, type.namespace.name, type.value)\n        ? { ...name, strategy: \"construct\" }\n        : { ...name, strategy: \"allocate\", size };\n};\n\nconst callerOutAllocation = (context: ModuleContext, parameter: GirParameter): CallerOutAllocation | undefined => {\n    const name = resolvedTypeName(context, parameter.type);\n    const type = parameter.type === undefined ? undefined : underlyingType(context, parameter.type);\n\n    if (name === undefined || type === undefined) {\n        return undefined;\n    }\n\n    if (type.kind === \"class\") {\n        return { ...name, strategy: \"construct\" };\n    }\n\n    return type.kind === \"record\" ? recordCallerOutAllocation(context, name, type) : undefined;\n};\n\nconst renderCallerOutInstance = (context: ModuleContext, parameter: GirParameter): string => {\n    const allocation = callerOutAllocation(context, parameter);\n\n    if (allocation === undefined) {\n        throw new Error(\"renderCallerOutInstance: expected a caller-allocated out-parameter with a known layout\");\n    }\n\n    const classExpression = context.qualify(allocation.namespaceName, sanitizeTypeIdentifier(allocation.typeName));\n\n    if (allocation.strategy === \"construct\") {\n        return `new ${classExpression}()`;\n    }\n\n    context.addRuntimeImport(\"alloc\");\n    context.addRuntimeImport(\"wrapHandle\");\n\n    return `wrapHandle(alloc(${String(allocation.size)}), ${classExpression})`;\n};\n\nconst isCollectibleCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    callerOutAllocation(context, parameter) !== undefined;\n\nconst hasInlineElementStride = (context: ModuleContext, array: CArrayType): boolean => {\n    if (array.elementCType?.includes(\"*\") === true) {\n        return false;\n    }\n\n    const element = underlyingType(context, array.element);\n\n    if (element === undefined) {\n        return false;\n    }\n\n    switch (element.kind) {\n        case \"primitive\": {\n            return (\n                element.category !== \"void\" &&\n                element.category !== \"string\" &&\n                element.category !== \"pointer\" &&\n                element.category !== \"unichar\" &&\n                element.category !== \"gtype\"\n            );\n        }\n        case \"enum\": {\n            return true;\n        }\n        case \"record\": {\n            return recordInlineSize(context, element.value) !== undefined;\n        }\n        case \"alias\":\n        case \"callback\":\n        case \"carray\":\n        case \"class\":\n        case \"hashtable\":\n        case \"interface\":\n        case \"list\":\n        case \"varargs\": {\n            return false;\n        }\n    }\n};\n\nconst isFixedArrayCallerOut = (context: ModuleContext, parameter: GirParameter): boolean => {\n    if (!isCallerAllocatedOut(parameter)) {\n        return false;\n    }\n\n    const type = parameter.type === undefined ? undefined : underlyingType(context, parameter.type);\n\n    return (\n        type?.kind === \"carray\" &&\n        type.fixedSize !== undefined &&\n        type.fixedSize > 0 &&\n        type.lengthParameterIndex === undefined &&\n        hasInlineElementStride(context, type)\n    );\n};\n\nconst isAllocatableCallerOut = (context: ModuleContext, parameter: GirParameter): boolean =>\n    underlyingParamKind(context, parameter) === \"record\" && isCollectibleCallerOut(context, parameter);\n\nconst isRecordInout = (context: ModuleContext, parameter: GirParameter): boolean =>\n    isInoutParameter(parameter) && underlyingParamKind(context, parameter) === \"record\";\n\nconst isHandlePassing = (context: ModuleContext, ref: TypeId): boolean => {\n    const type = context.library.typeFor(ref);\n\n    if (type === undefined) {\n        return true;\n    }\n\n    switch (type.kind) {\n        case \"class\":\n        case \"interface\":\n        case \"record\": {\n            return true;\n        }\n        case \"alias\": {\n            return type.value.target !== undefined && isHandlePassing(context, type.value.target);\n        }\n        case \"callback\":\n        case \"carray\":\n        case \"enum\":\n        case \"hashtable\":\n        case \"list\":\n        case \"primitive\":\n        case \"varargs\": {\n            return false;\n        }\n    }\n};\n\nconst isGObjectTypeNamed = (context: ModuleContext, ref: TypeId, typeName: string): boolean => {\n    const name = context.library.nameFor(ref);\n\n    return name?.namespaceName === \"GObject\" && name.typeName === typeName;\n};\n\nconst isClosureType = (context: ModuleContext, ref: TypeId): boolean => isGObjectTypeNamed(context, ref, \"Closure\");\nconst isValueType = (context: ModuleContext, ref: TypeId): boolean => isGObjectTypeNamed(context, ref, \"Value\");\nconst isValueTypeName = (name: TypeName): boolean => name.namespaceName === \"GObject\" && name.typeName === \"Value\";\n\nexport {\n    isAllocatableCallerOut,\n    isClosureType,\n    isValueType,\n    isValueTypeName,\n    isHandlePassedInPlace,\n    isCollectibleCallerOut,\n    isFixedArrayCallerOut,\n    isRecordInout,\n    isHandlePassing,\n    renderCallerOutInstance,\n    underlyingType,\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"record-constructor.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record-constructor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAK7D,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,gBAAgB,CAAC;AAS/D,KAAK,qBAAqB,GAAG;IACzB,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;CAC5B,CAAC;AAOF,QAAA,MAAM,qCAAqC,GACvC,SAAS,aAAa,EACtB,QAAQ,SAAS,EACjB,WAAW,MAAM,KAClB,MAaF,CAAC;AA0DF,QAAA,MAAM,uBAAuB,GAAI,SAAS,aAAa,EAAE,MAAM,qBAAqB,KAAG,MAyBtF,CAAC;AA+BF,OAAO,EAAE,qCAAqC,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"record-constructor.d.ts","sourceRoot":"","sources":["../../../src/store/gi/record-constructor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,gBAAgB,CAAC;AAe/D,KAAK,qBAAqB,GAAG;IACzB,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;CAC5B,CAAC;AAOF,QAAA,MAAM,qCAAqC,GACvC,SAAS,aAAa,EACtB,QAAQ,SAAS,EACjB,WAAW,MAAM,KAClB,MAaF,CAAC;AA0DF,QAAA,MAAM,uBAAuB,GAAI,SAAS,aAAa,EAAE,MAAM,qBAAqB,KAAG,MAyBtF,CAAC;AA+BF,OAAO,EAAE,qCAAqC,EAAE,uBAAuB,EAAE,CAAC"}

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

@@ -1,12 +1,11 @@
 import { sourceStringLiteral, toCamelIdentifier } from "@gtkx/utils";
 import { renderDescriptor } from "../../analysis/descriptor-render.js";
 import { inputParameters, parameterIdentifier } from "../../analysis/param-structure.js";
-import { renderTsType } from "../../analysis/ts-type.js";
 import { renderBlock, renderBracedOrEmpty } from "../../writer/emit.js";
 import { staticMembers } from "./callables.js";
 import { getDoc } from "./doc-spec.js";
 import { renderSourceGtype } from "./gtype-binding.js";
-import { emitFieldWrite, isEmittableField, isInlineField, isStorableFieldType } from "./record-field-accessor.js";
+import { emitFieldWrite, fieldTsType, isEmittableField, isInlineField, isStorableFieldType, } from "./record-field-accessor.js";
 import { computeRecordFieldSlots } from "./record-layout.js";
 import { isConstructibleRecord } from "./value-marshalable.js";
 const isWritableFieldSlot = (context, entry) => entry.field.writable &&
@@ -18,7 +17,7 @@ const renderRecordConstructorPropsInterface = (context, record, className) => {
     const lines = slots
         .filter((entry) => isWritableFieldSlot(context, entry))
         .map((entry) => `${getDoc(entry.field)}${toCamelIdentifier(entry.field.name)}?: ` +
-        `${renderTsType(context, entry.field.type, true)};`);
+        `${fieldTsType(context, entry.field.type, true)};`);
     return renderBracedOrEmpty(head, lines.join("\n"));
 };
 const isSelfReturning = (context, record, callable) => {

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, 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"]}
+{"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 { 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 {\n    emitFieldWrite,\n    fieldTsType,\n    isEmittableField,\n    isInlineField,\n    isStorableFieldType,\n} 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                `${fieldTsType(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

@@ -23,7 +23,8 @@ declare const isEmittableField: (context: ModuleContext, field: GirField) => fie
 declare const emitFieldWrite: (context: ModuleContext, spec: FieldWriteSpec) => string;
 declare const isStorableFieldType: (context: ModuleContext, ref: TypeId) => boolean;
 declare const resolveRecordFieldEntry: (context: ModuleContext, slot: RecordFieldSlot, claimedNames: Set<string>, siblingFields: GirField[]) => RecordFieldEntry | undefined;
+declare const fieldTsType: (context: ModuleContext, ref: TypeId | undefined, isNullable?: boolean) => string;
 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, isStorableFieldType, emitFieldWrite, resolveRecordFieldEntry, renderRecordFieldAccessor, };
+export { fieldTsType, 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;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"}
+{"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;AAGnD,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,EAKH,KAAK,eAAe,EACvB,MAAM,oBAAoB,CAAC;AAI5B,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;AA2FF,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;AA0BF,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,WAAW,GAAI,SAAS,aAAa,EAAE,KAAK,MAAM,GAAG,SAAS,EAAE,oBAAkB,KAAG,MAM1F,CAAC;AAEF,QAAA,MAAM,yBAAyB,GAC3B,SAAS,aAAa,EACtB,MAAM,eAAe,EACrB,cAAc,GAAG,CAAC,MAAM,CAAC,EACzB,eAAe,QAAQ,EAAE,KAC1B,MAAM,GAAG,SAsCX,CAAC;AAkCF,QAAA,MAAM,aAAa,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,OACwC,CAAC;AA0hB1G,OAAO,EACH,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,yBAAyB,GAC5B,CAAC"}

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

@@ -2,10 +2,10 @@ 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 { isByteSequence, 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";
+import { bitMask, computeRecordFieldSlots, inlineArrayStride, mergeBitfield, } from "./record-layout.js";
 import { wrapReturnValue } from "./return-wrap.js";
 import { isValueMarshalable } from "./value-marshalable.js";
 const isMarshalableField = (context, field) => {
@@ -60,6 +60,7 @@ const isStorableFieldType = (context, ref) => {
     const kind = context.library.typeFor(ref)?.kind;
     return kind !== "carray" && kind !== "list" && kind !== "hashtable";
 };
+const hasArrayAccessor = (context, target) => resolveInlineArray(context, target) !== undefined || resolveStructArray(context, target) !== undefined;
 const admitAccessibleField = (context, slot, claimedNames, siblingFields) => {
     const admitted = admitField(context, slot, claimedNames);
     if (admitted === undefined) {
@@ -67,9 +68,9 @@ const admitAccessibleField = (context, slot, claimedNames, siblingFields) => {
     }
     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));
+    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;
 };
 const resolveRecordFieldEntry = (context, slot, claimedNames, siblingFields) => {
@@ -79,12 +80,18 @@ const resolveRecordFieldEntry = (context, slot, claimedNames, siblingFields) =>
     }
     return {
         jsName: admitted.jsName,
-        tsType: renderTsType(context, admitted.field.type, false),
+        tsType: fieldTsType(context, admitted.field.type),
         isWritable: admitted.isSettable,
         doc: admitted.field.doc,
         annotations: admitted.field.annotations,
     };
 };
+const fieldTsType = (context, ref, isNullable = false) => {
+    if (ref !== undefined && context.library.typeFor(ref)?.kind === "callback") {
+        return isNullable ? "bigint | null" : "bigint";
+    }
+    return renderTsType(context, ref, isNullable);
+};
 const renderRecordFieldAccessor = (context, slot, claimedNames, siblingFields) => {
     const admitted = admitAccessibleField(context, slot, claimedNames, siblingFields);
     if (admitted === undefined) {
@@ -92,12 +99,13 @@ const renderRecordFieldAccessor = (context, slot, claimedNames, siblingFields) =
     }
     const { field, jsName } = admitted;
     const doc = getDoc(field);
-    const structArray = renderStructArrayAccessor(context, { field, jsName, slot: slot.slot, siblingFields });
-    if (structArray !== undefined) {
-        return `${doc}${structArray}`;
+    const target = { field, jsName, slot: slot.slot, siblingFields };
+    const arrayAccessor = renderInlineArrayAccessor(context, target) ?? renderStructArrayAccessor(context, target);
+    if (arrayAccessor !== undefined) {
+        return `${doc}${arrayAccessor}`;
     }
     const descriptor = context.hoistDescriptor(renderDescriptor(context, field.type, "none", { isInline: isInlineField(context, field) }));
-    const tsType = renderTsType(context, field.type, false);
+    const tsType = fieldTsType(context, field.type);
     const accessorOptions = {
         context,
         jsName,
@@ -132,7 +140,7 @@ const isAccessorEligibleType = (context, ref) => {
             return context.library.nameFor(ref) !== undefined;
         }
         case "carray": {
-            return type.fixedSize !== undefined;
+            return type.fixedSize !== undefined && type.arrayCType?.endsWith("*") === true;
         }
         case "list":
         case "hashtable":
@@ -161,11 +169,72 @@ const resolveInlineStructFields = (context, ref, occurrenceCType) => {
     }
     return type.value.fields;
 };
-const arrayLengthExpression = (arrayRef, siblingFields) => {
-    if (arrayRef.fixedSize !== undefined) {
-        return String(arrayRef.fixedSize);
+const isInlineScalarCategory = (category, isBehindPointer) => {
+    if (category === "pointer") {
+        return true;
+    }
+    return !isBehindPointer && category !== "void" && category !== "unichar" && category !== "string";
+};
+const isInlineArrayElement = (context, ref, cType) => {
+    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, target) => {
+    const { field, slot } = target;
+    if (field.type === undefined || slot.bitWidth !== undefined) {
+        return undefined;
     }
-    if (arrayRef.lengthParameterIndex === 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, target) => {
+    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, siblingFields) => {
+    if (arrayRef.fixedSize !== undefined || arrayRef.lengthParameterIndex === undefined) {
         return undefined;
     }
     const lengthField = siblingFields.filter((field) => !field.private)[arrayRef.lengthParameterIndex];
@@ -342,6 +411,63 @@ const resolveStructArray = (context, target) => {
         elementSize: shape.elementSize,
     };
 };
+const inlineArrayElementOffset = (options) => `${String(options.offset)} + __index * ${String(options.resolution.stride)}`;
+const inlineArrayGetterBlock = (options) => {
+    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) => {
+    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, target) => {
+    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 = {
+        context,
+        jsName,
+        tsType: renderTsType(context, field.type, false),
+        descriptor: context.hoistDescriptor(renderDescriptor(context, resolution.element, "none", { isInline: true })),
+        offset: slot.byteOffset,
+        resolution,
+    };
+    const blocks = [];
+    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, target) => {
     const resolution = resolveStructArray(context, target);
     if (resolution === undefined) {
@@ -401,5 +527,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, isStorableFieldType, emitFieldWrite, resolveRecordFieldEntry, renderRecordFieldAccessor, };
+export { fieldTsType, isEmittableField, isInlineField, isStorableFieldType, emitFieldWrite, resolveRecordFieldEntry, renderRecordFieldAccessor, };
 //# sourceMappingURL=record-field-accessor.js.map