@ts-for-gir/templates 4.0.0-beta.42 → 4.0.0-beta.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/templates",
-  "version": "4.0.0-beta.42",
+  "version": "4.0.0-beta.44",
   "description": "Templates for ts-for-gir",
   "type": "module",
   "main": "package.json",

package/templates/glib-2.0.d.ts

@@ -43,13 +43,13 @@ type CreateIndexType<Key extends string, Value extends any> =
 type $ParseDeepVariantDict<State extends string> =
     string extends State
     ? VariantTypeError<"$ParseDeepVariantDict: 'string' is not a supported type.">
-    : State extends `${infer Key}${infer ValueType}}${infer Remaining}`
+    : State extends `${infer Key}${infer AfterKey}`
     ? Key extends 's' | 'o' | 'g' | 'n' | 'q' | 't' | 'd' | 'u' | 'i' | 'x' | 'y'
-      ? ValueType extends 'v'
+      ? AfterKey extends `v}${infer Remaining}`
         ? [CreateIndexType<Key, Variant>, Remaining]  // a{sv} preserves Variant
-        : $ParseDeepVariantValue<ValueType> extends [infer V, '']
+        : $ParseDeepVariantValue<AfterKey> extends [infer V, `}${infer Remaining}`]
           ? [CreateIndexType<Key, V>, Remaining]
-          : VariantTypeError<`Invalid dictionary value type: ${ValueType}`>
+          : VariantTypeError<`Invalid dictionary value type in: ${AfterKey}`>
       : VariantTypeError<`Invalid dictionary key type: ${Key}`>
     : VariantTypeError<`Invalid dictionary format: ${State}`>;
 
@@ -73,13 +73,13 @@ type $ParseDeepVariantTuple<State extends string, Memo extends any[] = []> =
 type $ParseDeepVariantKeyValue<State extends string> =
     string extends State
     ? VariantTypeError<"$ParseDeepVariantKeyValue: 'string' is not a supported type.">
-    : State extends `${infer Key}${infer ValueType}}${infer Remaining}`
+    : State extends `${infer Key}${infer AfterKey}`
     ? Key extends 's' | 'o' | 'g' | 'n' | 'q' | 't' | 'd' | 'u' | 'i' | 'x' | 'y'
-      ? ValueType extends 'v'
+      ? AfterKey extends `v}${infer Remaining}`
         ? [[BasicTypeMap<Key>, Variant], Remaining]  // Value remains Variant for 'v'
-        : $ParseDeepVariantValue<ValueType> extends [infer V, '']
+        : $ParseDeepVariantValue<AfterKey> extends [infer V, `}${infer Remaining}`]
           ? [[BasicTypeMap<Key>, V], Remaining]
-          : VariantTypeError<`Invalid key-value value type: ${ValueType}`>
+          : VariantTypeError<`Invalid key-value value type in: ${AfterKey}`>
       : VariantTypeError<`Invalid key-value key type: ${Key}`>
     : VariantTypeError<`Invalid key-value format: ${State}`>;
 
@@ -236,8 +236,10 @@ type $SkipUntil<State extends string, Delimiter extends string, Depth extends nu
 type $ParseShallowVariantDict<State extends string> =
     string extends State
     ? VariantTypeError<"$ParseShallowVariantDict: 'string' is not a supported type.">
-    : State extends `${string}}${infer Remaining}`
-    ? [{ [key: string]: Variant }, Remaining]
+    : $SkipUntil<State, '}'> extends [infer Remaining]
+    ? Remaining extends string
+      ? [{ [key: string]: Variant }, Remaining]
+      : VariantTypeError<`Invalid dictionary format`>
     : VariantTypeError<`Invalid dictionary format`>;
 
 /**
@@ -246,8 +248,10 @@ type $ParseShallowVariantDict<State extends string> =
 type $ParseShallowVariantKeyValue<State extends string> =
     string extends State
     ? VariantTypeError<"$ParseShallowVariantKeyValue: 'string' is not a supported type.">
-    : State extends `${string}}${infer Remaining}`
-    ? [[any, Variant], Remaining]
+    : $SkipUntil<State, '}'> extends [infer Remaining]
+    ? Remaining extends string
+      ? [[any, Variant], Remaining]
+      : VariantTypeError<`Invalid key-value format`>
     : VariantTypeError<`Invalid key-value format`>;
 
 /**
@@ -275,7 +279,7 @@ type $ParseRecursiveVariantValue<State extends string> =
     ? Type extends 's' | 'o' | 'g' | 'b' | 'n' | 'q' | 't' | 'd' | 'u' | 'i' | 'x' | 'y' | 'h' | '?'
       ? [BasicTypeMap<Type>, Remaining]
       : Type extends 'v'
-        ? [any, Remaining]  // Variants are fully unpacked to any
+        ? [unknown, Remaining]  // Variants are fully unpacked to unknown
         // Container types
         : Type extends '('
           ? $ParseRecursiveVariantTuple<Remaining>
@@ -320,13 +324,13 @@ type $ParseRecursiveVariantTuple<State extends string, Memo extends any[] = []>
 type $ParseRecursiveVariantDict<State extends string> =
     string extends State
     ? VariantTypeError<"$ParseRecursiveVariantDict: 'string' is not a supported type.">
-    : State extends `${infer Key}${infer ValueType}}${infer Remaining}`
+    : State extends `${infer Key}${infer AfterKey}`
     ? Key extends 's' | 'o' | 'g' | 'n' | 'q' | 't' | 'd' | 'u' | 'i' | 'x' | 'y'
-      ? ValueType extends 'v'
-        ? [CreateIndexType<Key, any>, Remaining]  // a{sv} becomes any when recursively unpacked
-        : $ParseRecursiveVariantValue<ValueType> extends [infer V, '']
+      ? AfterKey extends `v}${infer Remaining}`
+        ? [CreateIndexType<Key, unknown>, Remaining]  // a{sv} becomes unknown when recursively unpacked
+        : $ParseRecursiveVariantValue<AfterKey> extends [infer V, `}${infer Remaining}`]
           ? [CreateIndexType<Key, V>, Remaining]
-          : VariantTypeError<`Invalid dictionary value type: ${ValueType}`>
+          : VariantTypeError<`Invalid dictionary value type in: ${AfterKey}`>
       : VariantTypeError<`Invalid dictionary key type: ${Key}`>
     : VariantTypeError<`Invalid dictionary format: ${State}`>;
 
@@ -336,13 +340,13 @@ type $ParseRecursiveVariantDict<State extends string> =
 type $ParseRecursiveVariantKeyValue<State extends string> =
     string extends State
     ? VariantTypeError<"$ParseRecursiveVariantKeyValue: 'string' is not a supported type.">
-    : State extends `${infer Key}${infer ValueType}}${infer Remaining}`
+    : State extends `${infer Key}${infer AfterKey}`
     ? Key extends 's' | 'o' | 'g' | 'n' | 'q' | 't' | 'd' | 'u' | 'i' | 'x' | 'y'
-      ? ValueType extends 'v'
-        ? [[BasicTypeMap<Key>, any], Remaining]  // Value is fully unpacked to any
-        : $ParseRecursiveVariantValue<ValueType> extends [infer V, '']
+      ? AfterKey extends `v}${infer Remaining}`
+        ? [[BasicTypeMap<Key>, unknown], Remaining]  // Value is fully unpacked to unknown
+        : $ParseRecursiveVariantValue<AfterKey> extends [infer V, `}${infer Remaining}`]
           ? [[BasicTypeMap<Key>, V], Remaining]
-          : VariantTypeError<`Invalid key-value value type: ${ValueType}`>
+          : VariantTypeError<`Invalid key-value value type in: ${AfterKey}`>
       : VariantTypeError<`Invalid key-value key type: ${Key}`>
     : VariantTypeError<`Invalid key-value format: ${State}`>;
 
@@ -416,9 +420,9 @@ type $ParseConstructorInputTuple<State extends string, Memo extends any[] = []>
 type $ParseConstructorInputDict<State extends string> =
     string extends State
     ? VariantTypeError<"Invalid dictionary state">
-    : State extends `${infer Key}${infer ValueType}}${infer Remaining}`
+    : State extends `${infer Key}${infer AfterKey}`
     ? Key extends 's' | 'o' | 'g' | 'n' | 'q' | 't' | 'd' | 'u' | 'i' | 'x' | 'y'
-      ? $ParseConstructorInputValue<ValueType> extends [infer V, '']
+      ? $ParseConstructorInputValue<AfterKey> extends [infer V, `}${infer Remaining}`]
         ? [CreateIndexType<Key, V>, Remaining]
         : VariantTypeError<`Invalid dictionary value type`>
       : VariantTypeError<`Invalid dictionary key type`>
@@ -430,9 +434,9 @@ type $ParseConstructorInputDict<State extends string> =
 type $ParseConstructorInputKeyValue<State extends string> =
     string extends State
     ? VariantTypeError<"Invalid key-value state">
-    : State extends `${infer Key}${infer ValueType}}${infer Remaining}`
+    : State extends `${infer Key}${infer AfterKey}`
     ? Key extends 's' | 'o' | 'g' | 'n' | 'q' | 't' | 'd' | 'u' | 'i' | 'x' | 'y'
-      ? $ParseConstructorInputValue<ValueType> extends [infer V, '']
+      ? $ParseConstructorInputValue<AfterKey> extends [infer V, `}${infer Remaining}`]
         ? [[BasicTypeMap<Key>, V], Remaining]
         : VariantTypeError<`Invalid key-value value type`>
       : VariantTypeError<`Invalid key-value key type`>
@@ -458,11 +462,18 @@ type $ParseVariant<T extends string> = $ParseShallowVariant<T>;
 
 type $VariantTypeToString<T extends VariantType> = T extends VariantType<infer S> ? S : never;
 
-type $ToTuple<T extends readonly VariantType[]> =
+type $ToTuple<T extends readonly Variant[]> =
+    T extends [] ? '' :
+    T extends [Variant<infer S>] ? `${S}` :
+    T extends [Variant<infer S>, ...infer U] ? (
+        U extends [...Variant[]] ? `${S}${$ToTuple<U>}` : never) :
+    '?';
+
+type $ToTupleVT<T extends readonly VariantType[]> =
     T extends [] ? '' :
     T extends [VariantType<infer S>] ? `${S}` :
     T extends [VariantType<infer S>, ...infer U] ? (
-        U extends [...VariantType[]] ? `${S}${$ToTuple<U>}` : never) :
+        U extends [...VariantType[]] ? `${S}${$ToTupleVT<U>}` : never) :
     '?';
 
 type $ElementSig<E extends any> =
@@ -659,7 +670,7 @@ export class Variant<S extends string = any> {
      */
     static new_strv(strv: string[]): Variant<'as'>;
     
-    static new_tuple<Items extends (ReadonlyArray<VariantType> | readonly [VariantType])>(children: Items): Variant<`(${$ToTuple<Items>})`>;
+    static new_tuple<Items extends (ReadonlyArray<Variant> | readonly [Variant])>(children: Items): Variant<`(${$ToTuple<Items>})`>;
     static new_uint16(value: number): Variant<'q'>;
     
     /**
@@ -1093,7 +1104,7 @@ export class VariantType<S extends string = any> {
     static new_array<S extends string>(element: VariantType<S>): VariantType<`a${S}`>;
     static new_dict_entry<K extends string, V extends string>(key: VariantType<K>, value: VariantType<V>): VariantType<`{${K}${V}}`>;
     static new_maybe<S extends string>(element: VariantType<S>): VariantType<`m${S}`>;
-    static new_tuple<Items extends (ReadonlyArray<VariantType> | readonly [VariantType])>(items: Items): VariantType<`(${$ToTuple<Items>})`>;
+    static new_tuple<Items extends (ReadonlyArray<VariantType> | readonly [VariantType])>(items: Items): VariantType<`(${$ToTupleVT<Items>})`>;
     // Members
     copy(): VariantType<S>;
     dup_string(): string;

package/templates/gobject-2.0.d.ts

@@ -12,13 +12,17 @@ export type GType<T = unknown> = {
     name: string
 }
 
+// Accepts either a raw GType or a class constructor with $gtype property.
+// Used in input positions where GJS automatically extracts $gtype from class constructors.
+export type GTypeInput<T = unknown> = GType<T> | { $gtype: GType<T> }
+
 // Extra interfaces used to help define GObject classes in js; these
 // aren't part of gi.
 export interface SignalDefinition {
     flags?: SignalFlags
     accumulator: number
-    return_type?: GType
-    param_types?: GType[]
+    return_type?: GTypeInput
+    param_types?: GTypeInput[]
 }
 
 export interface MetaInfo<Props, Interfaces, Sigs> {
@@ -104,7 +108,7 @@ export type RegisteredClass<
     : never
 
 export type SignalDefinitionType = {
-    param_types?: readonly GType[]
+    param_types?: readonly GTypeInput[]
     [key: string]: any
 }
 <% } %>
@@ -326,7 +330,7 @@ export function registerClass<
     Interfaces extends { $gtype: GType }[],
     Sigs extends {
         [key: string]: {
-            param_types?: readonly GType[]
+            param_types?: readonly GTypeInput[]
             [key: string]: any
         }
     },
@@ -345,7 +349,7 @@ export function registerClass<
     Interfaces extends { $gtype: GType }[],
     Sigs extends {
         [key: string]: {
-            param_types?: readonly GType[]
+            param_types?: readonly GTypeInput[]
             [key: string]: any
         }
     },