@ts-for-gir/cli 4.0.0-rc.1 → 4.0.0-rc.2

package/bin/ts-for-gir

@@ -7268,7 +7268,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 function getPackageVersion() {
   if (true) {
-    return "4.0.0-rc.1";
+    return "4.0.0-rc.2";
   }
   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.1";
+    return "4.0.0-rc.2";
   }
   const currentModulePath = fileURLToPath2(import.meta.url);
   const currentDir = dirname2(currentModulePath);
@@ -11977,6 +11977,7 @@ var Uint8ArrayType = new NativeType("Uint8Array");
 var BooleanType = new NativeType("boolean");
 var StringType = new NativeType("string");
 var NumberType = new NativeType("number");
+var BigintOrNumberType = new BinaryType(new NativeType("bigint"), NumberType);
 var NullType = new NativeType("null");
 var VoidType = new NativeType("void");
 var UnknownType = new NativeType("unknown");
@@ -12090,19 +12091,20 @@ function resolvePrimitiveType(name) {
     case "gfloat":
     case "gchar":
     case "guint":
-    case "glong":
-    case "gulong":
     case "gint":
     case "guint8":
+    case "gdouble":
+      return NumberType;
+    case "glong":
+    case "gulong":
     case "guint64":
     case "gint64":
-    case "gdouble":
     case "gssize":
     case "gsize":
     case "time_t":
     // C standard library time type (seconds since Unix epoch)
     case "ulong":
-      return NumberType;
+      return BigintOrNumberType;
     case "gboolean":
       return BooleanType;
     case "gpointer":
@@ -12154,6 +12156,19 @@ function resolveDirectedType(type, direction) {
         return type;
       }
     }
+  } else if (type === BigintOrNumberType && direction === "out" /* Out */) {
+    return NumberType;
+  } 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)) {
+    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));
   }
   return null;
 }
@@ -12306,7 +12321,7 @@ function getType(ns, param) {
   } else if (closure != null) {
     variableType = ClosureType.new({ type: variableType, user_data: closure });
   }
-  if (parameter.$ && (parameter.$.direction === "inout" /* Inout */ || parameter.$.direction === "out" /* Out */) && (nullable || allowNone) && !(variableType instanceof NativeType)) {
+  if (parameter.$ && (parameter.$.direction === "inout" /* Inout */ || parameter.$.direction === "out" /* Out */) && (nullable || allowNone) && !(variableType instanceof NativeType) && variableType !== BigintOrNumberType) {
     return new NullableType(variableType);
   }
   if ((!parameter.$?.direction || parameter.$.direction === "in" /* In */) && nullable) {
@@ -21064,12 +21079,12 @@ var SignalGenerator = class {
         const gobjectRef = this.namespace.namespace === "GObject" ? "" : "GObject.";
         cbType = `(pspec: ${gobjectRef}ParamSpec) => void`;
       } else if (signalInfo.signal) {
-        const paramTypes = signalInfo.signal.parameters.map((p, idx) => `arg${idx}: ${this.core.generateType(p.type)}`).join(", ");
+        const paramTypes = signalInfo.signal.parameters.map((p, idx) => `arg${idx}: ${this.core.generateDirectedType(p.type, "out" /* Out */)}`).join(", ");
         let returnType = signalInfo.signal.return_type;
         if (signalInfo.signal.return_type.equals(BooleanType)) {
           returnType = new BinaryType(BooleanType, VoidType);
         }
-        const returnTypeStr = this.core.generateType(returnType);
+        const returnTypeStr = this.core.generateDirectedType(returnType, "in" /* In */);
         cbType = `(${paramTypes}) => ${returnTypeStr}`;
       } else {
         const paramTypes = signalInfo.parameterTypes?.map((type, idx) => `arg${idx}: ${type}`) || [];
@@ -21581,13 +21596,15 @@ export const ${node.name}: ${node.name}Namespace & {
       }
     }
     const Type = type.resolve(this.namespace, this.options).rootPrint(this.namespace, this.options) || "any";
+    const GetterType = this.generateDirectedType(type, "out" /* Out */) || Type;
+    const SetterType = this.generateDirectedType(type, "in" /* In */) || Type;
     if (construct) {
       const unwrapped = type.deepUnwrap();
       if (unwrapped instanceof TypeIdentifier && unwrapped.is("GObject", "GType")) {
         const gtypeNamespace = this.namespace.namespace === "GObject" ? "" : "GObject.";
         return [`${name}: ${gtypeNamespace}GTypeInput;`];
       }
-      return [`${name}: ${Type};`];
+      return [`${name}: ${SetterType};`];
     }
     if (printAsProperty) {
       desc.push(`${getterSetterAnnotation}${indent} ${name}: ${Type};`);
@@ -21595,13 +21612,13 @@ export const ${node.name}: ${node.name}Namespace & {
     }
     if (hasGetter && hasSetter) {
       desc.push(
-        `${getterAnnotation}${indent}get ${name}(): ${Type};`,
-        `${setterAnnotation}${indent}set ${name}(val: ${Type});`
+        `${getterAnnotation}${indent}get ${name}(): ${GetterType};`,
+        `${setterAnnotation}${indent}set ${name}(val: ${SetterType});`
       );
     } else if (hasGetter) {
-      desc.push(`${getterSetterAnnotation}${indent}get ${name}(): ${Type};`);
+      desc.push(`${getterSetterAnnotation}${indent}get ${name}(): ${GetterType};`);
     } else {
-      desc.push(`${getterSetterAnnotation}${indent}set ${name}(val: ${Type});`);
+      desc.push(`${getterSetterAnnotation}${indent}set ${name}(val: ${SetterType});`);
     }
     return desc;
   }
@@ -21627,7 +21644,7 @@ export const ${node.name}: ${node.name}Namespace & {
         type = type.unwrap();
       }
     }
-    const typeStr = this.generateType(type);
+    const typeStr = this.generateDirectedType(type, "out" /* Out */);
     desc.push(`${indent}${commentOut}${staticStr}${readonly}${name}${affix}: ${typeStr}`);
     return desc;
   }
@@ -21764,10 +21781,10 @@ export const ${node.name}: ${node.name}Namespace & {
     }
     return def;
   }
-  generateParameter(tsParam) {
+  generateParameter(tsParam, direction = "in" /* In */) {
     const types = tsParam.type;
     const name = tsParam.name;
-    const typeStr = this.generateDirectedType(types, "in" /* In */);
+    const typeStr = this.generateDirectedType(types, direction);
     const optional = tsParam.isOptional && !tsParam.isVarArgs;
     const affix = optional ? "?" : "";
     const prefix = tsParam.isVarArgs ? "..." : "";
@@ -21802,18 +21819,18 @@ export const ${node.name}: ${node.name}Namespace & {
     }
     return "";
   }
-  generateFunctionReturn(tsFunction) {
+  generateFunctionReturn(tsFunction, direction = "out" /* Out */) {
     if (tsFunction.name === "constructor") {
       return "";
     }
-    const typeStr = this.generateDirectedType(tsFunction.return(), "out" /* Out */);
+    const typeStr = this.generateDirectedType(tsFunction.return(), direction);
     const outputParameters = tsFunction.output_parameters;
     if (outputParameters.length > 0) {
       const excludeActualReturnValueFromArray = typeStr === "void" || typeStr === "";
       const returns = [
         ...excludeActualReturnValueFromArray ? [] : [`${typeStr}`],
         ...outputParameters.map((op) => {
-          return resolveDirectedType(op.type, "out" /* Out */)?.resolve(this.namespace, this.options) ?? op.type.resolve(this.namespace, this.options);
+          return resolveDirectedType(op.type, direction)?.resolve(this.namespace, this.options) ?? op.type.resolve(this.namespace, this.options);
         }).map((p) => p.rootPrint(this.namespace, this.options))
       ];
       if (returns.length > 1) {
@@ -21834,6 +21851,9 @@ export const ${node.name}: ${node.name}Namespace & {
     const isStatic = tsFunction instanceof IntrospectedStaticClassFunction;
     const isGlobal = !(tsFunction instanceof IntrospectedClassFunction);
     const isArrowType = tsFunction instanceof IntrospectedCallback || tsFunction instanceof IntrospectedClassCallback;
+    const isReversedDirection = tsFunction instanceof IntrospectedVirtualClassFunction;
+    const inParamDirection = isReversedDirection ? "out" /* Out */ : "in" /* In */;
+    const returnDirection = isReversedDirection ? "in" /* In */ : "out" /* Out */;
     const { parameters: inParams } = tsFunction;
     def.push(
       ...this.addGirDocComment(
@@ -21858,7 +21878,7 @@ export const ${node.name}: ${node.name}Namespace & {
     if (isGlobal) {
       exportStr = !this.config.noNamespace ? "" : "export ";
     }
-    const returnType = this.generateFunctionReturn(tsFunction);
+    const returnType = this.generateFunctionReturn(tsFunction, returnDirection);
     let retSep = "";
     if (returnType) {
       if (isArrowType) {
@@ -21871,7 +21891,10 @@ export const ${node.name}: ${node.name}Namespace & {
     if (isInvalid(name) && !isGlobal) {
       name = `["${name}"]`;
     }
-    const inParamsDef = this.generateInParameters(inParams);
+    const inParamsDef = [];
+    for (const inParam of inParams) {
+      inParamsDef.push(...this.generateParameter(inParam, inParamDirection));
+    }
     def.push(
       `${indent}${commentOut}${exportStr}${staticStr}${globalStr}${name}${genericStr}(${inParamsDef.join(
         ", "
@@ -21902,7 +21925,10 @@ export const ${node.name}: ${node.name}Namespace & {
     name = removeNamespace(name, tsCallback.namespace.namespace);
     if (classModuleName) name = removeClassModule(name, classModuleName);
     const genericParameters = this.generateGenericParameters(generics);
-    const inParamsDef = this.generateInParameters(inParams);
+    const inParamsDef = [];
+    for (const inParam of inParams) {
+      inParamsDef.push(...this.generateParameter(inParam, "out" /* Out */));
+    }
     const interfaceHead = `${name}${genericParameters}`;
     def.push(this.generateExport("interface", `${interfaceHead}`, "{", indentCount));
     def.push(`${indentBody}(${inParamsDef.join(", ")}): ${returnTypeStr}`);
@@ -21974,7 +22000,7 @@ export const ${node.name}: ${node.name}Namespace & {
     const indent = generateIndent(indentCount);
     const exp = !this.config.noNamespace ? "" : "export ";
     const ComputedName = generateMemberName(tsConst);
-    const typeStr = this.generateType(tsConst.type);
+    const typeStr = this.generateType(resolveDirectedType(tsConst.type, "out" /* Out */) ?? tsConst.type);
     desc.push(`${indent}${exp}const ${ComputedName}: ${typeStr}`);
     return desc;
   }
@@ -22928,6 +22954,7 @@ var MUTTER_COMMON = {
   browseUrl: "https://gitlab.gnome.org/GNOME/mutter/",
   repositoryUrl: "https://gitlab.gnome.org/GNOME/mutter.git",
   license: "GPL-2.0-or-later",
+  iconFile: "mutter-r.svg",
   category: "GNOME Shell"
 };
 var SHELL_COMMON = {
@@ -22936,6 +22963,7 @@ var SHELL_COMMON = {
   browseUrl: "https://gitlab.gnome.org/GNOME/gnome-shell/",
   repositoryUrl: "https://gitlab.gnome.org/GNOME/gnome-shell.git",
   license: "GPL-2.0-or-later",
+  iconFile: "gnome-shell-r.svg",
   category: "GNOME Shell"
 };
 var meta = {
@@ -23262,6 +23290,7 @@ var gtksource5 = {
   repositoryUrl: "https://gitlab.gnome.org/GNOME/gtksourceview.git",
   license: "LGPL-2.1-or-later",
   cDocsUrl: "https://gnome.pages.gitlab.gnome.org/gtksourceview/gtksourceview5/",
+  iconFile: "gtksourceview-r.svg",
   category: "GNOME Desktop"
 };
 var shumate = {
@@ -23274,6 +23303,7 @@ var shumate = {
   repositoryUrl: "https://gitlab.gnome.org/GNOME/libshumate.git",
   license: "LGPL-2.1-or-later",
   cDocsUrl: "https://gnome.pages.gitlab.gnome.org/libshumate/",
+  iconFile: "libshumate-r.svg",
   category: "GNOME Desktop"
 };
 var notify = {
@@ -23469,6 +23499,7 @@ var tsparql = {
   repositoryUrl: "https://gitlab.gnome.org/GNOME/tracker.git",
   license: "LGPL-2.1-or-later",
   cDocsUrl: "https://gnome.pages.gitlab.gnome.org/tracker/docs/developer/",
+  iconFile: "tracker-r.svg",
   category: "Data & Markup"
 };
 var template = {
@@ -23537,6 +23568,7 @@ var polkit = {
   browseUrl: "https://gitlab.freedesktop.org/polkit/polkit/",
   repositoryUrl: "https://gitlab.freedesktop.org/polkit/polkit.git",
   license: "LGPL-2.0-or-later",
+  iconFile: "polkit-r.svg",
   category: "Security"
 };
 var polkitAgent = {
@@ -23548,6 +23580,7 @@ var polkitAgent = {
   browseUrl: "https://gitlab.freedesktop.org/polkit/polkit/",
   repositoryUrl: "https://gitlab.freedesktop.org/polkit/polkit.git",
   license: "LGPL-2.0-or-later",
+  iconFile: "polkit-r.svg",
   category: "Security"
 };
 var nm = {
@@ -23640,6 +23673,7 @@ var xdp = {
   browseUrl: "https://github.com/flatpak/libportal/",
   repositoryUrl: "https://github.com/flatpak/libportal.git",
   license: "LGPL-3.0-or-later",
+  iconFile: "libportal-r.svg",
   category: "System"
 };
 var xdpGtk4 = {
@@ -23651,6 +23685,7 @@ var xdpGtk4 = {
   browseUrl: "https://github.com/flatpak/libportal/",
   repositoryUrl: "https://github.com/flatpak/libportal.git",
   license: "LGPL-3.0-or-later",
+  iconFile: "libportal-r.svg",
   category: "System"
 };
 var rsvg = {
@@ -23663,6 +23698,7 @@ var rsvg = {
   repositoryUrl: "https://gitlab.gnome.org/GNOME/librsvg.git",
   license: "LGPL-2.1-or-later",
   cDocsUrl: "https://gnome.pages.gitlab.gnome.org/librsvg/doc/rsvg/",
+  iconFile: "librsvg-r.svg",
   category: "Graphics"
 };
 var gl = {
@@ -23730,6 +23766,7 @@ var goa = {
   repositoryUrl: "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git",
   license: "LGPL-2.0-or-later",
   cDocsUrl: "https://gnome.pages.gitlab.gnome.org/gnome-online-accounts/goa/",
+  iconFile: "goa-r.svg",
   category: "Web"
 };
 var rest = {
@@ -24217,6 +24254,10 @@ var TypeDocPipeline = class {
     );
     result.project.packageVersion = module.libraryVersion.toString();
     this.registerGirMetadata(result.app, module);
+    const nsMeta = this.buildNamespaceMetadata(module);
+    for (const child of result.project.children ?? []) {
+      child.girNamespaceMetadata ??= nsMeta;
+    }
     return result;
   }
   /**
@@ -24294,6 +24335,7 @@ var TypeDocPipeline = class {
       [new TSConfigReader()]
     );
     this.fixExportImportReferences(result.project);
+    this.enrichModuleReflections(result.project);
     return result;
   }
   /**
@@ -24339,7 +24381,8 @@ var TypeDocPipeline = class {
         ...existing,
         displayName: existing.displayName ?? meta2.displayName,
         description: existing.description ?? meta2.description,
-        logoUrl: existing.logoUrl ?? meta2.logoUrl,
+        logoUrl: existing.logoUrl ?? meta2.logoUrl ?? (meta2.iconFile ? `assets/library-icons/${meta2.iconFile}` : void 0),
+        iconFile: existing.iconFile ?? meta2.iconFile,
         websiteUrl: existing.websiteUrl ?? meta2.websiteUrl,
         cDocsUrl: existing.cDocsUrl ?? meta2.cDocsUrl,
         license: existing.license ?? meta2.license,
@@ -24347,6 +24390,27 @@ var TypeDocPipeline = class {
       };
     }
   }
+  /**
+   * Attach metadata to module reflections by matching against known GIR modules.
+   * Used in combined mode where modules are discovered via "packages" entry point strategy.
+   */
+  enrichModuleReflections(project) {
+    if (!project.children) return;
+    const metaByImportName = /* @__PURE__ */ new Map();
+    for (const module of this.modules) {
+      metaByImportName.set(module.importName, this.buildNamespaceMetadata(module));
+    }
+    for (const child of project.children) {
+      const enriched = child;
+      if (enriched.girNamespaceMetadata?.category) continue;
+      const scopeMatch = child.name.match(/^@[^/]+\/(.+)$/);
+      const importName = scopeMatch ? scopeMatch[1] : child.name.toLowerCase();
+      const nsMeta = metaByImportName.get(importName);
+      if (nsMeta) {
+        enriched.girNamespaceMetadata ??= nsMeta;
+      }
+    }
+  }
   async cleanup() {
     if (this.tempDir) {
       await rm(this.tempDir, { recursive: true, force: true });
@@ -24642,7 +24706,8 @@ var TypeDocPipeline = class {
       packageVersion: pkgJson?.version,
       displayName: meta2?.displayName,
       description: meta2?.description ?? pkgJson?.description,
-      logoUrl: meta2?.logoUrl,
+      logoUrl: meta2?.logoUrl ?? (meta2?.iconFile ? `assets/library-icons/${meta2.iconFile}` : void 0),
+      iconFile: meta2?.iconFile,
       websiteUrl: meta2?.websiteUrl ?? pkgJson?.homepage,
       cDocsUrl: meta2?.cDocsUrl,
       license: meta2?.license ?? pkgJson?.license,
@@ -24744,7 +24809,7 @@ var JsonDefinitionGenerator = class _JsonDefinitionGenerator {
 };
 
 // ../typedoc-theme/src/theme.ts
-import { copyFileSync, writeFileSync as writeFileSync3 } from "node:fs";
+import { copyFileSync, existsSync as existsSync3, mkdirSync, readdirSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { dirname as dirname8, join as join14 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { DefaultTheme, RendererEvent } from "typedoc";
@@ -25628,7 +25693,7 @@ import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { i18n, JSX as JSX8, ReflectionKind as ReflectionKind4 } from "typedoc";
 function getTsForGirVersion() {
   if (true) {
-    return "4.0.0-rc.1";
+    return "4.0.0-rc.2";
   }
   const __dirname3 = dirname7(fileURLToPath4(import.meta.url));
   return JSON.parse(readFileSync6(join13(__dirname3, "..", "..", "package.json"), "utf8")).version;
@@ -25707,7 +25772,7 @@ function giDocgenModuleInfo(context, mod, nsMeta) {
 var giDocgenSidebar = (context, props) => {
   const owningModule = findOwningModule(props.model);
   const nsMeta = owningModule ? getGirNamespaceMetadata(props.model) : void 0;
-  const logoUrl = nsMeta?.logoUrl || context.relativeURL("assets/logo_x4.png", true);
+  const logoUrl = nsMeta?.logoUrl ? nsMeta.logoUrl.startsWith("http://") || nsMeta.logoUrl.startsWith("https://") ? nsMeta.logoUrl : context.relativeURL(nsMeta.logoUrl, true) : context.relativeURL("assets/logo_x4.png", true);
   const logoAlt = nsMeta?.displayName || nsMeta?.namespace || "GJS TypeScript Definitions";
   const logoHref = owningModule ? context.urlTo(owningModule) : context.relativeURL("index.html", true);
   const subtitleTarget = nsMeta ? (nsMeta.displayName || nsMeta.packageName).toUpperCase() : "GJS";
@@ -26095,6 +26160,16 @@ var GiDocgenTheme = class extends DefaultTheme {
       for (const file of FAVICON_FILES) {
         copyFileSync(join14(faviconDir, file), join14(assetsDir, file));
       }
+      const iconsSourceDir = join14(__dirname2, "..", "..", "..", "refs", "library-icons", "library-icons");
+      const iconsOutputDir = join14(assetsDir, "library-icons");
+      if (existsSync3(iconsSourceDir)) {
+        mkdirSync(iconsOutputDir, { recursive: true });
+        for (const file of readdirSync(iconsSourceDir)) {
+          if (file.endsWith("-r.svg")) {
+            copyFileSync(join14(iconsSourceDir, file), join14(iconsOutputDir, file));
+          }
+        }
+      }
       const projectName = event.project.name || "TS for GIR";
       const manifest = {
         name: `TypeScript type definitions for ${projectName}`,

package/package.json

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