@gtkx/ffi 0.6.1 → 0.7.0

package/dist/native.d.ts

@@ -21,18 +21,29 @@ export declare const events: EventEmitter<NativeEventMap>;
  * @throws Error if no registered class is found in the type hierarchy
  */
 export declare function getObject<T extends NativeObject = NativeObject>(id: unknown): T;
+/**
+ * Wraps a native boxed type pointer in a class instance.
+ * Unlike getObject(), this does NOT call typeNameFromInstance() because boxed
+ * types don't have embedded type information like GObjects do.
+ * @param id - The native pointer to wrap
+ * @param glibTypeName - The GLib type name (e.g., "GdkRGBA")
+ * @returns A new instance with the pointer attached
+ * @throws Error if the type is not registered
+ */
+export declare function getBoxed<T extends NativeObject = NativeObject>(id: unknown, glibTypeName: string): T;
 type TypeWithGlibTypeName<T extends NativeObject> = {
     glibTypeName: string;
     prototype: T;
+    fromPtr(ptr: unknown): T;
 };
 /**
- * Attempts to cast an object to a specific interface or class type.
+ * Wraps a native pointer as an interface instance.
  * Returns null if the object does not implement the requested interface.
- * @param obj - The object to get the interface from
- * @param targetType - The interface or class type to cast to
- * @returns The object typed as the target type, or null if not implemented
+ * @param id - The native pointer to wrap
+ * @param targetType - The interface type to cast to
+ * @returns A new instance with the correct prototype, or null if not implemented
  */
-export declare const getInterface: <T extends NativeObject>(obj: NativeObject, targetType: TypeWithGlibTypeName<T>) => T | null;
+export declare const getInterface: <T extends NativeObject>(id: unknown, targetType: TypeWithGlibTypeName<T>) => T | null;
 /**
  * Starts the GTK application with the given application ID.
  * Sets up a keep-alive timer to prevent Node.js from exiting.

package/dist/native.js

@@ -42,7 +42,14 @@ const findRegisteredClass = (glibTypeName) => {
  * @throws Error if no registered class is found in the type hierarchy
  */
 export function getObject(id) {
-    const runtimeTypeName = typeNameFromInstance(getObjectId(id));
+    if (id === null || id === undefined) {
+        throw new Error("getObject: id cannot be null or undefined");
+    }
+    const objectId = getObjectId(id);
+    if (objectId === null || objectId === undefined) {
+        throw new Error("getObject: failed to get object ID from input");
+    }
+    const runtimeTypeName = typeNameFromInstance(objectId);
     const cls = findRegisteredClass(runtimeTypeName);
     if (!cls) {
         throw new Error(`Unknown GLib type: ${runtimeTypeName}. Make sure the class is registered.`);
@@ -52,20 +59,41 @@ export function getObject(id) {
     return instance;
 }
 /**
- * Attempts to cast an object to a specific interface or class type.
+ * Wraps a native boxed type pointer in a class instance.
+ * Unlike getObject(), this does NOT call typeNameFromInstance() because boxed
+ * types don't have embedded type information like GObjects do.
+ * @param id - The native pointer to wrap
+ * @param glibTypeName - The GLib type name (e.g., "GdkRGBA")
+ * @returns A new instance with the pointer attached
+ * @throws Error if the type is not registered
+ */
+export function getBoxed(id, glibTypeName) {
+    if (id === null || id === undefined) {
+        throw new Error("getBoxed: id cannot be null or undefined");
+    }
+    const cls = getClassByTypeName(glibTypeName);
+    if (!cls) {
+        throw new Error(`Unknown boxed type: ${glibTypeName}. Make sure the class is registered.`);
+    }
+    const instance = Object.create(cls.prototype);
+    instance.id = id;
+    return instance;
+}
+/**
+ * Wraps a native pointer as an interface instance.
  * Returns null if the object does not implement the requested interface.
- * @param obj - The object to get the interface from
- * @param targetType - The interface or class type to cast to
- * @returns The object typed as the target type, or null if not implemented
+ * @param id - The native pointer to wrap
+ * @param targetType - The interface type to cast to
+ * @returns A new instance with the correct prototype, or null if not implemented
  */
-export const getInterface = (obj, targetType) => {
+export const getInterface = (id, targetType) => {
     const targetGType = typeFromName(targetType.glibTypeName);
     if (targetGType === 0)
         return null;
-    const objId = getObjectId(obj.id);
+    const objId = getObjectId(id);
     if (!typeCheckInstanceIsA(objId, targetGType))
         return null;
-    return obj;
+    return targetType.fromPtr(id);
 };
 const keepAlive = () => {
     keepAliveTimeout = setTimeout(() => keepAlive(), 2147483647);
@@ -88,11 +116,15 @@ export const start = (appId, flags) => {
     try {
         initAdwaita();
     }
-    catch { }
+    catch {
+        // Adwaita is optional - silently continue if not available
+    }
     try {
         initGtkSource();
     }
-    catch { }
+    catch {
+        // GtkSourceView is optional - silently continue if not available
+    }
     keepAlive();
     return currentApp;
 };
@@ -124,7 +156,9 @@ export const stop = () => {
     try {
         finalizeGtkSource();
     }
-    catch { }
+    catch {
+        // GtkSourceView finalization is optional - silently continue if not available
+    }
     nativeStop();
     currentApp = null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/ffi",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Generated TypeScript FFI bindings for GTK4 libraries",
   "keywords": [
     "gtk",
@@ -46,10 +46,10 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/native": "0.6.1"
+    "@gtkx/native": "0.7.0"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.6.1"
+    "@gtkx/gir": "0.7.0"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",