Merge branch 'main' into v1-alpha

src/service/hyprland.ts

@@ -21,14 +21,14 @@ interface Active {
 class HyprlandService extends Service {
     static {
         Service.register(this, {
-            'urgent-window': ['int'],
+            'urgent-window': ['string'],
             'submap': ['string'],
             'keyboard-layout': ['string', 'string'],
         });
     }
 
     _active: Active;
-    _monitors: Map<string, object>;
+    _monitors: Map<number, object>;
     _workspaces: Map<number, object>;
     _clients: Map<string, object>;
 

src/utils.ts

@@ -192,12 +192,12 @@ export function subprocess(
             stdout.read_line_async(GLib.PRIORITY_LOW, null, (stdout, res) => {
                 try {
                     const output = stdout?.read_line_finish_utf8(res)[0];
-                    if (output) {
+                    if (typeof output === 'string' && stdout) {
                         callback(output);
                         read(stdout);
                     }
                 } catch (e) {
-                    return onError(e as Error);
+                    onError(e as Error);
                 }
             });
         };

src/widget.ts

@@ -18,7 +18,6 @@ import { ctor } from './widgets/shared.js';
 
 export default function Widget({ type, ...params }: { type: ctor }) {
     return constructor(type, params);
-}
 
 export const Box = (args: object) => constructor(AgsBox, args);
 export const Button = (args: object) => constructor(AgsButton, args);
@@ -54,4 +53,4 @@ Widget.Revealer = Revealer;
 Widget.Scrollable = Scrollable;
 Widget.Slider = Slider;
 Widget.Stack = Stack;
-Widget.Window = Window;
+Widget.Window = Window;