@ts-for-gir/cli 4.0.0-beta.39 → 4.0.0-beta.40

package/bin/ts-for-gir

@@ -6596,7 +6596,7 @@ __export(parser_exports, {
   parseGir: () => parseGir
 });
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/util.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.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 + "]*";
@@ -6624,7 +6624,7 @@ function isExist(v) {
   return typeof v !== "undefined";
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/validator.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/validator.js
 var defaultOptions = {
   allowBooleanAttributes: false,
   //A tag can have attributes without any value
@@ -6930,7 +6930,7 @@ function getPositionFromMatch(match) {
   return match.startIndex + match[1].length;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
 var defaultOptions2 = {
   preserveOrder: false,
   attributeNamePrefix: "@_",
@@ -6987,6 +6987,7 @@ function normalizeProcessEntities(value) {
       maxExpansionDepth: 10,
       maxTotalExpansions: 1e3,
       maxExpandedLength: 1e5,
+      maxEntityCount: 100,
       allowedTags: null,
       tagFilter: null
     };
@@ -6999,6 +7000,7 @@ function normalizeProcessEntities(value) {
       maxExpansionDepth: value.maxExpansionDepth ?? 10,
       maxTotalExpansions: value.maxTotalExpansions ?? 1e3,
       maxExpandedLength: value.maxExpandedLength ?? 1e5,
+      maxEntityCount: value.maxEntityCount ?? 100,
       allowedTags: value.allowedTags ?? null,
       tagFilter: value.tagFilter ?? null
     };
@@ -7011,7 +7013,7 @@ var buildOptions = function(options2) {
   return built;
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
 var METADATA_SYMBOL;
 if (typeof Symbol !== "function") {
   METADATA_SYMBOL = "@@xmlMetadata";
@@ -7045,7 +7047,7 @@ var XmlNode = class {
   }
 };
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
 var DocTypeReader = class {
   constructor(options2) {
     this.suppressValidationErr = !options2;
@@ -7053,6 +7055,7 @@ var DocTypeReader = class {
   }
   readDocType(xmlData, i) {
     const entities = /* @__PURE__ */ Object.create(null);
+    let entityCount = 0;
     if (xmlData[i + 3] === "O" && xmlData[i + 4] === "C" && xmlData[i + 5] === "T" && xmlData[i + 6] === "Y" && xmlData[i + 7] === "P" && xmlData[i + 8] === "E") {
       i = i + 9;
       let angleBracketsCount = 1;
@@ -7065,11 +7068,17 @@ var DocTypeReader = class {
             let entityName, val;
             [entityName, val, i] = this.readEntityExp(xmlData, i + 1, this.suppressValidationErr);
             if (val.indexOf("&") === -1) {
+              if (this.options.enabled !== false && this.options.maxEntityCount && entityCount >= this.options.maxEntityCount) {
+                throw new Error(
+                  `Entity count (${entityCount + 1}) exceeds maximum allowed (${this.options.maxEntityCount})`
+                );
+              }
               const escaped = entityName.replace(/[.\-+*:]/g, "\\.");
               entities[entityName] = {
                 regx: RegExp(`&${escaped};`, "g"),
                 val
               };
+              entityCount++;
             }
           } else if (hasBody && hasSeq(xmlData, "!ELEMENT", i)) {
             i += 8;
@@ -7432,7 +7441,7 @@ function handleInfinity(str, num, options2) {
   }
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/ignoreAttributes.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/ignoreAttributes.js
 function getIgnoreAttributesFn(ignoreAttributes) {
   if (typeof ignoreAttributes === "function") {
     return ignoreAttributes;
@@ -7452,7 +7461,7 @@ function getIgnoreAttributesFn(ignoreAttributes) {
   return () => false;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
 var OrderedObjParser = class {
   constructor(options2) {
     this.options = options2;
@@ -8020,7 +8029,7 @@ function fromCodePoint(str, base, prefix) {
   }
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/xmlparser/node2json.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/xmlparser/node2json.js
 var METADATA_SYMBOL2 = XmlNode.getMetaDataSymbol();
 function prettify(node, options2) {
   return compress(node, options2);
@@ -8105,7 +8114,7 @@ function isLeafTag(obj, options2) {
   return false;
 }
 
-// ../../.yarn/cache/fast-xml-parser-npm-5.4.1-48bbd2c631-2b40067c3a.zip/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
+// ../../.yarn/cache/fast-xml-parser-npm-5.4.2-dc824fc7a7-12585d5dd7.zip/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
 var XMLParser = class {
   constructor(options2) {
     this.externalEntities = {};
@@ -11007,6 +11016,9 @@ var IntrospectedClass = class _IntrospectedClass extends IntrospectedBaseClass {
   constructor(name, namespace) {
     super({ name, namespace });
   }
+  get gtype() {
+    return this.name;
+  }
   getAllSignals() {
     const allSignals = this.getBaseSignals();
     if (this.hasGObjectSupport()) {
@@ -12167,6 +12179,7 @@ var IntrospectedRecord = class _IntrospectedRecord extends IntrospectedBaseClass
   _structFor = null;
   _isSimple = null;
   _isSimpleWithoutPointers = null;
+  _overriddenGType = null;
   /**
    * Returns all signals for this record (records typically don't have signals)
    */
@@ -12179,6 +12192,12 @@ var IntrospectedRecord = class _IntrospectedRecord extends IntrospectedBaseClass
   get structFor() {
     return this._structFor;
   }
+  get gtype() {
+    return this._overriddenGType ?? this.name;
+  }
+  overrideGType(gtype) {
+    this._overriddenGType = gtype;
+  }
   getType() {
     if (this._structFor) {
       return this._structFor;
@@ -12248,6 +12267,7 @@ var IntrospectedRecord = class _IntrospectedRecord extends IntrospectedBaseClass
       constructors,
       _isForeign,
       _structFor,
+      _overriddenGType,
       props,
       fields,
       callbacks,
@@ -12261,6 +12281,7 @@ var IntrospectedRecord = class _IntrospectedRecord extends IntrospectedBaseClass
     }
     clazz._structFor = _structFor;
     clazz._isForeign = _isForeign;
+    clazz._overriddenGType = _overriddenGType;
     clazz.props = (options2.props ?? props).map((p) => p.copy({ parent: clazz }));
     clazz.fields = (options2.fields ?? fields).map((f) => f.copy({ parent: clazz }));
     clazz.callbacks = (options2.callbacks ?? callbacks).map((c) => c.copy({ parent: clazz }));
@@ -12473,6 +12494,7 @@ var GirComplexRecord = class extends IntrospectedRecord {
 // ../lib/src/gir/enum.ts
 var IntrospectedEnum = class _IntrospectedEnum extends IntrospectedNamespaceMember {
   members = /* @__PURE__ */ new Map();
+  isRegistered = false;
   flags = false;
   ns;
   constructor(name, namespace, options2 = {}) {
@@ -12480,11 +12502,12 @@ var IntrospectedEnum = class _IntrospectedEnum extends IntrospectedNamespaceMemb
     this.ns = namespace;
   }
   copy({ members } = {}) {
-    const { namespace, name, flags } = this;
+    const { namespace, name, isRegistered, flags } = this;
     const en = new _IntrospectedEnum(name, namespace);
     for (const [key, member] of (members ?? this.members).entries()) {
       en.members.set(key, member.copy());
     }
+    en.isRegistered = isRegistered;
     en.flags = flags;
     en._copyBaseProperties(this);
     return en;
@@ -12528,6 +12551,7 @@ var IntrospectedEnum = class _IntrospectedEnum extends IntrospectedNamespaceMemb
   static fromXML(element, ns, options2, flags = false) {
     const em = new _IntrospectedEnum(sanitizeMemberName(element.$.name), ns);
     if (element.$["glib:type-name"]) {
+      em.isRegistered = true;
       em.resolve_names.push(element.$["glib:type-name"]);
       ns.registerResolveName(element.$["glib:type-name"], ns.namespace, em.name);
     }
@@ -12572,6 +12596,11 @@ var IntrospectedError = class _IntrospectedError extends IntrospectedEnum {
     en.flags = flags;
     return en._copyBaseProperties(this);
   }
+  asClass() {
+    const clazz = super.asClass();
+    clazz.overrideGType(this.namespace.namespace === "GLib" ? "Error" : "GLib.Error");
+    return clazz;
+  }
   static fromXML(element, ns, options2) {
     const err = new _IntrospectedError(sanitizeMemberName(element.$.name), ns);
     if (element.$["glib:type-name"]) {
@@ -13072,7 +13101,7 @@ var GirModule = class _GirModule {
       return !this.hasImport(el.name);
     };
     if (ns.enumeration) {
-      const enumerations = ns.enumeration?.map((enumeration) => {
+      const enumerations = ns.enumeration?.filter(isIntrospectable).map((enumeration) => {
         if (enumeration.$["glib:error-domain"]) {
           return IntrospectedError.fromXML(enumeration, this, options2);
         } else {
@@ -19143,7 +19172,6 @@ export const ${node.name}: ${node.name}Namespace & {
   generateEnum(girEnum, indentCount = 0) {
     const desc = [];
     const { name, namespace } = girEnum;
-    desc.push(...this.addGirDocComment(girEnum.doc, [], indentCount));
     const isInvalidEnum = Array.from(girEnum.members.keys()).some(
       (name2) => name2.match(/^[0-9]+$/) || name2 === "NaN" || name2 === "Infinity"
     );
@@ -19151,13 +19179,14 @@ export const ${node.name}: ${node.name}Namespace & {
       desc.push(...girEnum.asClass().asString(this));
       return desc;
     }
-    desc.push("");
+    if (girEnum.isRegistered) {
+      desc.push(`export namespace ${name} {`);
+      const gtypeNamespace = namespace.namespace === "GObject" ? "" : "GObject.";
+      desc.push(`    export const $gtype: ${gtypeNamespace}GType<${name}>;`);
+      desc.push("}");
+      desc.push("");
+    }
     desc.push(...this.addGirDocComment(girEnum.doc, [], indentCount));
-    desc.push(`export namespace ${name} {`);
-    const gtypeNamespace = namespace.namespace === "GObject" ? "" : "GObject.";
-    desc.push(`    export const $gtype: ${gtypeNamespace}GType<${name}>;`);
-    desc.push("}");
-    desc.push("");
     desc.push(this.generateExport("enum", name, "{", indentCount));
     if (girEnum.members) {
       for (const girEnumMember of girEnum.members.values()) {
@@ -19166,6 +19195,7 @@ export const ${node.name}: ${node.name}Namespace & {
       }
     }
     desc.push("}");
+    desc.push("");
     return desc;
   }
   generateEnumMember(tsMember, indentCount = 1) {
@@ -19778,7 +19808,7 @@ ${girClass.__ts__indexSignature}
         def.push(this.generateExport("class", classHead, "{"));
       }
       const gtypeNamespace = this.namespace.namespace === "GObject" ? "" : "GObject.";
-      def.push(`static $gtype: ${gtypeNamespace}GType<${girClass.name}>;`);
+      def.push(`static $gtype: ${gtypeNamespace}GType<${girClass.gtype}>;`);
       if (girClass.__ts__indexSignature) {
         def.push(`
 ${girClass.__ts__indexSignature}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-beta.39",
+  "version": "4.0.0-beta.40",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -52,13 +52,13 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.39",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.39",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.39",
-    "@ts-for-gir/generator-json": "^4.0.0-beta.39",
-    "@ts-for-gir/generator-typescript": "^4.0.0-beta.39",
-    "@ts-for-gir/lib": "^4.0.0-beta.39",
-    "@ts-for-gir/reporter": "^4.0.0-beta.39",
+    "@gi.ts/parser": "^4.0.0-beta.40",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.40",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.40",
+    "@ts-for-gir/generator-json": "^4.0.0-beta.40",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.40",
+    "@ts-for-gir/lib": "^4.0.0-beta.40",
+    "@ts-for-gir/reporter": "^4.0.0-beta.40",
     "@types/ejs": "^3.1.5",
     "@types/inquirer": "^9.0.9",
     "@types/node": "^24.11.0",
@@ -68,9 +68,9 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^8.3.0",
-    "@ts-for-gir/templates": "^4.0.0-beta.39",
+    "@ts-for-gir/templates": "^4.0.0-beta.40",
     "colorette": "^2.0.20",
-    "cosmiconfig": "^9.0.0",
+    "cosmiconfig": "^9.0.1",
     "ejs": "^4.0.1",
     "glob": "^13.0.6",
     "inquirer": "^13.3.0",