@gtkx/ffi 0.4.0 → 0.4.3

package/dist/generated/harfbuzz/functions.js

@@ -1214,14 +1214,12 @@ export const bufferGetSegmentProperties = (buffer, props) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_segment_properties_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_segment_properties_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: props,
+            value: props?.id ?? props,
         },
     ], { type: "undefined" });
 };
@@ -2921,25 +2919,21 @@ export const faceCollectNominalGlyphMapping = (face, mapping, unicodes) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_map_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_map_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: mapping,
+            value: mapping?.id ?? mapping,
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: unicodes,
+            value: unicodes?.id ?? unicodes,
             optional: true,
         },
     ], { type: "undefined" });
@@ -2963,14 +2957,12 @@ export const faceCollectUnicodes = (face, out) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: out,
+            value: out?.id ?? out,
         },
     ], { type: "undefined" });
 };
@@ -2993,14 +2985,12 @@ export const faceCollectVariationSelectors = (face, out) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: out,
+            value: out?.id ?? out,
         },
     ], { type: "undefined" });
 };
@@ -3028,14 +3018,12 @@ export const faceCollectVariationUnicodes = (face, variationSelector, out) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: out,
+            value: out?.id ?? out,
         },
     ], { type: "undefined" });
 };
@@ -3632,14 +3620,12 @@ export const featureFromString = (str, len, feature) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_feature_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_feature_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: feature,
+            value: feature?.id ?? feature,
         },
     ], { type: "int", size: 64, unsigned: true });
 };
@@ -8237,14 +8223,12 @@ export const otLayoutCollectFeatures = (face, tableTag, featureIndexes, scripts,
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: featureIndexes,
+            value: featureIndexes?.id ?? featureIndexes,
         },
     ], { type: "undefined" });
 };
@@ -8282,14 +8266,12 @@ export const otLayoutCollectFeaturesMap = (face, tableTag, scriptIndex, language
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_map_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_map_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: featureMap,
+            value: featureMap?.id ?? featureMap,
         },
     ], { type: "undefined" });
 };
@@ -8347,14 +8329,12 @@ export const otLayoutCollectLookups = (face, tableTag, lookupIndexes, scripts, l
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: lookupIndexes,
+            value: lookupIndexes?.id ?? lookupIndexes,
         },
     ], { type: "undefined" });
 };
@@ -8985,14 +8965,12 @@ export const otLayoutGetGlyphsInClass = (face, klass, glyphs) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
     ], { type: "undefined" });
 };
@@ -9469,50 +9447,42 @@ export const otLayoutLookupCollectGlyphs = (face, tableTag, lookupIndex, glyphsB
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphsBefore,
+            value: glyphsBefore?.id ?? glyphsBefore,
             optional: true,
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphsInput,
+            value: glyphsInput?.id ?? glyphsInput,
             optional: true,
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphsAfter,
+            value: glyphsAfter?.id ?? glyphsAfter,
             optional: true,
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphsOutput,
+            value: glyphsOutput?.id ?? glyphsOutput,
             optional: true,
         },
     ], { type: "undefined" });
@@ -9627,14 +9597,12 @@ export const otLayoutLookupSubstituteClosure = (face, lookupIndex, glyphs) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
     ], { type: "undefined" });
 };
@@ -9705,14 +9673,12 @@ export const otLayoutLookupsSubstituteClosure = (face, lookups, glyphs) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
     ], { type: "undefined" });
 };
@@ -11018,14 +10984,12 @@ export const otShapeGlyphsClosure = (font, buffer, features, numFeatures, glyphs
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
     ], { type: "undefined" });
 };
@@ -11053,14 +11017,12 @@ export const otShapePlanCollectLookups = (shapePlan, tableTag, lookupIndexes) =>
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_set_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_set_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: lookupIndexes,
+            value: lookupIndexes?.id ?? lookupIndexes,
         },
     ], { type: "undefined" });
 };
@@ -11317,14 +11279,12 @@ export const otVarFindAxisInfo = (face, axisTag, axisInfo) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "hb_ot_var_axis_info_t",
-                    lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "hb_ot_var_axis_info_t",
+                lib: "libharfbuzz-gobject.so.0,libharfbuzz.so.0",
             },
-            value: axisInfo,
+            value: axisInfo?.id ?? axisInfo,
         },
     ], { type: "int", size: 64, unsigned: true });
 };

package/dist/generated/pango/attr-iterator.d.ts

@@ -2,6 +2,7 @@ import { Ref } from "@gtkx/native";
 import { AttrType } from "./enums.js";
 import { Attribute } from "./attribute.js";
 import { FontDescription } from "./font-description.js";
+import { Language } from "./language.js";
 /**
  * A `PangoAttrIterator` is used to iterate through a `PangoAttrList`.
  *
@@ -46,7 +47,7 @@ export declare class AttrIterator {
      * @param language - location to store language tag
      * @param extraAttrs - location in which to store a list of non-font attributes
      */
-    getFont(desc: FontDescription, language?: Ref<unknown> | null, extraAttrs?: Ref<Attribute[]> | null): void;
+    getFont(desc: FontDescription, language?: Ref<Language> | null, extraAttrs?: Ref<Attribute[]> | null): void;
     /**
      * Advance the iterator until the next change of style.
      */

package/dist/generated/pango/attr-iterator.js

@@ -171,6 +171,8 @@ export class AttrIterator {
                 optional: true,
             },
         ], { type: "undefined" });
+        if (language)
+            language.value = getObject(language.value);
     }
     /**
      * Advance the iterator until the next change of style.

package/dist/generated/pango/functions.d.ts

@@ -4,6 +4,7 @@ import { AttrIterator } from "./attr-iterator.js";
 import { AttrList } from "./attr-list.js";
 import { Attribute } from "./attribute.js";
 import { FontDescription } from "./font-description.js";
+import { GlyphString } from "./glyph-string.js";
 import { Item } from "./item.js";
 import { Language } from "./language.js";
 import { Matrix } from "./matrix.js";
@@ -672,7 +673,7 @@ export declare const log2visGetEmbeddingLevels: (text: string, length: number, p
  * @param text - address of return location for text with tags stripped
  * @param accelChar - address of return location for accelerator char
  */
-export declare const markupParserFinish: (context: GLib.MarkupParseContext, attrList?: Ref<unknown> | null, text?: Ref<string> | null, accelChar?: Ref<number> | null) => boolean;
+export declare const markupParserFinish: (context: GLib.MarkupParseContext, attrList?: Ref<AttrList> | null, text?: Ref<string> | null, accelChar?: Ref<number> | null) => boolean;
 /**
  * Incrementally parses marked-up text to create a plain-text string
  * and an attribute list.
@@ -740,7 +741,7 @@ export declare const parseEnum: (type: number, warn: boolean, str?: string | nul
  * @param text - address of return location for text with tags stripped
  * @param accelChar - address of return location for accelerator char
  */
-export declare const parseMarkup: (markupText: string, length: number, accelMarker: number, attrList?: Ref<unknown> | null, text?: Ref<string> | null, accelChar?: Ref<number> | null) => boolean;
+export declare const parseMarkup: (markupText: string, length: number, accelMarker: number, attrList?: Ref<AttrList> | null, text?: Ref<string> | null, accelChar?: Ref<number> | null) => boolean;
 /**
  * Parses a font stretch.
  *
@@ -925,7 +926,7 @@ export declare const scriptGetSampleLanguage: (script: Script) => Language | nul
  * @param analysis - `PangoAnalysis` structure from [func@Pango.itemize]
  * @param glyphs - glyph string in which to store results
  */
-export declare const shape: (text: string, length: number, analysis: number, glyphs: Ref<unknown>) => void;
+export declare const shape: (text: string, length: number, analysis: number, glyphs: GlyphString) => void;
 /**
  * Convert the characters in `text` into glyphs.
  *
@@ -955,7 +956,7 @@ export declare const shape: (text: string, length: number, analysis: number, gly
  * @param analysis - `PangoAnalysis` structure from [func@Pango.itemize].
  * @param glyphs - glyph string in which to store results.
  */
-export declare const shapeFull: (itemText: string, itemLength: number, paragraphLength: number, analysis: number, glyphs: Ref<unknown>, paragraphText?: string | null) => void;
+export declare const shapeFull: (itemText: string, itemLength: number, paragraphLength: number, analysis: number, glyphs: GlyphString, paragraphText?: string | null) => void;
 /**
  * Convert the characters in `item` into glyphs.
  *
@@ -977,7 +978,7 @@ export declare const shapeFull: (itemText: string, itemLength: number, paragraph
  * @param glyphs - glyph string in which to store results
  * @param flags - flags influencing the shaping process
  */
-export declare const shapeItem: (item: Item, paragraphLength: number, glyphs: Ref<unknown>, flags: ShapeFlags, paragraphText?: string | null, logAttrs?: number | null) => void;
+export declare const shapeItem: (item: Item, paragraphLength: number, glyphs: GlyphString, flags: ShapeFlags, paragraphText?: string | null, logAttrs?: number | null) => void;
 /**
  * Convert the characters in `text` into glyphs.
  *
@@ -1005,7 +1006,7 @@ export declare const shapeItem: (item: Item, paragraphLength: number, glyphs: Re
  * @param glyphs - glyph string in which to store results
  * @param flags - flags influencing the shaping process
  */
-export declare const shapeWithFlags: (itemText: string, itemLength: number, paragraphLength: number, analysis: number, glyphs: Ref<unknown>, flags: ShapeFlags, paragraphText?: string | null) => void;
+export declare const shapeWithFlags: (itemText: string, itemLength: number, paragraphLength: number, analysis: number, glyphs: GlyphString, flags: ShapeFlags, paragraphText?: string | null) => void;
 /**
  * Skips 0 or more characters of white space.
  * @param pos - in/out string position

package/dist/generated/pango/functions.js

@@ -1740,6 +1740,8 @@ export const markupParserFinish = (context, attrList, text, accelChar) => {
     if (error.value !== null) {
         throw new NativeError(error.value);
     }
+    if (attrList)
+        attrList.value = getObject(attrList.value);
     return result;
 };
 /**
@@ -1906,6 +1908,8 @@ export const parseMarkup = (markupText, length, accelMarker, attrList, text, acc
     if (error.value !== null) {
         throw new NativeError(error.value);
     }
+    if (attrList)
+        attrList.value = getObject(attrList.value);
     return result;
 };
 /**
@@ -2306,14 +2310,12 @@ export const shape = (text, length, analysis, glyphs) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "PangoGlyphString",
-                    lib: "libpango-1.0.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "PangoGlyphString",
+                lib: "libpango-1.0.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
     ], { type: "undefined" });
 };
@@ -2371,14 +2373,12 @@ export const shapeFull = (itemText, itemLength, paragraphLength, analysis, glyph
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "PangoGlyphString",
-                    lib: "libpango-1.0.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "PangoGlyphString",
+                lib: "libpango-1.0.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
     ], { type: "undefined" });
 };
@@ -2430,14 +2430,12 @@ export const shapeItem = (item, paragraphLength, glyphs, flags, paragraphText, l
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "PangoGlyphString",
-                    lib: "libpango-1.0.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "PangoGlyphString",
+                lib: "libpango-1.0.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
         {
             type: { type: "int", size: 32, unsigned: false },
@@ -2497,14 +2495,12 @@ export const shapeWithFlags = (itemText, itemLength, paragraphLength, analysis,
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "PangoGlyphString",
-                    lib: "libpango-1.0.so.0",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "PangoGlyphString",
+                lib: "libpango-1.0.so.0",
             },
-            value: glyphs,
+            value: glyphs?.id ?? glyphs,
         },
         {
             type: { type: "int", size: 32, unsigned: false },

package/dist/registry.d.ts

@@ -1,11 +1,11 @@
 /**
- * Base interface for all native GLib/GTK objects.
- * All generated classes implement this interface.
+ * Base type for all native GLib/GTK objects.
+ * All generated classes implement this type.
  */
-export interface NativeObject {
+export type NativeObject = {
     /** The native pointer/handle to the underlying GLib object */
     id: unknown;
-}
+};
 type GObjectClass = {
     glibTypeName: string;
     prototype: NativeObject;

package/package.json

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