gjs: fix widget props type

delete test

2 files changed, 17 insertions, 30 deletions

diff --git a/core/gjs/src/widgets.ts b/core/gjs/src/widgets.ts
index 50fe303..e14ca0b 100644
--- a/core/gjs/src/widgets.ts
+++ b/core/gjs/src/widgets.ts
@@ -10,14 +10,14 @@ Object.defineProperty(Astal.Box.prototype, "children", {
     set(v) { this.set_children(v) },
 })
 
-export type BoxProps = ConstructProps<Astal.Box, Astal.Box.ConstructorProps>
+export type BoxProps = ConstructProps<Box, Astal.Box.ConstructorProps>
 export class Box extends astalify(Astal.Box) {
     static { GObject.registerClass({ GTypeName: "Box" }, this) }
     constructor(props?: BoxProps, ...children: Array<BindableChild>) { super({ children, ...props } as any) }
 }
 
 // Button
-export type ButtonProps = ConstructProps<Astal.Button, Astal.Button.ConstructorProps, {
+export type ButtonProps = ConstructProps<Button, Astal.Button.ConstructorProps, {
     onClicked: []
     onClick: [event: Astal.ClickEvent]
     onClickRelease: [event: Astal.ClickEvent]
@@ -31,21 +31,21 @@ export class Button extends astalify(Astal.Button) {
 }
 
 // CenterBox
-export type CenterBoxProps = ConstructProps<Astal.CenterBox, Astal.CenterBox.ConstructorProps>
+export type CenterBoxProps = ConstructProps<CenterBox, Astal.CenterBox.ConstructorProps>
 export class CenterBox extends astalify(Astal.CenterBox) {
     static { GObject.registerClass({ GTypeName: "CenterBox" }, this) }
     constructor(props?: CenterBoxProps, ...children: Array<BindableChild>) { super({ children, ...props } as any) }
 }
 
 // CircularProgress
-export type CircularProgressProps = ConstructProps<Astal.CircularProgress, Astal.CircularProgress.ConstructorProps>
+export type CircularProgressProps = ConstructProps<CircularProgress, Astal.CircularProgress.ConstructorProps>
 export class CircularProgress extends astalify(Astal.CircularProgress) {
     static { GObject.registerClass({ GTypeName: "CircularProgress" }, this) }
     constructor(props?: CircularProgressProps, child?: BindableChild) { super({ child, ...props } as any) }
 }
 
 // DrawingArea
-export type DrawingAreaProps = ConstructProps<Gtk.DrawingArea, Gtk.DrawingArea.ConstructorProps, {
+export type DrawingAreaProps = ConstructProps<DrawingArea, Gtk.DrawingArea.ConstructorProps, {
     onDraw: [cr: any] // TODO: cairo types
 }>
 export class DrawingArea extends astalify(Gtk.DrawingArea) {
@@ -54,7 +54,7 @@ export class DrawingArea extends astalify(Gtk.DrawingArea) {
 }
 
 // Entry
-export type EntryProps = ConstructProps<Gtk.Entry, Gtk.Entry.ConstructorProps, {
+export type EntryProps = ConstructProps<Entry, Gtk.Entry.ConstructorProps, {
     onChanged: []
     onActivate: []
 }>
@@ -64,7 +64,7 @@ export class Entry extends astalify(Gtk.Entry) {
 }
 
 // EventBox
-export type EventBoxProps = ConstructProps<Astal.EventBox, Astal.EventBox.ConstructorProps, {
+export type EventBoxProps = ConstructProps<EventBox, Astal.EventBox.ConstructorProps, {
     onClick: [event: Astal.ClickEvent]
     onClickRelease: [event: Astal.ClickEvent]
     onHover: [event: Astal.HoverEvent]
@@ -80,21 +80,21 @@ export class EventBox extends astalify(Astal.EventBox) {
 // // TODO: FlowBox
 //
 // Icon
-export type IconProps = ConstructProps<Astal.Icon, Astal.Icon.ConstructorProps>
+export type IconProps = ConstructProps<Icon, Astal.Icon.ConstructorProps>
 export class Icon extends astalify(Astal.Icon) {
     static { GObject.registerClass({ GTypeName: "Icon" }, this) }
     constructor(props?: IconProps) { super(props as any) }
 }
 
 // Label
-export type LabelProps = ConstructProps<Astal.Label, Astal.Label.ConstructorProps>
+export type LabelProps = ConstructProps<Label, Astal.Label.ConstructorProps>
 export class Label extends astalify(Astal.Label) {
     static { GObject.registerClass({ GTypeName: "Label" }, this) }
     constructor(props?: LabelProps) { super(props as any) }
 }
 
 // LevelBar
-export type LevelBarProps = ConstructProps<Astal.LevelBar, Astal.LevelBar.ConstructorProps>
+export type LevelBarProps = ConstructProps<LevelBar, Astal.LevelBar.ConstructorProps>
 export class LevelBar extends astalify(Astal.LevelBar) {
     static { GObject.registerClass({ GTypeName: "LevelBar" }, this) }
     constructor(props?: LevelBarProps) { super(props as any) }
@@ -103,28 +103,28 @@ export class LevelBar extends astalify(Astal.LevelBar) {
 // TODO: ListBox
 
 // Overlay
-export type OverlayProps = ConstructProps<Astal.Overlay, Astal.Overlay.ConstructorProps>
+export type OverlayProps = ConstructProps<Overlay, Astal.Overlay.ConstructorProps>
 export class Overlay extends astalify(Astal.Overlay) {
     static { GObject.registerClass({ GTypeName: "Overlay" }, this) }
     constructor(props?: OverlayProps, ...children: Array<BindableChild>) { super({ children, ...props } as any) }
 }
 
 // Revealer
-export type RevealerProps = ConstructProps<Gtk.Revealer, Gtk.Revealer.ConstructorProps>
+export type RevealerProps = ConstructProps<Revealer, Gtk.Revealer.ConstructorProps>
 export class Revealer extends astalify(Gtk.Revealer) {
     static { GObject.registerClass({ GTypeName: "Revealer" }, this) }
     constructor(props?: RevealerProps, child?: BindableChild) { super({ child, ...props } as any) }
 }
 
 // Scrollable
-export type ScrollableProps = ConstructProps<Astal.Scrollable, Astal.Scrollable.ConstructorProps>
+export type ScrollableProps = ConstructProps<Scrollable, Astal.Scrollable.ConstructorProps>
 export class Scrollable extends astalify(Astal.Scrollable) {
     static { GObject.registerClass({ GTypeName: "Scrollable" }, this) }
     constructor(props?: ScrollableProps, child?: BindableChild) { super({ child, ...props } as any) }
 }
 
 // Slider
-export type SliderProps = ConstructProps<Astal.Slider, Astal.Slider.ConstructorProps, {
+export type SliderProps = ConstructProps<Slider, Astal.Slider.ConstructorProps, {
     onDragged: []
 }>
 export class Slider extends astalify(Astal.Slider) {
@@ -133,21 +133,21 @@ export class Slider extends astalify(Astal.Slider) {
 }
 
 // Stack
-export type StackProps = ConstructProps<Astal.Stack, Astal.Stack.ConstructorProps>
+export type StackProps = ConstructProps<Stack, Astal.Stack.ConstructorProps>
 export class Stack extends astalify(Astal.Stack) {
     static { GObject.registerClass({ GTypeName: "Stack" }, this) }
     constructor(props?: StackProps, ...children: Array<BindableChild>) { super({ children, ...props } as any) }
 }
 
 // Switch
-export type SwitchProps = ConstructProps<Gtk.Switch, Gtk.Switch.ConstructorProps>
+export type SwitchProps = ConstructProps<Switch, Gtk.Switch.ConstructorProps>
 export class Switch extends astalify(Gtk.Switch) {
     static { GObject.registerClass({ GTypeName: "Switch" }, this) }
     constructor(props?: SwitchProps) { super(props as any) }
 }
 
 // Window
-export type WindowProps = ConstructProps<Astal.Window, Astal.Window.ConstructorProps>
+export type WindowProps = ConstructProps<Window, Astal.Window.ConstructorProps>
 export class Window extends astalify(Astal.Window) {
     static { GObject.registerClass({ GTypeName: "Window" }, this) }
     constructor(props?: WindowProps, child?: BindableChild) { super({ child, ...props } as any) }
diff --git a/core/lua/test.lua b/core/lua/test.lua
deleted file mode 100644
index 2494403..0000000
--- a/core/lua/test.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local a = require("astal")
-
-a.App:start({
-    instance_name = "Hello",
-    main = function()
-        a.Widget.Window({
-            no_implicit_destroy = true,
-            a.Widget.Button({
-                label = "hello",
-            }),
-        })
-    end,
-})