touch ups

nix/hm-module.nix

@@ -58,7 +58,7 @@ in {
       xdg.configFile."astal".source = cfg.configDir;
     })
     (mkIf (cfg.package != null) (let
-      path = "share/astal/types";
+      path = "share/io.Aylur.Astal/types";
       pkg = cfg.package.override {
         extraPackages = cfg.extraPackages;
         buildTypes = true;

package.json

@@ -20,6 +20,6 @@
         "eslint": "^8.42.0"
     },
     "scripts": {
-        "test": "eslint ."
+        "lint": "eslint ."
     }
 }

src/app.ts

@@ -4,6 +4,7 @@ import Gio from 'gi://Gio';
 import GLib from 'gi://GLib';
 import { timeout, readFileAsync } from './utils.js';
 import { loadInterfaceXML } from './utils.js';
+import { registerGObject } from './utils.js';
 
 import S from './service.js';
 import V from './variable.js';
@@ -36,9 +37,12 @@ export interface Config {
 
 export class App extends Gtk.Application {
     static {
-        S.register(this, {
-            'window-toggled': ['string', 'boolean'],
-            'config-parsed': [],
+        registerGObject(this, {
+            typename: 'Astal',
+            signals: {
+                'window-toggled': ['string', 'boolean'],
+                'config-parsed': [],
+            },
         });
     }
 

src/widgets/box.ts

@@ -26,6 +26,7 @@ export class Box<Child extends Gtk.Widget, Attr> extends Gtk.Box {
             properties: {
                 'vertical': ['boolean', 'rw'],
                 'children': ['jsobject', 'rw'],
+                'child': ['jsobject', 'rw'],
             },
         });
     }
@@ -47,7 +48,7 @@ export class Box<Child extends Gtk.Widget, Attr> extends Gtk.Box {
     get child() { return this.children[0] as Child; }
     set child(child: Child) { this.children = [child]; }
 
-    get children() {
+    get children(): Child[] {
         const children = [];
         let widget = this.get_first_child();
         while (widget) {

src/widgets/button.ts

@@ -1,13 +1,15 @@
 import { register, type BaseProps, type Widget } from './widget.js';
 import Gtk from 'gi://Gtk?version=4.0';
 
+type Event<Self> = (self: Self) => unknown
+
 export type ButtonProps<
     Child extends Gtk.Widget = Gtk.Widget,
     Attr = unknown,
     Self = Button<Child, Attr>,
 > = BaseProps<Self, Gtk.Button.ConstructorProperties & {
     child?: Child
-    on_clicked?: (self: Self) => boolean
+    on_clicked?: Event<Self>
 }, Attr>;
 
 export function newButton<
@@ -40,5 +42,5 @@ export class Button<Child extends Gtk.Widget, Attr> extends Gtk.Button {
     set child(child: Child) { super.child = child; }
 
     get on_clicked() { return this._get('on-clicked') || (() => false); }
-    set on_clicked(callback: (self: this) => void) { this._set('on-clicked', callback); }
+    set on_clicked(callback: Event<this>) { this._set('on-clicked', callback); }
 }

src/widgets/calendar.ts

@@ -1,13 +1,19 @@
 import { register, type BaseProps, type Widget } from './widget.js';
 import Gtk from 'gi://Gtk?version=4.0';
 
+type Event<Self> = (self: Self) => void
+
 export type CalendarProps<
     Attr = unknown,
     Self = Calendar<Attr>,
-> = BaseProps<Self, Gtk.Calendar.ConstructorProperties, Attr>;
+> = BaseProps<Self, Gtk.Calendar.ConstructorProperties & {
+    on_day_selected?: Event<Self>
+}, Attr>;
 
-export function newCalendar<Attr = unknown>(props?: CalendarProps<Attr>) {
-    return new Calendar(props);
+export function newCalendar<
+    Attr = unknown
+>(...props: ConstructorParameters<typeof Calendar<Attr>>) {
+    return new Calendar(...props);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -17,6 +23,7 @@ export class Calendar<Attr> extends Gtk.Calendar {
         register(this, {
             properties: {
                 'date': ['jsobject', 'r'],
+                'on-day-selected': ['jsobject', 'rw'],
             },
         });
     }
@@ -26,7 +33,11 @@ export class Calendar<Attr> extends Gtk.Calendar {
         this.connect('notify::day', () => this.notify('date'));
         this.connect('notify::month', () => this.notify('date'));
         this.connect('notify::year', () => this.notify('date'));
+        this.connect('day-selected', this.on_day_selected.bind(this));
     }
 
     get date() { return this.get_date(); }
+
+    get on_day_selected() { return this._get('on-day-selected') || (() => false); }
+    set on_day_selected(callback: Event<this>) { this._set('on-day-selected', callback); }
 }

src/widgets/entry.ts

@@ -11,8 +11,10 @@ export type EntryProps<
     on_change?: EventHandler<Self>
 }, Attr>
 
-export function newEntry<Attr = unknown>(props?: EntryProps<Attr>) {
-    return new Entry(props);
+export function newEntry<
+    Attr = unknown
+>(...props: ConstructorParameters<typeof Entry<Attr>>) {
+    return new Entry(...props);
 }
 
 export interface Entry<Attr> extends Widget<Attr> { }

src/widgets/menubutton.ts

@@ -7,7 +7,6 @@ export type MenuButtonProps<
     Self = MenuButton<Child, Attr>,
 > = BaseProps<Self, Gtk.MenuButton.ConstructorProperties & {
     child?: Child
-    on_activate?: (self: Self) => boolean
 }, Attr>;
 
 export function newMenuButton<
@@ -20,25 +19,15 @@ export function newMenuButton<
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface MenuButton<Child, Attr> extends Widget<Attr> { }
 export class MenuButton<Child extends Gtk.Widget, Attr> extends Gtk.MenuButton {
-    static {
-        register(this, {
-            properties: {
-                'on-activate': ['jsobject', 'rw'],
-            },
-        });
-    }
+    static { register(this); }
 
     constructor(props: MenuButtonProps<Child, Attr> = {}, child?: Child) {
         if (child)
             props.child = child;
 
         super(props as Gtk.MenuButton.ConstructorProperties);
-        this.connect('activate', this.on_activate.bind(this));
     }
 
     get child() { return super.child as Child; }
     set child(child: Child) { super.child = child; }
-
-    get on_activate() { return this._get('on-activate') || (() => false); }
-    set on_activate(callback: (self: this) => void) { this._set('on-activate', callback); }
 }

src/widgets/popover.ts

@@ -2,6 +2,8 @@ import { register, type BaseProps, type Widget } from './widget.js';
 import Gtk from 'gi://Gtk?version=4.0';
 import Gdk from 'gi://Gdk?version=4.0';
 
+type Event<Self> = (self: Self) => void | unknown
+
 const POSITION = {
     'left': Gtk.PositionType.LEFT,
     'right': Gtk.PositionType.RIGHT,
@@ -17,7 +19,7 @@ export type PopoverProps<
     Self = Popover<Child, Attr>,
 > = BaseProps<Self, Gtk.Popover.ConstructorProperties & {
     child?: Child
-    on_closed?: (self: Self) => boolean
+    on_closed?: Event<Self>
     xoffset?: number
     yoffset?: number
     popover_position?: Position
@@ -63,7 +65,7 @@ export class Popover<Child extends Gtk.Widget, Attr> extends Gtk.Popover {
     set child(child: Child) { super.child = child; }
 
     get on_closed() { return this._get('on-closed') || (() => false); }
-    set on_closed(callback: (self: this) => void) { this._set('on-closed', callback); }
+    set on_closed(callback: Event<this>) { this._set('on-closed', callback); }
 
     get yoffset() { return this.get_offset()[1]; }
     set yoffset(y: number) { this.set_offset(this.xoffset, y); }

src/widgets/separator.ts

@@ -8,8 +8,10 @@ export type SeparatorProps<
     vertical?: boolean
 }, Attr>;
 
-export function newSeparator<Attr = unknown>(props?: SeparatorProps<Attr>) {
-    return new Separator(props);
+export function newSeparator<
+    Attr = unknown
+>(...props: ConstructorParameters<typeof Separator<Attr>>) {
+    return new Separator(...props);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -28,10 +30,7 @@ export class Separator<Attr> extends Gtk.Separator {
         this.connect('notify::orientation', () => this.notify('vertical'));
     }
 
-    get vertical() {
-        return this.orientation === Gtk.Orientation.VERTICAL;
-    }
-
+    get vertical() { return this.orientation === Gtk.Orientation.VERTICAL; }
     set vertical(v: boolean) {
         this.orientation = Gtk.Orientation[v ? 'VERTICAL' : 'HORIZONTAL'];
     }

src/widgets/slider.ts

@@ -149,13 +149,7 @@ export class Slider<Attr> extends Gtk.Scale {
     }
 
     get vertical() { return this.orientation === Gtk.Orientation.VERTICAL; }
-    set vertical(vertical) {
-        if (this.vertical === vertical)
-            return;
-
-        this.orientation = vertical
-            ? Gtk.Orientation.VERTICAL : Gtk.Orientation.HORIZONTAL;
-
-        this.notify('vertical');
+    set vertical(v: boolean) {
+        this.orientation = Gtk.Orientation[v ? 'VERTICAL' : 'HORIZONTAL'];
     }
 }

src/widgets/switch.ts

@@ -1,15 +1,19 @@
 import { register, type BaseProps, type Widget } from './widget.js';
 import Gtk from 'gi://Gtk?version=4.0';
 
+type Event<Self> = (self: Self) => void | boolean
+
 export type SwitchProps<
     Attr = unknown,
     Self = Switch<Attr>,
 > = BaseProps<Self, Gtk.Switch.ConstructorProperties & {
-    on_activate?: (self: Self) => boolean
+    on_activate?: Event<Self>
 }, Attr>;
 
-export function newSwitch<Attr = unknown>(props?: SwitchProps<Attr>) {
-    return new Switch(props);
+export function newSwitch<
+    Attr = unknown
+>(...props: ConstructorParameters<typeof Switch<Attr>>) {
+    return new Switch(...props);
 }
 
 export interface Switch<Attr> extends Widget<Attr> { }
@@ -24,9 +28,9 @@ export class Switch<Attr> extends Gtk.Switch {
 
     constructor(props: SwitchProps<Attr> = {}) {
         super(props as Gtk.Switch.ConstructorProperties);
-        this.connect('activate', this.on_activate.bind(this));
+        this.connect('notify::active', this.on_activate.bind(this));
     }
 
     get on_activate() { return this._get('on-activate') || (() => false); }
-    set on_activate(callback: (self: this) => void) { this._set('on-activate', callback); }
+    set on_activate(callback: Event<this>) { this._set('on-activate', callback); }
 }

src/widgets/togglebutton.ts

@@ -1,13 +1,15 @@
 import { register, type BaseProps, type Widget } from './widget.js';
 import Gtk from 'gi://Gtk?version=4.0';
 
+type Event<Self> = (self: Self) => boolean | unknown
+
 export type ToggleButtonProps<
     Child extends Gtk.Widget = Gtk.Widget,
     Attr = unknown,
     Self = ToggleButton<Child, Attr>,
 > = BaseProps<Self, Gtk.ToggleButton.ConstructorProperties & {
     child?: Child
-    on_toggled?: (self: Self) => boolean
+    on_toggled?: Event<Self>
 }, Attr>;
 
 export function newToggleButton<
@@ -40,5 +42,5 @@ export class ToggleButton<Child extends Gtk.Widget, Attr> extends Gtk.ToggleButt
     set child(child: Child) { super.child = child; }
 
     get on_toggled() { return this._get('on-toggled') || (() => false); }
-    set on_toggled(callback: (self: this) => void) { this._set('on-toggled', callback); }
+    set on_toggled(callback: Event<this>) { this._set('on-toggled', callback); }
 }