@gtkx/runtime 1.2.2 → 1.4.0

package/dist/native-value.js

@@ -1,4 +1,8 @@
-import { getHandle, getWrapperClass, wrapCallScopedObject, wrapHandle, wrapObject } from "./registry.js";
+import { bindFunctionPointer, call, getType, } from "@gtkx/native";
+import { boxedT, isGtypeDescriptor, refT, } from "./descriptors.js";
+import { checkError } from "./error.js";
+import { LIB } from "./library.js";
+import { coerceGType, getHandle, getWrapperClass, resolveWrapperClass, wrapCallScopedObject, wrapFundamentalHandle, wrapHandle, wrapObject, } from "./registry.js";
 import { resolveDescriptorType } from "./type.js";
 const MARSHALLED_KINDS = new Set([
     "object",
@@ -8,6 +12,7 @@ const MARSHALLED_KINDS = new Set([
     "array",
     "hashtable",
 ]);
+const NULL_POINTER = 0n;
 function isMarshalledDescriptor(descriptor) {
     return MARSHALLED_KINDS.has(descriptor.kind);
 }
@@ -18,14 +23,74 @@ function collectionFromNative(descriptor, value) {
     return value === null ? null : mapCollection(descriptor, value, fromNative);
 }
 function boxedFromNative(descriptor, value) {
-    return value == null
-        ? null
-        : wrapHandle(value, getWrapperClass(resolveDescriptorType(descriptor)));
+    if (value == null) {
+        return null;
+    }
+    const handle = value;
+    const type = resolveDescriptorType(descriptor);
+    return wrapHandle(handle, getWrapperClass(type));
+}
+function fundamentalWrapperClass(descriptor, handle) {
+    if (descriptor.wrapperClass !== undefined) {
+        return descriptor.wrapperClass;
+    }
+    const declaredType = resolveDescriptorType(descriptor);
+    return resolveWrapperClass(getType(handle, declaredType)) ?? getWrapperClass(declaredType);
 }
 function fundamentalFromNative(descriptor, value) {
-    return value == null
-        ? null
-        : wrapHandle(value, descriptor.wrapperClass ?? getWrapperClass(resolveDescriptorType(descriptor)));
+    if (value == null) {
+        return null;
+    }
+    const handle = value;
+    return wrapFundamentalHandle(handle, fundamentalWrapperClass(descriptor, handle));
+}
+const errorRefDescriptor = () => refT(boxedT("GError", { ownership: "full", sharedLibrary: LIB, getTypeFnName: "g_error_get_type" }));
+function decodedCallbackValues(descriptor, target, inputs) {
+    const values = [];
+    let cursor = 0;
+    for (const [index, argDescriptor] of descriptor.argDescriptors.entries()) {
+        if (index === descriptor.userDataIndex) {
+            values.push(target.userData ?? NULL_POINTER);
+        }
+        else {
+            values.push(toNative(argDescriptor, inputs[cursor]));
+            cursor += 1;
+        }
+    }
+    return values;
+}
+function decodedCallbackCallable(descriptor, target) {
+    const canThrow = descriptor.canThrow === true;
+    const isOneShot = descriptor.scope === "async";
+    const argDescriptors = canThrow ? [...descriptor.argDescriptors, errorRefDescriptor()] : descriptor.argDescriptors;
+    let bound;
+    let isSpent = false;
+    return (...inputs) => {
+        if (isSpent) {
+            throw new Error("An async-scoped callback was already invoked; its native caller has released it");
+        }
+        bound ??= bindFunctionPointer(target.fnPtr, argDescriptors, descriptor.returnDescriptor, "decoded callback");
+        const values = decodedCallbackValues(descriptor, target, inputs);
+        isSpent = isOneShot;
+        if (!canThrow) {
+            return fromNative(descriptor.returnDescriptor, call(bound, values));
+        }
+        const errorRef = { value: null };
+        values.push(errorRef);
+        const result = call(bound, values);
+        checkError(errorRef);
+        return fromNative(descriptor.returnDescriptor, result);
+    };
+}
+function callbackFromNative(descriptor, value) {
+    if (value == null) {
+        return value;
+    }
+    const target = value;
+    if (typeof target.fnPtr !== "bigint") {
+        return value;
+    }
+    return decodedCallbackCallable(descriptor, { fnPtr: target.fnPtr, userData: target.userData });
 }
 function hashTableFromNative(descriptor, value) {
     if (value === null) {
@@ -40,12 +105,20 @@ function hashTableFromNative(descriptor, value) {
 /**
  * Converts a raw value returned from native code into its JavaScript form,
  * wrapping object, struct, boxed, and fundamental handles and recursively
- * converting arrays and hash tables according to the descriptor.
+ * converting arrays and hash tables according to the descriptor. A callback
+ * decoded from a native function pointer and its bound user data becomes a
+ * callable function that invokes the native callback; it stays valid only as
+ * long as the native caller keeps the pointer pair alive, which for an
+ * async-scoped callback means until the first invocation — calling one a
+ * second time throws instead of reaching the released native closure.
  *
  * @param descriptor Describes the native type of the value.
  * @param value The raw native value to convert.
  */
 function fromNative(descriptor, value) {
+    if (descriptor.kind === "callback") {
+        return callbackFromNative(descriptor, value);
+    }
     if (!isMarshalledDescriptor(descriptor)) {
         return value;
     }
@@ -84,13 +157,17 @@ function hashTableToNative(descriptor, value) {
 }
 /**
  * Converts a JavaScript value into the raw form native code expects, unwrapping
- * object, struct, boxed, and fundamental wrappers back to their handles and
+ * object, struct, boxed, and fundamental wrappers back to their handles,
+ * resolving a class passed for a GType to the GType it was registered under, and
  * recursively converting arrays and maps according to the descriptor.
  *
  * @param descriptor Describes the native type to convert to.
  * @param value The JavaScript value to convert.
  */
 function toNative(descriptor, value) {
+    if (isGtypeDescriptor(descriptor)) {
+        return coerceGType(value);
+    }
     if (!isMarshalledDescriptor(descriptor)) {
         return value;
     }

package/dist/native-value.js.map

@@ -1 +1 @@
-{"version":3,"file":"native-value.js","sourceRoot":"","sources":["../src/native-value.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Descriptor, ExternalObject, Handle } from \"@gtkx/native\";\nimport type { ArrayDescriptor, FundamentalDescriptor, HashTableDescriptor, StructDescriptor } from \"./descriptors.js\";\nimport { getHandle, getWrapperClass, wrapCallScopedObject, wrapHandle, wrapObject } from \"./registry.js\";\nimport { resolveDescriptorType } from \"./type.js\";\n\ntype MarshalledKind = \"object\" | \"struct\" | \"boxed\" | \"fundamental\" | \"array\" | \"hashtable\";\ntype MarshalledDescriptor = Extract<Descriptor, { kind: MarshalledKind }>;\n\nconst MARSHALLED_KINDS: Set<Descriptor[\"kind\"]> = new Set<MarshalledKind>([\n    \"object\",\n    \"struct\",\n    \"boxed\",\n    \"fundamental\",\n    \"array\",\n    \"hashtable\",\n]);\n\nfunction isMarshalledDescriptor(descriptor: Descriptor): descriptor is MarshalledDescriptor {\n    return MARSHALLED_KINDS.has(descriptor.kind);\n}\n\nfunction mapCollection(\n    descriptor: ArrayDescriptor,\n    value: unknown,\n    convert: (itemDescriptor: Descriptor, item: unknown) => unknown,\n): unknown[] {\n    return (value as unknown[]).map((item) => convert(descriptor.itemDescriptor, item));\n}\n\nfunction collectionFromNative(descriptor: ArrayDescriptor, value: unknown): unknown {\n    return value === null ? null : mapCollection(descriptor, value, fromNative);\n}\n\nfunction boxedFromNative(descriptor: Descriptor, value: unknown): unknown {\n    return value == null\n        ? null\n        : wrapHandle(value as ExternalObject<Handle>, getWrapperClass(resolveDescriptorType(descriptor)));\n}\n\nfunction fundamentalFromNative(descriptor: FundamentalDescriptor, value: unknown): unknown {\n    return value == null\n        ? null\n        : wrapHandle(\n                value as ExternalObject<Handle>,\n                descriptor.wrapperClass ?? getWrapperClass(resolveDescriptorType(descriptor)),\n            );\n}\n\nfunction hashTableFromNative(descriptor: HashTableDescriptor, value: unknown): unknown {\n    if (value === null) {\n        return null;\n    }\n\n    const entries = value as [unknown, unknown][];\n\n    return new Map(\n        entries.map(([key, val]): [unknown, unknown] => [\n            fromNative(descriptor.keyDescriptor, key),\n            fromNative(descriptor.valueDescriptor, val),\n        ]),\n    );\n}\n\n/**\n * Converts a raw value returned from native code into its JavaScript form,\n * wrapping object, struct, boxed, and fundamental handles and recursively\n * converting arrays and hash tables according to the descriptor.\n *\n * @param descriptor Describes the native type of the value.\n * @param value The raw native value to convert.\n */\nfunction fromNative(descriptor: Descriptor, value: unknown): unknown {\n    if (!isMarshalledDescriptor(descriptor)) {\n        return value;\n    }\n\n    switch (descriptor.kind) {\n        case \"object\": {\n            return descriptor.isCallScoped === true ? wrapCallScopedObject(value) : wrapObject(value);\n        }\n        case \"struct\": {\n            return wrapHandle(value as ExternalObject<Handle> | null, (descriptor as StructDescriptor).wrapperClass);\n        }\n        case \"boxed\": {\n            return boxedFromNative(descriptor, value);\n        }\n        case \"fundamental\": {\n            return fundamentalFromNative(descriptor, value);\n        }\n        case \"array\": {\n            return collectionFromNative(descriptor, value);\n        }\n        case \"hashtable\": {\n            return hashTableFromNative(descriptor, value);\n        }\n    }\n}\n\nfunction collectionToNative(descriptor: ArrayDescriptor, value: unknown): unknown {\n    return value == null ? null : mapCollection(descriptor, value, toNative);\n}\n\nfunction hashTableToNative(descriptor: HashTableDescriptor, value: unknown): unknown {\n    if (value == null) {\n        return null;\n    }\n\n    return [...(value as Map<unknown, unknown>)].map(([key, val]): [unknown, unknown] => [\n        toNative(descriptor.keyDescriptor, key),\n        toNative(descriptor.valueDescriptor, val),\n    ]);\n}\n\n/**\n * Converts a JavaScript value into the raw form native code expects, unwrapping\n * object, struct, boxed, and fundamental wrappers back to their handles and\n * recursively converting arrays and maps according to the descriptor.\n *\n * @param descriptor Describes the native type to convert to.\n * @param value The JavaScript value to convert.\n */\nfunction toNative(descriptor: Descriptor, value: unknown): unknown {\n    if (!isMarshalledDescriptor(descriptor)) {\n        return value;\n    }\n\n    switch (descriptor.kind) {\n        case \"object\":\n        case \"struct\":\n        case \"boxed\":\n        case \"fundamental\": {\n            const instance = value as object | null | undefined;\n\n            return instance == null ? null : getHandle(instance);\n        }\n        case \"array\": {\n            return collectionToNative(descriptor, value);\n        }\n        case \"hashtable\": {\n            return hashTableToNative(descriptor, value);\n        }\n    }\n}\n\nexport { fromNative, toNative };\n"]}
+{"version":3,"file":"native-value.js","sourceRoot":"","sources":["../src/native-value.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AnyClass } from \"@gtkx/utils\";\nimport {\n    bindFunctionPointer,\n    call,\n    type CallDescriptor,\n    type Descriptor,\n    type ExternalObject,\n    getType,\n    type Handle,\n    type Ref,\n} from \"@gtkx/native\";\nimport {\n    type ArrayDescriptor,\n    boxedT,\n    type CallbackDescriptor,\n    type FundamentalDescriptor,\n    type HashTableDescriptor,\n    isGtypeDescriptor,\n    refT,\n    type StructDescriptor,\n} from \"./descriptors.js\";\nimport { checkError } from \"./error.js\";\nimport { LIB } from \"./library.js\";\nimport {\n    coerceGType,\n    getHandle,\n    getWrapperClass,\n    resolveWrapperClass,\n    wrapCallScopedObject,\n    wrapFundamentalHandle,\n    wrapHandle,\n    wrapObject,\n} from \"./registry.js\";\nimport { resolveDescriptorType } from \"./type.js\";\n\ntype MarshalledKind = \"object\" | \"struct\" | \"boxed\" | \"fundamental\" | \"array\" | \"hashtable\";\ntype MarshalledDescriptor = Extract<Descriptor, { kind: MarshalledKind }>;\ntype DecodedCallbackTarget = { fnPtr: bigint; userData?: bigint | undefined };\n\nconst MARSHALLED_KINDS: Set<Descriptor[\"kind\"]> = new Set<MarshalledKind>([\n    \"object\",\n    \"struct\",\n    \"boxed\",\n    \"fundamental\",\n    \"array\",\n    \"hashtable\",\n]);\n\nconst NULL_POINTER = 0n;\n\nfunction isMarshalledDescriptor(descriptor: Descriptor): descriptor is MarshalledDescriptor {\n    return MARSHALLED_KINDS.has(descriptor.kind);\n}\n\nfunction mapCollection(\n    descriptor: ArrayDescriptor,\n    value: unknown,\n    convert: (itemDescriptor: Descriptor, item: unknown) => unknown,\n): unknown[] {\n    return (value as unknown[]).map((item) => convert(descriptor.itemDescriptor, item));\n}\n\nfunction collectionFromNative(descriptor: ArrayDescriptor, value: unknown): unknown {\n    return value === null ? null : mapCollection(descriptor, value, fromNative);\n}\n\nfunction boxedFromNative(descriptor: Descriptor, value: unknown): unknown {\n    if (value == null) {\n        return null;\n    }\n\n    const handle = value as ExternalObject<Handle>;\n    const type = resolveDescriptorType(descriptor);\n\n    return wrapHandle(handle, getWrapperClass(type));\n}\n\nfunction fundamentalWrapperClass(descriptor: FundamentalDescriptor, handle: ExternalObject<Handle>): AnyClass {\n    if (descriptor.wrapperClass !== undefined) {\n        return descriptor.wrapperClass;\n    }\n\n    const declaredType = resolveDescriptorType(descriptor);\n\n    return resolveWrapperClass(getType(handle, declaredType)) ?? getWrapperClass(declaredType);\n}\n\nfunction fundamentalFromNative(descriptor: FundamentalDescriptor, value: unknown): unknown {\n    if (value == null) {\n        return null;\n    }\n\n    const handle = value as ExternalObject<Handle>;\n\n    return wrapFundamentalHandle(handle, fundamentalWrapperClass(descriptor, handle));\n}\n\nconst errorRefDescriptor = (): Descriptor =>\n    refT(boxedT(\"GError\", { ownership: \"full\", sharedLibrary: LIB, getTypeFnName: \"g_error_get_type\" }));\n\nfunction decodedCallbackValues(\n    descriptor: CallbackDescriptor,\n    target: DecodedCallbackTarget,\n    inputs: unknown[],\n): unknown[] {\n    const values: unknown[] = [];\n    let cursor = 0;\n\n    for (const [index, argDescriptor] of descriptor.argDescriptors.entries()) {\n        if (index === descriptor.userDataIndex) {\n            values.push(target.userData ?? NULL_POINTER);\n        } else {\n            values.push(toNative(argDescriptor, inputs[cursor]));\n            cursor += 1;\n        }\n    }\n\n    return values;\n}\n\nfunction decodedCallbackCallable(\n    descriptor: CallbackDescriptor,\n    target: DecodedCallbackTarget,\n): (...inputs: unknown[]) => unknown {\n    const canThrow = descriptor.canThrow === true;\n    const isOneShot = descriptor.scope === \"async\";\n    const argDescriptors = canThrow ? [...descriptor.argDescriptors, errorRefDescriptor()] : descriptor.argDescriptors;\n    let bound: ExternalObject<CallDescriptor> | undefined;\n    let isSpent = false;\n\n    return (...inputs) => {\n        if (isSpent) {\n            throw new Error(\"An async-scoped callback was already invoked; its native caller has released it\");\n        }\n\n        bound ??= bindFunctionPointer(target.fnPtr, argDescriptors, descriptor.returnDescriptor, \"decoded callback\");\n        const values = decodedCallbackValues(descriptor, target, inputs);\n        isSpent = isOneShot;\n\n        if (!canThrow) {\n            return fromNative(descriptor.returnDescriptor, call(bound, values));\n        }\n\n        const errorRef: Ref = { value: null };\n        values.push(errorRef);\n        const result = call(bound, values);\n        checkError(errorRef);\n\n        return fromNative(descriptor.returnDescriptor, result);\n    };\n}\n\nfunction callbackFromNative(descriptor: CallbackDescriptor, value: unknown): unknown {\n    if (value == null) {\n        return value;\n    }\n\n    const target = value as Partial<DecodedCallbackTarget>;\n\n    if (typeof target.fnPtr !== \"bigint\") {\n        return value;\n    }\n\n    return decodedCallbackCallable(descriptor, { fnPtr: target.fnPtr, userData: target.userData });\n}\n\nfunction hashTableFromNative(descriptor: HashTableDescriptor, value: unknown): unknown {\n    if (value === null) {\n        return null;\n    }\n\n    const entries = value as [unknown, unknown][];\n\n    return new Map(\n        entries.map(([key, val]): [unknown, unknown] => [\n            fromNative(descriptor.keyDescriptor, key),\n            fromNative(descriptor.valueDescriptor, val),\n        ]),\n    );\n}\n\n/**\n * Converts a raw value returned from native code into its JavaScript form,\n * wrapping object, struct, boxed, and fundamental handles and recursively\n * converting arrays and hash tables according to the descriptor. A callback\n * decoded from a native function pointer and its bound user data becomes a\n * callable function that invokes the native callback; it stays valid only as\n * long as the native caller keeps the pointer pair alive, which for an\n * async-scoped callback means until the first invocation — calling one a\n * second time throws instead of reaching the released native closure.\n *\n * @param descriptor Describes the native type of the value.\n * @param value The raw native value to convert.\n */\nfunction fromNative(descriptor: Descriptor, value: unknown): unknown {\n    if (descriptor.kind === \"callback\") {\n        return callbackFromNative(descriptor, value);\n    }\n\n    if (!isMarshalledDescriptor(descriptor)) {\n        return value;\n    }\n\n    switch (descriptor.kind) {\n        case \"object\": {\n            return descriptor.isCallScoped === true ? wrapCallScopedObject(value) : wrapObject(value);\n        }\n        case \"struct\": {\n            return wrapHandle(value as ExternalObject<Handle> | null, (descriptor as StructDescriptor).wrapperClass);\n        }\n        case \"boxed\": {\n            return boxedFromNative(descriptor, value);\n        }\n        case \"fundamental\": {\n            return fundamentalFromNative(descriptor, value);\n        }\n        case \"array\": {\n            return collectionFromNative(descriptor, value);\n        }\n        case \"hashtable\": {\n            return hashTableFromNative(descriptor, value);\n        }\n    }\n}\n\nfunction collectionToNative(descriptor: ArrayDescriptor, value: unknown): unknown {\n    return value == null ? null : mapCollection(descriptor, value, toNative);\n}\n\nfunction hashTableToNative(descriptor: HashTableDescriptor, value: unknown): unknown {\n    if (value == null) {\n        return null;\n    }\n\n    return [...(value as Map<unknown, unknown>)].map(([key, val]): [unknown, unknown] => [\n        toNative(descriptor.keyDescriptor, key),\n        toNative(descriptor.valueDescriptor, val),\n    ]);\n}\n\n/**\n * Converts a JavaScript value into the raw form native code expects, unwrapping\n * object, struct, boxed, and fundamental wrappers back to their handles,\n * resolving a class passed for a GType to the GType it was registered under, and\n * recursively converting arrays and maps according to the descriptor.\n *\n * @param descriptor Describes the native type to convert to.\n * @param value The JavaScript value to convert.\n */\nfunction toNative(descriptor: Descriptor, value: unknown): unknown {\n    if (isGtypeDescriptor(descriptor)) {\n        return coerceGType(value);\n    }\n\n    if (!isMarshalledDescriptor(descriptor)) {\n        return value;\n    }\n\n    switch (descriptor.kind) {\n        case \"object\":\n        case \"struct\":\n        case \"boxed\":\n        case \"fundamental\": {\n            const instance = value as object | null | undefined;\n\n            return instance == null ? null : getHandle(instance);\n        }\n        case \"array\": {\n            return collectionToNative(descriptor, value);\n        }\n        case \"hashtable\": {\n            return hashTableToNative(descriptor, value);\n        }\n    }\n}\n\nexport { fromNative, toNative };\n"]}

package/dist/object.d.ts

@@ -1,4 +1,4 @@
-import { type Descriptor, type ExternalObject, type Handle } from "@gtkx/native";
+import { type Descriptor } from "@gtkx/native";
 import { type AnyClass } from "@gtkx/utils";
 /**
  * One construct property a wrapper class accepts: the canonical `GObject` name it is set under,
@@ -28,17 +28,24 @@ declare function registerConstructProperties(cls: AnyClass, bindings: ConstructB
  * for a read-only property and for a value of a type the property cannot hold, and
  * a `RangeError` for a value the ParamSpec rejects. A value marshalled through a
  * declared descriptor is converted rather than checked, so a `null` handed to a
- * numeric one of those lands 0 rather than being refused.
+ * numeric one of those lands 0 rather than being refused, and a number is fitted to
+ * the property first, as `coerceObjectProperty` does: truncated toward zero for a
+ * whole-number property and clamped to the range its `GObject.ParamSpec` allows.
  * Properties whose value is `undefined` are skipped. A type registered with
  * `registerClass` binds the wrapper before its `constructed` slot runs, so an
  * override of that slot already sees a usable instance.
+ * When construction returns an object that already has a wrapper — it reached
+ * JavaScript and was wrapped before `g_object_new` returned, for example a
+ * `Gtk.Window` observed through the toplevels list — that existing wrapper is
+ * returned instead of binding `wrapper`, so both references stay one object.
  *
  * @param gtype The GType of the object to construct.
  * @param props Property names mapped to the values to set them to.
  * @param wrapper The wrapper instance to bind to the new object.
- * @returns The handle of the newly created object.
+ * @returns The wrapper bound to the constructed object: `wrapper` itself, or
+ * the wrapper the object already had.
  */
-declare function newObjectWithProperties(gtype: bigint, props: object, wrapper: object): ExternalObject<Handle>;
+declare function newObjectWithProperties<T extends object>(gtype: bigint, props: object, wrapper: T): T;
 /**
  * Reads a GObject property and converts it to its JavaScript value using the
  * descriptor.
@@ -52,8 +59,9 @@ declare function getObjectProperty(obj: object, propertyName: string, descriptor
  * Writes a JavaScript value to a GObject property, converting it to native form
  * using the descriptor. The descriptor converts what it is given rather than checking it against
  * the property's `GObject.ParamSpec`, so `null` and `undefined` written to a numeric or enum
- * property land 0, where the same write to a property installed through `registerClass` is
- * refused with a `TypeError`.
+ * property land 0, and a fractional number written to a whole-number property is truncated toward
+ * zero, where the same writes to a property installed through `registerClass` are refused with a
+ * `TypeError`.
  *
  * @param obj The object to write to.
  * @param propertyName The property name.

package/dist/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,KAAK,MAAM,EAAa,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,aAAa,CAAC;AAQ5D;;;GAGG;AACH,KAAK,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AAC/D,wGAAwG;AACxG,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAmE1D;;;;;;;;;GASG;AACH,iBAAS,2BAA2B,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAGrF;AAoBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,iBAAS,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAkBtG;AAED;;;;;;;GAOG;AACH,iBAAS,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAK7F;AAED;;;;;;;;;;;GAWG;AACH,iBAAS,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAE5G;AAED,OAAO,EACH,uBAAuB,EACvB,iBAAiB,EACjB,2BAA2B,EAC3B,iBAAiB,EACjB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,GACzB,CAAC"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAA+C,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,aAAa,CAAC;AAQ5D;;;GAGG;AACH,KAAK,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AAC/D,wGAAwG;AACxG,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAmE1D;;;;;;;;;GASG;AACH,iBAAS,2BAA2B,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAGrF;AAoBD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,iBAAS,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAsB9F;AAED;;;;;;;GAOG;AACH,iBAAS,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAK7F;AAED;;;;;;;;;;;;GAYG;AACH,iBAAS,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAE5G;AAED,OAAO,EACH,uBAAuB,EACvB,iBAAiB,EACjB,2BAA2B,EAC3B,iBAAiB,EACjB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,GACzB,CAAC"}

package/dist/object.js

@@ -3,9 +3,9 @@ import { getParentClass } from "@gtkx/utils";
 import { bind } from "./bind.js";
 import { objectT, stringT, voidT } from "./descriptors.js";
 import { LIB, VALUE_T } from "./library.js";
-import { constructPropertyFor } from "./properties.js";
+import { coercePropertyValue, constructPropertyFor } from "./properties.js";
 import { getHandle, registerWrapper } from "./registry.js";
-import { fromValue, newValueForDescriptor, toValue } from "./value.js";
+import { fromValueForDescriptor, newValueForDescriptor, toValue } from "./value.js";
 const declaredBindings = new WeakMap();
 const resolvedBindings = new WeakMap();
 const declarations = { generation: 0 };
@@ -66,7 +66,7 @@ function constructPropertyForEntry(source, name, value) {
     if (binding === undefined) {
         return constructPropertyFor(source.gtype, name, value, source.wrapper);
     }
-    return { name: binding[0], value: toValue(binding[1], value) };
+    return { name: binding[0], value: toValue(binding[1], coercePropertyValue(source.gtype, binding[0], value)) };
 }
 /**
  * Constructs a new GObject of the given type, setting the supplied construct
@@ -78,15 +78,22 @@ function constructPropertyForEntry(source, name, value) {
  * for a read-only property and for a value of a type the property cannot hold, and
  * a `RangeError` for a value the ParamSpec rejects. A value marshalled through a
  * declared descriptor is converted rather than checked, so a `null` handed to a
- * numeric one of those lands 0 rather than being refused.
+ * numeric one of those lands 0 rather than being refused, and a number is fitted to
+ * the property first, as `coerceObjectProperty` does: truncated toward zero for a
+ * whole-number property and clamped to the range its `GObject.ParamSpec` allows.
  * Properties whose value is `undefined` are skipped. A type registered with
  * `registerClass` binds the wrapper before its `constructed` slot runs, so an
  * override of that slot already sees a usable instance.
+ * When construction returns an object that already has a wrapper — it reached
+ * JavaScript and was wrapped before `g_object_new` returned, for example a
+ * `Gtk.Window` observed through the toplevels list — that existing wrapper is
+ * returned instead of binding `wrapper`, so both references stay one object.
  *
  * @param gtype The GType of the object to construct.
  * @param props Property names mapped to the values to set them to.
  * @param wrapper The wrapper instance to bind to the new object.
- * @returns The handle of the newly created object.
+ * @returns The wrapper bound to the constructed object: `wrapper` itself, or
+ * the wrapper the object already had.
  */
 function newObjectWithProperties(gtype, props, wrapper) {
     const names = [];
@@ -100,8 +107,11 @@ function newObjectWithProperties(gtype, props, wrapper) {
             values.push(property.value);
         }
     }
-    newObject(gtype, names, values, wrapper, registerWrapper);
-    return getHandle(wrapper);
+    const existing = newObject(gtype, names, values, wrapper, registerWrapper);
+    if (existing !== null) {
+        return existing;
+    }
+    return wrapper;
 }
 /**
  * Reads a GObject property and converts it to its JavaScript value using the
@@ -114,14 +124,15 @@ function newObjectWithProperties(gtype, props, wrapper) {
 function getObjectProperty(obj, propertyName, descriptor) {
     const value = newValueForDescriptor(descriptor);
     gObjectGetProperty(getHandle(obj), propertyName, value);
-    return fromValue(value);
+    return fromValueForDescriptor(descriptor, value);
 }
 /**
  * Writes a JavaScript value to a GObject property, converting it to native form
  * using the descriptor. The descriptor converts what it is given rather than checking it against
  * the property's `GObject.ParamSpec`, so `null` and `undefined` written to a numeric or enum
- * property land 0, where the same write to a property installed through `registerClass` is
- * refused with a `TypeError`.
+ * property land 0, and a fractional number written to a whole-number property is truncated toward
+ * zero, where the same writes to a property installed through `registerClass` are refused with a
+ * `TypeError`.
  *
  * @param obj The object to write to.
  * @param propertyName The property name.

package/dist/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../src/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,SAAS,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAiB,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAA0B,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAWvE,MAAM,gBAAgB,GAAyC,IAAI,OAAO,EAAE,CAAC;AAC7E,MAAM,gBAAgB,GAAwC,IAAI,OAAO,EAAE,CAAC;AAC5E,MAAM,YAAY,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;AACvC,MAAM,WAAW,GAAsB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAsB,CAAC;AAEhF,MAAM,kBAAkB,GAAG,IAAI,CAC3B,GAAG,EACH,uBAAuB,EACvB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,EACnD,KAAK,CACR,CAAC;AAEF,MAAM,kBAAkB,GAAG,IAAI,CAC3B,GAAG,EACH,uBAAuB,EACvB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,EACnD,KAAK,CACR,CAAC;AAEF,SAAS,uBAAuB,CAAC,GAAa;IAC1C,MAAM,QAAQ,GAAwB,EAAE,CAAC;IACzC,IAAI,OAAO,GAAoB,GAAG,CAAC;IAEnC,OAAO,OAAO,KAAK,IAAI,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE1C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;QAED,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAa;IACxC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAsB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAsB,CAAC;IAE3E,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAyB;IACnD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEzC,IAAI,MAAM,EAAE,UAAU,KAAK,YAAY,CAAC,UAAU,EAAE,CAAC;QACjD,OAAO,MAAM,CAAC,QAAQ,CAAC;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC5C,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE7E,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,2BAA2B,CAAC,GAAa,EAAE,QAA2B;IAC3E,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACpC,YAAY,CAAC,UAAU,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,yBAAyB,CAC9B,MAAuE,EACvE,IAAY,EACZ,KAAc;IAEd,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEtC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,oBAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAS,uBAAuB,CAAC,KAAa,EAAE,KAAa,EAAE,OAAe;IAC1E,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,WAAmC,CAAC,CAAC;IACnF,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAE5C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,yBAAyB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAEnF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IAE1D,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,iBAAiB,CAAC,GAAW,EAAE,YAAoB,EAAE,UAAsB;IAChF,MAAM,KAAK,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAChD,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IAExD,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,iBAAiB,CAAC,GAAW,EAAE,YAAoB,EAAE,UAAsB,EAAE,OAAgB;IAClG,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,OAAO,EACH,uBAAuB,EACvB,iBAAiB,EACjB,2BAA2B,EAC3B,iBAAiB,GAGpB,CAAC","sourcesContent":["import { type Descriptor, type ExternalObject, type Handle, newObject } from \"@gtkx/native\";\nimport { type AnyClass, getParentClass } from \"@gtkx/utils\";\nimport { bind } from \"./bind.js\";\nimport { objectT, stringT, voidT } from \"./descriptors.js\";\nimport { LIB, VALUE_T } from \"./library.js\";\nimport { type ConstructProperty, constructPropertyFor } from \"./properties.js\";\nimport { getHandle, registerWrapper } from \"./registry.js\";\nimport { fromValue, newValueForDescriptor, toValue } from \"./value.js\";\n\n/**\n * One construct property a wrapper class accepts: the canonical `GObject` name it is set under,\n * and the descriptor its value is marshalled through.\n */\ntype ConstructBinding = [name: string, descriptor: Descriptor];\n/** The construct properties a wrapper class accepts, keyed by the camelCased name callers give them. */\ntype ConstructBindings = Record<string, ConstructBinding>;\ntype ResolvedBindings = { generation: number; bindings: ConstructBindings };\n\nconst declaredBindings: WeakMap<AnyClass, ConstructBindings> = new WeakMap();\nconst resolvedBindings: WeakMap<AnyClass, ResolvedBindings> = new WeakMap();\nconst declarations = { generation: 0 };\nconst NO_BINDINGS: ConstructBindings = Object.create(null) as ConstructBindings;\n\nconst gObjectGetProperty = bind(\n    LIB,\n    \"g_object_get_property\",\n    [objectT(\"borrowed\"), stringT(\"borrowed\"), VALUE_T],\n    voidT,\n);\n\nconst gObjectSetProperty = bind(\n    LIB,\n    \"g_object_set_property\",\n    [objectT(\"borrowed\"), stringT(\"borrowed\"), VALUE_T],\n    voidT,\n);\n\nfunction collectDeclaredBindings(cls: AnyClass): ConstructBindings[] {\n    const declared: ConstructBindings[] = [];\n    let current: AnyClass | null = cls;\n\n    while (current !== null) {\n        const own = declaredBindings.get(current);\n\n        if (own !== undefined) {\n            declared.push(own);\n        }\n\n        current = getParentClass(current);\n    }\n\n    return declared;\n}\n\nfunction mergeDeclaredBindings(cls: AnyClass): ConstructBindings {\n    const declared = collectDeclaredBindings(cls);\n    const merged: ConstructBindings = Object.create(null) as ConstructBindings;\n\n    for (let index = declared.length - 1; index >= 0; index--) {\n        Object.assign(merged, declared[index]);\n    }\n\n    return merged;\n}\n\nfunction constructBindingsFor(cls: AnyClass | undefined): ConstructBindings {\n    if (cls === undefined) {\n        return NO_BINDINGS;\n    }\n\n    const cached = resolvedBindings.get(cls);\n\n    if (cached?.generation === declarations.generation) {\n        return cached.bindings;\n    }\n\n    const bindings = mergeDeclaredBindings(cls);\n    resolvedBindings.set(cls, { generation: declarations.generation, bindings });\n\n    return bindings;\n}\n\n/**\n * Declares the construct properties a wrapper class accepts, so `newObjectWithProperties`\n * marshals each one through its descriptor rather than resolving it from the\n * `GObject.ParamSpec` the type installs. A class inherits the declarations of its ancestors.\n * Registering takes effect immediately, including for classes already constructed from and for\n * subclasses that already inherited an earlier declaration.\n *\n * @param cls The wrapper class the properties are declared on.\n * @param bindings CamelCased property names mapped to their canonical name and descriptor.\n */\nfunction registerConstructProperties(cls: AnyClass, bindings: ConstructBindings): void {\n    declaredBindings.set(cls, bindings);\n    declarations.generation += 1;\n}\n\nfunction constructPropertyForEntry(\n    source: { gtype: bigint; bindings: ConstructBindings; wrapper: object },\n    name: string,\n    value: unknown,\n): ConstructProperty | undefined {\n    if (value === undefined) {\n        return undefined;\n    }\n\n    const binding = source.bindings[name];\n\n    if (binding === undefined) {\n        return constructPropertyFor(source.gtype, name, value, source.wrapper);\n    }\n\n    return { name: binding[0], value: toValue(binding[1], value) };\n}\n\n/**\n * Constructs a new GObject of the given type, setting the supplied construct\n * properties, and binds `wrapper` to it. A property the wrapper's class declares\n * through `registerConstructProperties` is marshalled through its descriptor; any\n * other one is marshalled through the `GObject.ParamSpec` the type installs under\n * that name, dashed or camelCased, and is skipped when the type installs none.\n * A value that ParamSpec would refuse throws before GObject sees it: a `TypeError`\n * for a read-only property and for a value of a type the property cannot hold, and\n * a `RangeError` for a value the ParamSpec rejects. A value marshalled through a\n * declared descriptor is converted rather than checked, so a `null` handed to a\n * numeric one of those lands 0 rather than being refused.\n * Properties whose value is `undefined` are skipped. A type registered with\n * `registerClass` binds the wrapper before its `constructed` slot runs, so an\n * override of that slot already sees a usable instance.\n *\n * @param gtype The GType of the object to construct.\n * @param props Property names mapped to the values to set them to.\n * @param wrapper The wrapper instance to bind to the new object.\n * @returns The handle of the newly created object.\n */\nfunction newObjectWithProperties(gtype: bigint, props: object, wrapper: object): ExternalObject<Handle> {\n    const names: string[] = [];\n    const values: ExternalObject<Handle>[] = [];\n    const bindings = constructBindingsFor(wrapper.constructor as AnyClass | undefined);\n    const source = { gtype, bindings, wrapper };\n\n    for (const name of Object.keys(props)) {\n        const property = constructPropertyForEntry(source, name, Reflect.get(props, name));\n\n        if (property !== undefined) {\n            names.push(property.name);\n            values.push(property.value);\n        }\n    }\n\n    newObject(gtype, names, values, wrapper, registerWrapper);\n\n    return getHandle(wrapper);\n}\n\n/**\n * Reads a GObject property and converts it to its JavaScript value using the\n * descriptor.\n *\n * @param obj The object to read from.\n * @param propertyName The property name.\n * @param descriptor Describes the property's type.\n */\nfunction getObjectProperty(obj: object, propertyName: string, descriptor: Descriptor): unknown {\n    const value = newValueForDescriptor(descriptor);\n    gObjectGetProperty(getHandle(obj), propertyName, value);\n\n    return fromValue(value);\n}\n\n/**\n * Writes a JavaScript value to a GObject property, converting it to native form\n * using the descriptor. The descriptor converts what it is given rather than checking it against\n * the property's `GObject.ParamSpec`, so `null` and `undefined` written to a numeric or enum\n * property land 0, where the same write to a property installed through `registerClass` is\n * refused with a `TypeError`.\n *\n * @param obj The object to write to.\n * @param propertyName The property name.\n * @param descriptor Describes the property's type.\n * @param jsValue The value to set.\n */\nfunction setObjectProperty(obj: object, propertyName: string, descriptor: Descriptor, jsValue: unknown): void {\n    gObjectSetProperty(getHandle(obj), propertyName, toValue(descriptor, jsValue));\n}\n\nexport {\n    newObjectWithProperties,\n    getObjectProperty,\n    registerConstructProperties,\n    setObjectProperty,\n    type ConstructBinding,\n    type ConstructBindings,\n};\n"]}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../src/object.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Descriptor, type ExternalObject, type Handle, newObject } from \"@gtkx/native\";\nimport { type AnyClass, getParentClass } from \"@gtkx/utils\";\nimport { bind } from \"./bind.js\";\nimport { objectT, stringT, voidT } from \"./descriptors.js\";\nimport { LIB, VALUE_T } from \"./library.js\";\nimport { coercePropertyValue, type ConstructProperty, constructPropertyFor } from \"./properties.js\";\nimport { getHandle, registerWrapper } from \"./registry.js\";\nimport { fromValueForDescriptor, newValueForDescriptor, toValue } from \"./value.js\";\n\n/**\n * One construct property a wrapper class accepts: the canonical `GObject` name it is set under,\n * and the descriptor its value is marshalled through.\n */\ntype ConstructBinding = [name: string, descriptor: Descriptor];\n/** The construct properties a wrapper class accepts, keyed by the camelCased name callers give them. */\ntype ConstructBindings = Record<string, ConstructBinding>;\ntype ResolvedBindings = { generation: number; bindings: ConstructBindings };\n\nconst declaredBindings: WeakMap<AnyClass, ConstructBindings> = new WeakMap();\nconst resolvedBindings: WeakMap<AnyClass, ResolvedBindings> = new WeakMap();\nconst declarations = { generation: 0 };\nconst NO_BINDINGS: ConstructBindings = Object.create(null) as ConstructBindings;\n\nconst gObjectGetProperty = bind(\n    LIB,\n    \"g_object_get_property\",\n    [objectT(\"borrowed\"), stringT(\"borrowed\"), VALUE_T],\n    voidT,\n);\n\nconst gObjectSetProperty = bind(\n    LIB,\n    \"g_object_set_property\",\n    [objectT(\"borrowed\"), stringT(\"borrowed\"), VALUE_T],\n    voidT,\n);\n\nfunction collectDeclaredBindings(cls: AnyClass): ConstructBindings[] {\n    const declared: ConstructBindings[] = [];\n    let current: AnyClass | null = cls;\n\n    while (current !== null) {\n        const own = declaredBindings.get(current);\n\n        if (own !== undefined) {\n            declared.push(own);\n        }\n\n        current = getParentClass(current);\n    }\n\n    return declared;\n}\n\nfunction mergeDeclaredBindings(cls: AnyClass): ConstructBindings {\n    const declared = collectDeclaredBindings(cls);\n    const merged: ConstructBindings = Object.create(null) as ConstructBindings;\n\n    for (let index = declared.length - 1; index >= 0; index--) {\n        Object.assign(merged, declared[index]);\n    }\n\n    return merged;\n}\n\nfunction constructBindingsFor(cls: AnyClass | undefined): ConstructBindings {\n    if (cls === undefined) {\n        return NO_BINDINGS;\n    }\n\n    const cached = resolvedBindings.get(cls);\n\n    if (cached?.generation === declarations.generation) {\n        return cached.bindings;\n    }\n\n    const bindings = mergeDeclaredBindings(cls);\n    resolvedBindings.set(cls, { generation: declarations.generation, bindings });\n\n    return bindings;\n}\n\n/**\n * Declares the construct properties a wrapper class accepts, so `newObjectWithProperties`\n * marshals each one through its descriptor rather than resolving it from the\n * `GObject.ParamSpec` the type installs. A class inherits the declarations of its ancestors.\n * Registering takes effect immediately, including for classes already constructed from and for\n * subclasses that already inherited an earlier declaration.\n *\n * @param cls The wrapper class the properties are declared on.\n * @param bindings CamelCased property names mapped to their canonical name and descriptor.\n */\nfunction registerConstructProperties(cls: AnyClass, bindings: ConstructBindings): void {\n    declaredBindings.set(cls, bindings);\n    declarations.generation += 1;\n}\n\nfunction constructPropertyForEntry(\n    source: { gtype: bigint; bindings: ConstructBindings; wrapper: object },\n    name: string,\n    value: unknown,\n): ConstructProperty | undefined {\n    if (value === undefined) {\n        return undefined;\n    }\n\n    const binding = source.bindings[name];\n\n    if (binding === undefined) {\n        return constructPropertyFor(source.gtype, name, value, source.wrapper);\n    }\n\n    return { name: binding[0], value: toValue(binding[1], coercePropertyValue(source.gtype, binding[0], value)) };\n}\n\n/**\n * Constructs a new GObject of the given type, setting the supplied construct\n * properties, and binds `wrapper` to it. A property the wrapper's class declares\n * through `registerConstructProperties` is marshalled through its descriptor; any\n * other one is marshalled through the `GObject.ParamSpec` the type installs under\n * that name, dashed or camelCased, and is skipped when the type installs none.\n * A value that ParamSpec would refuse throws before GObject sees it: a `TypeError`\n * for a read-only property and for a value of a type the property cannot hold, and\n * a `RangeError` for a value the ParamSpec rejects. A value marshalled through a\n * declared descriptor is converted rather than checked, so a `null` handed to a\n * numeric one of those lands 0 rather than being refused, and a number is fitted to\n * the property first, as `coerceObjectProperty` does: truncated toward zero for a\n * whole-number property and clamped to the range its `GObject.ParamSpec` allows.\n * Properties whose value is `undefined` are skipped. A type registered with\n * `registerClass` binds the wrapper before its `constructed` slot runs, so an\n * override of that slot already sees a usable instance.\n * When construction returns an object that already has a wrapper — it reached\n * JavaScript and was wrapped before `g_object_new` returned, for example a\n * `Gtk.Window` observed through the toplevels list — that existing wrapper is\n * returned instead of binding `wrapper`, so both references stay one object.\n *\n * @param gtype The GType of the object to construct.\n * @param props Property names mapped to the values to set them to.\n * @param wrapper The wrapper instance to bind to the new object.\n * @returns The wrapper bound to the constructed object: `wrapper` itself, or\n * the wrapper the object already had.\n */\nfunction newObjectWithProperties<T extends object>(gtype: bigint, props: object, wrapper: T): T {\n    const names: string[] = [];\n    const values: ExternalObject<Handle>[] = [];\n    const bindings = constructBindingsFor(wrapper.constructor as AnyClass | undefined);\n    const source = { gtype, bindings, wrapper };\n\n    for (const name of Object.keys(props)) {\n        const property = constructPropertyForEntry(source, name, Reflect.get(props, name));\n\n        if (property !== undefined) {\n            names.push(property.name);\n            values.push(property.value);\n        }\n    }\n\n    const existing = newObject(gtype, names, values, wrapper, registerWrapper);\n\n    if (existing !== null) {\n        return existing as T;\n    }\n\n    return wrapper;\n}\n\n/**\n * Reads a GObject property and converts it to its JavaScript value using the\n * descriptor.\n *\n * @param obj The object to read from.\n * @param propertyName The property name.\n * @param descriptor Describes the property's type.\n */\nfunction getObjectProperty(obj: object, propertyName: string, descriptor: Descriptor): unknown {\n    const value = newValueForDescriptor(descriptor);\n    gObjectGetProperty(getHandle(obj), propertyName, value);\n\n    return fromValueForDescriptor(descriptor, value);\n}\n\n/**\n * Writes a JavaScript value to a GObject property, converting it to native form\n * using the descriptor. The descriptor converts what it is given rather than checking it against\n * the property's `GObject.ParamSpec`, so `null` and `undefined` written to a numeric or enum\n * property land 0, and a fractional number written to a whole-number property is truncated toward\n * zero, where the same writes to a property installed through `registerClass` are refused with a\n * `TypeError`.\n *\n * @param obj The object to write to.\n * @param propertyName The property name.\n * @param descriptor Describes the property's type.\n * @param jsValue The value to set.\n */\nfunction setObjectProperty(obj: object, propertyName: string, descriptor: Descriptor, jsValue: unknown): void {\n    gObjectSetProperty(getHandle(obj), propertyName, toValue(descriptor, jsValue));\n}\n\nexport {\n    newObjectWithProperties,\n    getObjectProperty,\n    registerConstructProperties,\n    setObjectProperty,\n    type ConstructBinding,\n    type ConstructBindings,\n};\n"]}

package/dist/param-spec.d.ts

@@ -1,11 +1,42 @@
 import { type ExternalObject, type Handle } from "@gtkx/native";
 type ValueGuard = (value: unknown) => boolean;
+declare const INT32_MINIMUM = -2147483648;
+declare const INT32_MAXIMUM = 2147483647;
+declare const INT64_MINIMUM: bigint;
+declare const INT64_MAXIMUM: bigint;
+declare const UINT64_MAXIMUM: bigint;
+declare const WHOLE_NUMBER_RANGES: Map<bigint, [minimum: number, maximum: number]>;
 declare const getParamFlags: (pspec: ExternalObject<Handle>) => number;
 declare const getParamValueType: (pspec: ExternalObject<Handle>) => bigint;
+/**
+ * Reads the `GParamFlags` bitfield of a `GObject.ParamSpec`.
+ *
+ * @param spec The param spec wrapper to read.
+ * @returns The spec's flags.
+ */
+declare const getParamSpecFlags: (spec: object) => number;
+/**
+ * Reads the GType of the values a `GObject.ParamSpec` describes.
+ *
+ * @param spec The param spec wrapper to read.
+ * @returns The GType of the spec's values.
+ */
+declare const getParamSpecValueType: (spec: object) => bigint;
+/**
+ * Reads the GType a `GObject.ParamSpec` is installed on.
+ *
+ * @param spec The param spec wrapper to read.
+ * @returns The owning GType, or `TYPE_INVALID` while the spec is not installed on any type.
+ */
+declare const getParamSpecOwnerType: (spec: object) => bigint;
 declare const isParamWritable: (flags: number) => boolean;
+declare const isParamReadable: (flags: number) => boolean;
 declare const isParamConstructOnly: (flags: number) => boolean;
 declare const isParamLaxlyValidated: (flags: number) => boolean;
+declare const isParamExplicitlyNotified: (flags: number) => boolean;
 declare const wasParamValueModified: (pspec: ExternalObject<Handle>, value: ExternalObject<Handle>) => boolean;
+declare function isStringArray(value: unknown[]): boolean;
+declare function resolveGtype(value: unknown): bigint;
 declare function valueGuardFor(valueType: bigint): ValueGuard;
-export { getParamFlags, getParamValueType, isParamConstructOnly, isParamLaxlyValidated, isParamWritable, type ValueGuard, valueGuardFor, wasParamValueModified, };
+export { WHOLE_NUMBER_RANGES, getParamFlags, getParamSpecFlags, getParamSpecOwnerType, getParamSpecValueType, getParamValueType, INT32_MAXIMUM, INT32_MINIMUM, INT64_MAXIMUM, INT64_MINIMUM, isParamConstructOnly, isParamReadable, isStringArray, isParamExplicitlyNotified, isParamLaxlyValidated, isParamWritable, resolveGtype, UINT64_MAXIMUM, type ValueGuard, valueGuardFor, wasParamValueModified, };
 //# sourceMappingURL=param-spec.d.ts.map

package/dist/param-spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"param-spec.d.ts","sourceRoot":"","sources":["../src/param-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,MAAM,EAAQ,MAAM,cAAc,CAAC;AAkCtE,KAAK,UAAU,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;AA6D9C,QAAA,MAAM,aAAa,GAAI,OAAO,cAAc,CAAC,MAAM,CAAC,KAAG,MAA2D,CAAC;AAEnH,QAAA,MAAM,iBAAiB,GAAI,OAAO,cAAc,CAAC,MAAM,CAAC,KAAG,MACE,CAAC;AAE9D,QAAA,MAAM,eAAe,GAAI,OAAO,MAAM,KAAG,OAAyC,CAAC;AACnF,QAAA,MAAM,oBAAoB,GAAI,OAAO,MAAM,KAAG,OAA+C,CAAC;AAC9F,QAAA,MAAM,qBAAqB,GAAI,OAAO,MAAM,KAAG,OAA+C,CAAC;AAE/F,QAAA,MAAM,qBAAqB,GAAI,OAAO,cAAc,CAAC,MAAM,CAAC,EAAE,OAAO,cAAc,CAAC,MAAM,CAAC,KAAG,OAC/C,CAAC;AAoEhD,iBAAS,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAepD;AAoCD,OAAO,EACH,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EACf,KAAK,UAAU,EACf,aAAa,EACb,qBAAqB,GACxB,CAAC"}
+{"version":3,"file":"param-spec.d.ts","sourceRoot":"","sources":["../src/param-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,MAAM,EAAQ,MAAM,cAAc,CAAC;AAkCtE,KAAK,UAAU,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;AAgB9C,QAAA,MAAM,aAAa,cAAiB,CAAC;AACrC,QAAA,MAAM,aAAa,aAAgB,CAAC;AAEpC,QAAA,MAAM,aAAa,EAAE,MAAqB,CAAC;AAC3C,QAAA,MAAM,aAAa,EAAE,MAAuB,CAAC;AAC7C,QAAA,MAAM,cAAc,EAAE,MAAuB,CAAC;AAa9C,QAAA,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAWvE,CAAC;AAgCH,QAAA,MAAM,aAAa,GAAI,OAAO,cAAc,CAAC,MAAM,CAAC,KAAG,MAA2D,CAAC;AAEnH,QAAA,MAAM,iBAAiB,GAAI,OAAO,cAAc,CAAC,MAAM,CAAC,KAAG,MACE,CAAC;AAK9D;;;;;GAKG;AACH,QAAA,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAIzC,CAAC;AAEF;;;;;GAKG;AACH,QAAA,MAAM,qBAAqB,GAAI,MAAM,MAAM,KAAG,MAI7C,CAAC;AAEF;;;;;GAKG;AACH,QAAA,MAAM,qBAAqB,GAAI,MAAM,MAAM,KAAG,MAI7C,CAAC;AAEF,QAAA,MAAM,eAAe,GAAI,OAAO,MAAM,KAAG,OAAyC,CAAC;AACnF,QAAA,MAAM,eAAe,GAAI,OAAO,MAAM,KAAG,OAAyC,CAAC;AACnF,QAAA,MAAM,oBAAoB,GAAI,OAAO,MAAM,KAAG,OAA+C,CAAC;AAC9F,QAAA,MAAM,qBAAqB,GAAI,OAAO,MAAM,KAAG,OAA+C,CAAC;AAC/F,QAAA,MAAM,yBAAyB,GAAI,OAAO,MAAM,KAAG,OAAgD,CAAC;AAEpG,QAAA,MAAM,qBAAqB,GAAI,OAAO,cAAc,CAAC,MAAM,CAAC,EAAE,OAAO,cAAc,CAAC,MAAM,CAAC,KAAG,OAC/C,CAAC;AAUhD,iBAAS,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAQhD;AAsCD,iBAAS,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAQ5C;AAcD,iBAAS,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAepD;AA4CD,OAAO,EACH,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,yBAAyB,EACzB,qBAAqB,EACrB,eAAe,EACf,YAAY,EACZ,cAAc,EACd,KAAK,UAAU,EACf,aAAa,EACb,qBAAqB,GACxB,CAAC"}

package/dist/param-spec.js

@@ -2,15 +2,17 @@ import { read } from "@gtkx/native";
 import { bind } from "./bind.js";
 import { biguint64T, booleanT, stringT, uint32T, voidT } from "./descriptors.js";
 import { LIB, PARAM_T, VALUE_T } from "./library.js";
-import { getInstanceType } from "./registry.js";
+import { getHandle, getInstanceType } from "./registry.js";
 import { getStrvType, isTypedClass, TYPE_BOOLEAN, TYPE_BOXED, TYPE_CHAR, TYPE_DOUBLE, TYPE_ENUM, TYPE_FLAGS, TYPE_FLOAT, TYPE_GTYPE, TYPE_INT, TYPE_INT64, TYPE_INTERFACE, TYPE_INVALID, TYPE_LONG, TYPE_OBJECT, TYPE_PARAM, TYPE_POINTER, TYPE_STRING, TYPE_UCHAR, TYPE_UINT, TYPE_UINT64, TYPE_ULONG, TYPE_VARIANT, typeFundamental, typeIsA, } from "./type.js";
 const PARAM_READABLE = 1;
 const PARAM_WRITABLE = 2;
 const PARAM_CONSTRUCT_ONLY = 8;
 const PARAM_LAX_VALIDATION = 16;
+const PARAM_EXPLICIT_NOTIFY = 1 << 30;
 const READ_FLAGS = PARAM_READABLE | PARAM_WRITABLE | PARAM_CONSTRUCT_ONLY | PARAM_LAX_VALIDATION;
 const FLAGS_BYTE_OFFSET = 16;
 const VALUE_TYPE_BYTE_OFFSET = 24;
+const OWNER_TYPE_BYTE_OFFSET = 32;
 const LAYOUT_PROBE_NAME = "gtkx-param-layout";
 const INT8_MINIMUM = -128;
 const INT8_MAXIMUM = 127;
@@ -29,6 +31,19 @@ const WRAPPED_FUNDAMENTALS = new Set([
     TYPE_VARIANT,
 ]);
 const isWideUnsignedValue = wideIntegerGuardFor(0n, UINT64_MAXIMUM);
+const MAX_SAFE = Number.MAX_SAFE_INTEGER;
+const WHOLE_NUMBER_RANGES = new Map([
+    [TYPE_CHAR, [INT8_MINIMUM, INT8_MAXIMUM]],
+    [TYPE_UCHAR, [0, UINT8_MAXIMUM]],
+    [TYPE_INT, [INT32_MINIMUM, INT32_MAXIMUM]],
+    [TYPE_UINT, [0, UINT32_MAXIMUM]],
+    [TYPE_ENUM, [INT32_MINIMUM, INT32_MAXIMUM]],
+    [TYPE_FLAGS, [0, UINT32_MAXIMUM]],
+    [TYPE_LONG, [-MAX_SAFE, MAX_SAFE]],
+    [TYPE_ULONG, [0, MAX_SAFE]],
+    [TYPE_INT64, [-MAX_SAFE, MAX_SAFE]],
+    [TYPE_UINT64, [0, MAX_SAFE]],
+]);
 const SCALAR_GUARDS = new Map([
     [TYPE_BOOLEAN, isBooleanValue],
     [TYPE_STRING, isStringValue],
@@ -53,9 +68,42 @@ const paramSpecRefSink = bind(LIB, "g_param_spec_ref_sink", [PARAM_T], PARAM_T);
 const newParamSpecBoolean = bind(LIB, "g_param_spec_boolean", [stringT("borrowed"), stringT("borrowed"), stringT("borrowed"), booleanT, uint32T], PARAM_T);
 const getParamFlags = (pspec) => read(pspec, uint32T, FLAGS_BYTE_OFFSET);
 const getParamValueType = (pspec) => read(pspec, biguint64T, VALUE_TYPE_BYTE_OFFSET);
+const getParamOwnerType = (pspec) => read(pspec, biguint64T, OWNER_TYPE_BYTE_OFFSET);
+/**
+ * Reads the `GParamFlags` bitfield of a `GObject.ParamSpec`.
+ *
+ * @param spec The param spec wrapper to read.
+ * @returns The spec's flags.
+ */
+const getParamSpecFlags = (spec) => {
+    assertParamLayout();
+    return getParamFlags(getHandle(spec));
+};
+/**
+ * Reads the GType of the values a `GObject.ParamSpec` describes.
+ *
+ * @param spec The param spec wrapper to read.
+ * @returns The GType of the spec's values.
+ */
+const getParamSpecValueType = (spec) => {
+    assertParamLayout();
+    return getParamValueType(getHandle(spec));
+};
+/**
+ * Reads the GType a `GObject.ParamSpec` is installed on.
+ *
+ * @param spec The param spec wrapper to read.
+ * @returns The owning GType, or `TYPE_INVALID` while the spec is not installed on any type.
+ */
+const getParamSpecOwnerType = (spec) => {
+    assertParamLayout();
+    return getParamOwnerType(getHandle(spec));
+};
 const isParamWritable = (flags) => (flags & PARAM_WRITABLE) !== 0;
+const isParamReadable = (flags) => (flags & PARAM_READABLE) !== 0;
 const isParamConstructOnly = (flags) => (flags & PARAM_CONSTRUCT_ONLY) !== 0;
 const isParamLaxlyValidated = (flags) => (flags & PARAM_LAX_VALIDATION) !== 0;
+const isParamExplicitlyNotified = (flags) => (flags & PARAM_EXPLICIT_NOTIFY) !== 0;
 const wasParamValueModified = (pspec, value) => paramValueValidate(pspec, value);
 function isBooleanValue(value) {
     return typeof value === "boolean";
@@ -63,8 +111,16 @@ function isBooleanValue(value) {
 function isStringValue(value) {
     return value == null || typeof value === "string";
 }
+function isStringArray(value) {
+    for (const item of value) {
+        if (typeof item !== "string") {
+            return false;
+        }
+    }
+    return true;
+}
 function isStrvValue(value) {
-    return value == null || (Array.isArray(value) && value.every((item) => typeof item === "string"));
+    return value == null || (Array.isArray(value) && isStringArray(value));
 }
 function isNumberValue(value) {
     return typeof value === "number";
@@ -122,7 +178,11 @@ function readProbeLayout(flags) {
     const probe = newParamSpecBoolean(LAYOUT_PROBE_NAME, null, null, false, flags);
     paramSpecRefSink(probe);
     try {
-        return { flags: getParamFlags(probe), valueType: getParamValueType(probe) };
+        return {
+            flags: getParamFlags(probe),
+            valueType: getParamValueType(probe),
+            ownerType: getParamOwnerType(probe),
+        };
     }
     finally {
         paramSpecUnref(probe);
@@ -130,7 +190,9 @@ function readProbeLayout(flags) {
 }
 function isLayoutIntact(flags) {
     const layout = readProbeLayout(flags);
-    return (layout.flags & READ_FLAGS) === flags && layout.valueType === TYPE_BOOLEAN;
+    return ((layout.flags & READ_FLAGS) === flags &&
+        layout.valueType === TYPE_BOOLEAN &&
+        layout.ownerType === TYPE_INVALID);
 }
 function assertParamLayout() {
     if (layout.wasChecked) {
@@ -143,5 +205,5 @@ function assertParamLayout() {
     }
     throw new Error("GParamSpec does not match the memory layout this build reads a property's flags and value type at");
 }
-export { getParamFlags, getParamValueType, isParamConstructOnly, isParamLaxlyValidated, isParamWritable, valueGuardFor, wasParamValueModified, };
+export { WHOLE_NUMBER_RANGES, getParamFlags, getParamSpecFlags, getParamSpecOwnerType, getParamSpecValueType, getParamValueType, INT32_MAXIMUM, INT32_MINIMUM, INT64_MAXIMUM, INT64_MINIMUM, isParamConstructOnly, isParamReadable, isStringArray, isParamExplicitlyNotified, isParamLaxlyValidated, isParamWritable, resolveGtype, UINT64_MAXIMUM, valueGuardFor, wasParamValueModified, };
 //# sourceMappingURL=param-spec.js.map