@gtkx/react 1.1.0 → 1.2.1

package/dist/hooks/use-latest-ref.d.ts

@@ -0,0 +1,4 @@
+import { type RefObject } from "react";
+declare function useLatestRef<T>(value: T): RefObject<T>;
+export { useLatestRef };
+//# sourceMappingURL=use-latest-ref.d.ts.map

package/dist/hooks/use-latest-ref.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-latest-ref.d.ts","sourceRoot":"","sources":["../../src/hooks/use-latest-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAA8B,MAAM,OAAO,CAAC;AAEnE,iBAAS,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAQ/C;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/dist/hooks/use-latest-ref.js

@@ -0,0 +1,10 @@
+import { useInsertionEffect, useRef } from "react";
+function useLatestRef(value) {
+    const ref = useRef(value);
+    useInsertionEffect(() => {
+        ref.current = value;
+    });
+    return ref;
+}
+export { useLatestRef };
+//# sourceMappingURL=use-latest-ref.js.map

package/dist/hooks/use-latest-ref.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-latest-ref.js","sourceRoot":"","sources":["../../src/hooks/use-latest-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,kBAAkB,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEnE,SAAS,YAAY,CAAI,KAAQ;IAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAE1B,kBAAkB,CAAC,GAAG,EAAE;QACpB,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC","sourcesContent":["import { type RefObject, useInsertionEffect, useRef } from \"react\";\n\nfunction useLatestRef<T>(value: T): RefObject<T> {\n    const ref = useRef(value);\n\n    useInsertionEffect(() => {\n        ref.current = value;\n    });\n\n    return ref;\n}\n\nexport { useLatestRef };\n"]}

package/dist/hooks/use-signal.d.ts

@@ -20,13 +20,9 @@ type UseSignalOptions = {
 /**
  * Connects a handler to a GObject signal for the lifetime of the component, reconnecting when the object changes.
  *
- * Each emission runs the handler from the latest render, so it does not have to be stable and a
+ * Each emission runs the handler from the latest committed render, so it does not have to be stable and a
  * changing handler never reconnects the signal.
  *
- * On React 19.2 this does not hold inside a component wrapped in `memo` or `forwardRef`, where every emission
- * runs the handler captured on the first render. Keep the calling component unwrapped, or read the values the
- * handler needs off the GObject itself. React fixes this on the 19.3 line.
- *
  * @param signal The signal name, optionally with a `::detail` suffix.
  * @param options `isAfter` runs the handler after the default handler; `isImmediate` also invokes it on connect.
  */

package/dist/hooks/use-signal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-signal.d.ts","sourceRoot":"","sources":["../../src/hooks/use-signal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AAEpE,0EAA0E;AAC1E,KAAK,OAAO,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AACvE,qFAAqF;AACrF,KAAK,UAAU,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,MAAM,EAAE,CAAC;AAEzG;;;GAGG;AACH,KAAK,kBAAkB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,OAAO,CAAC,CAAC,CAAC,GAC1F,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACb,CAAC,SAAS,GAAG,MAAM,KAAK,KAAK,MAAM,EAAE,GACjC,KAAK,SAAS,MAAM,OAAO,CAAC,CAAC,CAAC,GAC1B,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GACjB,aAAa,GACjB,aAAa,CAAC;AAExB,qCAAqC;AACrC,KAAK,gBAAgB,GAAG;IACpB,qFAAqF;IACrF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uFAAuF;IACvF,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,iBAAS,SAAS,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,EACzE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EACjC,EAAE,OAAe,EAAE,WAAmB,EAAE,GAAE,gBAAqB,GAChE,IAAI,CAoBN;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"use-signal.d.ts","sourceRoot":"","sources":["../../src/hooks/use-signal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AAGpE,0EAA0E;AAC1E,KAAK,OAAO,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AACvE,qFAAqF;AACrF,KAAK,UAAU,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,MAAM,EAAE,CAAC;AAEzG;;;GAGG;AACH,KAAK,kBAAkB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,OAAO,CAAC,CAAC,CAAC,GAC1F,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACb,CAAC,SAAS,GAAG,MAAM,KAAK,KAAK,MAAM,EAAE,GACjC,KAAK,SAAS,MAAM,OAAO,CAAC,CAAC,CAAC,GAC1B,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GACjB,aAAa,GACjB,aAAa,CAAC;AAExB,qCAAqC;AACrC,KAAK,gBAAgB,GAAG;IACpB,qFAAqF;IACrF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uFAAuF;IACvF,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;;;GAQG;AACH,iBAAS,SAAS,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,EACzE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EACjC,EAAE,OAAe,EAAE,WAAmB,EAAE,GAAE,gBAAqB,GAChE,IAAI,CAqBN;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/dist/hooks/use-signal.js

@@ -1,25 +1,23 @@
-import { useEffectEvent, useLayoutEffect } from "react";
+import { useLayoutEffect } from "react";
 import { resolveRefProp } from "../utils/ref-prop.js";
+import { useLatestRef } from "./use-latest-ref.js";
 /**
  * Connects a handler to a GObject signal for the lifetime of the component, reconnecting when the object changes.
  *
- * Each emission runs the handler from the latest render, so it does not have to be stable and a
+ * Each emission runs the handler from the latest committed render, so it does not have to be stable and a
  * changing handler never reconnects the signal.
  *
- * On React 19.2 this does not hold inside a component wrapped in `memo` or `forwardRef`, where every emission
- * runs the handler captured on the first render. Keep the calling component unwrapped, or read the values the
- * handler needs off the GObject itself. React fixes this on the 19.3 line.
- *
  * @param signal The signal name, optionally with a `::detail` suffix.
  * @param options `isAfter` runs the handler after the default handler; `isImmediate` also invokes it on connect.
  */
 function useSignal(object, signal, handler, { isAfter = false, isImmediate = false } = {}) {
-    const emit = useEffectEvent(handler);
+    const handlerRef = useLatestRef(handler);
     useLayoutEffect(() => {
         const resolved = resolveRefProp(object);
         if (!resolved) {
             return;
         }
+        const emit = (...args) => handlerRef.current(...args);
         resolved.on(signal, emit, isAfter);
         if (isImmediate) {
             emit();
@@ -27,7 +25,7 @@ function useSignal(object, signal, handler, { isAfter = false, isImmediate = fal
         return () => {
             resolved.off(signal, emit);
         };
-    }, [object, signal, isAfter, isImmediate]);
+    }, [handlerRef, object, signal, isAfter, isImmediate]);
 }
 export { useSignal };
 //# sourceMappingURL=use-signal.js.map

package/dist/hooks/use-signal.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-signal.js","sourceRoot":"","sources":["../../src/hooks/use-signal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAgB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA2BpE;;;;;;;;;;;;GAYG;AACH,SAAS,SAAS,CACd,MAAkB,EAClB,MAAS,EACT,OAAiC,EACjC,EAAE,OAAO,GAAG,KAAK,EAAE,WAAW,GAAG,KAAK,KAAuB,EAAE;IAE/D,MAAM,IAAI,GAAG,cAAc,CAAC,OAAwB,CAAC,CAAC;IAEtD,eAAe,CAAC,GAAG,EAAE;QACjB,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QAED,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,IAAI,WAAW,EAAE,CAAC;YACd,IAAI,EAAE,CAAC;QACX,CAAC;QAED,OAAO,GAAG,EAAE;YACR,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,OAAO,EAAE,SAAS,EAAE,CAAC","sourcesContent":["import type * as GObject from \"@gtkx/gi/gobject\";\nimport type { SignalHandler } from \"@gtkx/runtime\";\nimport { useEffectEvent, useLayoutEffect } from \"react\";\nimport { type RefProp, resolveRefProp } from \"../utils/ref-prop.js\";\n\n/** The signal map `T` declares, from signal name to handler signature. */\ntype Signals<T extends GObject.Object> = NonNullable<T[\"__signals__\"]>;\n/** Every signal name `T` declares, on its own or narrowed by a `::detail` suffix. */\ntype SignalName<T extends GObject.Object> = keyof Signals<T> | `${keyof Signals<T> & string}::${string}`;\n\n/**\n * The handler signature `T` declares for signal `S`, looked up through any `::detail` suffix and\n * falling back to an untyped `SignalHandler` when the object declares no such signal.\n */\ntype TypedSignalHandler<T extends GObject.Object, S extends string> = S extends keyof Signals<T>\n    ? Signals<T>[S]\n    : S extends `${infer TBase}::${string}`\n        ? TBase extends keyof Signals<T>\n            ? Signals<T>[TBase]\n            : SignalHandler\n        : SignalHandler;\n\n/** Options for {@link useSignal}. */\ntype UseSignalOptions = {\n    /** Runs the handler after the object's own default handler rather than before it. */\n    isAfter?: boolean;\n    /** Invokes the handler once, with no arguments, as soon as the signal is connected. */\n    isImmediate?: boolean;\n};\n\n/**\n * Connects a handler to a GObject signal for the lifetime of the component, reconnecting when the object changes.\n *\n * Each emission runs the handler from the latest render, so it does not have to be stable and a\n * changing handler never reconnects the signal.\n *\n * On React 19.2 this does not hold inside a component wrapped in `memo` or `forwardRef`, where every emission\n * runs the handler captured on the first render. Keep the calling component unwrapped, or read the values the\n * handler needs off the GObject itself. React fixes this on the 19.3 line.\n *\n * @param signal The signal name, optionally with a `::detail` suffix.\n * @param options `isAfter` runs the handler after the default handler; `isImmediate` also invokes it on connect.\n */\nfunction useSignal<T extends GObject.Object, S extends SignalName<T> & string>(\n    object: RefProp<T>,\n    signal: S,\n    handler: TypedSignalHandler<T, S>,\n    { isAfter = false, isImmediate = false }: UseSignalOptions = {},\n): void {\n    const emit = useEffectEvent(handler as SignalHandler);\n\n    useLayoutEffect(() => {\n        const resolved = resolveRefProp(object);\n\n        if (!resolved) {\n            return;\n        }\n\n        resolved.on(signal, emit, isAfter);\n\n        if (isImmediate) {\n            emit();\n        }\n\n        return () => {\n            resolved.off(signal, emit);\n        };\n    }, [object, signal, isAfter, isImmediate]);\n}\n\nexport { useSignal };\n"]}
+{"version":3,"file":"use-signal.js","sourceRoot":"","sources":["../../src/hooks/use-signal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAgB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA2BnD;;;;;;;;GAQG;AACH,SAAS,SAAS,CACd,MAAkB,EAClB,MAAS,EACT,OAAiC,EACjC,EAAE,OAAO,GAAG,KAAK,EAAE,WAAW,GAAG,KAAK,KAAuB,EAAE;IAE/D,MAAM,UAAU,GAAG,YAAY,CAAgB,OAAwB,CAAC,CAAC;IAEzE,eAAe,CAAC,GAAG,EAAE;QACjB,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QAED,MAAM,IAAI,GAAkB,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrE,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,IAAI,WAAW,EAAE,CAAC;YACd,IAAI,EAAE,CAAC;QACX,CAAC;QAED,OAAO,GAAG,EAAE;YACR,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,OAAO,EAAE,SAAS,EAAE,CAAC","sourcesContent":["import type * as GObject from \"@gtkx/gi/gobject\";\nimport type { SignalHandler } from \"@gtkx/runtime\";\nimport { useLayoutEffect } from \"react\";\nimport { type RefProp, resolveRefProp } from \"../utils/ref-prop.js\";\nimport { useLatestRef } from \"./use-latest-ref.js\";\n\n/** The signal map `T` declares, from signal name to handler signature. */\ntype Signals<T extends GObject.Object> = NonNullable<T[\"__signals__\"]>;\n/** Every signal name `T` declares, on its own or narrowed by a `::detail` suffix. */\ntype SignalName<T extends GObject.Object> = keyof Signals<T> | `${keyof Signals<T> & string}::${string}`;\n\n/**\n * The handler signature `T` declares for signal `S`, looked up through any `::detail` suffix and\n * falling back to an untyped `SignalHandler` when the object declares no such signal.\n */\ntype TypedSignalHandler<T extends GObject.Object, S extends string> = S extends keyof Signals<T>\n    ? Signals<T>[S]\n    : S extends `${infer TBase}::${string}`\n        ? TBase extends keyof Signals<T>\n            ? Signals<T>[TBase]\n            : SignalHandler\n        : SignalHandler;\n\n/** Options for {@link useSignal}. */\ntype UseSignalOptions = {\n    /** Runs the handler after the object's own default handler rather than before it. */\n    isAfter?: boolean;\n    /** Invokes the handler once, with no arguments, as soon as the signal is connected. */\n    isImmediate?: boolean;\n};\n\n/**\n * Connects a handler to a GObject signal for the lifetime of the component, reconnecting when the object changes.\n *\n * Each emission runs the handler from the latest committed render, so it does not have to be stable and a\n * changing handler never reconnects the signal.\n *\n * @param signal The signal name, optionally with a `::detail` suffix.\n * @param options `isAfter` runs the handler after the default handler; `isImmediate` also invokes it on connect.\n */\nfunction useSignal<T extends GObject.Object, S extends SignalName<T> & string>(\n    object: RefProp<T>,\n    signal: S,\n    handler: TypedSignalHandler<T, S>,\n    { isAfter = false, isImmediate = false }: UseSignalOptions = {},\n): void {\n    const handlerRef = useLatestRef<SignalHandler>(handler as SignalHandler);\n\n    useLayoutEffect(() => {\n        const resolved = resolveRefProp(object);\n\n        if (!resolved) {\n            return;\n        }\n\n        const emit: SignalHandler = (...args) => handlerRef.current(...args);\n        resolved.on(signal, emit, isAfter);\n\n        if (isImmediate) {\n            emit();\n        }\n\n        return () => {\n            resolved.off(signal, emit);\n        };\n    }, [handlerRef, object, signal, isAfter, isImmediate]);\n}\n\nexport { useSignal };\n"]}

package/dist/internal.d.ts

@@ -8,6 +8,7 @@ export { createElementComponent } from "./components/element.js";
 export { createPortaledComponent } from "./components/portaled.js";
 /** @internal */
 export { createWindowComponent } from "./components/window.js";
+export { useLatestRef } from "./hooks/use-latest-ref.js";
 export { useMergedRef } from "./hooks/use-merged-refs.js";
 export type * from "./prop-types.js";
 export { settleAccessible } from "./reconciler/apply-props.js";

package/dist/internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,CAAC;AAExB,gBAAgB;AAChB,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,gBAAgB;AAChB,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,gBAAgB;AAChB,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,gBAAgB;AAChB,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,mBAAmB,iBAAiB,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,KAAK,cAAc,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5G,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,CAAC;AAExB,gBAAgB;AAChB,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,gBAAgB;AAChB,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,gBAAgB;AAChB,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,gBAAgB;AAChB,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,mBAAmB,iBAAiB,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,KAAK,cAAc,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5G,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/internal.js

@@ -8,6 +8,7 @@ export { createElementComponent } from "./components/element.js";
 export { createPortaledComponent } from "./components/portaled.js";
 /** @internal */
 export { createWindowComponent } from "./components/window.js";
+export { useLatestRef } from "./hooks/use-latest-ref.js";
 export { useMergedRef } from "./hooks/use-merged-refs.js";
 export { settleAccessible } from "./reconciler/apply-props.js";
 export { isRootElement } from "./reconciler/root-element.js";

package/dist/internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,CAAC;AAExB,gBAAgB;AAChB,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,gBAAgB;AAChB,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,gBAAgB;AAChB,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,gBAAgB;AAChB,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAuB,yBAAyB,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["import \"./bootstrap.js\";\n\n/** @internal */\nexport { createApplicationWindowComponent } from \"./components/application-window.js\";\n/** @internal */\nexport { createApplicationComponent } from \"./components/application.js\";\nexport { createElementComponent } from \"./components/element.js\";\n/** @internal */\nexport { createPortaledComponent } from \"./components/portaled.js\";\n/** @internal */\nexport { createWindowComponent } from \"./components/window.js\";\nexport { useMergedRef } from \"./hooks/use-merged-refs.js\";\nexport type * from \"./prop-types.js\";\nexport { settleAccessible } from \"./reconciler/apply-props.js\";\nexport { isRootElement } from \"./reconciler/root-element.js\";\nexport { createReconcilerRoot, type ReconcilerRoot, setReconcilerErrorHandler } from \"./reconciler/root.js\";\nexport type { SettingsSchema, SettingsSchemaKeys, SettingValue } from \"./utils/settings.js\";\n"]}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,CAAC;AAExB,gBAAgB;AAChB,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,gBAAgB;AAChB,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,gBAAgB;AAChB,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,gBAAgB;AAChB,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAuB,yBAAyB,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["import \"./bootstrap.js\";\n\n/** @internal */\nexport { createApplicationWindowComponent } from \"./components/application-window.js\";\n/** @internal */\nexport { createApplicationComponent } from \"./components/application.js\";\nexport { createElementComponent } from \"./components/element.js\";\n/** @internal */\nexport { createPortaledComponent } from \"./components/portaled.js\";\n/** @internal */\nexport { createWindowComponent } from \"./components/window.js\";\nexport { useLatestRef } from \"./hooks/use-latest-ref.js\";\nexport { useMergedRef } from \"./hooks/use-merged-refs.js\";\nexport type * from \"./prop-types.js\";\nexport { settleAccessible } from \"./reconciler/apply-props.js\";\nexport { isRootElement } from \"./reconciler/root-element.js\";\nexport { createReconcilerRoot, type ReconcilerRoot, setReconcilerErrorHandler } from \"./reconciler/root.js\";\nexport type { SettingsSchema, SettingsSchemaKeys, SettingValue } from \"./utils/settings.js\";\n"]}

package/dist/utils/settings.d.ts

@@ -1,5 +1,5 @@
 import type * as Gio from "@gtkx/gi/gio";
-import { type VariantValue } from "./variant.js";
+import { type VariantValue } from "@gtkx/runtime";
 /** Maps each key of a GSettings schema to its kind: a GVariant type string, or `enum` or `flags`. */
 type SettingsSchemaKeys = Record<string, string>;
 /** Value type a key kind stands for: `number` for `enum` and `flags`, otherwise the unpacked GVariant. */

package/dist/utils/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,EAAgD,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAE/F,qGAAqG;AACrG,KAAK,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACjD,0GAA0G;AAC1G,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;AAChG,0GAA0G;AAC1G,KAAK,YAAY,CAAC,CAAC,SAAS,kBAAkB,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;AAErG,4GAA4G;AAC5G,KAAK,cAAc,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAAI;IACrE,gEAAgE;IAChE,EAAE,EAAE,MAAM,CAAC;IACX,4FAA4F;IAC5F,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,uFAAuF;IACvF,IAAI,EAAE,CAAC,CAAC;CACX,CAAC;AAOF,KAAK,uBAAuB,CAAC,CAAC,SAAS,kBAAkB,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI;IAC5E,GAAG,EAAE,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9B,GAAG,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;CAC5C,CAAC;AA4BF,QAAA,MAAM,sBAAsB,GAAI,CAAC,SAAS,kBAAkB,EAAE,CAAC,SAAS,MAAM,CAAC,EAC3E,UAAU,GAAG,CAAC,QAAQ,EACtB,QAAQ,cAAc,CAAC,CAAC,CAAC,EACzB,KAAK,CAAC,GAAG,MAAM,KAChB,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAa9B,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,KAAK,kBAAkB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,CAAC"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,EAA0B,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAE1E,qGAAqG;AACrG,KAAK,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACjD,0GAA0G;AAC1G,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;AAChG,0GAA0G;AAC1G,KAAK,YAAY,CAAC,CAAC,SAAS,kBAAkB,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;AAErG,4GAA4G;AAC5G,KAAK,cAAc,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAAI;IACrE,gEAAgE;IAChE,EAAE,EAAE,MAAM,CAAC;IACX,4FAA4F;IAC5F,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,uFAAuF;IACvF,IAAI,EAAE,CAAC,CAAC;CACX,CAAC;AAOF,KAAK,uBAAuB,CAAC,CAAC,SAAS,kBAAkB,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI;IAC5E,GAAG,EAAE,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9B,GAAG,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;CAC5C,CAAC;AAwBF,QAAA,MAAM,sBAAsB,GAAI,CAAC,SAAS,kBAAkB,EAAE,CAAC,SAAS,MAAM,CAAC,EAC3E,UAAU,GAAG,CAAC,QAAQ,EACtB,QAAQ,cAAc,CAAC,CAAC,CAAC,EACzB,KAAK,CAAC,GAAG,MAAM,KAChB,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAa9B,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,KAAK,kBAAkB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,CAAC"}

package/dist/utils/settings.js

@@ -1,4 +1,4 @@
-import { packVariant, parseVariantType, unpackVariant } from "./variant.js";
+import { fromVariant, toVariant } from "@gtkx/runtime";
 const ACCESSORS = {
     enum: {
         get: (settings, key) => settings.getEnum(key),
@@ -13,15 +13,12 @@ const ACCESSORS = {
         },
     },
 };
-const defaultAccessor = (kind) => {
-    const node = parseVariantType(kind);
-    return {
-        get: (settings, key) => unpackVariant(node, settings.getValue(key)),
-        set: (settings, key, value) => {
-            settings.setValue(key, packVariant(node, value));
-        },
-    };
-};
+const defaultAccessor = (kind) => ({
+    get: (settings, key) => fromVariant(kind, settings.getValue(key)),
+    set: (settings, key, value) => {
+        settings.setValue(key, toVariant(kind, value));
+    },
+});
 const resolveSettingAccessor = (settings, schema, key) => {
     const kind = schema.keys[key];
     if (kind === undefined) {

package/dist/utils/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAqB,MAAM,cAAc,CAAC;AA6B/F,MAAM,SAAS,GAAwD;IACnE,IAAI,EAAE;QACF,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;QACnE,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,KAAa,EAAE,EAAE;YACxD,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;KACJ;IACD,KAAK,EAAE;QACH,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QACpE,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,KAAa,EAAE,EAAE;YACxD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;KACJ;CACJ,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAmB,EAAE;IACtD,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEpC,OAAO;QACH,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzF,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,KAAc,EAAE,EAAE;YACzD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACrD,CAAC;KACJ,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC3B,QAAsB,EACtB,MAAyB,EACzB,GAAe,EACc,EAAE;IAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,+BAA+B,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,CAAwC,CAAC;IAEnG,OAAO;QACH,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC;QAC3C,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC;KAC9C,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAmE,CAAC","sourcesContent":["import type * as Gio from \"@gtkx/gi/gio\";\nimport { packVariant, parseVariantType, unpackVariant, type VariantValue } from \"./variant.js\";\n\n/** Maps each key of a GSettings schema to its kind: a GVariant type string, or `enum` or `flags`. */\ntype SettingsSchemaKeys = Record<string, string>;\n/** Value type a key kind stands for: `number` for `enum` and `flags`, otherwise the unpacked GVariant. */\ntype SettingKindValue<S extends string> = S extends \"enum\" | \"flags\" ? number : VariantValue<S>;\n/** Value type of key `P`, looked up by its kind in schema `K`, that reads and writes of that key take. */\ntype SettingValue<K extends SettingsSchemaKeys, P extends keyof K> = SettingKindValue<K[P] & string>;\n\n/** A GSettings schema, as described by the modules GTKX generates from a project's `.gschema.xml` files. */\ntype SettingsSchema<K extends SettingsSchemaKeys = SettingsSchemaKeys> = {\n    /** Schema id it is looked up by, such as `org.gtkx.Example`. */\n    id: string;\n    /** Path a relocatable schema is instantiated at, or `null` to use the schema's own path. */\n    path: string | null;\n    /** Kind of every key the schema declares, which types reads and writes of that key. */\n    keys: K;\n};\n\ntype SettingAccessor<T = unknown> = {\n    get: (settings: Gio.Settings, key: string) => T;\n    set: (settings: Gio.Settings, key: string, value: T) => void;\n};\n\ntype ResolvedSettingAccessor<K extends SettingsSchemaKeys, P extends keyof K> = {\n    get: () => SettingValue<K, P>;\n    set: (value: SettingValue<K, P>) => void;\n};\n\nconst ACCESSORS: Record<string, SettingAccessor<number> | undefined> = {\n    enum: {\n        get: (settings: Gio.Settings, key: string) => settings.getEnum(key),\n        set: (settings: Gio.Settings, key: string, value: number) => {\n            settings.setEnum(key, value);\n        },\n    },\n    flags: {\n        get: (settings: Gio.Settings, key: string) => settings.getFlags(key),\n        set: (settings: Gio.Settings, key: string, value: number) => {\n            settings.setFlags(key, value);\n        },\n    },\n};\n\nconst defaultAccessor = (kind: string): SettingAccessor => {\n    const node = parseVariantType(kind);\n\n    return {\n        get: (settings: Gio.Settings, key: string) => unpackVariant(node, settings.getValue(key)),\n        set: (settings: Gio.Settings, key: string, value: unknown) => {\n            settings.setValue(key, packVariant(node, value));\n        },\n    };\n};\n\nconst resolveSettingAccessor = <K extends SettingsSchemaKeys, P extends keyof K>(\n    settings: Gio.Settings,\n    schema: SettingsSchema<K>,\n    key: P & string,\n): ResolvedSettingAccessor<K, P> => {\n    const kind = schema.keys[key];\n\n    if (kind === undefined) {\n        throw new Error(`Key \"${key}\" is not defined in schema \"${schema.id}\"`);\n    }\n\n    const accessor = (ACCESSORS[kind] ?? defaultAccessor(kind)) as SettingAccessor<SettingValue<K, P>>;\n\n    return {\n        get: accessor.get.bind(null, settings, key),\n        set: accessor.set.bind(null, settings, key),\n    };\n};\n\nexport { resolveSettingAccessor, type SettingsSchemaKeys, type SettingValue, type SettingsSchema };\n"]}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAqB,MAAM,eAAe,CAAC;AA6B1E,MAAM,SAAS,GAAwD;IACnE,IAAI,EAAE;QACF,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;QACnE,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,KAAa,EAAE,EAAE;YACxD,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;KACJ;IACD,KAAK,EAAE;QACH,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QACpE,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,KAAa,EAAE,EAAE;YACxD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;KACJ;CACJ,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAmB,EAAE,CAAC,CAAC;IACxD,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACvF,GAAG,EAAE,CAAC,QAAsB,EAAE,GAAW,EAAE,KAAc,EAAE,EAAE;QACzD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IACnD,CAAC;CACJ,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,CAC3B,QAAsB,EACtB,MAAyB,EACzB,GAAe,EACc,EAAE;IAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,+BAA+B,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,CAAwC,CAAC;IAEnG,OAAO;QACH,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC;QAC3C,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC;KAC9C,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAmE,CAAC","sourcesContent":["import type * as Gio from \"@gtkx/gi/gio\";\nimport { fromVariant, toVariant, type VariantValue } from \"@gtkx/runtime\";\n\n/** Maps each key of a GSettings schema to its kind: a GVariant type string, or `enum` or `flags`. */\ntype SettingsSchemaKeys = Record<string, string>;\n/** Value type a key kind stands for: `number` for `enum` and `flags`, otherwise the unpacked GVariant. */\ntype SettingKindValue<S extends string> = S extends \"enum\" | \"flags\" ? number : VariantValue<S>;\n/** Value type of key `P`, looked up by its kind in schema `K`, that reads and writes of that key take. */\ntype SettingValue<K extends SettingsSchemaKeys, P extends keyof K> = SettingKindValue<K[P] & string>;\n\n/** A GSettings schema, as described by the modules GTKX generates from a project's `.gschema.xml` files. */\ntype SettingsSchema<K extends SettingsSchemaKeys = SettingsSchemaKeys> = {\n    /** Schema id it is looked up by, such as `org.gtkx.Example`. */\n    id: string;\n    /** Path a relocatable schema is instantiated at, or `null` to use the schema's own path. */\n    path: string | null;\n    /** Kind of every key the schema declares, which types reads and writes of that key. */\n    keys: K;\n};\n\ntype SettingAccessor<T = unknown> = {\n    get: (settings: Gio.Settings, key: string) => T;\n    set: (settings: Gio.Settings, key: string, value: T) => void;\n};\n\ntype ResolvedSettingAccessor<K extends SettingsSchemaKeys, P extends keyof K> = {\n    get: () => SettingValue<K, P>;\n    set: (value: SettingValue<K, P>) => void;\n};\n\nconst ACCESSORS: Record<string, SettingAccessor<number> | undefined> = {\n    enum: {\n        get: (settings: Gio.Settings, key: string) => settings.getEnum(key),\n        set: (settings: Gio.Settings, key: string, value: number) => {\n            settings.setEnum(key, value);\n        },\n    },\n    flags: {\n        get: (settings: Gio.Settings, key: string) => settings.getFlags(key),\n        set: (settings: Gio.Settings, key: string, value: number) => {\n            settings.setFlags(key, value);\n        },\n    },\n};\n\nconst defaultAccessor = (kind: string): SettingAccessor => ({\n    get: (settings: Gio.Settings, key: string) => fromVariant(kind, settings.getValue(key)),\n    set: (settings: Gio.Settings, key: string, value: unknown) => {\n        settings.setValue(key, toVariant(kind, value));\n    },\n});\n\nconst resolveSettingAccessor = <K extends SettingsSchemaKeys, P extends keyof K>(\n    settings: Gio.Settings,\n    schema: SettingsSchema<K>,\n    key: P & string,\n): ResolvedSettingAccessor<K, P> => {\n    const kind = schema.keys[key];\n\n    if (kind === undefined) {\n        throw new Error(`Key \"${key}\" is not defined in schema \"${schema.id}\"`);\n    }\n\n    const accessor = (ACCESSORS[kind] ?? defaultAccessor(kind)) as SettingAccessor<SettingValue<K, P>>;\n\n    return {\n        get: accessor.get.bind(null, settings, key),\n        set: accessor.set.bind(null, settings, key),\n    };\n};\n\nexport { resolveSettingAccessor, type SettingsSchemaKeys, type SettingValue, type SettingsSchema };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "React reconciler that renders GTK4 object trees, with the portals, signal handling, and hooks GTKX apps use",
   "keywords": [
     "gtkx",
@@ -86,9 +86,9 @@
   },
   "dependencies": {
     "react-reconciler": "^0.33.0",
-    "@gtkx/config": "1.1.0",
-    "@gtkx/runtime": "1.1.0",
-    "@gtkx/utils": "1.1.0"
+    "@gtkx/config": "1.2.1",
+    "@gtkx/runtime": "1.2.1",
+    "@gtkx/utils": "1.2.1"
   },
   "devDependencies": {
     "@types/react": "^19.2.18",

package/src/hooks/use-latest-ref.ts

@@ -0,0 +1,13 @@
+import { type RefObject, useInsertionEffect, useRef } from "react";
+
+function useLatestRef<T>(value: T): RefObject<T> {
+    const ref = useRef(value);
+
+    useInsertionEffect(() => {
+        ref.current = value;
+    });
+
+    return ref;
+}
+
+export { useLatestRef };

package/src/hooks/use-signal.ts

@@ -1,7 +1,8 @@
 import type * as GObject from "@gtkx/gi/gobject";
 import type { SignalHandler } from "@gtkx/runtime";
-import { useEffectEvent, useLayoutEffect } from "react";
+import { useLayoutEffect } from "react";
 import { type RefProp, resolveRefProp } from "../utils/ref-prop.js";
+import { useLatestRef } from "./use-latest-ref.js";
 
 /** The signal map `T` declares, from signal name to handler signature. */
 type Signals<T extends GObject.Object> = NonNullable<T["__signals__"]>;
@@ -31,13 +32,9 @@ type UseSignalOptions = {
 /**
  * Connects a handler to a GObject signal for the lifetime of the component, reconnecting when the object changes.
  *
- * Each emission runs the handler from the latest render, so it does not have to be stable and a
+ * Each emission runs the handler from the latest committed render, so it does not have to be stable and a
  * changing handler never reconnects the signal.
  *
- * On React 19.2 this does not hold inside a component wrapped in `memo` or `forwardRef`, where every emission
- * runs the handler captured on the first render. Keep the calling component unwrapped, or read the values the
- * handler needs off the GObject itself. React fixes this on the 19.3 line.
- *
  * @param signal The signal name, optionally with a `::detail` suffix.
  * @param options `isAfter` runs the handler after the default handler; `isImmediate` also invokes it on connect.
  */
@@ -47,7 +44,7 @@ function useSignal<T extends GObject.Object, S extends SignalName<T> & string>(
     handler: TypedSignalHandler<T, S>,
     { isAfter = false, isImmediate = false }: UseSignalOptions = {},
 ): void {
-    const emit = useEffectEvent(handler as SignalHandler);
+    const handlerRef = useLatestRef<SignalHandler>(handler as SignalHandler);
 
     useLayoutEffect(() => {
         const resolved = resolveRefProp(object);
@@ -56,6 +53,7 @@ function useSignal<T extends GObject.Object, S extends SignalName<T> & string>(
             return;
         }
 
+        const emit: SignalHandler = (...args) => handlerRef.current(...args);
         resolved.on(signal, emit, isAfter);
 
         if (isImmediate) {
@@ -65,7 +63,7 @@ function useSignal<T extends GObject.Object, S extends SignalName<T> & string>(
         return () => {
             resolved.off(signal, emit);
         };
-    }, [object, signal, isAfter, isImmediate]);
+    }, [handlerRef, object, signal, isAfter, isImmediate]);
 }
 
 export { useSignal };

package/src/internal.ts

@@ -9,6 +9,7 @@ export { createElementComponent } from "./components/element.js";
 export { createPortaledComponent } from "./components/portaled.js";
 /** @internal */
 export { createWindowComponent } from "./components/window.js";
+export { useLatestRef } from "./hooks/use-latest-ref.js";
 export { useMergedRef } from "./hooks/use-merged-refs.js";
 export type * from "./prop-types.js";
 export { settleAccessible } from "./reconciler/apply-props.js";

package/src/utils/settings.ts

@@ -1,5 +1,5 @@
 import type * as Gio from "@gtkx/gi/gio";
-import { packVariant, parseVariantType, unpackVariant, type VariantValue } from "./variant.js";
+import { fromVariant, toVariant, type VariantValue } from "@gtkx/runtime";
 
 /** Maps each key of a GSettings schema to its kind: a GVariant type string, or `enum` or `flags`. */
 type SettingsSchemaKeys = Record<string, string>;
@@ -43,16 +43,12 @@ const ACCESSORS: Record<string, SettingAccessor<number> | undefined> = {
     },
 };
 
-const defaultAccessor = (kind: string): SettingAccessor => {
-    const node = parseVariantType(kind);
-
-    return {
-        get: (settings: Gio.Settings, key: string) => unpackVariant(node, settings.getValue(key)),
-        set: (settings: Gio.Settings, key: string, value: unknown) => {
-            settings.setValue(key, packVariant(node, value));
-        },
-    };
-};
+const defaultAccessor = (kind: string): SettingAccessor => ({
+    get: (settings: Gio.Settings, key: string) => fromVariant(kind, settings.getValue(key)),
+    set: (settings: Gio.Settings, key: string, value: unknown) => {
+        settings.setValue(key, toVariant(kind, value));
+    },
+});
 
 const resolveSettingAccessor = <K extends SettingsSchemaKeys, P extends keyof K>(
     settings: Gio.Settings,

package/dist/utils/variant.d.ts

@@ -1,89 +0,0 @@
-import * as GLib from "@gtkx/gi/glib";
-/** JavaScript type every GVariant basic type code unpacks to. */
-type BasicValueMap = {
-    /** Boolean, held as a single byte reading 0 or 1. */
-    b: boolean;
-    /** Unsigned byte. */
-    y: number;
-    /** Signed 16-bit integer. */
-    n: number;
-    /** Unsigned 16-bit integer. */
-    q: number;
-    /** Signed 32-bit integer. */
-    i: number;
-    /** Unsigned 32-bit integer. */
-    u: number;
-    /** Index into the file descriptor list a message carries. */
-    h: number;
-    /** Double precision floating point number. */
-    d: number;
-    /** Signed 64-bit integer. */
-    x: bigint;
-    /** Unsigned 64-bit integer. */
-    t: bigint;
-    /** UTF-8 string, under no further constraint on what it holds. */
-    s: string;
-    /** D-Bus object path. */
-    o: string;
-    /** GVariant type signature. */
-    g: string;
-    /** Boxed variant holding a value of any type. */
-    v: GLib.Variant;
-};
-/** Single-character code of one of the GVariant basic types in {@link BasicValueMap}. */
-type BasicCode = keyof BasicValueMap;
-/** Parses the element type of an array, yielding the array type it produces and the rest of the string. */
-type ParseArray<S extends string> = Parse<S> extends [infer V, infer R extends string] ? [V[], R] : never;
-/** Parses the element type of a maybe, yielding the nullable type it produces and the rest of the string. */
-type ParseMaybe<S extends string> = Parse<S> extends [infer V, infer R extends string] ? [V | null, R] : never;
-/** Collects tuple member types into `Acc` up to the closing parenthesis, yielding them and the rest of the string. */
-type ParseTuple<S extends string, Acc extends unknown[]> = S extends `)${infer Rest}` ? [Acc, Rest] : [Parse<S>] extends [never] ? never : Parse<S> extends [infer V, infer R extends string] ? ParseTuple<R, [...Acc, V]> : never;
-/** Types a dictionary entry key can hold. */
-type DictKey = string | number | bigint | boolean;
-/** Parses the key and value types of a dictionary entry, yielding them and the rest of the string after its brace. */
-type ParsePair<S extends string> = Parse<S> extends [infer K, infer R1 extends string] ? Parse<R1> extends [infer V, infer R2 extends string] ? R2 extends `}${infer R3}` ? [K] extends [DictKey] ? [K, V, R3] : never : never : never : never;
-/**
- * Parses a dictionary entry into the collection an array of those entries unpacks to, a record for string keys and a
- * `Map` otherwise, plus the rest of the string.
- */
-type ParseDict<S extends string> = ParsePair<S> extends [infer K, infer V, infer R extends string] ? [[K] extends [string] ? Record<string, V> : Map<K, V>, R] : never;
-/** Parses a standalone dictionary entry into a key and value pair, yielding it and the rest of the string. */
-type ParseEntry<S extends string> = ParsePair<S> extends [infer K, infer V, infer R extends string] ? [[K, V], R] : never;
-/** Parses what follows an `a` as a dictionary when it opens an entry, and as a plain array otherwise. */
-type ParseArrayOrDict<S extends string> = S extends `{${infer Rest}` ? ParseDict<Rest> : ParseArray<S>;
-/**
- * Parses the type at the head of `S`, yielding the JavaScript type it unpacks to and the rest of the string, or
- * `never` when the string is malformed.
- */
-type Parse<S extends string> = S extends `a${infer Rest}` ? ParseArrayOrDict<Rest> : S extends `m${infer Rest}` ? ParseMaybe<Rest> : S extends `(${infer Rest}` ? ParseTuple<Rest, []> : S extends `{${infer Rest}` ? ParseEntry<Rest> : S extends `${infer C}${infer Rest}` ? C extends BasicCode ? [BasicValueMap[C], Rest] : never : never;
-/** JavaScript type a variant of type string `S` unpacks to, or `unknown` when `S` is not one complete type. */
-type VariantValue<S extends string> = [Parse<S>] extends [never] ? unknown : Parse<S> extends [infer V, ""] ? V : unknown;
-type VariantTypeNode = {
-    kind: "basic";
-    code: BasicCode;
-} | {
-    kind: "array";
-    elementTypeString: string;
-    element: VariantTypeNode;
-} | {
-    kind: "dict";
-    entryTypeString: string;
-    key: VariantTypeNode;
-    value: VariantTypeNode;
-} | {
-    kind: "entry";
-    key: VariantTypeNode;
-    value: VariantTypeNode;
-} | {
-    kind: "tuple";
-    items: VariantTypeNode[];
-} | {
-    kind: "maybe";
-    elementTypeString: string;
-    element: VariantTypeNode;
-};
-declare const parseVariantType: (typeString: string) => VariantTypeNode;
-declare const unpackVariant: (node: VariantTypeNode, variant: GLib.Variant) => unknown;
-declare const packVariant: (node: VariantTypeNode, value: unknown) => GLib.Variant;
-export { parseVariantType, unpackVariant, packVariant, type VariantValue };
-//# sourceMappingURL=variant.d.ts.map

package/dist/utils/variant.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"variant.d.ts","sourceRoot":"","sources":["../../src/utils/variant.ts"],"names":[],"mappings":"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"}

package/dist/utils/variant.js

@@ -1,197 +0,0 @@
-import * as GLib from "@gtkx/gi/glib";
-const BASIC_CODES = "bynqiuxthdsogv";
-const STRING_KEY_CODES = new Set(["s", "o", "g"]);
-const CONTAINER_PARSERS = {
-    a: parseArrayNode,
-    m: parseMaybeNode,
-    "(": parseTupleNode,
-    "{": parseEntryNode,
-};
-const parsedTypes = new Map();
-const unpackBasic = {
-    b: (variant) => variant.getBoolean(),
-    y: (variant) => variant.getByte(),
-    n: (variant) => variant.getInt16(),
-    q: (variant) => variant.getUint16(),
-    i: (variant) => variant.getInt32(),
-    u: (variant) => variant.getUint32(),
-    h: (variant) => variant.getHandle(),
-    d: (variant) => variant.getDouble(),
-    x: (variant) => variant.getInt64(),
-    t: (variant) => variant.getUint64(),
-    s: (variant) => variant.getString()[0],
-    o: (variant) => variant.getString()[0],
-    g: (variant) => variant.getString()[0],
-    v: (variant) => variant.getVariant(),
-};
-const packBasic = {
-    b: (value) => GLib.Variant.newBoolean(value),
-    y: (value) => GLib.Variant.newByte(value),
-    n: (value) => GLib.Variant.newInt16(value),
-    q: (value) => GLib.Variant.newUint16(value),
-    i: (value) => GLib.Variant.newInt32(value),
-    u: (value) => GLib.Variant.newUint32(value),
-    h: (value) => GLib.Variant.newHandle(value),
-    d: (value) => GLib.Variant.newDouble(value),
-    x: (value) => GLib.Variant.newInt64(value),
-    t: (value) => GLib.Variant.newUint64(value),
-    s: (value) => GLib.Variant.newString(value),
-    o: packObjectPath,
-    g: packSignature,
-    v: (value) => GLib.Variant.newVariant(value),
-};
-const isBasicCode = (code) => BASIC_CODES.includes(code);
-const isStringKeyed = (key) => key.kind === "basic" && STRING_KEY_CODES.has(key.code);
-const invalidType = (source) => new Error(`Invalid GVariant type string "${source}"`);
-const parsePair = (source, start) => {
-    const [key, keyEnd] = parseNode(source, start);
-    if (key.kind !== "basic" || key.code === "v") {
-        throw invalidType(source);
-    }
-    const [value, valueEnd] = parseNode(source, keyEnd);
-    if (source[valueEnd] !== "}") {
-        throw invalidType(source);
-    }
-    return [key, value, valueEnd + 1];
-};
-function parseArrayNode(source, start) {
-    if (source[start] === "{") {
-        const [key, value, end] = parsePair(source, start + 1);
-        return [{ kind: "dict", entryTypeString: source.slice(start, end), key, value }, end];
-    }
-    const [element, end] = parseNode(source, start);
-    return [{ kind: "array", elementTypeString: source.slice(start, end), element }, end];
-}
-function parseMaybeNode(source, start) {
-    const [element, end] = parseNode(source, start);
-    return [{ kind: "maybe", elementTypeString: source.slice(start, end), element }, end];
-}
-function parseTupleNode(source, start) {
-    const items = [];
-    let position = start;
-    while (source[position] !== ")") {
-        if (position >= source.length) {
-            throw invalidType(source);
-        }
-        const [item, end] = parseNode(source, position);
-        items.push(item);
-        position = end;
-    }
-    return [{ kind: "tuple", items }, position + 1];
-}
-function parseEntryNode(source, start) {
-    const [key, value, end] = parsePair(source, start);
-    return [{ kind: "entry", key, value }, end];
-}
-const parseNode = (source, start) => {
-    const code = source[start];
-    if (code === undefined) {
-        throw invalidType(source);
-    }
-    const container = CONTAINER_PARSERS[code];
-    if (container !== undefined) {
-        return container(source, start + 1);
-    }
-    if (isBasicCode(code)) {
-        return [{ kind: "basic", code }, start + 1];
-    }
-    throw invalidType(source);
-};
-const parseVariantType = (typeString) => {
-    const cached = parsedTypes.get(typeString);
-    if (cached !== undefined) {
-        return cached;
-    }
-    const [node, end] = parseNode(typeString, 0);
-    if (end !== typeString.length) {
-        throw invalidType(typeString);
-    }
-    parsedTypes.set(typeString, node);
-    return node;
-};
-const unpackChildren = (variant, unpackChild) => {
-    const children = [];
-    const count = variant.nChildren();
-    for (let index = 0; index < count; index += 1) {
-        children.push(unpackChild(variant.getChildValue(index)));
-    }
-    return children;
-};
-const unpackPair = (key, value, entry) => [
-    unpackVariant(key, entry.getChildValue(0)),
-    unpackVariant(value, entry.getChildValue(1)),
-];
-const unpackDict = (node, variant) => {
-    const entries = unpackChildren(variant, (entry) => unpackPair(node.key, node.value, entry));
-    if (!isStringKeyed(node.key)) {
-        return new Map(entries);
-    }
-    const stringEntries = entries.map(([key, value]) => [key, value]);
-    return Object.fromEntries(stringEntries);
-};
-const unpackMaybe = (element, variant) => {
-    const child = variant.getMaybe();
-    return child === null ? null : unpackVariant(element, child);
-};
-const unpackVariant = (node, variant) => {
-    switch (node.kind) {
-        case "basic": {
-            return unpackBasic[node.code](variant);
-        }
-        case "array": {
-            return unpackChildren(variant, (child) => unpackVariant(node.element, child));
-        }
-        case "dict": {
-            return unpackDict(node, variant);
-        }
-        case "entry": {
-            return unpackPair(node.key, node.value, variant);
-        }
-        case "tuple": {
-            return node.items.map((item, index) => unpackVariant(item, variant.getChildValue(index)));
-        }
-        case "maybe": {
-            return unpackMaybe(node.element, variant);
-        }
-    }
-};
-const packValidatedString = (value, isValid, description, construct) => {
-    if (typeof value !== "string" || !isValid(value)) {
-        throw new Error(`"${String(value)}" is not a valid GVariant ${description}`);
-    }
-    return construct(value);
-};
-function packObjectPath(value) {
-    return packValidatedString(value, (path) => GLib.Variant.isObjectPath(path), "object path", (path) => GLib.Variant.newObjectPath(path));
-}
-function packSignature(value) {
-    return packValidatedString(value, (signature) => GLib.Variant.isSignature(signature), "type signature", (signature) => GLib.Variant.newSignature(signature));
-}
-const packEntry = (key, value, pair) => GLib.Variant.newDictEntry(packVariant(key, pair[0]), packVariant(value, pair[1]));
-const dictEntries = (value) => value instanceof Map ? [...value] : Object.entries(value);
-const packDict = (node, value) => GLib.Variant.newArray(GLib.VariantType.new(node.entryTypeString), dictEntries(value).map((pair) => packEntry(node.key, node.value, pair)));
-const packMaybe = (node, value) => GLib.Variant.newMaybe(GLib.VariantType.new(node.elementTypeString), value === null ? null : packVariant(node.element, value));
-const packVariant = (node, value) => {
-    switch (node.kind) {
-        case "basic": {
-            return packBasic[node.code](value);
-        }
-        case "array": {
-            return GLib.Variant.newArray(GLib.VariantType.new(node.elementTypeString), value.map((item) => packVariant(node.element, item)));
-        }
-        case "dict": {
-            return packDict(node, value);
-        }
-        case "entry": {
-            return packEntry(node.key, node.value, value);
-        }
-        case "tuple": {
-            return GLib.Variant.newTuple(node.items.map((item, index) => packVariant(item, value[index])));
-        }
-        case "maybe": {
-            return packMaybe(node, value);
-        }
-    }
-};
-export { parseVariantType, unpackVariant, packVariant };
-//# sourceMappingURL=variant.js.map

package/dist/utils/variant.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"variant.js","sourceRoot":"","sources":["../../src/utils/variant.ts"],"names":[],"mappings":"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","sourcesContent":["import * as GLib from \"@gtkx/gi/glib\";\n\n/** JavaScript type every GVariant basic type code unpacks to. */\ntype BasicValueMap = {\n    /** Boolean, held as a single byte reading 0 or 1. */\n    b: boolean;\n    /** Unsigned byte. */\n    y: number;\n    /** Signed 16-bit integer. */\n    n: number;\n    /** Unsigned 16-bit integer. */\n    q: number;\n    /** Signed 32-bit integer. */\n    i: number;\n    /** Unsigned 32-bit integer. */\n    u: number;\n    /** Index into the file descriptor list a message carries. */\n    h: number;\n    /** Double precision floating point number. */\n    d: number;\n    /** Signed 64-bit integer. */\n    x: bigint;\n    /** Unsigned 64-bit integer. */\n    t: bigint;\n    /** UTF-8 string, under no further constraint on what it holds. */\n    s: string;\n    /** D-Bus object path. */\n    o: string;\n    /** GVariant type signature. */\n    g: string;\n    /** Boxed variant holding a value of any type. */\n    v: GLib.Variant;\n};\n\n/** Single-character code of one of the GVariant basic types in {@link BasicValueMap}. */\ntype BasicCode = keyof BasicValueMap;\n/** Parses the element type of an array, yielding the array type it produces and the rest of the string. */\ntype ParseArray<S extends string> = Parse<S> extends [infer V, infer R extends string] ? [V[], R] : never;\n/** Parses the element type of a maybe, yielding the nullable type it produces and the rest of the string. */\ntype ParseMaybe<S extends string> = Parse<S> extends [infer V, infer R extends string] ? [V | null, R] : never;\n\n/** Collects tuple member types into `Acc` up to the closing parenthesis, yielding them and the rest of the string. */\ntype ParseTuple<S extends string, Acc extends unknown[]> = S extends `)${infer Rest}`\n    ? [Acc, Rest]\n    : [Parse<S>] extends [never]\n            ? never\n            : Parse<S> extends [infer V, infer R extends string]\n                ? ParseTuple<R, [...Acc, V]>\n                : never;\n\n/** Types a dictionary entry key can hold. */\ntype DictKey = string | number | bigint | boolean;\n\n/** Parses the key and value types of a dictionary entry, yielding them and the rest of the string after its brace. */\ntype ParsePair<S extends string> =\n    Parse<S> extends [infer K, infer R1 extends string]\n        ? Parse<R1> extends [infer V, infer R2 extends string]\n            ? R2 extends `}${infer R3}`\n                ? [K] extends [DictKey]\n                        ? [K, V, R3]\n                        : never\n                : never\n            : never\n        : never;\n\n/**\n * Parses a dictionary entry into the collection an array of those entries unpacks to, a record for string keys and a\n * `Map` otherwise, plus the rest of the string.\n */\ntype ParseDict<S extends string> =\n    ParsePair<S> extends [infer K, infer V, infer R extends string]\n        ? [[K] extends [string] ? Record<string, V> : Map<K, V>, R]\n        : never;\n\n/** Parses a standalone dictionary entry into a key and value pair, yielding it and the rest of the string. */\ntype ParseEntry<S extends string> =\n    ParsePair<S> extends [infer K, infer V, infer R extends string] ? [[K, V], R] : never;\n\n/** Parses what follows an `a` as a dictionary when it opens an entry, and as a plain array otherwise. */\ntype ParseArrayOrDict<S extends string> = S extends `{${infer Rest}` ? ParseDict<Rest> : ParseArray<S>;\n\n/**\n * Parses the type at the head of `S`, yielding the JavaScript type it unpacks to and the rest of the string, or\n * `never` when the string is malformed.\n */\ntype Parse<S extends string> = S extends `a${infer Rest}`\n    ? ParseArrayOrDict<Rest>\n    : S extends `m${infer Rest}`\n        ? ParseMaybe<Rest>\n        : S extends `(${infer Rest}`\n            ? ParseTuple<Rest, []>\n            : S extends `{${infer Rest}`\n                ? ParseEntry<Rest>\n                : S extends `${infer C}${infer Rest}`\n                    ? C extends BasicCode\n                        ? [BasicValueMap[C], Rest]\n                        : never\n                    : never;\n\n/** JavaScript type a variant of type string `S` unpacks to, or `unknown` when `S` is not one complete type. */\ntype VariantValue<S extends string> = [Parse<S>] extends [never]\n    ? unknown\n    : Parse<S> extends [infer V, \"\"]\n        ? V\n        : unknown;\n\ntype VariantTypeNode =\n    | { kind: \"basic\"; code: BasicCode } |\n    { kind: \"array\"; elementTypeString: string; element: VariantTypeNode } |\n    { kind: \"dict\"; entryTypeString: string; key: VariantTypeNode; value: VariantTypeNode } |\n    { kind: \"entry\"; key: VariantTypeNode; value: VariantTypeNode } |\n    { kind: \"tuple\"; items: VariantTypeNode[] } |\n    { kind: \"maybe\"; elementTypeString: string; element: VariantTypeNode };\n\nconst BASIC_CODES = \"bynqiuxthdsogv\";\nconst STRING_KEY_CODES: Set<string> = new Set([\"s\", \"o\", \"g\"]);\n\nconst CONTAINER_PARSERS: Record<string, (source: string, start: number) => [VariantTypeNode, number]> = {\n    a: parseArrayNode,\n    m: parseMaybeNode,\n    \"(\": parseTupleNode,\n    \"{\": parseEntryNode,\n};\n\nconst parsedTypes: Map<string, VariantTypeNode> = new Map();\n\nconst unpackBasic: Record<BasicCode, (variant: GLib.Variant) => unknown> = {\n    b: (variant) => variant.getBoolean(),\n    y: (variant) => variant.getByte(),\n    n: (variant) => variant.getInt16(),\n    q: (variant) => variant.getUint16(),\n    i: (variant) => variant.getInt32(),\n    u: (variant) => variant.getUint32(),\n    h: (variant) => variant.getHandle(),\n    d: (variant) => variant.getDouble(),\n    x: (variant) => variant.getInt64(),\n    t: (variant) => variant.getUint64(),\n    s: (variant) => variant.getString()[0],\n    o: (variant) => variant.getString()[0],\n    g: (variant) => variant.getString()[0],\n    v: (variant) => variant.getVariant(),\n};\n\nconst packBasic: Record<BasicCode, (value: unknown) => GLib.Variant> = {\n    b: (value) => GLib.Variant.newBoolean(value as boolean),\n    y: (value) => GLib.Variant.newByte(value as number),\n    n: (value) => GLib.Variant.newInt16(value as number),\n    q: (value) => GLib.Variant.newUint16(value as number),\n    i: (value) => GLib.Variant.newInt32(value as number),\n    u: (value) => GLib.Variant.newUint32(value as number),\n    h: (value) => GLib.Variant.newHandle(value as number),\n    d: (value) => GLib.Variant.newDouble(value as number),\n    x: (value) => GLib.Variant.newInt64(value as bigint),\n    t: (value) => GLib.Variant.newUint64(value as bigint),\n    s: (value) => GLib.Variant.newString(value as string),\n    o: packObjectPath,\n    g: packSignature,\n    v: (value) => GLib.Variant.newVariant(value as GLib.Variant),\n};\n\nconst isBasicCode = (code: string): code is BasicCode => BASIC_CODES.includes(code);\nconst isStringKeyed = (key: VariantTypeNode): boolean => key.kind === \"basic\" && STRING_KEY_CODES.has(key.code);\nconst invalidType = (source: string): Error => new Error(`Invalid GVariant type string \"${source}\"`);\n\nconst parsePair = (source: string, start: number): [VariantTypeNode, VariantTypeNode, number] => {\n    const [key, keyEnd] = parseNode(source, start);\n\n    if (key.kind !== \"basic\" || key.code === \"v\") {\n        throw invalidType(source);\n    }\n\n    const [value, valueEnd] = parseNode(source, keyEnd);\n\n    if (source[valueEnd] !== \"}\") {\n        throw invalidType(source);\n    }\n\n    return [key, value, valueEnd + 1];\n};\n\nfunction parseArrayNode(source: string, start: number): [VariantTypeNode, number] {\n    if (source[start] === \"{\") {\n        const [key, value, end] = parsePair(source, start + 1);\n\n        return [{ kind: \"dict\", entryTypeString: source.slice(start, end), key, value }, end];\n    }\n\n    const [element, end] = parseNode(source, start);\n\n    return [{ kind: \"array\", elementTypeString: source.slice(start, end), element }, end];\n}\n\nfunction parseMaybeNode(source: string, start: number): [VariantTypeNode, number] {\n    const [element, end] = parseNode(source, start);\n\n    return [{ kind: \"maybe\", elementTypeString: source.slice(start, end), element }, end];\n}\n\nfunction parseTupleNode(source: string, start: number): [VariantTypeNode, number] {\n    const items: VariantTypeNode[] = [];\n    let position = start;\n\n    while (source[position] !== \")\") {\n        if (position >= source.length) {\n            throw invalidType(source);\n        }\n\n        const [item, end] = parseNode(source, position);\n        items.push(item);\n        position = end;\n    }\n\n    return [{ kind: \"tuple\", items }, position + 1];\n}\n\nfunction parseEntryNode(source: string, start: number): [VariantTypeNode, number] {\n    const [key, value, end] = parsePair(source, start);\n\n    return [{ kind: \"entry\", key, value }, end];\n}\n\nconst parseNode = (source: string, start: number): [VariantTypeNode, number] => {\n    const code = source[start];\n\n    if (code === undefined) {\n        throw invalidType(source);\n    }\n\n    const container = CONTAINER_PARSERS[code];\n\n    if (container !== undefined) {\n        return container(source, start + 1);\n    }\n\n    if (isBasicCode(code)) {\n        return [{ kind: \"basic\", code }, start + 1];\n    }\n\n    throw invalidType(source);\n};\n\nconst parseVariantType = (typeString: string): VariantTypeNode => {\n    const cached = parsedTypes.get(typeString);\n\n    if (cached !== undefined) {\n        return cached;\n    }\n\n    const [node, end] = parseNode(typeString, 0);\n\n    if (end !== typeString.length) {\n        throw invalidType(typeString);\n    }\n\n    parsedTypes.set(typeString, node);\n\n    return node;\n};\n\nconst unpackChildren = (variant: GLib.Variant, unpackChild: (child: GLib.Variant) => unknown): unknown[] => {\n    const children: unknown[] = [];\n    const count = variant.nChildren();\n\n    for (let index = 0; index < count; index += 1) {\n        children.push(unpackChild(variant.getChildValue(index)));\n    }\n\n    return children;\n};\n\nconst unpackPair = (key: VariantTypeNode, value: VariantTypeNode, entry: GLib.Variant): [unknown, unknown] => [\n    unpackVariant(key, entry.getChildValue(0)),\n    unpackVariant(value, entry.getChildValue(1)),\n];\n\nconst unpackDict = (\n    node: { key: VariantTypeNode; value: VariantTypeNode },\n    variant: GLib.Variant,\n): Record<string, unknown> | Map<unknown, unknown> => {\n    const entries = unpackChildren(variant, (entry) => unpackPair(node.key, node.value, entry)) as [unknown, unknown][];\n\n    if (!isStringKeyed(node.key)) {\n        return new Map(entries);\n    }\n\n    const stringEntries: [string, unknown][] = entries.map(([key, value]) => [key as string, value]);\n\n    return Object.fromEntries(stringEntries);\n};\n\nconst unpackMaybe = (element: VariantTypeNode, variant: GLib.Variant): unknown => {\n    const child = variant.getMaybe();\n\n    return child === null ? null : unpackVariant(element, child);\n};\n\nconst unpackVariant = (node: VariantTypeNode, variant: GLib.Variant): unknown => {\n    switch (node.kind) {\n        case \"basic\": {\n            return unpackBasic[node.code](variant);\n        }\n        case \"array\": {\n            return unpackChildren(variant, (child) => unpackVariant(node.element, child));\n        }\n        case \"dict\": {\n            return unpackDict(node, variant);\n        }\n        case \"entry\": {\n            return unpackPair(node.key, node.value, variant);\n        }\n        case \"tuple\": {\n            return node.items.map((item, index) => unpackVariant(item, variant.getChildValue(index)));\n        }\n        case \"maybe\": {\n            return unpackMaybe(node.element, variant);\n        }\n    }\n};\n\nconst packValidatedString = (\n    value: unknown,\n    isValid: (value: string) => boolean,\n    description: string,\n    construct: (value: string) => GLib.Variant,\n): GLib.Variant => {\n    if (typeof value !== \"string\" || !isValid(value)) {\n        throw new Error(`\"${String(value)}\" is not a valid GVariant ${description}`);\n    }\n\n    return construct(value);\n};\n\nfunction packObjectPath(value: unknown): GLib.Variant {\n    return packValidatedString(\n        value,\n        (path) => GLib.Variant.isObjectPath(path),\n        \"object path\",\n        (path) => GLib.Variant.newObjectPath(path),\n    );\n}\n\nfunction packSignature(value: unknown): GLib.Variant {\n    return packValidatedString(\n        value,\n        (signature) => GLib.Variant.isSignature(signature),\n        \"type signature\",\n        (signature) => GLib.Variant.newSignature(signature),\n    );\n}\n\nconst packEntry = (key: VariantTypeNode, value: VariantTypeNode, pair: [unknown, unknown]): GLib.Variant =>\n    GLib.Variant.newDictEntry(packVariant(key, pair[0]), packVariant(value, pair[1]));\n\nconst dictEntries = (value: unknown): [unknown, unknown][] =>\n    value instanceof Map ? [...value] : Object.entries(value as Record<string, unknown>);\n\nconst packDict = (\n    node: { entryTypeString: string; key: VariantTypeNode; value: VariantTypeNode },\n    value: unknown,\n): GLib.Variant =>\n    GLib.Variant.newArray(\n        GLib.VariantType.new(node.entryTypeString),\n        dictEntries(value).map((pair) => packEntry(node.key, node.value, pair)),\n    );\n\nconst packMaybe = (node: { elementTypeString: string; element: VariantTypeNode }, value: unknown): GLib.Variant =>\n    GLib.Variant.newMaybe(\n        GLib.VariantType.new(node.elementTypeString),\n        value === null ? null : packVariant(node.element, value),\n    );\n\nconst packVariant = (node: VariantTypeNode, value: unknown): GLib.Variant => {\n    switch (node.kind) {\n        case \"basic\": {\n            return packBasic[node.code](value);\n        }\n        case \"array\": {\n            return GLib.Variant.newArray(\n                GLib.VariantType.new(node.elementTypeString),\n                (value as unknown[]).map((item) => packVariant(node.element, item)),\n            );\n        }\n        case \"dict\": {\n            return packDict(node, value);\n        }\n        case \"entry\": {\n            return packEntry(node.key, node.value, value as [unknown, unknown]);\n        }\n        case \"tuple\": {\n            return GLib.Variant.newTuple(\n                node.items.map((item, index) => packVariant(item, (value as unknown[])[index])),\n            );\n        }\n        case \"maybe\": {\n            return packMaybe(node, value);\n        }\n    }\n};\n\nexport { parseVariantType, unpackVariant, packVariant, type VariantValue };\n"]}

package/src/utils/variant.ts

@@ -1,400 +0,0 @@
-import * as GLib from "@gtkx/gi/glib";
-
-/** JavaScript type every GVariant basic type code unpacks to. */
-type BasicValueMap = {
-    /** Boolean, held as a single byte reading 0 or 1. */
-    b: boolean;
-    /** Unsigned byte. */
-    y: number;
-    /** Signed 16-bit integer. */
-    n: number;
-    /** Unsigned 16-bit integer. */
-    q: number;
-    /** Signed 32-bit integer. */
-    i: number;
-    /** Unsigned 32-bit integer. */
-    u: number;
-    /** Index into the file descriptor list a message carries. */
-    h: number;
-    /** Double precision floating point number. */
-    d: number;
-    /** Signed 64-bit integer. */
-    x: bigint;
-    /** Unsigned 64-bit integer. */
-    t: bigint;
-    /** UTF-8 string, under no further constraint on what it holds. */
-    s: string;
-    /** D-Bus object path. */
-    o: string;
-    /** GVariant type signature. */
-    g: string;
-    /** Boxed variant holding a value of any type. */
-    v: GLib.Variant;
-};
-
-/** Single-character code of one of the GVariant basic types in {@link BasicValueMap}. */
-type BasicCode = keyof BasicValueMap;
-/** Parses the element type of an array, yielding the array type it produces and the rest of the string. */
-type ParseArray<S extends string> = Parse<S> extends [infer V, infer R extends string] ? [V[], R] : never;
-/** Parses the element type of a maybe, yielding the nullable type it produces and the rest of the string. */
-type ParseMaybe<S extends string> = Parse<S> extends [infer V, infer R extends string] ? [V | null, R] : never;
-
-/** Collects tuple member types into `Acc` up to the closing parenthesis, yielding them and the rest of the string. */
-type ParseTuple<S extends string, Acc extends unknown[]> = S extends `)${infer Rest}`
-    ? [Acc, Rest]
-    : [Parse<S>] extends [never]
-            ? never
-            : Parse<S> extends [infer V, infer R extends string]
-                ? ParseTuple<R, [...Acc, V]>
-                : never;
-
-/** Types a dictionary entry key can hold. */
-type DictKey = string | number | bigint | boolean;
-
-/** Parses the key and value types of a dictionary entry, yielding them and the rest of the string after its brace. */
-type ParsePair<S extends string> =
-    Parse<S> extends [infer K, infer R1 extends string]
-        ? Parse<R1> extends [infer V, infer R2 extends string]
-            ? R2 extends `}${infer R3}`
-                ? [K] extends [DictKey]
-                        ? [K, V, R3]
-                        : never
-                : never
-            : never
-        : never;
-
-/**
- * Parses a dictionary entry into the collection an array of those entries unpacks to, a record for string keys and a
- * `Map` otherwise, plus the rest of the string.
- */
-type ParseDict<S extends string> =
-    ParsePair<S> extends [infer K, infer V, infer R extends string]
-        ? [[K] extends [string] ? Record<string, V> : Map<K, V>, R]
-        : never;
-
-/** Parses a standalone dictionary entry into a key and value pair, yielding it and the rest of the string. */
-type ParseEntry<S extends string> =
-    ParsePair<S> extends [infer K, infer V, infer R extends string] ? [[K, V], R] : never;
-
-/** Parses what follows an `a` as a dictionary when it opens an entry, and as a plain array otherwise. */
-type ParseArrayOrDict<S extends string> = S extends `{${infer Rest}` ? ParseDict<Rest> : ParseArray<S>;
-
-/**
- * Parses the type at the head of `S`, yielding the JavaScript type it unpacks to and the rest of the string, or
- * `never` when the string is malformed.
- */
-type Parse<S extends string> = S extends `a${infer Rest}`
-    ? ParseArrayOrDict<Rest>
-    : S extends `m${infer Rest}`
-        ? ParseMaybe<Rest>
-        : S extends `(${infer Rest}`
-            ? ParseTuple<Rest, []>
-            : S extends `{${infer Rest}`
-                ? ParseEntry<Rest>
-                : S extends `${infer C}${infer Rest}`
-                    ? C extends BasicCode
-                        ? [BasicValueMap[C], Rest]
-                        : never
-                    : never;
-
-/** JavaScript type a variant of type string `S` unpacks to, or `unknown` when `S` is not one complete type. */
-type VariantValue<S extends string> = [Parse<S>] extends [never]
-    ? unknown
-    : Parse<S> extends [infer V, ""]
-        ? V
-        : unknown;
-
-type VariantTypeNode =
-    | { kind: "basic"; code: BasicCode } |
-    { kind: "array"; elementTypeString: string; element: VariantTypeNode } |
-    { kind: "dict"; entryTypeString: string; key: VariantTypeNode; value: VariantTypeNode } |
-    { kind: "entry"; key: VariantTypeNode; value: VariantTypeNode } |
-    { kind: "tuple"; items: VariantTypeNode[] } |
-    { kind: "maybe"; elementTypeString: string; element: VariantTypeNode };
-
-const BASIC_CODES = "bynqiuxthdsogv";
-const STRING_KEY_CODES: Set<string> = new Set(["s", "o", "g"]);
-
-const CONTAINER_PARSERS: Record<string, (source: string, start: number) => [VariantTypeNode, number]> = {
-    a: parseArrayNode,
-    m: parseMaybeNode,
-    "(": parseTupleNode,
-    "{": parseEntryNode,
-};
-
-const parsedTypes: Map<string, VariantTypeNode> = new Map();
-
-const unpackBasic: Record<BasicCode, (variant: GLib.Variant) => unknown> = {
-    b: (variant) => variant.getBoolean(),
-    y: (variant) => variant.getByte(),
-    n: (variant) => variant.getInt16(),
-    q: (variant) => variant.getUint16(),
-    i: (variant) => variant.getInt32(),
-    u: (variant) => variant.getUint32(),
-    h: (variant) => variant.getHandle(),
-    d: (variant) => variant.getDouble(),
-    x: (variant) => variant.getInt64(),
-    t: (variant) => variant.getUint64(),
-    s: (variant) => variant.getString()[0],
-    o: (variant) => variant.getString()[0],
-    g: (variant) => variant.getString()[0],
-    v: (variant) => variant.getVariant(),
-};
-
-const packBasic: Record<BasicCode, (value: unknown) => GLib.Variant> = {
-    b: (value) => GLib.Variant.newBoolean(value as boolean),
-    y: (value) => GLib.Variant.newByte(value as number),
-    n: (value) => GLib.Variant.newInt16(value as number),
-    q: (value) => GLib.Variant.newUint16(value as number),
-    i: (value) => GLib.Variant.newInt32(value as number),
-    u: (value) => GLib.Variant.newUint32(value as number),
-    h: (value) => GLib.Variant.newHandle(value as number),
-    d: (value) => GLib.Variant.newDouble(value as number),
-    x: (value) => GLib.Variant.newInt64(value as bigint),
-    t: (value) => GLib.Variant.newUint64(value as bigint),
-    s: (value) => GLib.Variant.newString(value as string),
-    o: packObjectPath,
-    g: packSignature,
-    v: (value) => GLib.Variant.newVariant(value as GLib.Variant),
-};
-
-const isBasicCode = (code: string): code is BasicCode => BASIC_CODES.includes(code);
-const isStringKeyed = (key: VariantTypeNode): boolean => key.kind === "basic" && STRING_KEY_CODES.has(key.code);
-const invalidType = (source: string): Error => new Error(`Invalid GVariant type string "${source}"`);
-
-const parsePair = (source: string, start: number): [VariantTypeNode, VariantTypeNode, number] => {
-    const [key, keyEnd] = parseNode(source, start);
-
-    if (key.kind !== "basic" || key.code === "v") {
-        throw invalidType(source);
-    }
-
-    const [value, valueEnd] = parseNode(source, keyEnd);
-
-    if (source[valueEnd] !== "}") {
-        throw invalidType(source);
-    }
-
-    return [key, value, valueEnd + 1];
-};
-
-function parseArrayNode(source: string, start: number): [VariantTypeNode, number] {
-    if (source[start] === "{") {
-        const [key, value, end] = parsePair(source, start + 1);
-
-        return [{ kind: "dict", entryTypeString: source.slice(start, end), key, value }, end];
-    }
-
-    const [element, end] = parseNode(source, start);
-
-    return [{ kind: "array", elementTypeString: source.slice(start, end), element }, end];
-}
-
-function parseMaybeNode(source: string, start: number): [VariantTypeNode, number] {
-    const [element, end] = parseNode(source, start);
-
-    return [{ kind: "maybe", elementTypeString: source.slice(start, end), element }, end];
-}
-
-function parseTupleNode(source: string, start: number): [VariantTypeNode, number] {
-    const items: VariantTypeNode[] = [];
-    let position = start;
-
-    while (source[position] !== ")") {
-        if (position >= source.length) {
-            throw invalidType(source);
-        }
-
-        const [item, end] = parseNode(source, position);
-        items.push(item);
-        position = end;
-    }
-
-    return [{ kind: "tuple", items }, position + 1];
-}
-
-function parseEntryNode(source: string, start: number): [VariantTypeNode, number] {
-    const [key, value, end] = parsePair(source, start);
-
-    return [{ kind: "entry", key, value }, end];
-}
-
-const parseNode = (source: string, start: number): [VariantTypeNode, number] => {
-    const code = source[start];
-
-    if (code === undefined) {
-        throw invalidType(source);
-    }
-
-    const container = CONTAINER_PARSERS[code];
-
-    if (container !== undefined) {
-        return container(source, start + 1);
-    }
-
-    if (isBasicCode(code)) {
-        return [{ kind: "basic", code }, start + 1];
-    }
-
-    throw invalidType(source);
-};
-
-const parseVariantType = (typeString: string): VariantTypeNode => {
-    const cached = parsedTypes.get(typeString);
-
-    if (cached !== undefined) {
-        return cached;
-    }
-
-    const [node, end] = parseNode(typeString, 0);
-
-    if (end !== typeString.length) {
-        throw invalidType(typeString);
-    }
-
-    parsedTypes.set(typeString, node);
-
-    return node;
-};
-
-const unpackChildren = (variant: GLib.Variant, unpackChild: (child: GLib.Variant) => unknown): unknown[] => {
-    const children: unknown[] = [];
-    const count = variant.nChildren();
-
-    for (let index = 0; index < count; index += 1) {
-        children.push(unpackChild(variant.getChildValue(index)));
-    }
-
-    return children;
-};
-
-const unpackPair = (key: VariantTypeNode, value: VariantTypeNode, entry: GLib.Variant): [unknown, unknown] => [
-    unpackVariant(key, entry.getChildValue(0)),
-    unpackVariant(value, entry.getChildValue(1)),
-];
-
-const unpackDict = (
-    node: { key: VariantTypeNode; value: VariantTypeNode },
-    variant: GLib.Variant,
-): Record<string, unknown> | Map<unknown, unknown> => {
-    const entries = unpackChildren(variant, (entry) => unpackPair(node.key, node.value, entry)) as [unknown, unknown][];
-
-    if (!isStringKeyed(node.key)) {
-        return new Map(entries);
-    }
-
-    const stringEntries: [string, unknown][] = entries.map(([key, value]) => [key as string, value]);
-
-    return Object.fromEntries(stringEntries);
-};
-
-const unpackMaybe = (element: VariantTypeNode, variant: GLib.Variant): unknown => {
-    const child = variant.getMaybe();
-
-    return child === null ? null : unpackVariant(element, child);
-};
-
-const unpackVariant = (node: VariantTypeNode, variant: GLib.Variant): unknown => {
-    switch (node.kind) {
-        case "basic": {
-            return unpackBasic[node.code](variant);
-        }
-        case "array": {
-            return unpackChildren(variant, (child) => unpackVariant(node.element, child));
-        }
-        case "dict": {
-            return unpackDict(node, variant);
-        }
-        case "entry": {
-            return unpackPair(node.key, node.value, variant);
-        }
-        case "tuple": {
-            return node.items.map((item, index) => unpackVariant(item, variant.getChildValue(index)));
-        }
-        case "maybe": {
-            return unpackMaybe(node.element, variant);
-        }
-    }
-};
-
-const packValidatedString = (
-    value: unknown,
-    isValid: (value: string) => boolean,
-    description: string,
-    construct: (value: string) => GLib.Variant,
-): GLib.Variant => {
-    if (typeof value !== "string" || !isValid(value)) {
-        throw new Error(`"${String(value)}" is not a valid GVariant ${description}`);
-    }
-
-    return construct(value);
-};
-
-function packObjectPath(value: unknown): GLib.Variant {
-    return packValidatedString(
-        value,
-        (path) => GLib.Variant.isObjectPath(path),
-        "object path",
-        (path) => GLib.Variant.newObjectPath(path),
-    );
-}
-
-function packSignature(value: unknown): GLib.Variant {
-    return packValidatedString(
-        value,
-        (signature) => GLib.Variant.isSignature(signature),
-        "type signature",
-        (signature) => GLib.Variant.newSignature(signature),
-    );
-}
-
-const packEntry = (key: VariantTypeNode, value: VariantTypeNode, pair: [unknown, unknown]): GLib.Variant =>
-    GLib.Variant.newDictEntry(packVariant(key, pair[0]), packVariant(value, pair[1]));
-
-const dictEntries = (value: unknown): [unknown, unknown][] =>
-    value instanceof Map ? [...value] : Object.entries(value as Record<string, unknown>);
-
-const packDict = (
-    node: { entryTypeString: string; key: VariantTypeNode; value: VariantTypeNode },
-    value: unknown,
-): GLib.Variant =>
-    GLib.Variant.newArray(
-        GLib.VariantType.new(node.entryTypeString),
-        dictEntries(value).map((pair) => packEntry(node.key, node.value, pair)),
-    );
-
-const packMaybe = (node: { elementTypeString: string; element: VariantTypeNode }, value: unknown): GLib.Variant =>
-    GLib.Variant.newMaybe(
-        GLib.VariantType.new(node.elementTypeString),
-        value === null ? null : packVariant(node.element, value),
-    );
-
-const packVariant = (node: VariantTypeNode, value: unknown): GLib.Variant => {
-    switch (node.kind) {
-        case "basic": {
-            return packBasic[node.code](value);
-        }
-        case "array": {
-            return GLib.Variant.newArray(
-                GLib.VariantType.new(node.elementTypeString),
-                (value as unknown[]).map((item) => packVariant(node.element, item)),
-            );
-        }
-        case "dict": {
-            return packDict(node, value);
-        }
-        case "entry": {
-            return packEntry(node.key, node.value, value as [unknown, unknown]);
-        }
-        case "tuple": {
-            return GLib.Variant.newTuple(
-                node.items.map((item, index) => packVariant(item, (value as unknown[])[index])),
-            );
-        }
-        case "maybe": {
-            return packMaybe(node, value);
-        }
-    }
-};
-
-export { parseVariantType, unpackVariant, packVariant, type VariantValue };