@ts-for-gir/cli 4.0.0-beta.42 → 4.0.0-beta.43

package/bin/ts-for-gir

@@ -7270,7 +7270,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 function getPackageVersion() {
   if (true) {
-    return "4.0.0-beta.42";
+    return "4.0.0-beta.43";
   }
   const currentModulePath = fileURLToPath(import.meta.url);
   const currentDir = dirname(currentModulePath);
@@ -8166,7 +8166,7 @@ import { fileURLToPath as fileURLToPath2 } from "node:url";
 var NEW_LINE_REG_EXP = /[\n\r]+/g;
 function getPackageVersion2() {
   if (true) {
-    return "4.0.0-beta.42";
+    return "4.0.0-beta.43";
   }
   const currentModulePath = fileURLToPath2(import.meta.url);
   const currentDir = dirname2(currentModulePath);
@@ -8198,7 +8198,7 @@ __export(parser_exports, {
   parseGir: () => parseGir
 });
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/util.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/util.js
 var nameStartChar = ":A-Za-z_\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
 var nameChar = nameStartChar + "\\-.\\d\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
 var nameRegexp = "[" + nameStartChar + "][" + nameChar + "]*";
@@ -8239,7 +8239,7 @@ var DANGEROUS_PROPERTY_NAMES = [
 ];
 var criticalProperties = ["__proto__", "constructor", "prototype"];
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/validator.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/validator.js
 var defaultOptions = {
   allowBooleanAttributes: false,
   //A tag can have attributes without any value
@@ -8545,7 +8545,7 @@ function getPositionFromMatch(match) {
   return match.startIndex + match[1].length;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
 var defaultOnDangerousProperty = (name) => {
   if (DANGEROUS_PROPERTY_NAMES.includes(name)) {
     return "__" + name;
@@ -8675,7 +8675,7 @@ var buildOptions = function(options2) {
   return built;
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
 var METADATA_SYMBOL;
 if (typeof Symbol !== "function") {
   METADATA_SYMBOL = "@@xmlMetadata";
@@ -8709,7 +8709,7 @@ var XmlNode = class {
   }
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
 var DocTypeReader = class {
   constructor(options2) {
     this.suppressValidationErr = !options2;
@@ -8989,7 +8989,7 @@ function validateEntityName(name) {
     throw new Error(`Invalid entity name ${name}`);
 }
 
-// ../../.yarn/cache/strnum-npm-2.2.1-b3a08c1c56-c553d83e1a.zip/node_modules/strnum/strnum.js
+// ../../.yarn/cache/strnum-npm-2.2.2-816fd1e52f-c55813cfde.zip/node_modules/strnum/strnum.js
 var hexRegex = /^[-+]?0x[a-fA-F0-9]+$/;
 var numRegex = /^([\-\+])?(0*)([0-9]*(\.[0-9]*)?)$/;
 var consider = {
@@ -9006,8 +9006,9 @@ function toNumber(str, options2 = {}) {
   options2 = Object.assign({}, consider, options2);
   if (!str || typeof str !== "string") return str;
   let trimmedStr = str.trim();
-  if (options2.skipLike !== void 0 && options2.skipLike.test(trimmedStr)) return str;
-  else if (str === "0") return 0;
+  if (trimmedStr.length === 0) return str;
+  else if (options2.skipLike !== void 0 && options2.skipLike.test(trimmedStr)) return str;
+  else if (trimmedStr === "0") return 0;
   else if (options2.hex && hexRegex.test(trimmedStr)) {
     return parse_int(trimmedStr, 16);
   } else if (!isFinite(trimmedStr)) {
@@ -9110,7 +9111,7 @@ function handleInfinity(str, num, options2) {
   }
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/ignoreAttributes.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/ignoreAttributes.js
 function getIgnoreAttributesFn(ignoreAttributes) {
   if (typeof ignoreAttributes === "function") {
     return ignoreAttributes;
@@ -9664,7 +9665,7 @@ var Matcher = class {
   }
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
 function extractRawAttributes(prefixedAttrs, options2) {
   if (!prefixedAttrs) return {};
   const attrs = options2.attributesGroupName ? prefixedAttrs[options2.attributesGroupName] : prefixedAttrs;
@@ -10317,7 +10318,7 @@ function sanitizeName(name, options2) {
   return name;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/xmlparser/node2json.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/xmlparser/node2json.js
 var METADATA_SYMBOL2 = XmlNode.getMetaDataSymbol();
 function stripAttributePrefix(attrs, prefix) {
   if (!attrs || typeof attrs !== "object") return {};
@@ -10426,7 +10427,7 @@ function isLeafTag(obj, options2) {
   return false;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.5.8-4d571da1cb-888f9a5d34.zip/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.5.9-0801b67a48-5f1a1a8b52.zip/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
 var XMLParser = class {
   constructor(options2) {
     this.externalEntities = {};
@@ -13404,11 +13405,22 @@ var IntrospectedClass = class _IntrospectedClass extends IntrospectedBaseClass {
         returnType: "void"
       });
     });
+    if (this.isGObjectObject()) {
+      allSignals.push({
+        name: `notify::\${string}`,
+        isNotifySignal: true,
+        isDetailSignal: false,
+        isTemplateLiteral: true,
+        parameterTypes: ["GObject.ParamSpec"],
+        returnType: "void"
+      });
+    }
   }
   addDetailedSignals(allSignals) {
     const propertyNames = this.getUniquePropertyNames();
     this.signals.forEach((signal) => {
       if (signal.detailed) {
+        if (signal.name === "notify") return;
         propertyNames.forEach((propertyName) => {
           allSignals.push({
             name: `${signal.name}::${propertyName}`,
@@ -13419,6 +13431,15 @@ var IntrospectedClass = class _IntrospectedClass extends IntrospectedBaseClass {
             returnType: this.getPropertyTypeString(signal.return_type)
           });
         });
+        allSignals.push({
+          name: `${signal.name}::\${string}`,
+          signal,
+          isNotifySignal: false,
+          isDetailSignal: true,
+          isTemplateLiteral: true,
+          parameterTypes: signal.parameters.map((p) => this.getPropertyTypeString(p.type)),
+          returnType: this.getPropertyTypeString(signal.return_type)
+        });
       }
     });
   }
@@ -17766,7 +17787,7 @@ See https://gjs.guide/guides/gobject/basics.html#properties for more details.`;
       const override3 = new IntrospectedClassFunction({
         parent: ParamSpec,
         name: "override",
-        return_type: VoidType,
+        return_type: ParamSpec.getType(),
         parameters: [
           new IntrospectedFunctionParameter({
             direction: "in" /* In */,
@@ -21024,7 +21045,6 @@ var SignalGenerator = class {
     }
     const allSignals = girClass.getAllSignals();
     allSignals.forEach((signalInfo) => {
-      const signalKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(signalInfo.name) ? signalInfo.name : `"${signalInfo.name}"`;
       let cbType;
       if (signalInfo.isNotifySignal) {
         const gobjectRef = this.namespace.namespace === "GObject" ? "" : "GObject.";
@@ -21042,6 +21062,11 @@ var SignalGenerator = class {
         const returnTypeStr = signalInfo.returnType || "void";
         cbType = `(${paramTypes.join(", ")}) => ${returnTypeStr}`;
       }
+      if (signalInfo.isTemplateLiteral) {
+        def.push(`${indent}    [key: \`${signalInfo.name}\`]: ${cbType};`);
+        return;
+      }
+      const signalKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(signalInfo.name) ? signalInfo.name : `"${signalInfo.name}"`;
       if (!signalInfo.isNotifySignal && signalInfo.signal) {
         const signalTags = [
           { tagName: "signal", paramName: "", text: "" },
@@ -21459,7 +21484,7 @@ export const ${node.name}: ${node.name}Namespace & {
       parameters: [
         new IntrospectedFunctionParameter({
           name: "options",
-          type: NativeType.of("{ message: string, code: number}"),
+          type: NativeType.of("{ message: string, code: number }"),
           direction: "in" /* In */
         })
       ],
@@ -22083,7 +22108,7 @@ export const ${node.name}: ${node.name}Namespace & {
       def.push(...this.generateDirectAllocationConstructor(girClass.mainConstructor));
     else if (girClass.mainConstructor instanceof IntrospectedConstructor)
       def.push(...this.generateConstructor(girClass.mainConstructor));
-    else if (girClass.someParent((p) => p.namespace.namespace === "GObject" && p.name === "Object"))
+    else if (girClass.namespace.namespace === "GObject" && girClass.name === "Object" || girClass.someParent((p) => p.namespace.namespace === "GObject" && p.name === "Object"))
       def.push(`
 constructor(properties?: Partial<${girClass.name}.ConstructorProps>, ...args: any[]);
 `);
@@ -24889,7 +24914,7 @@ import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { i18n, JSX as JSX8, ReflectionKind as ReflectionKind4 } from "typedoc";
 function getTsForGirVersion() {
   if (true) {
-    return "4.0.0-beta.42";
+    return "4.0.0-beta.43";
   }
   const __dirname3 = dirname7(fileURLToPath4(import.meta.url));
   return JSON.parse(readFileSync6(join13(__dirname3, "..", "..", "package.json"), "utf8")).version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-beta.42",
+  "version": "4.0.0-beta.43",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -52,31 +52,31 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.42",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.42",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.42",
-    "@ts-for-gir/generator-json": "^4.0.0-beta.42",
-    "@ts-for-gir/generator-typescript": "^4.0.0-beta.42",
-    "@ts-for-gir/lib": "^4.0.0-beta.42",
-    "@ts-for-gir/reporter": "^4.0.0-beta.42",
-    "@ts-for-gir/tsconfig": "^4.0.0-beta.42",
+    "@gi.ts/parser": "^4.0.0-beta.43",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.43",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.43",
+    "@ts-for-gir/generator-json": "^4.0.0-beta.43",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.43",
+    "@ts-for-gir/lib": "^4.0.0-beta.43",
+    "@ts-for-gir/reporter": "^4.0.0-beta.43",
+    "@ts-for-gir/tsconfig": "^4.0.0-beta.43",
     "@types/ejs": "^3.1.5",
     "@types/inquirer": "^9.0.9",
     "@types/node": "^24.12.0",
     "@types/yargs": "^17.0.35",
     "esbuild": "^0.27.4",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "dependencies": {
     "@inquirer/prompts": "^8.3.2",
-    "@ts-for-gir/templates": "^4.0.0-beta.42",
+    "@ts-for-gir/templates": "^4.0.0-beta.43",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.1",
     "ejs": "^5.0.1",
     "glob": "^13.0.6",
     "inquirer": "^13.3.2",
     "prettier": "^3.8.1",
-    "typedoc": "^0.28.17",
+    "typedoc": "^0.28.18",
     "yargs": "^18.0.0"
   }
 }