@girs/unity-7.0 7.0.0-4.0.0-beta.2 → 7.0.0-4.0.0-beta.3

package/README.md

@@ -5,7 +5,7 @@
 ![downloads/week](https://img.shields.io/npm/dw/@girs/unity-7.0)
 
 
-GJS TypeScript type definitions for Unity-7.0, generated from library version 7.0.0 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.0.0-beta.2.
+GJS TypeScript type definitions for Unity-7.0, generated from library version 7.0.0 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.0.0-beta.3.
 
 
 ## Install
@@ -22,11 +22,6 @@ You can import this package into your project like this:
 import Unity from '@girs/unity-7.0';
 ```
 
-Or if you prefer CommonJS, you can also use this:
-```ts
-const Unity = require('@girs/unity-7.0');
-```
-
 ### Ambient Modules
 
 You can also use [ambient modules](https://github.com/gjsify/ts-for-gir/tree/main/packages/cli#ambient-modules) to import this module like you would do this in JavaScript.
@@ -81,19 +76,6 @@ Now you have also type support for this, too:
 const Unity = imports.gi.Unity;
 ```
 
-
-### ESM vs. CommonJS
-
-GJS supports two different import syntaxes. The new modern ESM syntax and the old global imports syntax.
-
-In TypeScript projects for GJS and GNOME Shell extensions, you have the flexibility to use `ESM` syntax and then decide the import syntax for your bundled file. If your bundler is configured to use `CommonJS`, it will convert to the GJS-specific global imports syntax, like `const moduleName = imports.gi[moduleName]`. This is different from the traditional `require` syntax seen in Node.js. The global imports syntax is chosen because it aligns with the CommonJS format supported by NPM, which is used for the generated type definitions and this package.
-
-On the other hand, if you configure your bundler to use ESM, it will retain the ESM import syntax. It's crucial to ensure that your bundler is set up to correctly translate and bundle these imports into either CommonJS or ESM format, depending on your project's requirements.
-
-This approach is particularly important due to the `@girs` types, which include both `*.cjs `files, using the GJS global imports syntax, and `*.js` files, which utilize the ESM syntax. By appropriately setting up your bundler, you can control which syntax—CommonJS or ESM—is used in your project. The choice of CommonJS in this context is also due to the similarity between the GJS-specific global imports and CommonJS syntax, allowing for easier management and bundling in these specific types of projects.
-
-Since GNOME Shell 45, you should only use ESM, even for GNOME Shell extensions. Before that, extensions had to use the global import syntax, unlike normal GJS applications, where ESM has been available for some time.
-
 ### Bundle
 
 Depending on your project configuration, it is recommended to use a bundler like [esbuild](https://esbuild.github.io/). You can find examples using different bundlers [here](https://github.com/gjsify/ts-for-gir/tree/main/examples).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@girs/unity-7.0",
-  "version": "7.0.0-4.0.0-beta.2",
+  "version": "7.0.0-4.0.0-beta.3",
   "description": "GJS TypeScript type definitions for Unity-7.0, generated from library version 7.0.0",
   "type": "module",
   "module": "unity-7.0.js",
@@ -26,13 +26,12 @@
     "test": "NODE_OPTIONS=--max_old_space_size=9216 tsc --noEmit unity-7.0.d.ts"
   },
   "dependencies": {
-    "@girs/dbusmenu-0.4": "^0.4.0-4.0.0-beta.2",
-    "@girs/dee-1.0": "^1.0.0-4.0.0-beta.2",
-    "@girs/gio-2.0": "^2.80.0-4.0.0-beta.2",
-    "@girs/gjs": "^4.0.0-beta.2",
-    "@girs/glib-2.0": "^2.80.0-4.0.0-beta.2",
-    "@girs/gmodule-2.0": "^2.0.0-4.0.0-beta.2",
-    "@girs/gobject-2.0": "^2.80.0-4.0.0-beta.2"
+    "@girs/dbusmenu-0.4": "^0.4.0-4.0.0-beta.3",
+    "@girs/dee-1.0": "^1.0.0-4.0.0-beta.3",
+    "@girs/gio-2.0": "^2.80.0-4.0.0-beta.3",
+    "@girs/gjs": "^4.0.0-beta.3",
+    "@girs/glib-2.0": "^2.80.0-4.0.0-beta.3",
+    "@girs/gobject-2.0": "^2.80.0-4.0.0-beta.3"
   },
   "devDependencies": {
     "typescript": "*"

package/unity-7.0.d.ts

@@ -11,12 +11,11 @@ import './unity-7.0-ambient.d.ts';
  * Unity-7.0
  */
 
-import type GLib from '@girs/glib-2.0';
 import type Dbusmenu from '@girs/dbusmenu-0.4';
 import type GObject from '@girs/gobject-2.0';
+import type GLib from '@girs/glib-2.0';
 import type Dee from '@girs/dee-1.0';
 import type Gio from '@girs/gio-2.0';
-import type GModule from '@girs/gmodule-2.0';
 
 export namespace Unity {
     enum CategoryType {
@@ -153,18 +152,18 @@ export namespace Unity {
     function filter_renderer_from_string(renderer_name: string): FilterRenderer;
     function scope_module_get_version(): number;
     function scope_module_load_scopes(): AbstractScope[];
-    function object_unref(object: any): void;
+    function object_unref(object?: any | null): void;
     interface ScopeSearchBaseCallback {
         (instance: ScopeSearchBase): void;
     }
     interface AbstractPreviewCallback {
-        (previewer: ResultPreviewer, preview: AbstractPreview): void;
+        (previewer: ResultPreviewer, preview?: AbstractPreview | null): void;
     }
     module AppInfoManager {
         // Signal callback interfaces
 
         interface Changed {
-            (id: string, new_appinfo: Gio.AppInfo): void;
+            (id: string, new_appinfo?: Gio.AppInfo | null): void;
         }
 
         // Constructor properties interface
@@ -186,12 +185,15 @@ export namespace Unity {
         connect(id: string, callback: (...args: any[]) => any): number;
         connect_after(id: string, callback: (...args: any[]) => any): number;
         emit(id: string, ...args: any[]): void;
-        connect(signal: 'changed', callback: (_source: this, id: string, new_appinfo: Gio.AppInfo) => void): number;
+        connect(
+            signal: 'changed',
+            callback: (_source: this, id: string, new_appinfo: Gio.AppInfo | null) => void,
+        ): number;
         connect_after(
             signal: 'changed',
-            callback: (_source: this, id: string, new_appinfo: Gio.AppInfo) => void,
+            callback: (_source: this, id: string, new_appinfo: Gio.AppInfo | null) => void,
         ): number;
-        emit(signal: 'changed', id: string, new_appinfo: Gio.AppInfo): void;
+        emit(signal: 'changed', id: string, new_appinfo?: Gio.AppInfo | null): void;
 
         // Own static methods of Unity.AppInfoManager
 
@@ -200,12 +202,12 @@ export namespace Unity {
 
         // Own methods of Unity.AppInfoManager
 
-        lookup(id: string): Gio.AppInfo;
-        get_categories(id: string): string[];
-        get_keywords(id: string): string[];
-        get_path(id: string): string;
-        lookup_async(id: string, _callback_: Gio.AsyncReadyCallback<this>): void;
-        lookup_finish(_res_: Gio.AsyncResult): Gio.AppInfo;
+        lookup(id: string): Gio.AppInfo | null;
+        get_categories(id: string): string[] | null;
+        get_keywords(id: string): string[] | null;
+        get_path(id: string): string | null;
+        lookup_async(id: string, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
+        lookup_finish(_res_: Gio.AsyncResult): Gio.AppInfo | null;
         clear(): void;
     }
 
@@ -293,7 +295,7 @@ export namespace Unity {
         // Own methods of Unity.Inspector
 
         get_unity_running(): boolean;
-        get_unity_bus_name(): string;
+        get_unity_bus_name(): string | null;
     }
 
     module LauncherEntry {
@@ -365,8 +367,8 @@ export namespace Unity {
         set_progress_visible(value: boolean): void;
         get_urgent(): boolean;
         set_urgent(value: boolean): void;
-        get_quicklist(): Dbusmenu.Menuitem;
-        set_quicklist(value: Dbusmenu.Menuitem): void;
+        get_quicklist(): Dbusmenu.Menuitem | null;
+        set_quicklist(value?: Dbusmenu.Menuitem | null): void;
 
         // Inherited methods
         /**
@@ -573,7 +575,7 @@ export namespace Unity {
          *   static void
          *   my_object_class_init (MyObjectClass *klass)
          *   {
-         *     properties[PROP_FOO] = g_param_spec_int ("foo", NULL, NULL,
+         *     properties[PROP_FOO] = g_param_spec_int ("foo", "Foo", "The foo",
          *                                              0, 100,
          *                                              50,
          *                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -791,7 +793,7 @@ export namespace Unity {
 
         has_app_info(appinfo: Gio.AppInfo): boolean;
         has_app_id(app_id: string): boolean;
-        lookup(app_id: string): Gio.AppInfo;
+        lookup(app_id: string): Gio.AppInfo | null;
         enumerate_ids(): string[];
         enumerate_app_infos(): Gio.AppInfo[];
     }
@@ -810,6 +812,14 @@ export namespace Unity {
         constructor(properties?: Partial<MetadataProvider.ConstructorProps>, ...args: any[]);
 
         _init(...args: any[]): void;
+
+        // Own virtual methods of Unity.MetadataProvider
+
+        vfunc_update_hints(hints: { [key: string]: any } | GLib.HashTable<string, GLib.Variant>): void;
+
+        // Own methods of Unity.MetadataProvider
+
+        update_hints(hints: { [key: string]: any } | GLib.HashTable<string, GLib.Variant>): void;
     }
 
     module ProgressSourceProvider {
@@ -899,7 +909,7 @@ export namespace Unity {
         add_metadata_provider(provider: MetadataProvider): void;
         get_id(): string;
         get_name(): string;
-        get_icon_hint(): Gio.Icon;
+        get_icon_hint(): Gio.Icon | null;
         get_default_renderer(): CategoryRenderer;
         get_content_type(): CategoryContentType;
         set_content_type(value: CategoryContentType): void;
@@ -965,11 +975,18 @@ export namespace Unity {
         connect_after(signal: 'changed', callback: (_source: this) => void): number;
         emit(signal: 'changed'): void;
 
+        // Own virtual methods of Unity.Filter
+
+        vfunc_get_hints(): GLib.HashTable<string, GLib.Variant>;
+        vfunc_update(properties: GLib.Variant): void;
+
         // Own methods of Unity.Filter
 
+        get_hints(): GLib.HashTable<string, GLib.Variant>;
+        update(properties: GLib.Variant): void;
         get_id(): string;
         get_display_name(): string;
-        get_icon_hint(): Gio.Icon;
+        get_icon_hint(): Gio.Icon | null;
         get_renderer(): FilterRenderer;
         get_visible(): boolean;
         set_visible(value: boolean): void;
@@ -1181,7 +1198,7 @@ export namespace Unity {
          *   static void
          *   my_object_class_init (MyObjectClass *klass)
          *   {
-         *     properties[PROP_FOO] = g_param_spec_int ("foo", NULL, NULL,
+         *     properties[PROP_FOO] = g_param_spec_int ("foo", "Foo", "The foo",
          *                                              0, 100,
          *                                              50,
          *                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -1393,7 +1410,7 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon, active: boolean): FilterOption;
+        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon | null, active: boolean): FilterOption;
 
         // Own methods of Unity.FilterOption
 
@@ -1443,8 +1460,8 @@ export namespace Unity {
 
         // Own methods of Unity.OptionsFilter
 
-        add_option(id: string, display_name: string, icon_hint: Gio.Icon): FilterOption;
-        get_option(id: string): FilterOption;
+        add_option(id: string, display_name: string, icon_hint?: Gio.Icon | null): FilterOption;
+        get_option(id: string): FilterOption | null;
         remove_option(id: string): boolean;
         get_sort_type(): OptionsFilterSortType;
         set_sort_type(value: OptionsFilterSortType): void;
@@ -1467,14 +1484,19 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon, collapsed: boolean): RadioOptionFilter;
+        static ['new'](
+            id: string,
+            display_name: string,
+            icon_hint: Gio.Icon | null,
+            collapsed: boolean,
+        ): RadioOptionFilter;
         // Conflicted with Unity.OptionsFilter.new
 
         static ['new'](...args: never[]): any;
 
         // Own methods of Unity.RadioOptionFilter
 
-        get_active_option(): FilterOption;
+        get_active_option(): FilterOption | null;
     }
 
     module CheckOptionFilter {
@@ -1492,7 +1514,12 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon, collapsed: boolean): CheckOptionFilter;
+        static ['new'](
+            id: string,
+            display_name: string,
+            icon_hint: Gio.Icon | null,
+            collapsed: boolean,
+        ): CheckOptionFilter;
         // Conflicted with Unity.OptionsFilter.new
 
         static ['new'](...args: never[]): any;
@@ -1516,7 +1543,7 @@ export namespace Unity {
         static ['new'](
             id: string,
             display_name: string,
-            icon_hint: Gio.Icon,
+            icon_hint: Gio.Icon | null,
             collapsed: boolean,
         ): CheckOptionFilterCompact;
         // Conflicted with Unity.OptionsFilter.new
@@ -1546,7 +1573,7 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon, collapsed: boolean): RatingsFilter;
+        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon | null, collapsed: boolean): RatingsFilter;
 
         // Own methods of Unity.RatingsFilter
 
@@ -1568,15 +1595,20 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon, collapsed: boolean): MultiRangeFilter;
+        static ['new'](
+            id: string,
+            display_name: string,
+            icon_hint: Gio.Icon | null,
+            collapsed: boolean,
+        ): MultiRangeFilter;
         // Conflicted with Unity.OptionsFilter.new
 
         static ['new'](...args: never[]): any;
 
         // Own methods of Unity.MultiRangeFilter
 
-        get_first_active(): FilterOption;
-        get_last_active(): FilterOption;
+        get_first_active(): FilterOption | null;
+        get_last_active(): FilterOption | null;
     }
 
     module PreferencesManager {
@@ -1703,7 +1735,7 @@ export namespace Unity {
         // Own methods of Unity.DeprecatedScopeSearch
 
         set_reply_hint(key: string, variant: GLib.Variant): void;
-        get_filter(filter_id: string): Filter;
+        get_filter(filter_id: string): Filter | null;
         equals(other: DeprecatedScopeSearch): boolean;
         get_channel_id(): string;
         get_search_string(): string;
@@ -1772,15 +1804,15 @@ export namespace Unity {
             scope_id: string,
             search_string: string,
             search_type: SearchType,
-            hints: { [key: string]: any } | GLib.HashTable<string, GLib.Variant>,
-            _callback_: Gio.AsyncReadyCallback<this>,
+            hints?: GLib.HashTable<string, GLib.Variant> | null,
+            _callback_?: Gio.AsyncReadyCallback<this> | null,
         ): void;
         search_scope_finish(_res_: Gio.AsyncResult): GLib.HashTable<string, GLib.Variant>;
         push_results(
             scope_id: string,
             results_model: Dee.SerializableModel,
             category_ids: string[],
-            _callback_: Gio.AsyncReadyCallback<this>,
+            _callback_?: Gio.AsyncReadyCallback<this> | null,
         ): void;
         push_results_finish(_res_: Gio.AsyncResult): void;
         push_filter_settings(filters: FilterSet): void;
@@ -1826,8 +1858,13 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
+        // Own virtual methods of Unity.Preview
+
+        vfunc_create_raw<T = GObject.Object>(): T;
+
         // Own methods of Unity.Preview
 
+        create_raw<T = GObject.Object>(): T;
         add_action(action: PreviewAction): void;
         add_info(info_hint: InfoHint): void;
         get_title(): string;
@@ -1838,8 +1875,8 @@ export namespace Unity {
         set_description_markup(value: string): void;
         get_image_source_uri(): string;
         set_image_source_uri(value: string): void;
-        get_image(): Gio.Icon;
-        set_image(value: Gio.Icon): void;
+        get_image(): Gio.Icon | null;
+        set_image(value?: Gio.Icon | null): void;
 
         // Inherited methods
         /**
@@ -2046,7 +2083,7 @@ export namespace Unity {
          *   static void
          *   my_object_class_init (MyObjectClass *klass)
          *   {
-         *     properties[PROP_FOO] = g_param_spec_int ("foo", NULL, NULL,
+         *     properties[PROP_FOO] = g_param_spec_int ("foo", "Foo", "The foo",
          *                                              0, 100,
          *                                              50,
          *                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -2273,16 +2310,16 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon): PreviewAction;
+        static ['new'](id: string, display_name: string, icon_hint?: Gio.Icon | null): PreviewAction;
 
         static with_layout_hint(
             id: string,
             display_name: string,
-            icon_hint: Gio.Icon,
+            icon_hint: Gio.Icon | null,
             layout: LayoutHint,
         ): PreviewAction;
 
-        static with_uri(uri: string, display_name: string, icon_hint: Gio.Icon): PreviewAction;
+        static with_uri(uri: string, display_name: string, icon_hint?: Gio.Icon | null): PreviewAction;
 
         // Own signals of Unity.PreviewAction
 
@@ -2299,9 +2336,9 @@ export namespace Unity {
         get_display_name(): string;
         get_extra_text(): string;
         set_extra_text(value: string): void;
-        get_icon_hint(): Gio.Icon;
+        get_icon_hint(): Gio.Icon | null;
         get_layout_hint(): LayoutHint;
-        get_hints(): GLib.HashTable<string, GLib.Variant>;
+        get_hints(): GLib.HashTable<string, GLib.Variant> | null;
 
         // Inherited methods
         /**
@@ -2508,7 +2545,7 @@ export namespace Unity {
          *   static void
          *   my_object_class_init (MyObjectClass *klass)
          *   {
-         *     properties[PROP_FOO] = g_param_spec_int ("foo", NULL, NULL,
+         *     properties[PROP_FOO] = g_param_spec_int ("foo", "Foo", "The foo",
          *                                              0, 100,
          *                                              50,
          *                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -2719,15 +2756,15 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon, data: string): InfoHint;
+        static ['new'](id: string, display_name: string, icon_hint: Gio.Icon | null, data: string): InfoHint;
 
-        static with_variant(id: string, display_name: string, icon_hint: Gio.Icon, data: GLib.Variant): InfoHint;
+        static with_variant(id: string, display_name: string, icon_hint: Gio.Icon | null, data: GLib.Variant): InfoHint;
 
         // Own methods of Unity.InfoHint
 
         get_id(): string;
         get_display_name(): string;
-        get_icon_hint(): Gio.Icon;
+        get_icon_hint(): Gio.Icon | null;
         get_data(): GLib.Variant;
         // Conflicted with GObject.Object.get_data
         get_data(...args: never[]): any;
@@ -2748,7 +2785,7 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](title: string, description: string, image: Gio.Icon): GenericPreview;
+        static ['new'](title: string, description: string, image?: Gio.Icon | null): GenericPreview;
     }
 
     module ApplicationPreview {
@@ -2792,8 +2829,8 @@ export namespace Unity {
             title: string,
             subtitle: string,
             description: string,
-            icon: Gio.Icon,
-            screenshot: Gio.Icon,
+            icon?: Gio.Icon | null,
+            screenshot?: Gio.Icon | null,
         ): ApplicationPreview;
 
         // Own methods of Unity.ApplicationPreview
@@ -2824,7 +2861,7 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](title: string, subtitle: string, image: Gio.Icon): MusicPreview;
+        static ['new'](title: string, subtitle: string, image?: Gio.Icon | null): MusicPreview;
 
         // Own methods of Unity.MusicPreview
 
@@ -2880,15 +2917,20 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](title: string, subtitle: string, image: Gio.Icon): PaymentPreview;
+        static ['new'](title: string, subtitle: string, image?: Gio.Icon | null): PaymentPreview;
 
-        static for_type(title: string, subtitle: string, image: Gio.Icon, type: PaymentPreviewType): PaymentPreview;
+        static for_type(
+            title: string,
+            subtitle: string,
+            image: Gio.Icon | null,
+            type: PaymentPreviewType,
+        ): PaymentPreview;
 
-        static for_application(title: string, subtitle: string, image: Gio.Icon): PaymentPreview;
+        static for_application(title: string, subtitle: string, image?: Gio.Icon | null): PaymentPreview;
 
-        static for_music(title: string, subtitle: string, image: Gio.Icon): PaymentPreview;
+        static for_music(title: string, subtitle: string, image?: Gio.Icon | null): PaymentPreview;
 
-        static for_error(title: string, subtitle: string, image: Gio.Icon): PaymentPreview;
+        static for_error(title: string, subtitle: string, image?: Gio.Icon | null): PaymentPreview;
 
         // Own methods of Unity.PaymentPreview
 
@@ -2928,7 +2970,7 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](title: string, subtitle: string, description: string, image: Gio.Icon): MoviePreview;
+        static ['new'](title: string, subtitle: string, description: string, image?: Gio.Icon | null): MoviePreview;
 
         // Own methods of Unity.MoviePreview
 
@@ -2965,7 +3007,7 @@ export namespace Unity {
 
         _init(...args: any[]): void;
 
-        static ['new'](sender: string, subtitle: string, content: string, avatar: Gio.Icon): SocialPreview;
+        static ['new'](sender: string, subtitle: string, content: string, avatar?: Gio.Icon | null): SocialPreview;
 
         // Own methods of Unity.SocialPreview
 
@@ -3046,8 +3088,8 @@ export namespace Unity {
 
         static with_search(
             search_string: string,
-            filter_set: FilterSet,
-            search_metadata: SearchMetadata,
+            filter_set?: FilterSet | null,
+            search_metadata?: SearchMetadata | null,
         ): ActivationResponse;
 
         static with_preview(preview: Preview): ActivationResponse;
@@ -3109,7 +3151,7 @@ export namespace Unity {
             channel_id: string,
             scope_id: string,
             action_type: number,
-            result: ScopeResult,
+            _result_?: ScopeResult | null,
         ): AggregatorActivation;
 
         // Own methods of Unity.AggregatorActivation
@@ -3120,8 +3162,8 @@ export namespace Unity {
         set_scope_id(value: string): void;
         get_action_type(): number;
         set_action_type(value: number): void;
-        get_scope_result(): ScopeResult;
-        set_scope_result(value: ScopeResult): void;
+        get_scope_result(): ScopeResult | null;
+        set_scope_result(value?: ScopeResult | null): void;
         get_hints(): GLib.HashTable<string, GLib.Variant>;
     }
 
@@ -3145,13 +3187,13 @@ export namespace Unity {
         // Own virtual methods of Unity.FilterSet
 
         vfunc_add(filter: Filter): void;
-        vfunc_get_filter_by_id(filter_id: string): Filter;
+        vfunc_get_filter_by_id(filter_id: string): Filter | null;
         vfunc_get_filters(): Filter[];
 
         // Own methods of Unity.FilterSet
 
         add(filter: Filter): void;
-        get_filter_by_id(filter_id: string): Filter;
+        get_filter_by_id(filter_id: string): Filter | null;
         get_filters(): Filter[];
     }
 
@@ -3234,13 +3276,13 @@ export namespace Unity {
 
         vfunc_cancel(): void;
         vfunc_is_cancelled(): boolean;
-        vfunc_get_gcancellable(): Gio.Cancellable;
+        vfunc_get_gcancellable(): Gio.Cancellable | null;
 
         // Own methods of Unity.Cancellable
 
         cancel(): void;
         is_cancelled(): boolean;
-        get_gcancellable(): Gio.Cancellable;
+        get_gcancellable(): Gio.Cancellable | null;
     }
 
     module ScopeSearchBase {
@@ -3292,13 +3334,13 @@ export namespace Unity {
 
         // Own virtual methods of Unity.ResultSet
 
-        vfunc_add_result(result: ScopeResult): void;
+        vfunc_add_result(_result_: ScopeResult): void;
         vfunc_add_result_from_variant(variant: GLib.Variant): void;
         vfunc_flush(): void;
 
         // Own methods of Unity.ResultSet
 
-        add_result(result: ScopeResult): void;
+        add_result(_result_: ScopeResult): void;
         add_result_from_variant(variant: GLib.Variant): void;
         flush(): void;
     }
@@ -3349,12 +3391,12 @@ export namespace Unity {
 
         // Own virtual methods of Unity.ResultPreviewer
 
-        vfunc_run(): AbstractPreview;
+        vfunc_run(): AbstractPreview | null;
         vfunc_run_async(async_callback: AbstractPreviewCallback): void;
 
         // Own methods of Unity.ResultPreviewer
 
-        run(): AbstractPreview;
+        run(): AbstractPreview | null;
         run_async(async_callback: AbstractPreviewCallback): void;
         set_scope_result(scope_result: ScopeResult): void;
         set_search_metadata(search_metadata: SearchMetadata): void;
@@ -3391,14 +3433,14 @@ export namespace Unity {
 
         // Own static methods of Unity.SearchMetadata
 
-        static create(metadata: { [key: string]: any } | GLib.HashTable<string, GLib.Variant>): SearchMetadata;
+        static create(metadata?: GLib.HashTable<string, GLib.Variant> | null): SearchMetadata;
         static create_from_variant(metadata: GLib.Variant): SearchMetadata;
 
         // Own methods of Unity.SearchMetadata
 
-        get_locale(): string;
-        get_form_factor(): string;
-        get_location(): GeoCoordinate;
+        get_locale(): string | null;
+        get_form_factor(): string | null;
+        get_location(): GeoCoordinate | null;
     }
 
     module GeoCoordinate {
@@ -3470,27 +3512,31 @@ export namespace Unity {
         // Own virtual methods of Unity.AbstractScope
 
         vfunc_create_search_for_query(search_context: SearchContext): ScopeSearchBase;
-        vfunc_create_previewer(result: ScopeResult, metadata: SearchMetadata): ResultPreviewer;
+        vfunc_create_previewer(_result_: ScopeResult, metadata: SearchMetadata): ResultPreviewer;
         vfunc_get_categories(): CategorySet;
         vfunc_get_filters(): FilterSet;
         vfunc_get_schema(): Schema;
         vfunc_get_search_hint(): string;
         vfunc_get_group_name(): string;
         vfunc_get_unique_name(): string;
-        vfunc_activate(result: ScopeResult, metadata: SearchMetadata, action_id: string): ActivationResponse;
+        vfunc_activate(
+            _result_: ScopeResult,
+            metadata: SearchMetadata,
+            action_id?: string | null,
+        ): ActivationResponse | null;
         vfunc_normalize_search_query(search_query: string): string;
 
         // Own methods of Unity.AbstractScope
 
         create_search_for_query(search_context: SearchContext): ScopeSearchBase;
-        create_previewer(result: ScopeResult, metadata: SearchMetadata): ResultPreviewer;
+        create_previewer(_result_: ScopeResult, metadata: SearchMetadata): ResultPreviewer;
         get_categories(): CategorySet;
         get_filters(): FilterSet;
         get_schema(): Schema;
         get_search_hint(): string;
         get_group_name(): string;
         get_unique_name(): string;
-        activate(result: ScopeResult, metadata: SearchMetadata, action_id: string): ActivationResponse;
+        activate(_result_: ScopeResult, metadata: SearchMetadata, action_id?: string | null): ActivationResponse | null;
         normalize_search_query(search_query: string): string;
         results_invalidated(search_type: SearchType): void;
     }
@@ -3604,8 +3650,13 @@ export namespace Unity {
         ): number;
         emit(signal: 'active-sources-changed', active_ids: string[]): void;
 
+        // Own virtual methods of Unity.DeprecatedScopeBase
+
+        vfunc_create_impl<T = GObject.Object>(): T;
+
         // Own methods of Unity.DeprecatedScopeBase
 
+        create_impl<T = GObject.Object>(): T;
         ['export'](): void;
         unexport(): void;
         get_id(): string;
@@ -3630,11 +3681,11 @@ export namespace Unity {
         // Signal callback interfaces
 
         interface ActivateUri {
-            (uri: string): ActivationResponse;
+            (uri: string): ActivationResponse | null;
         }
 
         interface PreviewUri {
-            (uri: string): Preview;
+            (uri: string): Preview | null;
         }
 
         interface GenerateSearchKey {
@@ -3666,11 +3717,14 @@ export namespace Unity {
         connect(id: string, callback: (...args: any[]) => any): number;
         connect_after(id: string, callback: (...args: any[]) => any): number;
         emit(id: string, ...args: any[]): void;
-        connect(signal: 'activate-uri', callback: (_source: this, uri: string) => ActivationResponse): number;
-        connect_after(signal: 'activate-uri', callback: (_source: this, uri: string) => ActivationResponse): number;
+        connect(signal: 'activate-uri', callback: (_source: this, uri: string) => ActivationResponse | null): number;
+        connect_after(
+            signal: 'activate-uri',
+            callback: (_source: this, uri: string) => ActivationResponse | null,
+        ): number;
         emit(signal: 'activate-uri', uri: string): void;
-        connect(signal: 'preview-uri', callback: (_source: this, uri: string) => Preview): number;
-        connect_after(signal: 'preview-uri', callback: (_source: this, uri: string) => Preview): number;
+        connect(signal: 'preview-uri', callback: (_source: this, uri: string) => Preview | null): number;
+        connect_after(signal: 'preview-uri', callback: (_source: this, uri: string) => Preview | null): number;
         emit(signal: 'preview-uri', uri: string): void;
         connect(
             signal: 'generate-search-key',
@@ -3708,17 +3762,17 @@ export namespace Unity {
 
         // Own virtual methods of Unity.DeprecatedScope
 
-        vfunc_preview_result(result: ScopeResult, _callback_: Gio.AsyncReadyCallback<this>): void;
-        vfunc_preview_result_finish(_res_: Gio.AsyncResult): Preview;
-        vfunc_activate_result(result: ScopeResult, _callback_: Gio.AsyncReadyCallback<this>): void;
-        vfunc_activate_result_finish(_res_: Gio.AsyncResult): ActivationResponse;
+        vfunc_preview_result(_result_: ScopeResult, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
+        vfunc_preview_result_finish(_res_: Gio.AsyncResult): Preview | null;
+        vfunc_activate_result(_result_: ScopeResult, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
+        vfunc_activate_result_finish(_res_: Gio.AsyncResult): ActivationResponse | null;
 
         // Own methods of Unity.DeprecatedScope
 
-        preview_result(result: ScopeResult, _callback_: Gio.AsyncReadyCallback<this>): void;
-        preview_result_finish(_res_: Gio.AsyncResult): Preview;
-        activate_result(result: ScopeResult, _callback_: Gio.AsyncReadyCallback<this>): void;
-        activate_result_finish(_res_: Gio.AsyncResult): ActivationResponse;
+        preview_result(_result_: ScopeResult, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
+        preview_result_finish(_res_: Gio.AsyncResult): Preview | null;
+        activate_result(_result_: ScopeResult, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
+        activate_result_finish(_res_: Gio.AsyncResult): ActivationResponse | null;
         queue_search_changed(search_type: SearchType): void;
     }
 
@@ -3762,20 +3816,20 @@ export namespace Unity {
         // Own virtual methods of Unity.AggregatorScope
 
         vfunc_category_index_for_scope_id(scope_id: string): number;
-        vfunc_search(scope_search: AggregatedScopeSearch, _callback_: Gio.AsyncReadyCallback<this>): void;
+        vfunc_search(scope_search: AggregatedScopeSearch, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
         vfunc_search_finish(_res_: Gio.AsyncResult): void;
-        vfunc_activate(activation: AggregatorActivation, _callback_: Gio.AsyncReadyCallback<this>): void;
-        vfunc_activate_finish(_res_: Gio.AsyncResult): ActivationResponse;
+        vfunc_activate(activation: AggregatorActivation, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
+        vfunc_activate_finish(_res_: Gio.AsyncResult): ActivationResponse | null;
 
         // Own methods of Unity.AggregatorScope
 
         category_index_for_scope_id(scope_id: string): number;
         add_sorter(category_index: number, field: string, flags: AggregatorScopeSortFlags): void;
         add_constraint(category_index: number, field: string): void;
-        search(scope_search: AggregatedScopeSearch, _callback_: Gio.AsyncReadyCallback<this>): void;
+        search(scope_search: AggregatedScopeSearch, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
         search_finish(_res_: Gio.AsyncResult): void;
-        activate(activation: AggregatorActivation, _callback_: Gio.AsyncReadyCallback<this>): void;
-        activate_finish(_res_: Gio.AsyncResult): ActivationResponse;
+        activate(activation: AggregatorActivation, _callback_?: Gio.AsyncReadyCallback<this> | null): void;
+        activate_finish(_res_: Gio.AsyncResult): ActivationResponse | null;
         get_merge_mode(): AggregatorScopeMergeMode;
         set_merge_mode(value: AggregatorScopeMergeMode): void;
         get_proxy_filter_hints(): boolean;
@@ -3825,13 +3879,13 @@ export namespace Unity {
             (search: ScopeSearchBase, cb: ScopeSearchBaseCallback): void;
         }
         interface PreviewRunFunc {
-            (previewer: ResultPreviewer): AbstractPreview;
+            (previewer: ResultPreviewer): AbstractPreview | null;
         }
         interface PreviewRunAsyncFunc {
             (previewer: ResultPreviewer, cb: AbstractPreviewCallback): void;
         }
         interface ActivateFunc {
-            (result: ScopeResult, metadata: SearchMetadata, action_id: string): ActivationResponse;
+            (_result_: ScopeResult, metadata: SearchMetadata, action_id?: string | null): ActivationResponse | null;
         }
 
         // Constructor properties interface
@@ -3890,10 +3944,10 @@ export namespace Unity {
         // Own methods of Unity.SimpleScope
 
         set_search_func(func: SimpleScope.SearchRunFunc): void;
-        set_search_async_func(func: SimpleScope.SearchRunAsyncFunc): void;
-        set_activate_func(func: SimpleScope.ActivateFunc): void;
+        set_search_async_func(func?: SimpleScope.SearchRunAsyncFunc | null): void;
+        set_activate_func(func?: SimpleScope.ActivateFunc | null): void;
         set_preview_func(func: SimpleScope.PreviewRunFunc): void;
-        set_preview_async_func(func: SimpleScope.PreviewRunAsyncFunc): void;
+        set_preview_async_func(func?: SimpleScope.PreviewRunAsyncFunc | null): void;
         get_filter_set(): FilterSet;
         set_filter_set(value: FilterSet): void;
         get_category_set(): CategorySet;
@@ -3927,16 +3981,16 @@ export namespace Unity {
 
         // Own virtual methods of Unity.ScopeLoader
 
-        vfunc_get_scopes(module_name: string, module_type: string): AbstractScope[];
+        vfunc_get_scopes(module_name: string, module_type?: string | null): AbstractScope[];
         vfunc_export_scopes(scopes: AbstractScope[]): void;
 
         // Own methods of Unity.ScopeLoader
 
-        get_scopes(module_name: string, module_type: string): AbstractScope[];
+        get_scopes(module_name: string, module_type?: string | null): AbstractScope[];
         export_scopes(scopes: AbstractScope[]): void;
         load_group(group_name: string): void;
         load_scope(scope_id: string): void;
-        load_module(module: string, module_type: string): void;
+        load_module(module: string, module_type?: string | null): void;
     }
 
     module TrackMetadata {
@@ -4247,10 +4301,10 @@ export namespace Unity {
         set_playback_state(value: PlaybackState): void;
         get_current_playlist(): Playlist;
         set_current_playlist(value: Playlist): void;
-        get_track_menu(): Dbusmenu.Menuitem;
-        set_track_menu(value: Dbusmenu.Menuitem): void;
-        get_player_menu(): Dbusmenu.Menuitem;
-        set_player_menu(value: Dbusmenu.Menuitem): void;
+        get_track_menu(): Dbusmenu.Menuitem | null;
+        set_track_menu(value?: Dbusmenu.Menuitem | null): void;
+        get_player_menu(): Dbusmenu.Menuitem | null;
+        set_player_menu(value?: Dbusmenu.Menuitem | null): void;
     }
 
     type AppInfoManagerClass = typeof AppInfoManager;
@@ -4757,7 +4811,7 @@ export namespace Unity {
 
         static create(
             uri: string,
-            icon_hint: string,
+            icon_hint: string | null,
             category: number,
             result_type: ResultType,
             mimetype: string,
@@ -4765,8 +4819,8 @@ export namespace Unity {
             comment: string,
             dnd_uri: string,
             metadata: { [key: string]: any } | GLib.HashTable<string, GLib.Variant>,
-        ): ScopeResult;
-        static create_from_variant(variant: GLib.Variant): ScopeResult;
+        ): ScopeResult | null;
+        static create_from_variant(variant: GLib.Variant): ScopeResult | null;
     }
 
     class SearchContext {
@@ -4790,11 +4844,11 @@ export namespace Unity {
         static create(
             search_query: string,
             search_type: SearchType,
-            filter_state: FilterSet,
-            metadata: { [key: string]: any } | GLib.HashTable<string, GLib.Variant>,
+            filter_state: FilterSet | null,
+            metadata: GLib.HashTable<string, GLib.Variant> | null,
             result_set: ResultSet,
-            cancellable: Cancellable,
-        ): SearchContext;
+            cancellable?: Cancellable | null,
+        ): SearchContext | null;
 
         // Own methods of Unity.SearchContext