Declare promisified Gtk.FileDialog

src/lib/fixes.ts

@@ -17,9 +17,11 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+// Only use type imports here, as this module is used in prefs as well as extension code!
 import type GLib from "gi://GLib";
 import type Gio from "gi://Gio";
 import type Soup from "gi://Soup";
+import type Gtk from "gi://Gtk";
 
 /**
  * This module provides workarounds and fixes for various incomplete type
@@ -82,3 +84,15 @@ export interface PromisifiedSoupSession extends Soup.Session {
     cancellable?: Gio.Cancellable | null,
   ): Promise<ReturnType<Soup.Session["send_and_read_finish"]>>;
 }
+
+/**
+ * @see https://github.com/gjsify/ts-for-gir/issues/200
+ * @see https://github.com/gjsify/ts-for-gir/issues/140
+ */
+export interface PromisifiedGtkFileDialog extends Gtk.FileDialog {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  select_folder(
+    parent?: Gtk.Window | null,
+    cancellable?: Gio.Cancellable | null,
+  ): Promise<ReturnType<Gtk.FileDialog["select_folder_finish"]>>;
+}

src/prefs.ts

@@ -33,6 +33,7 @@ import SOURCES from "./lib/sources/metadata/all.js";
 import { SourceMetadata } from "./lib/source/source.js";
 
 import type { ExtensionMetadata } from "@girs/gnome-shell/extensions/extension";
+import { PromisifiedGtkFileDialog } from "./lib/fixes.js";
 
 Gio._promisify(Gtk.FileDialog.prototype, "select_folder");
 
@@ -132,13 +133,15 @@ const SourcesPage = GObject.registerClass(
       if (picturesDirectory) {
         dialog.initialFolder = Gio.file_new_for_path(picturesDirectory);
       }
-      // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
-      const file = await (dialog.select_folder(
+      const file = await (dialog as PromisifiedGtkFileDialog).select_folder(
         this.root as Gtk.Window,
-        null,
-      ) as unknown as Promise<Gio.File>);
-      const value = new GLib.Variant("ms", file.get_uri());
-      this.settings.extension.set_value("image-download-folder", value);
+      );
+      if (file) {
+        const value = new GLib.Variant("ms", file.get_uri());
+        this.settings.extension.set_value("image-download-folder", value);
+      } else {
+        console.warn("No folder selected; dialog cancelled?");
+      }
     }
 
     private initialize(