@ts-for-gir/cli 4.0.0-rc.8 → 4.0.0

package/bin/ts-for-gir

@@ -29,9 +29,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../.yarn/cache/lodash-npm-4.18.1-a64c3070ac-306fea53df.zip/node_modules/lodash/lodash.js
+// ../../node_modules/lodash/lodash.js
 var require_lodash = __commonJS({
-  "../../.yarn/cache/lodash-npm-4.18.1-a64c3070ac-306fea53df.zip/node_modules/lodash/lodash.js"(exports2, module) {
+  "../../node_modules/lodash/lodash.js"(exports2, module) {
     (function() {
       var undefined2;
       var VERSION = "4.18.1";
@@ -3346,7 +3346,7 @@ var require_lodash = __commonJS({
           }
           return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
         });
-        function join17(array, separator) {
+        function join18(array, separator) {
           return array == null ? "" : nativeJoin.call(array, separator);
         }
         function last(array) {
@@ -5270,7 +5270,7 @@ var require_lodash = __commonJS({
         lodash2.isUndefined = isUndefined;
         lodash2.isWeakMap = isWeakMap;
         lodash2.isWeakSet = isWeakSet;
-        lodash2.join = join17;
+        lodash2.join = join18;
         lodash2.kebabCase = kebabCase;
         lodash2.last = last;
         lodash2.lastIndexOf = lastIndexOf;
@@ -5527,22 +5527,22 @@ var require_lodash = __commonJS({
   }
 });
 
-// ../../.yarn/cache/lunr-npm-2.3.9-fa3aa9c2d6-f2f6db34c0.zip/node_modules/lunr/lunr.js
+// ../../node_modules/lunr/lunr.js
 var require_lunr = __commonJS({
-  "../../.yarn/cache/lunr-npm-2.3.9-fa3aa9c2d6-f2f6db34c0.zip/node_modules/lunr/lunr.js"(exports2, module) {
+  "../../node_modules/lunr/lunr.js"(exports2, module) {
     (function() {
       var lunr2 = function(config) {
-        var builder8 = new lunr2.Builder();
-        builder8.pipeline.add(
+        var builder9 = new lunr2.Builder();
+        builder9.pipeline.add(
           lunr2.trimmer,
           lunr2.stopWordFilter,
           lunr2.stemmer
         );
-        builder8.searchPipeline.add(
+        builder9.searchPipeline.add(
           lunr2.stemmer
         );
-        config.call(builder8, builder8);
-        return builder8.build();
+        config.call(builder9, builder9);
+        return builder9.build();
       };
       lunr2.version = "2.3.9";
       lunr2.utils = {};
@@ -6218,12 +6218,12 @@ var require_lunr = __commonJS({
       };
       lunr2.TokenSet._nextId = 1;
       lunr2.TokenSet.fromArray = function(arr) {
-        var builder8 = new lunr2.TokenSet.Builder();
+        var builder9 = new lunr2.TokenSet.Builder();
         for (var i = 0, len = arr.length; i < len; i++) {
-          builder8.insert(arr[i]);
+          builder9.insert(arr[i]);
         }
-        builder8.finish();
-        return builder8.root;
+        builder9.finish();
+        return builder9.root;
       };
       lunr2.TokenSet.fromClause = function(clause) {
         if ("editDistance" in clause) {
@@ -7268,7 +7268,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 function getPackageVersion() {
   if (true) {
-    return "4.0.0-rc.8";
+    return "4.0.0";
   }
   const currentModulePath = fileURLToPath(import.meta.url);
   const currentDir = dirname(currentModulePath);
@@ -7879,10 +7879,10 @@ ${"=".repeat(50)}`);
       if (statistics.typeStatistics.commonTypeConflicts.length > 0) {
         console.log(`
 \u2694\uFE0F  Type Conflicts:`);
-        statistics.typeStatistics.commonTypeConflicts.forEach(({ conflictType, count, examples: examples8 }) => {
+        statistics.typeStatistics.commonTypeConflicts.forEach(({ conflictType, count, examples: examples9 }) => {
           console.log(`  ${yellow(conflictType)}: ${count} conflicts`);
-          if (examples8.length > 0) {
-            console.log(`    \u2514\u2500 Examples: ${gray(examples8.join(", "))}`);
+          if (examples9.length > 0) {
+            console.log(`    \u2514\u2500 Examples: ${gray(examples9.join(", "))}`);
           }
         });
       }
@@ -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.8";
+    return "4.0.0";
   }
   try {
     const currentModulePath = fileURLToPath2(import.meta.url);
@@ -8201,7 +8201,7 @@ __export(parser_exports, {
   parseGir: () => parseGir
 });
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/util.js
+// ../../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 + "]*";
@@ -8242,7 +8242,7 @@ var DANGEROUS_PROPERTY_NAMES = [
 ];
 var criticalProperties = ["__proto__", "constructor", "prototype"];
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/validator.js
+// ../../node_modules/fast-xml-parser/src/validator.js
 var defaultOptions = {
   allowBooleanAttributes: false,
   //A tag can have attributes without any value
@@ -8548,7 +8548,7 @@ function getPositionFromMatch(match) {
   return match.startIndex + match[1].length;
 }
 
-// ../../.yarn/cache/@nodable-entities-npm-2.1.0-6eb9f06ac0-355c55e82a.zip/node_modules/@nodable/entities/src/entities.js
+// ../../node_modules/@nodable/entities/src/entities.js
 var BASIC_LATIN = {
   amp: "&",
   AMP: "&",
@@ -9648,7 +9648,7 @@ var COMMON_HTML = {
   frac34: "\xBE"
 };
 
-// ../../.yarn/cache/@nodable-entities-npm-2.1.0-6eb9f06ac0-355c55e82a.zip/node_modules/@nodable/entities/src/EntityDecoder.js
+// ../../node_modules/@nodable/entities/src/EntityDecoder.js
 var SPECIAL_CHARS = new Set("!?\\\\/[]$%{}^&*()<>|+");
 function validateEntityName(name) {
   if (name[0] === "#") {
@@ -10017,7 +10017,7 @@ var EntityDecoder = class {
   }
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
+// ../../node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
 var defaultOnDangerousProperty = (name) => {
   if (DANGEROUS_PROPERTY_NAMES.includes(name)) {
     return "__" + name;
@@ -10151,7 +10151,7 @@ var buildOptions = function(options2) {
   return built;
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
+// ../../node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
 var METADATA_SYMBOL;
 if (typeof Symbol !== "function") {
   METADATA_SYMBOL = "@@xmlMetadata";
@@ -10185,11 +10185,37 @@ var XmlNode = class {
   }
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
+// ../../node_modules/xml-naming/src/index.js
+var nameStartChar10 = ":A-Za-z_\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u0486\u0488-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD";
+var nameChar10 = nameStartChar10 + "\\-\\.\\d\xB7\u0300-\u036F\u203F-\u2040";
+var nameStartChar11 = ":A-Za-z_\xC0-\u02FF\u0370-\u037D\u037F-\u0486\u0488-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u{10000}-\u{EFFFF}";
+var nameChar11 = nameStartChar11 + "\\-\\.\\d\xB7\u0300-\u036F\u0487\u203F-\u2040";
+var buildRegexes = (startChar, char, flags = "") => {
+  const ncStart = startChar.replace(":", "");
+  const ncChar = char.replace(":", "");
+  const ncNamePat = `[${ncStart}][${ncChar}]*`;
+  return {
+    name: new RegExp(`^[${startChar}][${char}]*$`, flags),
+    ncName: new RegExp(`^${ncNamePat}$`, flags),
+    qName: new RegExp(`^${ncNamePat}(?::${ncNamePat})?$`, flags),
+    nmToken: new RegExp(`^[${char}]+$`, flags),
+    nmTokens: new RegExp(`^[${char}]+(?:\\s+[${char}]+)*$`, flags)
+  };
+};
+var regexes10 = buildRegexes(nameStartChar10, nameChar10);
+var regexes11 = buildRegexes(nameStartChar11, nameChar11, "u");
+var getRegexes = (xmlVersion = "1.0") => xmlVersion === "1.1" ? regexes11 : regexes10;
+var qName = (str, { xmlVersion = "1.0" } = {}) => getRegexes(xmlVersion).qName.test(str);
+
+// ../../node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
 var DocTypeReader = class {
-  constructor(options2) {
+  constructor(options2, xmlVersion) {
     this.suppressValidationErr = !options2;
     this.options = options2;
+    this.xmlVersion = xmlVersion || 1;
+  }
+  setXmlVersion(xmlVersion = 1) {
+    this.xmlVersion = xmlVersion;
   }
   readDocType(xmlData, i) {
     const entities = /* @__PURE__ */ Object.create(null);
@@ -10261,7 +10287,7 @@ var DocTypeReader = class {
       i++;
     }
     let entityName = xmlData.substring(startIndex, i);
-    validateEntityName2(entityName);
+    validateEntityName2(entityName, { xmlVersion: this.xmlVersion });
     i = skipWhitespace(xmlData, i);
     if (!this.suppressValidationErr) {
       if (xmlData.substring(i, i + 6).toUpperCase() === "SYSTEM") {
@@ -10287,7 +10313,7 @@ var DocTypeReader = class {
       i++;
     }
     let notationName = xmlData.substring(startIndex, i);
-    !this.suppressValidationErr && validateEntityName2(notationName);
+    !this.suppressValidationErr && validateEntityName2(notationName, { xmlVersion: this.xmlVersion });
     i = skipWhitespace(xmlData, i);
     const identifierType = xmlData.substring(i, i + 6).toUpperCase();
     if (!this.suppressValidationErr && identifierType !== "SYSTEM" && identifierType !== "PUBLIC") {
@@ -10336,7 +10362,7 @@ var DocTypeReader = class {
       i++;
     }
     let elementName = xmlData.substring(startIndex, i);
-    if (!this.suppressValidationErr && !isName(elementName)) {
+    if (!this.suppressValidationErr && !qName(elementName, { xmlVersion: this.xmlVersion })) {
       throw new Error(`Invalid element name: "${elementName}"`);
     }
     i = skipWhitespace(xmlData, i);
@@ -10369,14 +10395,14 @@ var DocTypeReader = class {
       i++;
     }
     let elementName = xmlData.substring(startIndex, i);
-    validateEntityName2(elementName);
+    validateEntityName2(elementName, { xmlVersion: this.xmlVersion });
     i = skipWhitespace(xmlData, i);
     startIndex = i;
     while (i < xmlData.length && !/\s/.test(xmlData[i])) {
       i++;
     }
     let attributeName = xmlData.substring(startIndex, i);
-    if (!validateEntityName2(attributeName)) {
+    if (!validateEntityName2(attributeName, { xmlVersion: this.xmlVersion })) {
       throw new Error(`Invalid attribute name: "${attributeName}"`);
     }
     i = skipWhitespace(xmlData, i);
@@ -10397,7 +10423,7 @@ var DocTypeReader = class {
         }
         let notation = xmlData.substring(startIndex2, i);
         notation = notation.trim();
-        if (!validateEntityName2(notation)) {
+        if (!validateEntityName2(notation, { xmlVersion: this.xmlVersion })) {
           throw new Error(`Invalid notation name: "${notation}"`);
         }
         allowedNotations.push(notation);
@@ -10454,19 +10480,22 @@ function hasSeq(data, seq, i) {
   }
   return true;
 }
-function validateEntityName2(name) {
-  if (isName(name))
+function validateEntityName2(name, xmlVersion) {
+  if (qName(name, { xmlVersion }))
     return name;
   else
     throw new Error(`Invalid entity name ${name}`);
 }
 
-// ../../.yarn/cache/strnum-npm-2.2.3-3aa06fd3c4-fb70206301.zip/node_modules/strnum/strnum.js
+// ../../node_modules/strnum/strnum.js
 var hexRegex = /^[-+]?0x[a-fA-F0-9]+$/;
+var binRegex = /^0b[01]+$/;
+var octRegex = /^0o[0-7]+$/;
 var numRegex = /^([\-\+])?(0*)([0-9]*(\.[0-9]*)?)$/;
 var consider = {
   hex: true,
-  // oct: false,
+  binary: false,
+  octal: false,
   leadingZeros: true,
   decimalPoint: ".",
   eNotation: true,
@@ -10483,6 +10512,10 @@ function toNumber(str, options2 = {}) {
   else if (trimmedStr === "0") return 0;
   else if (options2.hex && hexRegex.test(trimmedStr)) {
     return parse_int(trimmedStr, 16);
+  } else if (options2.binary && binRegex.test(trimmedStr)) {
+    return parse_int(trimmedStr, 2);
+  } else if (options2.octal && octRegex.test(trimmedStr)) {
+    return parse_int(trimmedStr, 8);
   } else if (!isFinite(trimmedStr)) {
     return handleInfinity(str, Number(trimmedStr), options2);
   } else if (trimmedStr.includes("e") || trimmedStr.includes("E")) {
@@ -10562,6 +10595,8 @@ function trimZeros(numStr) {
   return numStr;
 }
 function parse_int(numStr, base) {
+  const str = numStr.trim();
+  if (base === 2 || base === 8) numStr = str.substring(2);
   if (parseInt) return parseInt(numStr, base);
   else if (Number.parseInt) return Number.parseInt(numStr, base);
   else if (window && window.parseInt) return window.parseInt(numStr, base);
@@ -10583,7 +10618,7 @@ function handleInfinity(str, num, options2) {
   }
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/ignoreAttributes.js
+// ../../node_modules/fast-xml-parser/src/ignoreAttributes.js
 function getIgnoreAttributesFn(ignoreAttributes) {
   if (typeof ignoreAttributes === "function") {
     return ignoreAttributes;
@@ -10603,7 +10638,7 @@ function getIgnoreAttributesFn(ignoreAttributes) {
   return () => false;
 }
 
-// ../../.yarn/cache/path-expression-matcher-npm-1.5.0-73d258a112-28303bb9ee.zip/node_modules/path-expression-matcher/src/Expression.js
+// ../../node_modules/path-expression-matcher/src/Expression.js
 var Expression = class {
   /**
    * Create a new Expression
@@ -10766,7 +10801,7 @@ var Expression = class {
   }
 };
 
-// ../../.yarn/cache/path-expression-matcher-npm-1.5.0-73d258a112-28303bb9ee.zip/node_modules/path-expression-matcher/src/ExpressionSet.js
+// ../../node_modules/path-expression-matcher/src/ExpressionSet.js
 var ExpressionSet = class {
   constructor() {
     this._byDepthAndTag = /* @__PURE__ */ new Map();
@@ -10921,7 +10956,7 @@ var ExpressionSet = class {
   }
 };
 
-// ../../.yarn/cache/path-expression-matcher-npm-1.5.0-73d258a112-28303bb9ee.zip/node_modules/path-expression-matcher/src/Matcher.js
+// ../../node_modules/path-expression-matcher/src/Matcher.js
 var MatcherView = class {
   /**
    * @param {Matcher} matcher - The parent Matcher instance to read from.
@@ -11371,7 +11406,7 @@ var Matcher = class {
   }
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
+// ../../node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
 function extractRawAttributes(prefixedAttrs, options2) {
   if (!prefixedAttrs) return {};
   const attrs = options2.attributesGroupName ? prefixedAttrs[options2.attributesGroupName] : prefixedAttrs;
@@ -11602,6 +11637,7 @@ var parseXml = function(xmlData) {
         if (attsMap) {
           const ver = attsMap[this.options.attributeNamePrefix + "version"];
           this.entityDecoder.setXmlVersion(Number(ver) || 1);
+          docTypeReader.setXmlVersion(Number(ver) || 1);
         }
         if (options2.ignoreDeclaration && tagData.tagName === "?xml" || options2.ignorePiTags) {
         } else {
@@ -11905,7 +11941,7 @@ function readStopNodeData(xmlData, tagName, i) {
         const closeIndex = findClosingIndex(xmlData, "]]>", i, "StopNode is not closed.") - 2;
         i = closeIndex;
       } else {
-        const tagData = readTagExp(xmlData, i, ">");
+        const tagData = readTagExp(xmlData, i, false);
         if (tagData) {
           const openTagName = tagData && tagData.tagName;
           if (openTagName === tagName && tagData.tagExp[tagData.tagExp.length - 1] !== "/") {
@@ -11951,7 +11987,7 @@ function sanitizeName(name, options2) {
   return name;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/xmlparser/node2json.js
+// ../../node_modules/fast-xml-parser/src/xmlparser/node2json.js
 var METADATA_SYMBOL2 = XmlNode.getMetaDataSymbol();
 function stripAttributePrefix(attrs, prefix) {
   if (!attrs || typeof attrs !== "object") return {};
@@ -11991,6 +12027,9 @@ function compress(arr, options2, matcher, readonlyMatcher) {
     } else if (tagObj[property]) {
       let val = compress(tagObj[property], options2, matcher, readonlyMatcher);
       const isLeaf = isLeafTag(val, options2);
+      if (Object.keys(val).length === 0 && options2.alwaysCreateTextNode) {
+        val[options2.textNodeName] = "";
+      }
       if (tagObj[":@"]) {
         assignAttributes(val, tagObj[":@"], readonlyMatcher, options2);
       } else if (Object.keys(val).length === 1 && val[options2.textNodeName] !== void 0 && !options2.alwaysCreateTextNode) {
@@ -12060,7 +12099,7 @@ function isLeafTag(obj, options2) {
   return false;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.2-960de42682-7f32d77127.zip/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
+// ../../node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
 var XMLParser = class {
   constructor(options2) {
     this.externalEntities = {};
@@ -13244,9 +13283,9 @@ var NativeType = class _NativeType extends TypeExpression {
 };
 var OrType = class _OrType extends TypeExpression {
   types;
-  constructor(type, ...types) {
+  constructor(...types) {
     super();
-    this.types = [type, ...types];
+    this.types = [...types];
   }
   rewrap(type) {
     return type;
@@ -13255,14 +13294,13 @@ var OrType = class _OrType extends TypeExpression {
     return this;
   }
   resolve(namespace, options2) {
-    const [type, ...types] = this.types;
-    return new _OrType(type.resolve(namespace, options2), ...types.map((t) => t.resolve(namespace, options2)));
+    return makeUnion(...this.types.map((t) => t.resolve(namespace, options2)));
   }
   print(namespace, options2) {
-    return `(${this.types.map((t) => t.print(namespace, options2)).join(" | ")})`;
+    return `${this.types.map((t) => t.print(namespace, options2)).join(" | ")}`;
   }
   rootPrint(namespace, options2) {
-    return `${this.types.map((t) => t.print(namespace, options2)).join(" | ")}`;
+    return this.print(namespace, options2);
   }
   equals(type) {
     if (type instanceof _OrType) {
@@ -13272,6 +13310,35 @@ var OrType = class _OrType extends TypeExpression {
     }
   }
 };
+function makeUnion(...inputTypes) {
+  const types = /* @__PURE__ */ new Set();
+  for (const type of inputTypes) {
+    if (type instanceof BinaryType) {
+      types.add(type.a);
+      types.add(type.b);
+    } else if (type instanceof OrType && !(type instanceof TupleType)) {
+      for (const t of type.types) {
+        types.add(t);
+      }
+    } else {
+      types.add(type);
+    }
+  }
+  if (types.size === 1) {
+    return [...types][0];
+  }
+  if (types.size === 2) {
+    const typesArray = [...types];
+    if (typesArray[0] === NullType) {
+      return new NullableType(typesArray[1]);
+    }
+    if (typesArray[1] === NullType) {
+      return new NullableType(typesArray[0]);
+    }
+    return new BinaryType(...typesArray);
+  }
+  return new OrType(...types);
+}
 var TupleType = class _TupleType extends OrType {
   print(namespace, options2) {
     return `[${this.types.map((t) => t.print(namespace, options2)).join(", ")}]`;
@@ -13442,7 +13509,7 @@ var GenericType = class _GenericType extends TypeExpression {
     return this.identifier;
   }
 };
-var NullableType = class _NullableType extends BinaryType {
+var NullableType = class extends BinaryType {
   constructor(type) {
     super(type, NullType);
   }
@@ -13450,12 +13517,18 @@ var NullableType = class _NullableType extends BinaryType {
     return this.a;
   }
   rewrap(type) {
-    return new _NullableType(this.a.rewrap(type));
+    return makeNullable(this.a.rewrap(type));
   }
   get type() {
     return this.a;
   }
 };
+function makeNullable(type) {
+  if (type instanceof NullableType) return type;
+  if (type === RawPointerType) return NullType;
+  if (type === AnyType) return AnyType;
+  return makeUnion(type, NullType);
+}
 var PromiseType = class _PromiseType extends TypeExpression {
   type;
   constructor(type) {
@@ -13599,6 +13672,8 @@ var ArrayType = class _ArrayType extends TypeExpression {
     } else {
       typeSuffix = "".padStart(2 * depth, "[]");
     }
+    if (this.type instanceof OrType && !(this.type instanceof TupleType))
+      return `(${this.type.print(namespace, options2)})${typeSuffix}`;
     return `${this.type.print(namespace, options2)}${typeSuffix}`;
   }
   static new({
@@ -13625,6 +13700,7 @@ var NullType = new NativeType("null");
 var VoidType = new NativeType("void");
 var UnknownType = new NativeType("unknown");
 var AnyFunctionType = new NativeType("(...args: any[]) => any");
+var RawPointerType = new NativeType("never");
 
 // ../lib/src/utils/types.ts
 function getAliasType(namespace, _ns, parameter) {
@@ -13753,7 +13829,7 @@ function resolvePrimitiveType(name) {
     case "gboolean":
       return BooleanType;
     case "gpointer":
-      return AnyType;
+      return RawPointerType;
     case "object":
       return ObjectType;
     case "va_list":
@@ -13779,42 +13855,99 @@ function resolvePrimitiveType(name) {
 function resolveDirectedType(type, direction) {
   if (type instanceof ArrayType) {
     if ((direction === "in" /* In */ || direction === "inout" /* Inout */) && type.type.equals(Uint8ArrayType) && type.arrayDepth === 0) {
-      return new BinaryType(type, StringType);
+      return makeUnion(type, StringType);
     } else {
       return type.rewrap(resolveDirectedType(type.type, direction) ?? type.type);
     }
   } else if (type instanceof TypeIdentifier) {
     if ((direction === "in" /* In */ || direction === "inout" /* Inout */) && type.is("GLib", "Bytes")) {
-      return new BinaryType(type, Uint8ArrayType);
+      return makeUnion(type, Uint8ArrayType);
     } else if (type.is("GObject", "Value")) {
       if (direction === "in" /* In */ || direction === "inout" /* Inout */) {
-        return new BinaryType(type, AnyType);
+        return makeUnion(type, AnyType);
       } else {
         return UnknownType;
       }
     } else if (type.is("GLib", "HashTable")) {
-      if (direction === "in" /* In */) {
-        return new BinaryType(new NativeType("{ [key: string]: any }"), type);
-      } else {
-        return type;
-      }
+      return hashTableToJsDict(type);
     }
   } else if (type === BigintOrNumberType && direction === "out" /* Out */) {
     return NumberType;
+  } else if (type === RawPointerType && direction === "out" /* Out */) {
+    return NullType;
   } else if (type instanceof PromiseType) {
     const resolvedInner = resolveDirectedType(type.type, direction);
     if (resolvedInner) return new PromiseType(resolvedInner);
-  } else if (type instanceof BinaryType && !(type instanceof NullableType)) {
+  } else if (type instanceof NullableType) {
+    const inner = resolveDirectedType(type.a, direction);
+    if (inner !== null) return makeNullable(inner);
+  } else if (type instanceof TupleType) {
+    let changed = false;
+    const inner = type.types.map((t) => {
+      const resolved = resolveDirectedType(t, direction);
+      if (resolved !== null) {
+        changed = true;
+        return resolved;
+      }
+      return t;
+    });
+    if (changed) {
+      const [first, ...rest2] = inner;
+      return new TupleType(first, ...rest2);
+    }
+  } else if (type instanceof BinaryType) {
     const a = resolveDirectedType(type.a, direction) ?? type.a;
     const b = resolveDirectedType(type.b, direction) ?? type.b;
-    if (a !== type.a || b !== type.b) return new BinaryType(a, b);
-  } else if (type instanceof OrType && !(type instanceof BinaryType || type instanceof TupleType)) {
-    const types = type.types.map((t) => resolveDirectedType(t, direction) ?? t);
-    if (types.length === 1) return types[0];
-    return new OrType(types[0], ...types.slice(1));
+    if (a !== type.a || b !== type.b) return makeUnion(a, b);
   }
   return null;
 }
+function hashTableToJsDict(type) {
+  if (!(type instanceof GenerifiedTypeIdentifier) || type.generics.length === 0) {
+    return new NativeType("{ [key: string]: any }");
+  }
+  const [keyType, valueType] = type.generics;
+  const keyShape = jsKeyShapeFor(keyType);
+  if (keyShape === null) {
+    return NeverType;
+  }
+  return new HashTableDictType(keyShape, valueType ?? AnyType);
+}
+function jsKeyShapeFor(keyType) {
+  if (keyType === StringType) return "string";
+  if (keyType instanceof TypeIdentifier && keyType.is("GLib", "filename")) return "string";
+  if (keyType === NumberType) return "number";
+  if (keyType === BooleanType) return "number";
+  if (keyType === BigintOrNumberType) return "number";
+  return null;
+}
+var HashTableDictType = class _HashTableDictType extends TypeExpression {
+  constructor(keyShape, valueType) {
+    super();
+    this.keyShape = keyShape;
+    this.valueType = valueType;
+  }
+  keyShape;
+  valueType;
+  print(namespace, options2) {
+    return `{ [key: ${this.keyShape}]: ${this.valueType.rootPrint(namespace, options2)} }`;
+  }
+  resolve(_namespace, _options) {
+    return this;
+  }
+  equals(type) {
+    return type instanceof _HashTableDictType && this.keyShape === type.keyShape && this.valueType.equals(type.valueType);
+  }
+  rewrap(_type) {
+    return this;
+  }
+  unwrap() {
+    return this;
+  }
+  deepUnwrap() {
+    return this.valueType.deepUnwrap();
+  }
+};
 
 // ../lib/src/utils/gir-parsing.ts
 var girParsingReporter = new LazyReporter("GirParsing");
@@ -13965,10 +14098,10 @@ function getType(ns, param) {
     variableType = ClosureType.new({ type: variableType, user_data: closure });
   }
   if (parameter.$ && (parameter.$.direction === "inout" /* Inout */ || parameter.$.direction === "out" /* Out */) && (nullable || allowNone) && !(variableType instanceof NativeType) && variableType !== BigintOrNumberType) {
-    return new NullableType(variableType);
+    return makeNullable(variableType);
   }
   if ((!parameter.$?.direction || parameter.$.direction === "in" /* In */) && nullable) {
-    return new NullableType(variableType);
+    return makeNullable(variableType);
   }
   variableType.isPointer = isPointer;
   return variableType;
@@ -14477,7 +14610,7 @@ var IntrospectedProperty = class _IntrospectedProperty extends IntrospectedBase
     property.defaultValue = element.$["default-value"];
     property.getter = element.$.getter;
     if (element.$.nullable === "1" || element.$["allow-none"] === "1") {
-      property.type = new NullableType(property.type);
+      property.type = makeNullable(property.type);
     }
     return property;
   }
@@ -14585,7 +14718,7 @@ var IntrospectedSignal = class _IntrospectedSignal extends IntrospectedClassMemb
           }
         } else {
           if (isOptional) {
-            params.push(p.copy({ type: new NullableType(type), isOptional: false }));
+            params.push(p.copy({ type: makeNullable(type), isOptional: false }));
           } else {
             params.push(p);
           }
@@ -14689,7 +14822,7 @@ function resolveNullableProperties(cls) {
     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);
+      prop.type = makeNullable(prop.type);
     }
   }
 }
@@ -15988,7 +16121,10 @@ var IntrospectedFunction = class _IntrospectedFunction extends IntrospectedNames
     });
   }
   static filterParameters(parameters, length_params, user_data_params) {
-    return parameters.filter((_, i) => !length_params.includes(i) && !user_data_params.includes(i)).filter((v) => !(v.type instanceof TypeIdentifier && v.type.is("GLib", "DestroyNotify")));
+    return parameters.filter((_, i) => !length_params.includes(i) && !user_data_params.includes(i)).filter((v) => {
+      const unwrapped = v.type.unwrap();
+      return !(unwrapped instanceof TypeIdentifier && unwrapped.is("GLib", "DestroyNotify"));
+    });
   }
   static processOptionalParameters(parameters) {
     return parameters.reverse().reduce(
@@ -16003,7 +16139,7 @@ var IntrospectedFunction = class _IntrospectedFunction extends IntrospectedNames
           }
         } else {
           if (isOptional) {
-            params.push(p.copy({ type: new NullableType(type), isOptional: false }));
+            params.push(p.copy({ type: makeNullable(type), isOptional: false }));
           } else {
             params.push(p);
           }
@@ -16886,16 +17022,16 @@ function transformBacktickTypeRefs(text, ctx) {
   });
   return text;
 }
-function transformGirDocHighlights(description8) {
-  return description8.replace(/(?<!\{)(?<!\w)@([A-Za-z_][A-Za-z0-9_]*)/g, "`$1`");
+function transformGirDocHighlights(description9) {
+  return description9.replace(/(?<!\{)(?<!\w)@([A-Za-z_][A-Za-z0-9_]*)/g, "`$1`");
 }
-function transformGirDocCodeBlocks(description8) {
-  description8 = description8.replaceAll(/```\s*\{\s*\.(\w+)[^}]*\}/gm, "```$1").replaceAll(/\|\[<!-- language="([^"]+)" -->/gm, (_match, lang) => {
+function transformGirDocCodeBlocks(description9) {
+  description9 = description9.replaceAll(/```\s*\{\s*\.(\w+)[^}]*\}/gm, "```$1").replaceAll(/\|\[<!-- language="([^"]+)" -->/gm, (_match, lang) => {
     if (lang === "plain" || lang === "text") return "\n```";
     return `
 \`\`\`${lang.toLowerCase()}`;
   }).replaceAll(/\|\[/gm, "\n```").replaceAll(/\]\|/gm, "```\n");
-  return description8;
+  return description9;
 }
 
 // ../lib/src/utils/objects.ts
@@ -17480,7 +17616,7 @@ function promisifyNamespaceFunctions(namespace) {
             parameters: sync_parameters
           }),
           node.copy({
-            return_type: new BinaryType(async_return, node.return())
+            return_type: makeUnion(async_return, node.return())
           })
         ]);
       }
@@ -17500,7 +17636,7 @@ function generatePromisifyOverloadedSignatures(node, async_parameters, sync_para
   });
   const unionOverload = node.copy({
     parameters: [...async_parameters, sync_parameters[sync_parameters.length - 1].copy({ isOptional: true })],
-    returnType: new BinaryType(async_return, VoidType)
+    returnType: makeUnion(async_return, VoidType)
   });
   return [promiseOverload, callbackOverload, unionOverload];
 }
@@ -20085,8 +20221,10 @@ var shellTemplate = (version) => ({
     const addGlslSnippet = GLSLEffect.members.find((m) => m.name === "add_glsl_snippet");
     if (addGlslSnippet) {
       const updatedParameter = addGlslSnippet.parameters[0].copy({
-        type: new NullableType(
-          new OrType(new TypeIdentifier("SnippetHook", "Shell"), new TypeIdentifier("SnippetHook", "Cogl"))
+        type: makeUnion(
+          new TypeIdentifier("SnippetHook", "Shell"),
+          new TypeIdentifier("SnippetHook", "Cogl"),
+          NullType
         )
       });
       addGlslSnippet.parameters[0] = updatedParameter;
@@ -21058,6 +21196,7 @@ import { existsSync as existsSync2, readFileSync as readFileSync3, writeFileSync
 
 // src/config/config-loader.ts
 import { dirname as dirname5, resolve as resolve4 } from "node:path";
+import { pathToFileURL } from "node:url";
 import { cosmiconfig } from "cosmiconfig";
 
 // src/config/config-writer.ts
@@ -21107,6 +21246,14 @@ function getDefaultGirDirectories() {
     "/usr/lib/mutter-*",
     "/usr/lib/x86_64-linux-gnu/mutter-*"
   ];
+  if (process.env.FLATPAK_ID || existsSync("/.flatpak-info")) {
+    girDirectories.unshift(
+      "/run/host/usr/local/share/gir-1.0",
+      "/run/host/usr/share/gir-1.0",
+      "/run/host/usr/share/*/gir-1.0",
+      "/run/host/usr/lib/x86_64-linux-gnu/mutter-*"
+    );
+  }
   const dataDirs = process.env.XDG_DATA_DIRS?.split(":") || [];
   for (let dataDir of dataDirs) {
     dataDir = join5(dataDir, "gir-1.0");
@@ -21378,8 +21525,8 @@ var createOptions = {
   template: {
     type: "string",
     alias: "t",
-    description: "Template to scaffold (types-locally, types-npm, types-workspace)",
-    choices: ["types-locally", "types-npm", "types-workspace"]
+    description: "Template to scaffold (types-locally, types-npm, types-workspace, types-gjsify)",
+    choices: ["types-locally", "types-npm", "types-workspace", "types-gjsify"]
   },
   install: {
     type: "boolean",
@@ -21488,9 +21635,12 @@ var analyzeOptions = {
 async function loadConfigFile(configName) {
   const configSearchOptions = {
     loaders: {
-      // ESM loader
+      // ESM loader. cosmiconfig hands us an absolute filesystem path; Node's import()
+      // tolerates that as a non-spec extension, but spec-compliant runtimes (GJS /
+      // SpiderMonkey) reject it with "Module not found: <abs-path>". Convert to a
+      // file:// URL so the loader works in both runtimes.
       ".js": async (filepath) => {
-        const file = await import(filepath);
+        const file = await import(pathToFileURL(filepath).href);
         if (file?.default?.default) {
           return file.default.default;
         }
@@ -21628,13 +21778,13 @@ async function load(cliOptions) {
 }
 
 // src/commands/command-builder.ts
-function createBuilder(options2, examples8) {
+function createBuilder(options2, examples9) {
   return (yargs2) => {
     const optionNames = Object.keys(options2);
     for (const optionName of optionNames) {
       yargs2 = yargs2.option(optionName, options2[optionName]);
     }
-    return yargs2.example(examples8);
+    return yargs2.example(examples9);
   };
 }
 
@@ -22474,14 +22624,15 @@ var copy = {
 
 // src/commands/create.ts
 import { spawnSync } from "node:child_process";
-import { cpSync, existsSync as existsSync3, mkdirSync, readdirSync, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "node:fs";
+import { cpSync, existsSync as existsSync3, mkdirSync, readdirSync, readFileSync as readFileSync4, realpathSync, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname as dirname6, join as join9, resolve as resolve5 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { input, select as select2 } from "@inquirer/prompts";
 var command3 = "create [name]";
 var description3 = "Scaffold a new GJS TypeScript project from a template";
 var examples3 = [
-  [`${APP_NAME} create my-app --template types-npm`, "Scaffold using the @girs/* NPM types"],
+  [`${APP_NAME} create my-app --template types-gjsify`, "Scaffold a Node-free GJS app via gjsify (recommended)"],
+  [`${APP_NAME} create my-app --template types-npm`, "Scaffold using the @girs/* NPM types + node/esbuild"],
   [`${APP_NAME} create my-app --template types-locally`, "Scaffold and generate types into ./@types/ locally"],
   [
     `${APP_NAME} create my-app --template types-workspace`,
@@ -22491,15 +22642,20 @@ var examples3 = [
 ];
 var TEMPLATE_CHOICES = [
   {
-    value: "types-locally",
-    name: "types-locally",
-    description: "Generate GIR types directly into ./@types/ (no package format, no @girs/* deps)"
+    value: "types-gjsify",
+    name: "types-gjsify",
+    description: "Node-free: @girs/* from NPM, all dev scripts (install/build/run/format) routed through gjsify"
   },
   {
     value: "types-npm",
     name: "types-npm",
     description: "Use pre-generated types from the @girs/* NPM packages"
   },
+  {
+    value: "types-locally",
+    name: "types-locally",
+    description: "Generate GIR types directly into ./@types/ (no package format, no @girs/* deps)"
+  },
   {
     value: "types-workspace",
     name: "types-workspace",
@@ -22512,19 +22668,34 @@ var builder3 = createBuilder(createOptions, examples3);
 function findTemplatesRoot() {
   const __filename = fileURLToPath4(import.meta.url);
   const __dirname3 = dirname6(__filename);
+  let realDirname = __dirname3;
+  try {
+    realDirname = dirname6(realpathSync(__filename));
+  } catch {
+  }
   const candidates = [
-    // Bundled production binary (bin/ts-for-gir): ../dist-templates
+    // Symlink-resolved binary (`npm i -g` / `gjsify install -g`): the
+    // realpath-aware candidate is required when the CLI is launched via a
+    // `~/.local/bin/<name>` symlink that points at the real package's
+    // `bin/<name>`. Try it first so the success path is symmetric across
+    // install modes.
+    resolve5(realDirname, "..", "dist-templates"),
+    // Bundled production binary invoked at its real path (no symlink),
+    // or a tarball extracted into a flat `bin/` + `dist-templates/` layout.
     resolve5(__dirname3, "..", "dist-templates"),
     // Source layout (src/commands/create.ts): ../../dist-templates then ../../templates
     resolve5(__dirname3, "..", "..", "dist-templates"),
     resolve5(__dirname3, "..", "..", "templates")
   ];
+  const seen = /* @__PURE__ */ new Set();
   for (const path of candidates) {
+    if (seen.has(path)) continue;
+    seen.add(path);
     if (existsSync3(path)) return path;
   }
   throw new Error(
     `Could not locate templates directory. Looked in:
-  ${candidates.join("\n  ")}
+  ${[...seen].join("\n  ")}
 If you are running from source, make sure packages/cli/templates/ exists. If you are running the published CLI, make sure dist-templates/ was packed.`
   );
 }
@@ -22565,7 +22736,19 @@ function walkAndSubstitute(rootDir, projectName) {
 var handler3 = async (args) => {
   const opts = args;
   const log3 = new Logger(opts.verbose ?? false, "CreateCommand");
-  const templatesRoot = findTemplatesRoot();
+  let templatesRoot;
+  try {
+    templatesRoot = findTemplatesRoot();
+  } catch (err) {
+    if (typeof __GJS_BUNDLE__ !== "undefined") {
+      process.stderr.write(
+        "The 'create' command needs templates that aren't shipped alongside this binary.\nInstall the full package instead so `dist-templates/` lives next to the bin:\n  gjsify install -g @ts-for-gir/cli\n  npm  install -g @ts-for-gir/cli\n  npx  @ts-for-gir/cli create ...   # one-shot, no install\n"
+      );
+      process.exitCode = 1;
+      return;
+    }
+    throw err;
+  }
   const available = listTemplates(templatesRoot);
   if (available.length === 0) {
     throw new Error(`No templates found in ${templatesRoot}`);
@@ -22611,18 +22794,26 @@ var handler3 = async (args) => {
   walkAndSubstitute(targetDir, projectName);
   log3.success(`Scaffolded ${template2} into ${targetDir}`);
   if (opts.install) {
-    log3.info("Running npm install...");
-    const result = spawnSync("npm", ["install", "--no-audit", "--no-fund"], {
+    const installer = template2 === "types-gjsify" ? "gjsify" : "npm";
+    const installerArgs = template2 === "types-gjsify" ? ["install"] : ["install", "--no-audit", "--no-fund"];
+    log3.info(`Running ${installer} install...`);
+    const result = spawnSync(installer, installerArgs, {
       cwd: targetDir,
       stdio: "inherit"
     });
     if (result.status !== 0) {
-      log3.warn("npm install failed; you can re-run it manually in the project directory.");
+      log3.warn(`${installer} install failed; you can re-run it manually in the project directory.`);
     }
   }
   log3.info("\nNext steps:");
   log3.white(`  cd ${projectName}`);
-  if (!opts.install) log3.white("  npm install");
+  if (!opts.install) {
+    if (template2 === "types-gjsify") {
+      log3.white("  gjsify install");
+    } else {
+      log3.white("  npm install");
+    }
+  }
   switch (template2) {
     case "types-locally":
       log3.white("  npm run generate");
@@ -22637,6 +22828,10 @@ var handler3 = async (args) => {
       log3.white("  npm run build:types && npm install");
       log3.white("  npm run build:app && npm start");
       break;
+    case "types-gjsify":
+      log3.white("  gjsify run check");
+      log3.white("  gjsify run build && gjsify run start");
+      break;
   }
 };
 var create = {
@@ -23032,23 +23227,27 @@ var SignalGenerator = class {
       return interfaceTypeIdentifier ? `${interfaceTypeIdentifier}.SignalSignatures` : null;
     }).filter((sig) => !!sig);
     parentSignatures.push(...interfaceSignatures);
-    let signatureHead;
+    let signatureDecl;
     if (parentSignatures.length > 0) {
-      signatureHead = `${indent}interface SignalSignatures extends ${parentSignatures.join(", ")} {`;
+      signatureDecl = `interface SignalSignatures extends ${parentSignatures.join(", ")}`;
     } else {
       const isGObjectObject = girClass.name === "Object" && girClass.namespace.namespace === "GObject";
       if (isGObjectObject) {
-        signatureHead = `${indent}interface SignalSignatures {`;
+        signatureDecl = `interface SignalSignatures`;
       } else {
         const gobjectNamespace = this.namespace.assertInstalledImport("GObject");
         const gobjectObjectClass = gobjectNamespace.assertClass("Object");
         const gobjectRef = gobjectObjectClass.getType().resolveIdentifier(this.namespace, this.config)?.print(this.namespace, this.config);
         const fallbackRef = gobjectRef ? `${gobjectRef}.SignalSignatures` : "GObject.Object.SignalSignatures";
-        signatureHead = `${indent}interface SignalSignatures extends ${fallbackRef} {`;
+        signatureDecl = `interface SignalSignatures extends ${fallbackRef}`;
       }
     }
-    def.push(signatureHead);
     const allSignals = girClass.getAllSignals();
+    if (allSignals.length === 0) {
+      def.push(`${indent}${signatureDecl} {}`);
+      return def;
+    }
+    def.push(`${indent}${signatureDecl} {`);
     allSignals.forEach((signalInfo) => {
       let cbType;
       if (signalInfo.isNotifySignal) {
@@ -23389,6 +23588,9 @@ var ModuleGenerator = class _ModuleGenerator extends FormatGenerator {
   }
   generateDirectAllocationConstructor(node, indentCount = 1) {
     const indent = generateIndent(indentCount);
+    if (node.parameters.length === 0) {
+      return [`${indent}constructor(properties?: Partial<{}>);`];
+    }
     const fieldIndent = generateIndent(indentCount + 1);
     const constructorFields = node.parameters.flatMap((param) => param.asField().asString(this)).flatMap((line) => line.split("\n")).map((line) => line.replace(/^\s+/, "")).filter((line) => line.length > 0).map((line) => `${fieldIndent}${line}`).join("\n");
     return ["", `${indent}constructor(properties?: Partial<{`, constructorFields, `${indent}}>);`];
@@ -23497,7 +23699,7 @@ var ModuleGenerator = class _ModuleGenerator extends FormatGenerator {
       parameters: [
         new IntrospectedFunctionParameter({
           name: "options",
-          type: NativeType.of("{ message: string, code: number }"),
+          type: NativeType.of("{ message: string; code: number }"),
           direction: "in" /* In */
         })
       ],
@@ -23565,24 +23767,24 @@ var ModuleGenerator = class _ModuleGenerator extends FormatGenerator {
         case 3 /* FUNCTION_NAME_CONFLICT */:
         case 2 /* FIELD_NAME_CONFLICT */:
           getterSetterAnnotation = setterAnnotation = "// This accessor conflicts with a field or function name in a parent class or interface.\n";
-          type = new BinaryType(type.unwrap(), AnyType);
+          type = makeUnion(type.unwrap(), AnyType);
           printAsProperty = true;
           break;
         case 4 /* ACCESSOR_PROPERTY_CONFLICT */:
           getterSetterAnnotation = getterAnnotation = "// This accessor conflicts with a property or field in a parent class or interface.\n";
-          type = new BinaryType(type.unwrap(), AnyType);
+          type = makeUnion(type.unwrap(), AnyType);
           printAsProperty = true;
           break;
         case 5 /* PROPERTY_ACCESSOR_CONFLICT */:
-          type = new BinaryType(type.unwrap(), AnyType);
+          type = makeUnion(type.unwrap(), AnyType);
           break;
         case 1 /* PROPERTY_NAME_CONFLICT */:
           getterSetterAnnotation = setterAnnotation = getterAnnotation = "// This accessor conflicts with another accessor's type in a parent class or interface.\n";
-          type = new BinaryType(type.unwrap(), AnyType);
+          type = makeUnion(type.unwrap(), AnyType);
           break;
       }
       if (construct && !(type instanceof BinaryType)) {
-        type = new BinaryType(type instanceof TypeConflict ? type.unwrap() : type, AnyType);
+        type = makeUnion(type instanceof TypeConflict ? type.unwrap() : type, AnyType);
       }
     }
     const Type = type.resolve(this.namespace, this.options).rootPrint(this.namespace, this.options) || "any";
@@ -23629,7 +23831,7 @@ var ModuleGenerator = class _ModuleGenerator extends FormatGenerator {
         type = type.unwrap();
       } else if (type.conflictType === 3 /* FUNCTION_NAME_CONFLICT */) {
         commentOut = "\n// This field conflicts with a function in a parent class or interface.\n";
-        type = new BinaryType(type.unwrap(), AnyType);
+        type = makeUnion(type.unwrap(), AnyType);
       } else {
         type = type.unwrap();
       }
@@ -24056,6 +24258,10 @@ var ModuleGenerator = class _ModuleGenerator extends FormatGenerator {
     const { props } = girClass;
     const memberIndent = generateIndent(indentCount + 1);
     const constructorPropMembers = filterConflicts(girClass.namespace, girClass, props, 1 /* PRESERVE */).flatMap((v) => v.asString(this, true)).map((m) => `${memberIndent}${m}`).join("\n");
+    if (constructorPropMembers.length === 0) {
+      def.push(`${indent}${exp}interface ${constructPropInterfaceName}${genericTypes} ${ext} {}`);
+      return def;
+    }
     def.push(`${indent}${exp}interface ${constructPropInterfaceName}${genericTypes} ${ext} {`);
     def.push(constructorPropMembers);
     def.push(`${indent}}`);
@@ -26099,9 +26305,9 @@ var GirMetadataSerializer = class _GirMetadataSerializer {
     [IntrospectedAlias, (s, o) => s.buildBaseMetadata(o, "alias")]
   ];
   buildMetadata(girObj) {
-    for (const [ctor, handler8] of _GirMetadataSerializer.METADATA_DISPATCH) {
+    for (const [ctor, handler9] of _GirMetadataSerializer.METADATA_DISPATCH) {
       if (girObj instanceof ctor) {
-        return handler8(this, girObj);
+        return handler9(this, girObj);
       }
     }
     return null;
@@ -27159,14 +27365,14 @@ function getModuleName(row, moduleNames) {
   return void 0;
 }
 function buildChunk(rows) {
-  const builder8 = new import_lunr.default.Builder();
-  builder8.pipeline.add(import_lunr.default.trimmer);
-  builder8.ref("id");
-  builder8.field("name", { boost: 10 });
+  const builder9 = new import_lunr.default.Builder();
+  builder9.pipeline.add(import_lunr.default.trimmer);
+  builder9.ref("id");
+  builder9.field("name", { boost: 10 });
   for (let i = 0; i < rows.length; i++) {
-    builder8.add({ id: i, name: rows[i].name });
+    builder9.add({ id: i, name: rows[i].name });
   }
-  const index = builder8.build();
+  const index = builder9.build();
   const data = { rows, index };
   const compressed = deflateSync(Buffer.from(JSON.stringify(data)));
   return compressed.toString("base64");
@@ -27623,7 +27829,7 @@ function giDocgenModuleMemberSummary(context, member) {
   }
   const nsMeta = member.girNamespaceMetadata;
   const commentSummary = context.commentShortSummary(member);
-  const description8 = commentSummary || (nsMeta?.description ? JSX4.createElement("p", null, nsMeta.description) : null);
+  const description9 = commentSummary || (nsMeta?.description ? JSX4.createElement("p", null, nsMeta.description) : null);
   return JSX4.createElement(
     JSX4.Fragment,
     null,
@@ -27635,7 +27841,7 @@ function giDocgenModuleMemberSummary(context, member) {
     JSX4.createElement(
       "dd",
       { class: classNames({ "tsd-member-summary": true }, context.getReflectionClasses(member)) },
-      description8
+      description9
     )
   );
 }
@@ -27750,10 +27956,14 @@ import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { i18n, JSX as JSX8, ReflectionKind as ReflectionKind5 } from "typedoc";
 function getTsForGirVersion() {
   if (true) {
-    return "4.0.0-rc.8";
+    return "4.0.0";
+  }
+  try {
+    const __dirname3 = dirname8(fileURLToPath5(import.meta.url));
+    return JSON.parse(readFileSync7(join14(__dirname3, "..", "..", "package.json"), "utf8")).version;
+  } catch {
+    return "";
   }
-  const __dirname3 = dirname8(fileURLToPath5(import.meta.url));
-  return JSON.parse(readFileSync7(join14(__dirname3, "..", "..", "package.json"), "utf8")).version;
 }
 var TSFOR_GIR_VERSION = getTsForGirVersion();
 function giDocgenModuleInfo(context, mod, nsMeta) {
@@ -28622,14 +28832,132 @@ var list = {
   examples: examples7
 };
 
+// src/commands/self-update.ts
+import { chmodSync, existsSync as existsSync5, renameSync, writeFileSync as writeFileSync5 } from "node:fs";
+import { tmpdir as tmpdir2 } from "node:os";
+import { join as join17 } from "node:path";
+var REPO = "gjsify/ts-for-gir";
+var GITHUB_API = "https://api.github.com";
+var GJS_ASSET_NAME = "ts-for-gir-gjs";
+function getCurrentBinaryPath() {
+  const p = process.argv[1] ?? null;
+  if (!p) return null;
+  if (p.endsWith(".ts") || p.includes("node_modules")) return null;
+  return p;
+}
+async function fetchJson(url) {
+  const headers = {
+    Accept: "application/vnd.github.v3+json",
+    "User-Agent": `ts-for-gir/${APP_VERSION}`
+  };
+  const token = process.env.GITHUB_TOKEN;
+  if (token) headers.Authorization = `token ${token}`;
+  const response = await fetch(url, { headers });
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status} from ${url}`);
+  }
+  return response.json();
+}
+async function downloadBinary(url, destPath) {
+  const response = await fetch(url, {
+    headers: { "User-Agent": `ts-for-gir/${APP_VERSION}` }
+  });
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status} downloading binary`);
+  }
+  const buffer = await response.arrayBuffer();
+  const tmpPath = join17(tmpdir2(), `ts-for-gir-update-${Date.now()}`);
+  writeFileSync5(tmpPath, Buffer.from(buffer));
+  chmodSync(tmpPath, 493);
+  renameSync(tmpPath, destPath);
+}
+var command8 = "self-update";
+var description8 = "Update ts-for-gir to the latest version from GitHub releases";
+var examples8 = [
+  [`${APP_NAME} self-update`, "Check for updates and install the latest version"],
+  [`${APP_NAME} self-update --check`, "Only check for a newer version, do not install"],
+  [`${APP_NAME} self-update --force`, "Force reinstall even if already on the latest version"]
+];
+var builder8 = (yargs2) => yargs2.option("check", {
+  description: "Only check for a newer version, do not install",
+  type: "boolean",
+  default: false
+}).option("force", {
+  description: "Force reinstall even if already on the latest version",
+  type: "boolean",
+  default: false
+}).example(examples8);
+var handler8 = async (args) => {
+  console.log(`Checking for updates... (current: v${APP_VERSION})`);
+  let release;
+  try {
+    release = await fetchJson(`${GITHUB_API}/repos/${REPO}/releases/latest`);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`Failed to fetch release information: ${msg}
+`);
+    process.exitCode = 1;
+    return;
+  }
+  const latestVersion = release.tag_name.replace(/^v/, "");
+  if (latestVersion === APP_VERSION && !args.force) {
+    console.log(`Already up to date (v${APP_VERSION})`);
+    return;
+  }
+  if (args.check) {
+    console.log(`New version available: v${latestVersion} (current: v${APP_VERSION})`);
+    console.log(`Run \`${APP_NAME} self-update\` to install it.`);
+    return;
+  }
+  console.log(`Updating to v${latestVersion}...`);
+  const assets = release.assets;
+  const asset = assets.find((a) => a.name === GJS_ASSET_NAME);
+  if (!asset) {
+    process.stderr.write(
+      `No GJS binary found in release ${release.tag_name}.
+self-update requires the GJS bundle to be installed via install.js.
+For npm installations use: npm update -g @ts-for-gir/cli
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  const currentPath = getCurrentBinaryPath();
+  if (!currentPath || !existsSync5(currentPath)) {
+    process.stderr.write(
+      "Cannot determine current binary path for update.\nself-update only works when running the installed GJS binary.\n"
+    );
+    process.exitCode = 1;
+    return;
+  }
+  try {
+    await downloadBinary(asset.browser_download_url, currentPath);
+    console.log(`Successfully updated to v${latestVersion}`);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`Update failed: ${msg}
+`);
+    process.exitCode = 1;
+  }
+};
+var selfUpdate = {
+  command: command8,
+  description: description8,
+  builder: builder8,
+  handler: handler8,
+  examples: examples8
+};
+
 // src/start.ts
 try {
-  await yargs(hideBin(process.argv)).scriptName(APP_NAME).strict().usage(APP_USAGE).version(APP_VERSION).exitProcess(false).fail(false).command(analyze).command(create).command(generate).command(json2).command(list).command(copy).command(doc).demandCommand(1).help().parseAsync();
+  const cli = yargs(hideBin(process.argv));
+  await cli.scriptName(APP_NAME).strict().usage(APP_USAGE).version(APP_VERSION).wrap(cli.terminalWidth()).exitProcess(false).fail(false).command(analyze).command(create).command(generate).command(json2).command(list).command(copy).command(doc).command(selfUpdate).demandCommand(1).help().parseAsync();
+  process.exit(0);
 } catch (err) {
   const message = err instanceof Error ? err.message : String(err);
   process.stderr.write(`${message}
 `);
-  process.exitCode = 1;
+  process.exit(1);
 }
 /*! Bundled license information: