@ts-for-gir/cli 4.0.0-rc.6 → 4.0.0-rc.7

package/bin/ts-for-gir

@@ -7268,7 +7268,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 function getPackageVersion() {
   if (true) {
-    return "4.0.0-rc.6";
+    return "4.0.0-rc.7";
   }
   const currentModulePath = fileURLToPath(import.meta.url);
   const currentDir = dirname(currentModulePath);
@@ -8165,7 +8165,7 @@ import { fileURLToPath as fileURLToPath2 } from "node:url";
 var NEW_LINE_REG_EXP = /[\n\r]+/g;
 function getPackageVersion2() {
   if (true) {
-    return "4.0.0-rc.6";
+    return "4.0.0-rc.7";
   }
   const currentModulePath = fileURLToPath2(import.meta.url);
   const currentDir = dirname2(currentModulePath);
@@ -14393,12 +14393,16 @@ var IntrospectedProperty = class _IntrospectedProperty extends IntrospectedBase
   writable = false;
   readable = true;
   constructOnly;
+  /** GIR default-value attribute: the default value of the property as a string. */
+  defaultValue;
+  /** GIR getter attribute: name of the getter method for this property (used for nullable inference). */
+  getter;
   get namespace() {
     return this.parent.namespace;
   }
   copy(options2) {
     const { name, writable, readable, type, constructOnly, parent } = this;
-    return new _IntrospectedProperty({
+    const prop = new _IntrospectedProperty({
       name: options2?.name ?? name,
       writable,
       readable,
@@ -14406,6 +14410,9 @@ var IntrospectedProperty = class _IntrospectedProperty extends IntrospectedBase
       constructOnly,
       parent: options2?.parent ?? parent
     })._copyBaseProperties(this);
+    prop.defaultValue = this.defaultValue;
+    prop.getter = this.getter;
+    return prop;
   }
   accept(visitor) {
     const node = this.copy({
@@ -14463,6 +14470,11 @@ var IntrospectedProperty = class _IntrospectedProperty extends IntrospectedBase
       property.doc = parseDoc(element);
       property.metadata = parseMetadata(element);
     }
+    property.defaultValue = element.$["default-value"];
+    property.getter = element.$.getter;
+    if (element.$.nullable === "1" || element.$["allow-none"] === "1") {
+      property.type = new NullableType(property.type);
+    }
     return property;
   }
 };
@@ -14655,6 +14667,28 @@ var IntrospectedSignal = class _IntrospectedSignal extends IntrospectedClassMemb
 
 // ../lib/src/gir/introspected-classes.ts
 var log = new ConsoleReporter(true, "gir/introspected-classes", true);
+function hasExtendsShadowOf(cls, prerequisite, name) {
+  let current = cls.resolveParents().extends();
+  while (current) {
+    const node = current.node;
+    if (node !== prerequisite) {
+      const hasOwn = [...node.props, ...node.fields, ...node.members].some((m) => m.name === name);
+      if (hasOwn) return true;
+    }
+    current = current.extends();
+  }
+  return false;
+}
+function resolveNullableProperties(cls) {
+  for (const prop of cls.props) {
+    if (prop.type instanceof NullableType) continue;
+    const getterName = prop.getter ?? `get_${prop.name}`;
+    const getter = cls.members.find((m) => m.name === getterName && !(m instanceof IntrospectedStaticClassFunction));
+    if (getter instanceof IntrospectedClassFunction && getter.return() instanceof NullableType) {
+      prop.type = new NullableType(prop.type);
+    }
+  }
+}
 var IntrospectedClassFunction = class _IntrospectedClassFunction extends IntrospectedBase {
   parameters;
   return_type;
@@ -14665,6 +14699,8 @@ var IntrospectedClassFunction = class _IntrospectedClassFunction extends Introsp
   returnTypeDoc;
   /** If this function was generated from a signal, stores the signal name. */
   signalOrigin;
+  /** GIR glib:finish-func attribute: name of the function that finishes this async operation. */
+  finishFuncName;
   generics = [];
   constructor({
     name,
@@ -14711,6 +14747,7 @@ var IntrospectedClassFunction = class _IntrospectedClassFunction extends Introsp
     });
     fn.generics = [...this.generics];
     fn.returnTypeDoc = this.returnTypeDoc;
+    fn.finishFuncName = this.finishFuncName;
     if (interfaceParent) {
       fn.interfaceParent = interfaceParent;
     }
@@ -14732,6 +14769,7 @@ var IntrospectedClassFunction = class _IntrospectedClassFunction extends Introsp
   static fromXML(element, parent, options2) {
     const fn = IntrospectedFunction.fromXML(element, parent.namespace, options2);
     const { raw_name: name, output_parameters, parameters, return_type, doc: doc2, isIntrospectable: isIntrospectable2 } = fn;
+    const isShadowedBy = element.$["shadowed-by"] != null;
     const classFn = new _IntrospectedClassFunction({
       parent,
       name,
@@ -14739,10 +14777,11 @@ var IntrospectedClassFunction = class _IntrospectedClassFunction extends Introsp
       parameters,
       return_type,
       doc: doc2,
-      isIntrospectable: isIntrospectable2
+      isIntrospectable: isIntrospectable2 && !isShadowedBy
     });
     classFn.returnTypeDoc = fn.returnTypeDoc;
     classFn.generics = [...fn.generics];
+    classFn.finishFuncName = element.$["glib:finish-func"];
     return classFn;
   }
   anyify() {
@@ -14885,6 +14924,7 @@ var IntrospectedStaticClassFunction = class _IntrospectedStaticClassFunction ext
   static fromXML(m, parent, options2) {
     const fn = IntrospectedFunction.fromXML(m, parent.namespace, options2);
     const { raw_name: name, output_parameters, parameters, return_type, doc: doc2, isIntrospectable: isIntrospectable2 } = fn;
+    const isShadowedBy = m.$["shadowed-by"] != null;
     return new _IntrospectedStaticClassFunction({
       parent,
       name,
@@ -14892,7 +14932,7 @@ var IntrospectedStaticClassFunction = class _IntrospectedStaticClassFunction ext
       parameters,
       return_type,
       doc: doc2,
-      isIntrospectable: isIntrospectable2
+      isIntrospectable: isIntrospectable2 && !isShadowedBy
     });
   }
 };
@@ -15211,6 +15251,7 @@ var IntrospectedClass = class _IntrospectedClass extends IntrospectedBaseClass {
       if (extended?.node instanceof _IntrospectedClass) {
         for (const item of getItems(extended.node)) {
           if (items.has(item.name) || !validate3(item)) continue;
+          if (!hasExtendsShadowOf(this, extended.node, item.name)) continue;
           items.set(item.name, item);
         }
       }
@@ -15348,6 +15389,7 @@ var IntrospectedClass = class _IntrospectedClass extends IntrospectedBaseClass {
     _IntrospectedClass.parseBasicProperties(element, clazz, ns, options2);
     _IntrospectedClass.parseResolveNames(element, clazz, ns, name);
     _IntrospectedClass.parseInheritanceAndMembers(element, clazz, ns, options2);
+    resolveNullableProperties(clazz);
     return clazz;
   }
   static parseBasicProperties(element, clazz, ns, options2) {
@@ -15578,6 +15620,7 @@ var IntrospectedInterface = class _IntrospectedInterface extends IntrospectedBas
     _IntrospectedInterface.parseInterfaceBasicProperties(element, iface, namespace, options2);
     _IntrospectedInterface.parseInterfaceResolveNames(element, iface, namespace, name);
     _IntrospectedInterface.parseInterfaceMembers(element, iface, namespace, options2);
+    resolveNullableProperties(iface);
     return iface;
   }
   static parseInterfaceBasicProperties(element, iface, namespace, options2) {
@@ -15948,9 +15991,7 @@ var IntrospectedFunction = class _IntrospectedFunction extends IntrospectedNames
       ({ allowOptions, params }, p) => {
         const { type, isOptional } = p;
         if (allowOptions) {
-          if (type instanceof NullableType) {
-            params.push(p.copy({ isOptional: true }));
-          } else if (!isOptional) {
+          if (!isOptional) {
             params.push(p);
             return { allowOptions: false, params };
           } else {
@@ -17461,6 +17502,9 @@ function generatePromisifyOverloadedSignatures(node, async_parameters, sync_para
 }
 function findFinishMethodInClass(cls, node) {
   const members = node instanceof IntrospectedStaticClassFunction ? [...cls.constructors, ...cls.members.filter((m) => m instanceof IntrospectedStaticClassFunction)] : [...cls.members.filter((m) => !(m instanceof IntrospectedStaticClassFunction))];
+  if (node.finishFuncName) {
+    return members.find((m) => m.name === node.finishFuncName);
+  }
   return members.find(
     (m) => m.name === `${node.name.replace(/_async$/, "")}_finish` || m.name === `${node.name}_finish`
   );
@@ -20172,6 +20216,14 @@ var fixMissingParent = (node) => {
 var removeComplexFields = (node) => {
   const { namespace } = node;
   node.fields = node.fields.filter((f) => {
+    if (f.type instanceof ArrayType) {
+      const elementType = f.type.deepUnwrap();
+      if (elementType instanceof TypeIdentifier) {
+        const classNode = resolveTypeIdentifier(namespace, elementType);
+        return !classNode?.isPrivate;
+      }
+      return true;
+    }
     const type = f.type.deepUnwrap();
     if (type instanceof NativeType) {
       return true;
@@ -20716,7 +20768,7 @@ function checkFunctionConflicts(ns, base, functionElement, conflict_ids, nextTyp
       return false;
     });
   });
-  const hasFieldConflicts = checkFieldPropertyConflicts(base, functionElement.name);
+  const hasFieldConflicts = functionElement instanceof IntrospectedStaticClassFunction ? false : checkFieldPropertyConflicts(base, functionElement.name);
   const hasGObjectConflicts = checkGObjectConflicts(base, functionElement.name);
   const hasConflict = hasParentConflict || hasGObjectConflicts;
   return {
@@ -20950,6 +21002,38 @@ function mergeDescs(descs, comment, indentCount = 1) {
   return def;
 }
 
+// ../lib/src/utils/gir-defaults.ts
+function resolveCEnumConstant(cIdentifier, ns) {
+  const own = ns.enum_constants.get(cIdentifier);
+  if (own) return [ns.namespace, own[0], own[1]];
+  for (const dep of ns.allDependencies) {
+    const depModule = ns.getInstalledImport(dep.namespace);
+    if (!depModule) continue;
+    const entry = depModule.enum_constants.get(cIdentifier);
+    if (entry) return [depModule.namespace, entry[0], entry[1]];
+  }
+  return null;
+}
+function convertSingleCValue(value, ns) {
+  const trimmed = value.trim();
+  if (trimmed === "NULL") return "null";
+  if (trimmed === "TRUE") return "true";
+  if (trimmed === "FALSE") return "false";
+  if (/^-?\d+\.\d+$/.test(trimmed)) {
+    const n = parseFloat(trimmed);
+    if (!Number.isNaN(n)) return String(n);
+  }
+  const entry = resolveCEnumConstant(trimmed, ns);
+  if (entry) return `${entry[0]}.${entry[1]}.${entry[2]}`;
+  return trimmed;
+}
+function convertCDefaultValue(rawValue, ns) {
+  if (rawValue.includes("|")) {
+    return rawValue.split("|").map((part) => convertSingleCValue(part, ns)).join(" | ");
+  }
+  return convertSingleCValue(rawValue, ns);
+}
+
 // ../lib/src/utils/path.ts
 import { dirname as dirname4, resolve as resolve3 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
@@ -23441,6 +23525,12 @@ export const ${node.name}: ${node.name}Namespace & {
     if (tsProp.constructOnly) propTags.push({ tagName: "construct-only", paramName: "", text: "" });
     else if (tsProp.readable && !tsProp.writable) propTags.push({ tagName: "read-only", paramName: "", text: "" });
     else if (tsProp.writable && !tsProp.readable) propTags.push({ tagName: "write-only", paramName: "", text: "" });
+    if (tsProp.defaultValue !== void 0)
+      propTags.push({
+        tagName: "default",
+        paramName: "",
+        text: convertCDefaultValue(tsProp.defaultValue, this.namespace)
+      });
     desc.push(...this.addGirDocComment(tsProp.doc, propTags, indentCount));
     const indent = generateIndent(indentCount);
     const name = generateMemberName(tsProp);
@@ -27576,7 +27666,7 @@ import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { i18n, JSX as JSX8, ReflectionKind as ReflectionKind4 } from "typedoc";
 function getTsForGirVersion() {
   if (true) {
-    return "4.0.0-rc.6";
+    return "4.0.0-rc.7";
   }
   const __dirname3 = dirname8(fileURLToPath5(import.meta.url));
   return JSON.parse(readFileSync7(join14(__dirname3, "..", "..", "package.json"), "utf8")).version;

package/dist-templates/types-locally/package.json

@@ -11,7 +11,7 @@
 		"clear": "rm -rf dist @types"
 	},
 	"devDependencies": {
-		"@ts-for-gir/cli": "^4.0.0-rc.6",
+		"@ts-for-gir/cli": "^4.0.0-rc.7",
 		"esbuild": "^0.28.0",
 		"typescript": "^6.0.2"
 	}

package/dist-templates/types-npm/package.json

@@ -14,10 +14,10 @@
 		"typescript": "^6.0.2"
 	},
 	"dependencies": {
-		"@girs/adw-1": "^1.10.0-4.0.0-rc.5",
-		"@girs/gio-2.0": "^2.88.0-4.0.0-rc.5",
-		"@girs/gjs": "^4.0.0-rc.5",
-		"@girs/glib-2.0": "^2.88.0-4.0.0-rc.5",
-		"@girs/gtk-4.0": "^4.23.0-4.0.0-rc.5"
+		"@girs/adw-1": "^1.10.0-4.0.0-rc.6",
+		"@girs/gio-2.0": "^2.88.0-4.0.0-rc.6",
+		"@girs/gjs": "^4.0.0-rc.6",
+		"@girs/glib-2.0": "^2.88.0-4.0.0-rc.6",
+		"@girs/gtk-4.0": "^4.23.0-4.0.0-rc.6"
 	}
 }

package/dist-templates/types-workspace/package.json

@@ -16,7 +16,7 @@
 		"clear": "rm -rf @girs packages/*/dist"
 	},
 	"devDependencies": {
-		"@ts-for-gir/cli": "^4.0.0-rc.6",
+		"@ts-for-gir/cli": "^4.0.0-rc.7",
 		"typescript": "^6.0.2"
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -55,14 +55,14 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-rc.6",
-    "@ts-for-gir/generator-base": "^4.0.0-rc.6",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-rc.6",
-    "@ts-for-gir/generator-json": "^4.0.0-rc.6",
-    "@ts-for-gir/generator-typescript": "^4.0.0-rc.6",
-    "@ts-for-gir/lib": "^4.0.0-rc.6",
-    "@ts-for-gir/reporter": "^4.0.0-rc.6",
-    "@ts-for-gir/tsconfig": "^4.0.0-rc.6",
+    "@gi.ts/parser": "^4.0.0-rc.7",
+    "@ts-for-gir/generator-base": "^4.0.0-rc.7",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-rc.7",
+    "@ts-for-gir/generator-json": "^4.0.0-rc.7",
+    "@ts-for-gir/generator-typescript": "^4.0.0-rc.7",
+    "@ts-for-gir/lib": "^4.0.0-rc.7",
+    "@ts-for-gir/reporter": "^4.0.0-rc.7",
+    "@ts-for-gir/tsconfig": "^4.0.0-rc.7",
     "@types/ejs": "^3.1.5",
     "@types/inquirer": "^9.0.9",
     "@types/node": "^25.6.0",
@@ -72,7 +72,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^8.4.2",
-    "@ts-for-gir/templates": "^4.0.0-rc.6",
+    "@ts-for-gir/templates": "^4.0.0-rc.7",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.1",
     "ejs": "^5.0.2",