@gtkx/runtime 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/mixin.js

@@ -1,4 +1,8 @@
 import { getParentClass } from "@gtkx/utils";
+const syntheticSignalMembers = new WeakMap();
+function markSyntheticSignalMembers(klass, names) {
+    syntheticSignalMembers.set(klass.prototype, new Set(names));
+}
 function isDefinedInClassChain(prototype, key) {
     let current = prototype;
     while (current !== null && current !== Object.prototype) {
@@ -9,11 +13,22 @@ function isDefinedInClassChain(prototype, key) {
     }
     return false;
 }
-function copyLayerMember(target, layer, key) {
+function isNaturalInClassChain(prototype, key) {
+    let current = prototype;
+    while (current !== null && current !== Object.prototype) {
+        if (Object.hasOwn(current, key)) {
+            return syntheticSignalMembers.get(current)?.has(key) !== true;
+        }
+        current = Reflect.getPrototypeOf(current);
+    }
+    return false;
+}
+function copyLayerMember(target, layer, key, inheritedOverrides) {
     if (key === "constructor") {
         return;
     }
-    if (isDefinedInClassChain(target.prototype, key)) {
+    const isProtectedInherited = !inheritedOverrides.has(key) && isDefinedInClassChain(target.prototype, key);
+    if (isProtectedInherited || Object.hasOwn(target.prototype, key)) {
         return;
     }
     const descriptor = Object.getOwnPropertyDescriptor(layer, key);
@@ -21,9 +36,9 @@ function copyLayerMember(target, layer, key) {
         Object.defineProperty(target.prototype, key, descriptor);
     }
 }
-function copyLayerMembers(target, layer) {
+function copyLayerMembers(target, layer, inheritedOverrides = new Set()) {
     for (const key of Object.getOwnPropertyNames(layer)) {
-        copyLayerMember(target, layer, key);
+        copyLayerMember(target, layer, key, inheritedOverrides);
     }
 }
 /**
@@ -33,7 +48,8 @@ function copyLayerMembers(target, layer) {
  * @param target The class whose prototype receives the mixin members.
  * @param mixins The mixins to apply, in order.
  */
-function installMixins(target, mixins) {
+function installMixins(target, mixins, inheritedOverrideNames = []) {
+    const inheritedOverrides = new Set(inheritedOverrideNames);
     const empty = class {
         connect() {
             return 0;
@@ -43,7 +59,7 @@ function installMixins(target, mixins) {
         }
     };
     for (const mixin of mixins) {
-        copyLayerMembers(target, mixin(empty).prototype);
+        copyLayerMembers(target, mixin(empty).prototype, inheritedOverrides);
     }
 }
 function dropLayerMembers(layer, names) {
@@ -51,11 +67,22 @@ function dropLayerMembers(layer, names) {
         Reflect.deleteProperty(layer.prototype, name);
     }
 }
+function createMixinLayer(parent, mixin, inheritedNames) {
+    const layer = mixin(parent);
+    const protectedNames = new Set(inheritedNames);
+    for (const key of Object.getOwnPropertyNames(layer.prototype)) {
+        if (key !== "constructor" && isNaturalInClassChain(parent.prototype, key)) {
+            protectedNames.add(key);
+        }
+    }
+    dropLayerMembers(layer, protectedNames);
+    return layer;
+}
 function insertMixinLayer(target, mixin, inheritedNames) {
-    const layer = mixin(getParentClass(target));
-    dropLayerMembers(layer, inheritedNames);
+    const parent = getParentClass(target);
+    const layer = createMixinLayer(parent, mixin, inheritedNames);
     Object.setPrototypeOf(target.prototype, layer.prototype);
     Object.setPrototypeOf(target, layer);
 }
-export { copyLayerMembers, insertMixinLayer, installMixins };
+export { copyLayerMembers, createMixinLayer, insertMixinLayer, installMixins, markSyntheticSignalMembers, };
 //# sourceMappingURL=mixin.js.map

package/dist/mixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"mixin.js","sourceRoot":"","sources":["../src/mixin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAE,MAAM,aAAa,CAAC;AAmB5D,SAAS,qBAAqB,CAAC,SAAiB,EAAE,GAAW;IACzD,IAAI,OAAO,GAAkB,SAAS,CAAC;IAEvC,OAAO,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;QACtD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,eAAe,CAAC,MAAgB,EAAE,KAAa,EAAE,GAAW;IACjE,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;QACxB,OAAO;IACX,CAAC;IAED,IAAI,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC;QAC/C,OAAO;IACX,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE/D,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAgB,EAAE,KAAa;IACrD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,MAAgB,EAAE,MAAe;IACpD,MAAM,KAAK,GAA4B;QACnC,OAAO;YACH,OAAO,CAAC,CAAC;QACb,CAAC;QAED,IAAI;YACA,OAAO,SAAS,CAAC;QACrB,CAAC;KACJ,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAe,EAAE,KAAkB;IACzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAgB,EAAE,KAAY,EAAE,cAA2B;IACjF,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAA4B,CAAC,CAAC;IACvE,gBAAgB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACxC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACzC,CAAC;AAED,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAAkC,CAAC","sourcesContent":["import { type AnyClass, getParentClass } from \"@gtkx/utils\";\n\n/**\n * The signal plumbing every base class passed to a {@link Mixin} provides, so mixed-in interface\n * members can connect and emit without knowing the concrete class.\n */\ntype MixinReceiver = {\n    /** Connects a handler to a signal and returns its handler id. */\n    connect(signal: string, handler: (...args: unknown[]) => unknown, isAfter?: boolean): number;\n    /** Emits a signal with the given arguments and returns whatever the emission produced. */\n    emit(signal: string, ...args: unknown[]): unknown;\n};\n\n/**\n * A factory that, given a base class, returns a subclass adding extra members to\n * be merged onto a target prototype.\n */\ntype Mixin = (base: AnyClass<MixinReceiver>) => AnyClass;\n\nfunction isDefinedInClassChain(prototype: object, key: string): boolean {\n    let current: object | null = prototype;\n\n    while (current !== null && current !== Object.prototype) {\n        if (Object.hasOwn(current, key)) {\n            return true;\n        }\n\n        current = Reflect.getPrototypeOf(current);\n    }\n\n    return false;\n}\n\nfunction copyLayerMember(target: AnyClass, layer: object, key: string): void {\n    if (key === \"constructor\") {\n        return;\n    }\n\n    if (isDefinedInClassChain(target.prototype, key)) {\n        return;\n    }\n\n    const descriptor = Object.getOwnPropertyDescriptor(layer, key);\n\n    if (descriptor !== undefined) {\n        Object.defineProperty(target.prototype, key, descriptor);\n    }\n}\n\nfunction copyLayerMembers(target: AnyClass, layer: object): void {\n    for (const key of Object.getOwnPropertyNames(layer)) {\n        copyLayerMember(target, layer, key);\n    }\n}\n\n/**\n * Copies each mixin's prototype members onto the target class prototype, skipping\n * any member already defined anywhere in the target's class chain.\n *\n * @param target The class whose prototype receives the mixin members.\n * @param mixins The mixins to apply, in order.\n */\nfunction installMixins(target: AnyClass, mixins: Mixin[]): void {\n    const empty: AnyClass<MixinReceiver> = class {\n        connect(): number {\n            return 0;\n        }\n\n        emit(): unknown {\n            return undefined;\n        }\n    };\n\n    for (const mixin of mixins) {\n        copyLayerMembers(target, mixin(empty).prototype);\n    }\n}\n\nfunction dropLayerMembers(layer: AnyClass, names: Set<string>): void {\n    for (const name of names) {\n        Reflect.deleteProperty(layer.prototype, name);\n    }\n}\n\nfunction insertMixinLayer(target: AnyClass, mixin: Mixin, inheritedNames: Set<string>): void {\n    const layer = mixin(getParentClass(target) as AnyClass<MixinReceiver>);\n    dropLayerMembers(layer, inheritedNames);\n    Object.setPrototypeOf(target.prototype, layer.prototype);\n    Object.setPrototypeOf(target, layer);\n}\n\nexport { copyLayerMembers, insertMixinLayer, installMixins, type MixinReceiver, type Mixin };\n"]}
+{"version":3,"file":"mixin.js","sourceRoot":"","sources":["../src/mixin.ts"],"names":[],"mappings":"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","sourcesContent":["import { type AnyClass, getParentClass } from \"@gtkx/utils\";\n\n/**\n * The signal plumbing every base class passed to a {@link Mixin} provides, so mixed-in interface\n * members can connect and emit without knowing the concrete class.\n */\ntype MixinReceiver = {\n    /** Connects a handler to a signal and returns its handler id. */\n    connect(signal: string, handler: (...args: unknown[]) => unknown, isAfter?: boolean): number;\n    /** Emits a signal with the given arguments and returns whatever the emission produced. */\n    emit(signal: string, ...args: unknown[]): unknown;\n};\n\n/**\n * A factory that, given a base class, returns a subclass adding extra members to\n * be merged onto a target prototype.\n */\ntype Mixin = (base: AnyClass<MixinReceiver>) => AnyClass;\n\nconst syntheticSignalMembers: WeakMap<object, ReadonlySet<string>> = new WeakMap();\n\nfunction markSyntheticSignalMembers(klass: AnyClass, names: readonly string[]): void {\n    syntheticSignalMembers.set(klass.prototype, new Set(names));\n}\n\nfunction isDefinedInClassChain(prototype: object, key: string): boolean {\n    let current: object | null = prototype;\n\n    while (current !== null && current !== Object.prototype) {\n        if (Object.hasOwn(current, key)) {\n            return true;\n        }\n\n        current = Reflect.getPrototypeOf(current);\n    }\n\n    return false;\n}\n\nfunction isNaturalInClassChain(prototype: object, key: string): boolean {\n    let current: object | null = prototype;\n\n    while (current !== null && current !== Object.prototype) {\n        if (Object.hasOwn(current, key)) {\n            return syntheticSignalMembers.get(current)?.has(key) !== true;\n        }\n\n        current = Reflect.getPrototypeOf(current);\n    }\n\n    return false;\n}\n\nfunction copyLayerMember(target: AnyClass, layer: object, key: string, inheritedOverrides: Set<string>): void {\n    if (key === \"constructor\") {\n        return;\n    }\n\n    const isProtectedInherited = !inheritedOverrides.has(key) && isDefinedInClassChain(target.prototype, key);\n\n    if (isProtectedInherited || Object.hasOwn(target.prototype, key)) {\n        return;\n    }\n\n    const descriptor = Object.getOwnPropertyDescriptor(layer, key);\n\n    if (descriptor !== undefined) {\n        Object.defineProperty(target.prototype, key, descriptor);\n    }\n}\n\nfunction copyLayerMembers(target: AnyClass, layer: object, inheritedOverrides: Set<string> = new Set()): void {\n    for (const key of Object.getOwnPropertyNames(layer)) {\n        copyLayerMember(target, layer, key, inheritedOverrides);\n    }\n}\n\n/**\n * Copies each mixin's prototype members onto the target class prototype, skipping\n * any member already defined anywhere in the target's class chain.\n *\n * @param target The class whose prototype receives the mixin members.\n * @param mixins The mixins to apply, in order.\n */\nfunction installMixins(target: AnyClass, mixins: Mixin[], inheritedOverrideNames: Iterable<string> = []): void {\n    const inheritedOverrides = new Set(inheritedOverrideNames);\n    const empty: AnyClass<MixinReceiver> = class {\n        connect(): number {\n            return 0;\n        }\n\n        emit(): unknown {\n            return undefined;\n        }\n    };\n\n    for (const mixin of mixins) {\n        copyLayerMembers(target, mixin(empty).prototype, inheritedOverrides);\n    }\n}\n\nfunction dropLayerMembers(layer: AnyClass, names: Set<string>): void {\n    for (const name of names) {\n        Reflect.deleteProperty(layer.prototype, name);\n    }\n}\n\nfunction createMixinLayer(parent: AnyClass<MixinReceiver>, mixin: Mixin, inheritedNames: Set<string>): AnyClass {\n    const layer = mixin(parent);\n    const protectedNames = new Set(inheritedNames);\n\n    for (const key of Object.getOwnPropertyNames(layer.prototype)) {\n        if (key !== \"constructor\" && isNaturalInClassChain(parent.prototype, key)) {\n            protectedNames.add(key);\n        }\n    }\n\n    dropLayerMembers(layer, protectedNames);\n\n    return layer;\n}\n\nfunction insertMixinLayer(target: AnyClass, mixin: Mixin, inheritedNames: Set<string>): void {\n    const parent = getParentClass(target) as AnyClass<MixinReceiver>;\n    const layer = createMixinLayer(parent, mixin, inheritedNames);\n    Object.setPrototypeOf(target.prototype, layer.prototype);\n    Object.setPrototypeOf(target, layer);\n}\n\nexport {\n    copyLayerMembers,\n    createMixinLayer,\n    insertMixinLayer,\n    installMixins,\n    markSyntheticSignalMembers,\n    type MixinReceiver,\n    type Mixin,\n};\n"]}

package/dist/object.d.ts

@@ -1,5 +1,6 @@
 import { type Descriptor } from "@gtkx/native";
 import { type AnyClass } from "@gtkx/utils";
+import { propertyMapOverride, writablePropertyMapOverride } from "./property-brand.js";
 /**
  * One construct property a wrapper class accepts: the canonical `GObject` name it is set under,
  * and the descriptor its value is marshalled through.
@@ -54,7 +55,12 @@ declare function newObjectWithProperties<T extends object>(gtype: bigint, props:
  * @param propertyName The property name.
  * @param descriptor Describes the property's type.
  */
-declare function getObjectProperty(obj: object, propertyName: string, descriptor: Descriptor): unknown;
+declare function getProperty<TObject extends {
+    __properties__: object;
+}, TPropertyMap extends object = TObject extends {
+    [propertyMapOverride]?: infer TResolver;
+} ? TResolver extends () => infer TMap ? Extract<NonNullable<TMap>, object> : TObject["__properties__"] : TObject["__properties__"], TName extends Extract<keyof NoInfer<TPropertyMap>, string> = Extract<keyof NoInfer<TPropertyMap>, string>>(obj: TObject, propertyName: TName): NoInfer<TPropertyMap>[TName];
+declare function getProperty(obj: object, propertyName: string, descriptor: Descriptor): unknown;
 /**
  * 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
@@ -68,6 +74,11 @@ declare function getObjectProperty(obj: object, propertyName: string, descriptor
  * @param descriptor Describes the property's type.
  * @param jsValue The value to set.
  */
-declare function setObjectProperty(obj: object, propertyName: string, descriptor: Descriptor, jsValue: unknown): void;
-export { newObjectWithProperties, getObjectProperty, registerConstructProperties, setObjectProperty, type ConstructBinding, type ConstructBindings, };
+declare function setProperty<TObject extends {
+    __writableProperties__: object;
+}, TPropertyMap extends object = TObject extends {
+    [writablePropertyMapOverride]?: infer TResolver;
+} ? TResolver extends () => infer TMap ? Extract<NonNullable<TMap>, object> : TObject["__writableProperties__"] : TObject["__writableProperties__"], TName extends Extract<keyof NoInfer<TPropertyMap>, string> = Extract<keyof NoInfer<TPropertyMap>, string>>(obj: TObject, propertyName: TName, jsValue: NoInfer<TPropertyMap>[TName]): void;
+declare function setProperty(obj: object, propertyName: string, descriptor: Descriptor, jsValue: unknown): void;
+export { newObjectWithProperties, getProperty, registerConstructProperties, setProperty, type ConstructBinding, type ConstructBindings, };
 //# sourceMappingURL=object.d.ts.map

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,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"}
+{"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;AAW5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAIvF;;;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,WAAW,CAChB,OAAO,SAAS;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,EAC1C,YAAY,SAAS,MAAM,GAAG,OAAO,SAAS;IAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,SAAS,CAAA;CAAE,GACnF,SAAS,SAAS,MAAM,MAAM,IAAI,GAC9B,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,gBAAgB,CAAC,GAC7B,OAAO,CAAC,gBAAgB,CAAC,EAC/B,KAAK,SAAS,OAAO,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,EAC3G,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC;AACnE,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC;AAmBzF;;;;;;;;;;;;GAYG;AACH,iBAAS,WAAW,CAChB,OAAO,SAAS;IAAE,sBAAsB,EAAE,MAAM,CAAA;CAAE,EAClD,YAAY,SAAS,MAAM,GAAG,OAAO,SAAS;IAAE,CAAC,2BAA2B,CAAC,CAAC,EAAE,MAAM,SAAS,CAAA;CAAE,GAC3F,SAAS,SAAS,MAAM,MAAM,IAAI,GAC9B,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,wBAAwB,CAAC,GACrC,OAAO,CAAC,wBAAwB,CAAC,EACvC,KAAK,SAAS,OAAO,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,EAC3G,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;AAClF,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;AAiBxG,OAAO,EACH,uBAAuB,EACvB,WAAW,EACX,2BAA2B,EAC3B,WAAW,EACX,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,GACzB,CAAC"}

package/dist/object.js

@@ -3,9 +3,10 @@ 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 { coercePropertyValue, constructPropertyFor } from "./properties.js";
+import { coercePropertyValue, constructPropertyFor, readableObjectPropertyFor, writableObjectPropertyFor, } from "./properties.js";
+import { propertyMapOverride, writablePropertyMapOverride } from "./property-brand.js";
 import { getHandle, registerWrapper } from "./registry.js";
-import { fromValueForDescriptor, newValueForDescriptor, toValue } from "./value.js";
+import { fromObjectPropertyValue, fromValueForDescriptor, newValueForDescriptor, toValue } from "./value.js";
 const declaredBindings = new WeakMap();
 const resolvedBindings = new WeakMap();
 const declarations = { generation: 0 };
@@ -113,34 +114,26 @@ function newObjectWithProperties(gtype, props, wrapper) {
     }
     return wrapper;
 }
-/**
- * Reads a GObject property and converts it to its JavaScript value using the
- * descriptor.
- *
- * @param obj The object to read from.
- * @param propertyName The property name.
- * @param descriptor Describes the property's type.
- */
-function getObjectProperty(obj, propertyName, descriptor) {
+function getProperty(obj, propertyName, descriptor) {
+    if (arguments.length === 2) {
+        const property = readableObjectPropertyFor(obj, propertyName);
+        gObjectGetProperty(getHandle(obj), property.name, property.value);
+        return fromObjectPropertyValue(property.value);
+    }
+    if (descriptor === undefined) {
+        throw new TypeError("getProperty requires a property descriptor when called with three arguments");
+    }
     const value = newValueForDescriptor(descriptor);
     gObjectGetProperty(getHandle(obj), propertyName, 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, 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.
- * @param descriptor Describes the property's type.
- * @param jsValue The value to set.
- */
-function setObjectProperty(obj, propertyName, descriptor, jsValue) {
-    gObjectSetProperty(getHandle(obj), propertyName, toValue(descriptor, jsValue));
+function setProperty(obj, propertyName, descriptorOrValue, jsValue) {
+    if (arguments.length === 3) {
+        const property = writableObjectPropertyFor(obj, propertyName, descriptorOrValue);
+        gObjectSetProperty(getHandle(obj), property.name, property.value);
+        return;
+    }
+    gObjectSetProperty(getHandle(obj), propertyName, toValue(descriptorOrValue, jsValue));
 }
-export { newObjectWithProperties, getObjectProperty, registerConstructProperties, setObjectProperty, };
+export { newObjectWithProperties, getProperty, registerConstructProperties, setProperty, };
 //# sourceMappingURL=object.js.map

package/dist/object.js.map

@@ -1 +1 @@
-{"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"]}
+{"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 {\n    coercePropertyValue,\n    type ConstructProperty,\n    constructPropertyFor,\n    readableObjectPropertyFor,\n    writableObjectPropertyFor,\n} from \"./properties.js\";\nimport { propertyMapOverride, writablePropertyMapOverride } from \"./property-brand.js\";\nimport { getHandle, registerWrapper } from \"./registry.js\";\nimport { fromObjectPropertyValue, 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 getProperty<\n    TObject extends { __properties__: object },\n    TPropertyMap extends object = TObject extends { [propertyMapOverride]?: infer TResolver }\n        ? TResolver extends () => infer TMap\n            ? Extract<NonNullable<TMap>, object>\n            : TObject[\"__properties__\"]\n        : TObject[\"__properties__\"],\n    TName extends Extract<keyof NoInfer<TPropertyMap>, string> = Extract<keyof NoInfer<TPropertyMap>, string>,\n>(obj: TObject, propertyName: TName): NoInfer<TPropertyMap>[TName];\nfunction getProperty(obj: object, propertyName: string, descriptor: Descriptor): unknown;\nfunction getProperty(obj: object, propertyName: string, descriptor?: Descriptor): unknown {\n    if (arguments.length === 2) {\n        const property = readableObjectPropertyFor(obj, propertyName);\n        gObjectGetProperty(getHandle(obj), property.name, property.value);\n\n        return fromObjectPropertyValue(property.value);\n    }\n\n    if (descriptor === undefined) {\n        throw new TypeError(\"getProperty requires a property descriptor when called with three arguments\");\n    }\n\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 setProperty<\n    TObject extends { __writableProperties__: object },\n    TPropertyMap extends object = TObject extends { [writablePropertyMapOverride]?: infer TResolver }\n        ? TResolver extends () => infer TMap\n            ? Extract<NonNullable<TMap>, object>\n            : TObject[\"__writableProperties__\"]\n        : TObject[\"__writableProperties__\"],\n    TName extends Extract<keyof NoInfer<TPropertyMap>, string> = Extract<keyof NoInfer<TPropertyMap>, string>,\n>(obj: TObject, propertyName: TName, jsValue: NoInfer<TPropertyMap>[TName]): void;\nfunction setProperty(obj: object, propertyName: string, descriptor: Descriptor, jsValue: unknown): void;\nfunction setProperty(\n    obj: object,\n    propertyName: string,\n    descriptorOrValue: unknown,\n    jsValue?: unknown,\n): void {\n    if (arguments.length === 3) {\n        const property = writableObjectPropertyFor(obj, propertyName, descriptorOrValue);\n        gObjectSetProperty(getHandle(obj), property.name, property.value);\n\n        return;\n    }\n\n    gObjectSetProperty(getHandle(obj), propertyName, toValue(descriptorOrValue as Descriptor, jsValue));\n}\n\nexport {\n    newObjectWithProperties,\n    getProperty,\n    registerConstructProperties,\n    setProperty,\n    type ConstructBinding,\n    type ConstructBindings,\n};\n"]}

package/dist/properties.d.ts

@@ -21,7 +21,7 @@ type AccessorBase = PropertyCheck & {
 type DeclaredAccessor = AccessorBase & {
     isInterfaceProperty?: false;
     memberName: string;
-    hasGeneratedMember: boolean;
+    hasMemberAccessor: boolean;
 };
 type InterfaceAccessor = AccessorBase & {
     isInterfaceProperty: true;
@@ -61,6 +61,8 @@ declare const newParamSpecOverride: (name: string, source: bigint | AnyClass) =>
  * rather than looking for a generated accessor, which codegen omits when a method shares the name.
  */
 declare function isReadableProperty(gtype: bigint, propertyName: string): boolean;
+declare function readableObjectPropertyFor(instance: object, name: string): ConstructProperty;
+declare function writableObjectPropertyFor(instance: object, name: string, value: unknown): ConstructProperty;
 declare function coercePropertyValue(gtype: bigint, propertyName: string, value: unknown): unknown;
 /**
  * Fits a number to what a GObject property accepts, the way an animation writing a value on every
@@ -86,5 +88,5 @@ declare function buildPropertyDispatch(source: PropertyDispatchSource): Property
  */
 declare function getDeclaredPropertyName(object: object, accessor: string): string | undefined;
 declare function toNativeProperties(properties: Record<string, PropertySpec>): RegisterClassProperty[];
-export { buildPropertyDispatch, coerceObjectProperty, getDeclaredPropertyName, isReadableProperty, coercePropertyValue, constructPropertyFor, GET_PROPERTY_VFUNC, makeGetProperty, makeSetProperty, newParamSpecOverride, SET_PROPERTY_VFUNC, toNativeProperties, type ConstructProperty, type PropertyDispatch, type PropertySpec, };
+export { buildPropertyDispatch, coerceObjectProperty, getDeclaredPropertyName, isReadableProperty, coercePropertyValue, constructPropertyFor, GET_PROPERTY_VFUNC, makeGetProperty, makeSetProperty, newParamSpecOverride, readableObjectPropertyFor, SET_PROPERTY_VFUNC, toNativeProperties, writableObjectPropertyFor, type ConstructProperty, type PropertyDispatch, type PropertySpec, };
 //# sourceMappingURL=properties.d.ts.map

package/dist/properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../src/properties.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../src/properties.ts"],"names":[],"mappings":"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"}

package/dist/properties.js

@@ -23,7 +23,7 @@ const paramSpecDefaultValue = bind(LIB, "g_param_spec_get_default_value", [PARAM
 const paramSpecName = bind(LIB, "g_param_spec_get_name", [PARAM_T], stringT("borrowed"));
 const typeClassRef = bind(LIB, "g_type_class_ref", [biguint64T], CLASS_T);
 const typeClassUnref = bind(LIB, "g_type_class_unref", [CLASS_T], voidT);
-const coercionChecks = new Map();
+const propertyChecks = new Map();
 const classFindProperty = bind(LIB, "g_object_class_find_property", [CLASS_T, stringT("borrowed")], PARAM_T);
 const classListProperties = bind(LIB, "g_object_class_list_properties", [CLASS_T, refT(uint32T)], sizedArrayT(PARAM_T, 1, "full"));
 const defaultInterfaceRef = bind(LIB, "g_type_default_interface_ref", [biguint64T], CLASS_T);
@@ -105,7 +105,10 @@ const findSourceSpec = (source, name) => {
  * @param source The GType, wrapper class or interface declaring the property.
  * @returns Handle of the override spec.
  */
-const newParamSpecOverride = (name, source) => paramSpecOverrideNew(name, findSourceSpec(source, name));
+const newParamSpecOverride = (name, source) => {
+    const canonicalName = canonicalCase(name);
+    return paramSpecOverrideNew(canonicalName, findSourceSpec(source, canonicalName));
+};
 function describeValue(value) {
     if (typeof value === "string") {
         return JSON.stringify(value);
@@ -151,6 +154,18 @@ function assertWritable(instance, check, value) {
     }
     throw new TypeError(propertyMessage(instance, check, refusalTail(check, value, READ_ONLY_REASON)));
 }
+function assertReadable(instance, check) {
+    if (isParamReadable(check.flags)) {
+        return;
+    }
+    throw new TypeError(propertyMessage(instance, check, `cannot read property '${check.propertyName}'; the property is write-only`));
+}
+function assertMutable(instance, check, value) {
+    assertWritable(instance, check, value);
+    if (isParamConstructOnly(check.flags)) {
+        throw new TypeError(propertyMessage(instance, check, refusalTail(check, value, CONSTRUCT_ONLY_REASON)));
+    }
+}
 function writeHeld(check, gValue, value) {
     check.write ??= valueWriterFor(check.valueType);
     check.write(gValue, check.narrowValue(value));
@@ -187,7 +202,7 @@ function isReadableProperty(gtype, propertyName) {
         typeClassUnref(klass);
     }
 }
-function lookupCoercionCheck(gtype, name) {
+function lookupPropertyCheck(gtype, name) {
     const klass = typeClassRef(gtype);
     try {
         const pspec = findPropertySpec(klass, name);
@@ -197,9 +212,27 @@ function lookupCoercionCheck(gtype, name) {
         typeClassUnref(klass);
     }
 }
-function coercionCheckFor(gtype, name) {
-    const checks = coercionChecks.getOrInsertComputed(gtype, () => new Map());
-    return checks.getOrInsertComputed(name, () => lookupCoercionCheck(gtype, name));
+function propertyCheckFor(gtype, name) {
+    const checks = propertyChecks.getOrInsertComputed(gtype, () => new Map());
+    return checks.getOrInsertComputed(name, () => lookupPropertyCheck(gtype, name));
+}
+function objectPropertyCheckFor(instance, name) {
+    const gtype = getInstanceType(instance);
+    const check = typeIsA(gtype, TYPE_OBJECT) ? propertyCheckFor(gtype, name) : null;
+    if (check === null) {
+        throw new TypeError(`${instanceClassName(instance)} has no GObject property named '${name}'`);
+    }
+    return check;
+}
+function readableObjectPropertyFor(instance, name) {
+    const check = objectPropertyCheckFor(instance, name);
+    assertReadable(instance, check);
+    return { name: check.propertyName, value: newValueForType(check.valueType) };
+}
+function writableObjectPropertyFor(instance, name, value) {
+    const check = objectPropertyCheckFor(instance, name);
+    assertMutable(instance, check, value);
+    return { name: check.propertyName, value: checkedValueFor(instance, check, value) };
 }
 function truncateToWhole(check, value) {
     const range = WHOLE_NUMBER_RANGES.get(typeFundamental(check.valueType));
@@ -226,7 +259,7 @@ function coercePropertyValue(gtype, propertyName, value) {
     if (typeof value !== "number" || !Number.isFinite(value)) {
         return value;
     }
-    const check = coercionCheckFor(gtype, propertyName);
+    const check = propertyCheckFor(gtype, propertyName);
     return check === null ? value : coerceNumber(check, value);
 }
 /**
@@ -314,23 +347,39 @@ function checkedSetter(accessor) {
         writeProperty(this, accessor, value);
     };
 }
-function hasOwnMember(prototype, alias) {
-    return Object.getOwnPropertyDescriptor(prototype, alias) !== undefined;
+function memberDescriptorFor(prototype, name) {
+    let current = prototype;
+    while (current !== null) {
+        const descriptor = Object.getOwnPropertyDescriptor(current, name);
+        if (descriptor !== undefined) {
+            return descriptor;
+        }
+        current = Reflect.getPrototypeOf(current);
+    }
+    return undefined;
+}
+function isMemberAccessor(descriptor) {
+    return descriptor !== undefined && ("get" in descriptor || "set" in descriptor);
 }
 function defineAccessor(prototype, descriptor, alias) {
-    if (hasOwnMember(prototype, alias)) {
+    if (Object.getOwnPropertyDescriptor(prototype, alias) !== undefined) {
+        return;
+    }
+    const parent = Reflect.getPrototypeOf(prototype);
+    const inherited = parent === null ? undefined : memberDescriptorFor(parent, alias);
+    if (inherited !== undefined && !isMemberAccessor(inherited)) {
         return;
     }
     Object.defineProperty(prototype, alias, descriptor);
 }
 function installAccessors(klass, accessor) {
     const prototype = klass.prototype;
-    accessor.hasGeneratedMember = !hasOwnMember(prototype, accessor.memberName);
+    accessor.hasMemberAccessor = isMemberAccessor(Object.getOwnPropertyDescriptor(prototype, accessor.memberName));
     const descriptor = {
         configurable: true,
         enumerable: true,
-        get: accessor.hasGeneratedMember ? storedGetter(accessor) : memberGetter(accessor),
-        set: accessor.hasGeneratedMember ? checkedSetter(accessor) : memberSetter(accessor),
+        get: accessor.hasMemberAccessor ? memberGetter(accessor) : storedGetter(accessor),
+        set: accessor.hasMemberAccessor ? memberSetter(accessor) : checkedSetter(accessor),
     };
     for (const alias of accessorNames(accessor.name)) {
         defineAccessor(prototype, descriptor, alias);
@@ -376,7 +425,11 @@ function callMember(instance, member, args) {
     return fn.apply(instance, args);
 }
 function backingMemberFor(instance, accessor) {
-    if (accessor.hasGeneratedMember && !Object.hasOwn(instance, accessor.memberName)) {
+    if (accessor.hasMemberAccessor) {
+        return accessor.memberName;
+    }
+    const descriptor = Object.getOwnPropertyDescriptor(instance, accessor.memberName);
+    if (descriptor === undefined || ("value" in descriptor && typeof descriptor.value === "function")) {
         return undefined;
     }
     return accessor.memberName;
@@ -451,7 +504,7 @@ function buildAccessor(klass, name, pspec) {
         ...checkFor(getHandle(pspec), name),
         memberName: camelCase(name),
         storage: Symbol(`gtkx:property:${name}`),
-        hasGeneratedMember: false,
+        hasMemberAccessor: false,
     };
     installAccessors(klass, accessor);
     return accessor;
@@ -504,5 +557,5 @@ function toNativeProperties(properties) {
         pspec: getHandle(pspec),
     }));
 }
-export { buildPropertyDispatch, coerceObjectProperty, getDeclaredPropertyName, isReadableProperty, coercePropertyValue, constructPropertyFor, GET_PROPERTY_VFUNC, makeGetProperty, makeSetProperty, newParamSpecOverride, SET_PROPERTY_VFUNC, toNativeProperties, };
+export { buildPropertyDispatch, coerceObjectProperty, getDeclaredPropertyName, isReadableProperty, coercePropertyValue, constructPropertyFor, GET_PROPERTY_VFUNC, makeGetProperty, makeSetProperty, newParamSpecOverride, readableObjectPropertyFor, SET_PROPERTY_VFUNC, toNativeProperties, writableObjectPropertyFor, };
 //# sourceMappingURL=properties.js.map