@gtkx/gir 0.13.3 → 0.15.0

package/dist/index.d.ts

@@ -22,6 +22,6 @@
  */
 export { INTRINSIC_TYPES, isIntrinsicType, isNumericType, isStringType, isVoidType, NUMERIC_TYPES, STRING_TYPES, VOID_TYPES, } from "./intrinsics.js";
 export { GirRepository } from "./repository.js";
-export type { ContainerType, QualifiedName, TypeKind, } from "./types.js";
-export { GirCallback, GirClass, GirConstant, GirConstructor, GirEnumeration, GirEnumerationMember, GirField, GirFunction, GirInterface, GirMethod, GirNamespace, GirParameter, GirProperty, GirRecord, GirSignal, GirType, parseQualifiedName, qualifiedName, } from "./types.js";
+export type { ContainerType, DefaultValue, QualifiedName, TypeKind, } from "./types.js";
+export { GirCallback, GirClass, GirConstant, GirConstructor, GirEnumeration, GirEnumerationMember, GirField, GirFunction, GirInterface, GirMethod, GirNamespace, GirParameter, GirProperty, GirRecord, GirSignal, GirType, parseDefaultValue, parseQualifiedName, qualifiedName, } from "./types.js";
 export { toCamelCase, toPascalCase } from "./utils.js";

package/dist/index.js

@@ -22,5 +22,5 @@
  */
 export { INTRINSIC_TYPES, isIntrinsicType, isNumericType, isStringType, isVoidType, NUMERIC_TYPES, STRING_TYPES, VOID_TYPES, } from "./intrinsics.js";
 export { GirRepository } from "./repository.js";
-export { GirCallback, GirClass, GirConstant, GirConstructor, GirEnumeration, GirEnumerationMember, GirField, GirFunction, GirInterface, GirMethod, GirNamespace, GirParameter, GirProperty, GirRecord, GirSignal, GirType, parseQualifiedName, qualifiedName, } from "./types.js";
+export { GirCallback, GirClass, GirConstant, GirConstructor, GirEnumeration, GirEnumerationMember, GirField, GirFunction, GirInterface, GirMethod, GirNamespace, GirParameter, GirProperty, GirRecord, GirSignal, GirType, parseDefaultValue, parseQualifiedName, qualifiedName, } from "./types.js";
 export { toCamelCase, toPascalCase } from "./utils.js";

package/dist/internal/normalizer.js

@@ -7,7 +7,7 @@
  * @internal
  */
 import { isIntrinsicType } from "../intrinsics.js";
-import { GirCallback, GirClass, GirConstant, GirConstructor, GirEnumeration, GirEnumerationMember, GirField, GirFunction, GirInterface, GirMethod, GirNamespace, GirParameter, GirProperty, GirRecord, GirSignal, GirType, qualifiedName, } from "../types.js";
+import { GirCallback, GirClass, GirConstant, GirConstructor, GirEnumeration, GirEnumerationMember, GirField, GirFunction, GirInterface, GirMethod, GirNamespace, GirParameter, GirProperty, GirRecord, GirSignal, GirType, parseDefaultValue, qualifiedName, } from "../types.js";
 /**
  * Normalizes a raw namespace into a normalized namespace.
  */
@@ -274,6 +274,7 @@ const normalizeEnumeration = (raw, currentNamespace) => {
             cIdentifier: m.cIdentifier,
             doc: m.doc,
         })),
+        glibGetType: raw.glibGetType,
         doc: raw.doc,
     });
 };
@@ -382,7 +383,7 @@ const normalizeProperty = (raw, currentNamespace, ctx) => {
         readable: raw.readable ?? true,
         writable: raw.writable ?? false,
         constructOnly: raw.constructOnly ?? false,
-        hasDefault: raw.hasDefault ?? false,
+        defaultValue: parseDefaultValue(raw.defaultValueRaw),
         getter: raw.getter,
         setter: raw.setter,
         doc: raw.doc,

package/dist/internal/parser.js

@@ -255,7 +255,7 @@ export class RawGirParser {
                 direction: String(param["@_direction"] ?? "in") || "in",
                 callerAllocates: callerAllocates === "1",
                 nullable: param["@_nullable"] === "1",
-                optional: param["@_allow-none"] === "1",
+                optional: param["@_allow-none"] === "1" || param["@_optional"] === "1",
                 scope: scope,
                 closure: closure !== undefined ? parseInt(closure, 10) : undefined,
                 destroy: destroy !== undefined ? parseInt(destroy, 10) : undefined,
@@ -389,7 +389,7 @@ export class RawGirParser {
                 readable: prop["@_readable"] !== "0",
                 writable: prop["@_writable"] === "1",
                 constructOnly: prop["@_construct-only"] === "1",
-                hasDefault: prop["@_default-value"] !== undefined,
+                defaultValueRaw: prop["@_default-value"] !== undefined ? String(prop["@_default-value"]) : undefined,
                 getter,
                 setter,
                 doc: extractDoc(prop),
@@ -461,12 +461,16 @@ export class RawGirParser {
         if (!enumerations || !Array.isArray(enumerations)) {
             return [];
         }
-        return enumerations.map((enumeration) => ({
-            name: String(enumeration["@_name"] ?? ""),
-            cType: String(enumeration["@_c:type"] ?? ""),
-            members: this.parseEnumerationMembers(ensureArray(enumeration.member)),
-            doc: extractDoc(enumeration),
-        }));
+        return enumerations.map((enumeration) => {
+            const glibGetType = enumeration["@_glib:get-type"];
+            return {
+                name: String(enumeration["@_name"] ?? ""),
+                cType: String(enumeration["@_c:type"] ?? ""),
+                members: this.parseEnumerationMembers(ensureArray(enumeration.member)),
+                glibGetType: typeof glibGetType === "string" ? glibGetType : undefined,
+                doc: extractDoc(enumeration),
+            };
+        });
     }
     parseEnumerationMembers(members) {
         if (!members || !Array.isArray(members)) {

package/dist/internal/raw-types.d.ts

@@ -202,7 +202,7 @@ export type RawProperty = {
     readable?: boolean;
     writable?: boolean;
     constructOnly?: boolean;
-    hasDefault?: boolean;
+    defaultValueRaw?: string;
     getter?: string;
     setter?: string;
     doc?: string;
@@ -224,6 +224,7 @@ export type RawEnumeration = {
     name: string;
     cType: string;
     members: RawEnumerationMember[];
+    glibGetType?: string;
     doc?: string;
 };
 /**

package/dist/types.d.ts

@@ -31,6 +31,31 @@ export type TypeKind = "class" | "interface" | "record" | "enum" | "flags" | "ca
  * Container type discriminator for generic GLib containers.
  */
 export type ContainerType = "ghashtable" | "gptrarray" | "garray" | "glist" | "gslist";
+/**
+ * Parsed default value from GIR property definitions.
+ */
+export type DefaultValue = {
+    kind: "null";
+} | {
+    kind: "boolean";
+    value: boolean;
+} | {
+    kind: "number";
+    value: number;
+} | {
+    kind: "string";
+    value: string;
+} | {
+    kind: "enum";
+    cIdentifier: string;
+} | {
+    kind: "unknown";
+    raw: string;
+};
+/**
+ * Parses a raw default value string from GIR into a typed DefaultValue.
+ */
+export declare function parseDefaultValue(raw: string | undefined): DefaultValue | null;
 type RepositoryLike = {
     resolveClass(name: QualifiedName): GirClass | null;
     resolveInterface(name: QualifiedName): GirInterface | null;
@@ -261,12 +286,14 @@ export declare class GirEnumeration {
     readonly qualifiedName: QualifiedName;
     readonly cType: string;
     readonly members: GirEnumerationMember[];
+    readonly glibGetType?: string;
     readonly doc?: string;
     constructor(data: {
         name: string;
         qualifiedName: QualifiedName;
         cType: string;
         members: GirEnumerationMember[];
+        glibGetType?: string;
         doc?: string;
     });
     /** Finds a member by name. */
@@ -477,7 +504,7 @@ export declare class GirProperty {
     readonly readable: boolean;
     readonly writable: boolean;
     readonly constructOnly: boolean;
-    readonly hasDefault: boolean;
+    readonly defaultValue: DefaultValue | null;
     readonly getter?: string;
     readonly setter?: string;
     readonly doc?: string;
@@ -487,11 +514,12 @@ export declare class GirProperty {
         readable: boolean;
         writable: boolean;
         constructOnly: boolean;
-        hasDefault: boolean;
+        defaultValue: DefaultValue | null;
         getter?: string;
         setter?: string;
         doc?: string;
     });
+    get hasDefault(): boolean;
     /** True if readable but not writable. */
     isReadOnly(): boolean;
     /** True if writable but not readable. */

package/dist/types.js

@@ -21,6 +21,34 @@ export const parseQualifiedName = (qn) => {
         name: qn.slice(dot + 1),
     };
 };
+/**
+ * Parses a raw default value string from GIR into a typed DefaultValue.
+ */
+export function parseDefaultValue(raw) {
+    if (raw === undefined) {
+        return null;
+    }
+    if (raw === "NULL") {
+        return { kind: "null" };
+    }
+    if (raw === "TRUE") {
+        return { kind: "boolean", value: true };
+    }
+    if (raw === "FALSE") {
+        return { kind: "boolean", value: false };
+    }
+    const num = Number(raw);
+    if (!Number.isNaN(num)) {
+        return { kind: "number", value: num };
+    }
+    if (raw.startsWith('"') && raw.endsWith('"')) {
+        return { kind: "string", value: raw.slice(1, -1) };
+    }
+    if (/^[A-Z][A-Z0-9_]*$/.test(raw)) {
+        return { kind: "enum", cIdentifier: raw };
+    }
+    return { kind: "unknown", raw };
+}
 /**
  * Normalized namespace containing all resolved types.
  */
@@ -384,12 +412,14 @@ export class GirEnumeration {
     qualifiedName;
     cType;
     members;
+    glibGetType;
     doc;
     constructor(data) {
         this.name = data.name;
         this.qualifiedName = data.qualifiedName;
         this.cType = data.cType;
         this.members = data.members;
+        this.glibGetType = data.glibGetType;
         this.doc = data.doc;
     }
     /** Finds a member by name. */
@@ -641,7 +671,7 @@ export class GirProperty {
     readable;
     writable;
     constructOnly;
-    hasDefault;
+    defaultValue;
     getter;
     setter;
     doc;
@@ -651,11 +681,14 @@ export class GirProperty {
         this.readable = data.readable;
         this.writable = data.writable;
         this.constructOnly = data.constructOnly;
-        this.hasDefault = data.hasDefault;
+        this.defaultValue = data.defaultValue;
         this.getter = data.getter;
         this.setter = data.setter;
         this.doc = data.doc;
     }
+    get hasDefault() {
+        return this.defaultValue !== null;
+    }
     /** True if readable but not writable. */
     isReadOnly() {
         return this.readable && !this.writable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/gir",
-  "version": "0.13.3",
+  "version": "0.15.0",
   "description": "GObject Introspection file parser for GTKX",
   "keywords": [
     "gtkx",