gnim 1.7.0 → 1.8.1

package/dist/dbus.ts

@@ -620,9 +620,9 @@ export function method<const InArgs extends Array<DBusType>, const OutArgs exten
     inArgs: InArgs,
     outArgs: OutArgs,
 ): (
-    method: (this: Service, ...args: InferVariantTypes<InArgs>) => InferVariantTypes<OutArgs>,
+    method: (this: Service, ...args: any[]) => InferVariantTypes<OutArgs>,
     ctx: ClassMethodDecoratorContext<Service, typeof method>,
-) => void
+) => (this: Service, ...args: InferVariantTypes<InArgs>) => any
 
 /**
  * Registers a method.
@@ -633,9 +633,9 @@ export function method<const InArgs extends Array<DBusType>, const OutArgs exten
 export function method<const InArgs extends Array<DBusType>>(
     ...inArgs: InArgs
 ): (
-    method: (this: Service, ...args: InferVariantTypes<InArgs>) => void,
+    method: (this: Service, ...args: any[]) => void,
     ctx: ClassMethodDecoratorContext<Service, typeof method>,
-) => void
+) => (this: Service, ...args: InferVariantTypes<InArgs>) => void
 
 export function method<const InArgs extends Array<DBusType>, const OutArgs extends Array<DBusType>>(
     ...args: InArgs | [inArgs: InArgs, outArgs?: OutArgs]
@@ -646,10 +646,10 @@ export function method<const InArgs extends Array<DBusType>, const OutArgs exten
             ...args: InferVariantTypes<InArgs>
         ) => InferVariantTypes<OutArgs> | void,
         ctx: ClassMethodDecoratorContext<Service, typeof method>,
-    ): typeof method {
+    ): (this: Service, ...args: InferVariantTypes<InArgs>) => any {
         const name = installMethod(args, method, ctx)
 
-        return function (...args: InferVariantTypes<InArgs>) {
+        return function (...args) {
             if (this[internals].proxy) {
                 const value = this[remoteMethod](name, args)
                 return value.deepUnpack<InferVariantTypes<OutArgs>>()
@@ -673,12 +673,9 @@ export function methodAsync<
     inArgs: InArgs,
     outArgs: OutArgs,
 ): (
-    method: (
-        this: Service,
-        ...args: InferVariantTypes<InArgs>
-    ) => Promise<InferVariantTypes<OutArgs>>,
+    method: (this: Service, ...args: any[]) => Promise<InferVariantTypes<OutArgs>>,
     ctx: ClassMethodDecoratorContext<Service, typeof method>,
-) => void
+) => (this: Service, ...args: InferVariantTypes<InArgs>) => Promise<any>
 
 /**
  * Registers a method.
@@ -689,9 +686,9 @@ export function methodAsync<
 export function methodAsync<const InArgs extends Array<DBusType>>(
     ...inArgs: InArgs
 ): (
-    method: (this: Service, ...args: InferVariantTypes<InArgs>) => Promise<void>,
+    method: (this: Service, ...args: any[]) => Promise<void>,
     ctx: ClassMethodDecoratorContext<Service, typeof method>,
-) => void
+) => (this: Service, ...args: InferVariantTypes<InArgs>) => Promise<void>
 
 export function methodAsync<
     const InArgs extends Array<DBusType>,
@@ -703,10 +700,10 @@ export function methodAsync<
             ...args: InferVariantTypes<InArgs>
         ) => Promise<InferVariantTypes<OutArgs> | void>,
         ctx: ClassMethodDecoratorContext<Service, typeof method>,
-    ): typeof method {
+    ): (this: Service, ...args: InferVariantTypes<InArgs>) => Promise<any> {
         const name = installMethod(args, method, ctx)
 
-        return async function (...args: InferVariantTypes<InArgs>) {
+        return async function (...args) {
             if (this[internals].proxy) {
                 const value = await this[remoteMethodAsync](name, args)
                 return value.deepUnpack<InferVariantTypes<OutArgs>>()
@@ -729,7 +726,7 @@ export function property<T extends string>(type: T) {
     return function (
         _: void,
         ctx: ClassFieldDecoratorContext<Service, DeepInfer<T>>,
-    ): (this: Service, init: DeepInfer<T>) => DeepInfer<T> {
+    ): (this: Service, init: DeepInfer<T>) => any {
         const name = installProperty(type, ctx)
 
         void gproperty({ $gtype: inferGTypeFromVariant(type) })(
@@ -768,8 +765,7 @@ export function property<T extends string>(type: T) {
         return function (init) {
             const priv = this[internals].priv
             priv[name] = init
-            // we don't need to store the value on the object
-            return void 0 as unknown as DeepInfer<T>
+            // we don't need to store the value on the object itself
         }
     }
 }
@@ -782,9 +778,9 @@ export function property<T extends string>(type: T) {
  */
 export function getter<T extends string>(type: T) {
     return function (
-        getter: (this: Service) => DeepInfer<T>,
+        method: (this: Service) => DeepInfer<T>,
         ctx: ClassGetterDecoratorContext<Service, DeepInfer<T>>,
-    ): (this: Service) => DeepInfer<T> {
+    ): (this: Service) => any {
         const name = installProperty(type, ctx)
 
         ctx.addInitializer(function () {
@@ -796,11 +792,11 @@ export function getter<T extends string>(type: T) {
             ctx as ClassGetterDecoratorContext<GObject.Object> & Ctx,
         )
 
-        return function () {
+        return function get(): DeepInfer<T> {
             const { proxy } = this[internals]
             return proxy
                 ? proxy.get_cached_property(name)!.deepUnpack<DeepInfer<T>>()
-                : getter.call(this)
+                : method.call(this)
         }
     }
 }
@@ -813,7 +809,7 @@ export function getter<T extends string>(type: T) {
  */
 export function setter<T extends string>(type: T) {
     return function (
-        setter: (this: Service, value: DeepInfer<T>) => void,
+        setter: (this: Service, value: any) => void,
         ctx: ClassSetterDecoratorContext<Service, DeepInfer<T>>,
     ): (this: Service, value: DeepInfer<T>) => void {
         const name = installProperty(type, ctx)
@@ -843,9 +839,9 @@ export function setter<T extends string>(type: T) {
  */
 export function signal<const Params extends Array<DBusType>>(...params: Params) {
     return function (
-        method: (this: Service, ...params: InferVariantTypes<Params>) => void,
+        method: (this: Service, ...params: any) => void,
         ctx: ClassMethodDecoratorContext<Service, typeof method>,
-    ): typeof method {
+    ): (this: Service, ...params: InferVariantTypes<Params>) => void {
         const name = installSignal(params, ctx)
 
         void gsignal(...params.map(inferGTypeFromVariant))(
@@ -853,7 +849,7 @@ export function signal<const Params extends Array<DBusType>>(...params: Params)
             ctx as ClassMethodDecoratorContext<GObject.Object> & Ctx,
         )
 
-        return function (...params: InferVariantTypes<Params>) {
+        return function (...params) {
             if (this[internals].proxy) {
                 console.warn(`cannot emit signal "${name}" on remote object`)
             }

package/dist/gobject.ts

@@ -104,7 +104,7 @@ export function property<T>(typeDeclaration: PropertyTypeDeclaration<T>) {
         _: void,
         ctx: PropertyContext<T>,
         options?: { metaOnly: true },
-    ): (this: GObj, init: T) => T {
+    ): (this: GObj, init: T) => any {
         const fieldName = assertField(ctx)
         const key = kebabify(fieldName)
         const meta: Partial<Meta> = ctx.metadata!
@@ -160,7 +160,7 @@ export function property<T>(typeDeclaration: PropertyTypeDeclaration<T>) {
  * ```
  */
 export function getter<T>(typeDeclaration: PropertyTypeDeclaration<T>) {
-    return function getter(getter: (this: GObj) => T, ctx: GetterContext<T>): (this: GObj) => T {
+    return function (get: (this: GObj) => any, ctx: GetterContext<T>) {
         const fieldName = assertField(ctx)
         const meta: Partial<Meta> = ctx.metadata!
         const props = (meta.properties ??= {})
@@ -170,7 +170,7 @@ export function getter<T>(typeDeclaration: PropertyTypeDeclaration<T>) {
         } else {
             props[fieldName] = { flags: ParamFlags.READABLE, type: typeDeclaration }
         }
-        return getter
+        return get
     }
 }
 
@@ -194,10 +194,7 @@ export function getter<T>(typeDeclaration: PropertyTypeDeclaration<T>) {
  * ```
  */
 export function setter<T>(typeDeclaration: PropertyTypeDeclaration<T>) {
-    return function setter(
-        setter: (this: GObj, value: T) => void,
-        ctx: SetterContext<T>,
-    ): (this: GObj, value: T) => void {
+    return function (set: (this: GObj, value: any) => void, ctx: SetterContext<T>) {
         const fieldName = assertField(ctx)
         const meta: Partial<Meta> = ctx.metadata!
         const props = (meta.properties ??= {})
@@ -207,7 +204,7 @@ export function setter<T>(typeDeclaration: PropertyTypeDeclaration<T>) {
         } else {
             props[fieldName] = { flags: ParamFlags.WRITABLE, type: typeDeclaration }
         }
-        return setter
+        return set
     }
 }
 
@@ -238,12 +235,12 @@ export function signal<
     Return extends { $gtype: GType } | GType,
 >(
     params: Params,
-    returnType?: Return,
+    returnType: Return,
     options?: SignalOptions,
 ): (
-    method: (this: GObj, ...args: ParamTypes<Params>) => ParamType<Return>,
+    method: (this: GObj, ...args: any) => ParamType<Return>,
     ctx: SignalContext<typeof method>,
-) => typeof method
+) => (this: GObj, ...args: ParamTypes<Params>) => any
 
 /**
  * Defines a signal to be registered when using the {@link register} decorator.
@@ -261,9 +258,9 @@ export function signal<
 export function signal<Params extends Array<{ $gtype: GType } | GType>>(
     ...params: Params
 ): (
-    method: (this: GObject.Object, ...args: ParamTypes<Params>) => void,
+    method: (this: GObject.Object, ...args: any) => void,
     ctx: SignalContext<typeof method>,
-) => typeof method
+) => (this: GObject.Object, ...args: ParamTypes<Params>) => void
 
 export function signal<
     Params extends Array<{ $gtype: GType } | GType>,

package/dist/jsx/With.ts

@@ -26,6 +26,7 @@ export function With<T, E extends JSX.Element>({
     const currentScope = getScope()
     const fragment = new Fragment<E>()
 
+    let currentValue: T
     let scope: Scope
 
     function remove(child: E) {
@@ -52,9 +53,14 @@ export function With<T, E extends JSX.Element>({
     }
 
     const dispose = value.subscribe(() => {
-        callback(value.get())
+        const newValue = value.get()
+        if (currentValue === newValue) {
+            callback((currentValue = newValue))
+        }
     })
-    callback(value.get())
+
+    currentValue = value.get()
+    callback(currentValue)
 
     onCleanup(() => {
         dispose()

package/dist/jsx/state.ts

@@ -235,9 +235,9 @@ function createComputedArgs<
         if (subscribers.size === 0) {
             dispose = deps.map((dep, i) =>
                 dep.subscribe(() => {
-                    const newValue = dep.get()
-                    if (cache[i] !== newValue) {
-                        cache[i] = dep.get()
+                    const newDepValue = dep.get()
+                    if (cache[i] !== newDepValue) {
+                        cache[i] = newDepValue
 
                         const newValue = compute()
                         if (value !== newValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gnim",
-    "version": "1.7.0",
+    "version": "1.8.1",
     "type": "module",
     "author": "Aylur",
     "license": "MIT",