@ts-for-gir/cli 4.0.0-rc.15 → 4.0.0-rc.17

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";
@@ -5527,9 +5527,9 @@ 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 builder9 = new lunr2.Builder();
@@ -7268,7 +7268,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 function getPackageVersion() {
   if (true) {
-    return "4.0.0-rc.15";
+    return "4.0.0-rc.17";
   }
   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.15";
+    return "4.0.0-rc.17";
   }
   try {
     const currentModulePath = fileURLToPath2(import.meta.url);
@@ -8201,7 +8201,7 @@ __export(parser_exports, {
   parseGir: () => parseGir
 });
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.3-ba5bbbdf2c-00a58655d0.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.3-ba5bbbdf2c-00a58655d0.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.3-ba5bbbdf2c-00a58655d0.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.3-ba5bbbdf2c-00a58655d0.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.3-ba5bbbdf2c-00a58655d0.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.3-ba5bbbdf2c-00a58655d0.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.3-ba5bbbdf2c-00a58655d0.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 {
@@ -11951,7 +11987,7 @@ function sanitizeName(name, options2) {
   return name;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.3-ba5bbbdf2c-00a58655d0.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 {};
@@ -12063,7 +12099,7 @@ function isLeafTag(obj, options2) {
   return false;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.7.3-ba5bbbdf2c-00a58655d0.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 = {};
@@ -13247,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;
@@ -13258,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) {
@@ -13275,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(", ")}]`;
@@ -13460,9 +13524,10 @@ var NullableType = class extends BinaryType {
   }
 };
 function makeNullable(type) {
+  if (type instanceof NullableType) return type;
   if (type === RawPointerType) return NullType;
   if (type === AnyType) return AnyType;
-  return new NullableType(type);
+  return makeUnion(type, NullType);
 }
 var PromiseType = class _PromiseType extends TypeExpression {
   type;
@@ -13607,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({
@@ -13788,16 +13855,16 @@ 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;
       }
@@ -13818,11 +13885,7 @@ function resolveDirectedType(type, direction) {
   } else if (type instanceof BinaryType && !(type instanceof NullableType)) {
     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;
 }
@@ -17494,7 +17557,7 @@ function promisifyNamespaceFunctions(namespace) {
             parameters: sync_parameters
           }),
           node.copy({
-            return_type: new BinaryType(async_return, node.return())
+            return_type: makeUnion(async_return, node.return())
           })
         ]);
       }
@@ -17514,7 +17577,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];
 }
@@ -20099,8 +20162,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;
@@ -21393,8 +21458,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",
@@ -22499,7 +22564,8 @@ 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`,
@@ -22509,15 +22575,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",
@@ -22656,18 +22727,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");
@@ -22682,6 +22761,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 = {
@@ -23077,23 +23160,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) {
@@ -23434,6 +23521,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}}>);`];
@@ -23542,7 +23632,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 */
         })
       ],
@@ -23610,24 +23700,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";
@@ -23674,7 +23764,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();
       }
@@ -24101,6 +24191,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}}`);
@@ -27795,7 +27889,7 @@ 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.15";
+    return "4.0.0-rc.17";
   }
   try {
     const __dirname3 = dirname8(fileURLToPath5(import.meta.url));
@@ -28789,7 +28883,8 @@ var selfUpdate = {
 
 // 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).command(selfUpdate).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);