Merge pull request #184 from gjsify/fix/missing-fields

Preparations for GNOME Shell 46 and 47
gjsify · Jul 22, 2024 · 8b3ec80 · 8b3ec80
2 parents 5b037c7 + 5cf7760
commit 8b3ec80
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 25 deletions.
diff --git a/packages/generator-typescript/src/module-generator.ts b/packages/generator-typescript/src/module-generator.ts
@@ -956,7 +956,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
                     girClass,
                     girClass.fields.filter((field) => field.isStatic),
                 ),
-                `Static fields of ${girClass.namespace.namespace}.${girClass.name}`,
+                `Static fields`,
                 indentCount,
             ),
         )
@@ -977,7 +977,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
                     girClass,
                     girClass.fields.filter((field) => !field.isStatic),
                 ),
-                `Own fields of ${girClass.namespace.namespace}.${girClass.name}`,
+                `Fields`,
                 indentCount,
             ),
         )
@@ -1002,7 +1002,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
         def.push(
             ...this.generateProperties(
                 filterConflicts(girClass.namespace, girClass, girClass.props),
-                `Own properties of ${girClass.namespace.namespace}.${girClass.name}`,
+                `Properties`,
                 indentCount,
             ),
         )
@@ -1024,7 +1024,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
                     [],
                 ),
                 indentCount,
-                `Own static methods of ${girClass.namespace.namespace}.${girClass.name}`,
+                `Static methods`,
             ),
         )
 
@@ -1047,7 +1047,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
                     [],
                 ),
                 indentCount,
-                `Own methods of ${girClass.namespace.namespace}.${girClass.name}`,
+                `Methods`,
             ),
         )
 
@@ -1088,9 +1088,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
         )
 
         if (def.length) {
-            def.unshift(
-                ...this.addInfoComment(`Constructors of ${girClass.namespace.namespace}.${girClass.name}`, indentCount),
-            )
+            def.unshift(...this.addInfoComment(`Constructors`, indentCount))
         }
 
         return def
@@ -1115,7 +1113,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
                     [],
                 ),
                 indentCount,
-                `Own virtual methods of ${girClass.namespace.namespace}.${girClass.name}`,
+                `Virtual methods`,
             ),
         )
 
@@ -1253,7 +1251,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
 
         const signalDescs = this.generateSignals(girClass)
 
-        def.push(...this.mergeDescs(signalDescs, `Own signals of ${girClass.namespace.namespace}.${girClass.name}`, 1))
+        def.push(...this.mergeDescs(signalDescs, `Signals`, 1))
 
         return def
     }
@@ -1443,7 +1441,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
                 // Static Properties
                 def.push(...this.generateClassProperties(girClass))
 
-                // Static Fields
+                // Static and member Fields
                 def.push(...this.generateClassFields(girClass))
 
                 // Constructors

diff --git a/packages/lib/src/generics/clutter.ts b/packages/lib/src/generics/clutter.ts
@@ -57,3 +57,5 @@ export const clutter10 = clutterTemplate("10");
 export const clutter11 = clutterTemplate("11");
 export const clutter12 = clutterTemplate("12");
 export const clutter13 = clutterTemplate("13");
+export const clutter14 = clutterTemplate("14");
+export const clutter15 = clutterTemplate("15");
diff --git a/packages/lib/src/generics/generify.ts b/packages/lib/src/generics/generify.ts
@@ -1,8 +1,8 @@
 import gio from "./gio.js";
 import glib from "./glib.js";
-import { clutter10, clutter11, clutter12, clutter13 } from "./clutter.js";
-import { st1, st12, st13 } from "./st.js";
-import { meta10, meta11, meta12, meta13 } from "./meta.js";
+import { clutter10, clutter11, clutter12, clutter13, clutter14, clutter15 } from "./clutter.js";
+import { st1, st12, st13, st14, st15 } from "./st.js";
+import { meta10, meta11, meta12, meta13, meta14, meta15 } from "./meta.js";
 
 import { IntrospectedNamespace } from "../gir/namespace.js";
 import { NSRegistry } from "../gir/registry.js";
@@ -38,13 +38,19 @@ export function generify(registry: NSRegistry, inferGenerics: boolean) {
     $_(clutter11);
     $_(clutter12);
     $_(clutter13);
+    $_(clutter14);
+    $_(clutter15);
     $_(st1);
     $_(st12);
     $_(st13);
+    $_(st14);
+    $_(st15);
     $_(meta10);
     $_(meta11);
     $_(meta12);
     $_(meta13);
+    $_(meta14);
+    $_(meta15);
 
     const visitor = new GenericVisitor(registry, inferGenerics);
 

diff --git a/packages/lib/src/generics/meta.ts b/packages/lib/src/generics/meta.ts
@@ -31,3 +31,5 @@ export const meta10 = metaTemplate("10");
 export const meta11 = metaTemplate("11");
 export const meta12 = metaTemplate("12");
 export const meta13 = metaTemplate("13");
+export const meta14 = metaTemplate("14");
+export const meta15 = metaTemplate("15");
diff --git a/packages/lib/src/generics/st.ts b/packages/lib/src/generics/st.ts
@@ -22,7 +22,8 @@ const stTemplate = (version: string) => ({
 
         const Actor = Clutter.assertClass("Actor");
         const Content = Clutter.assertClass("Content");
-        const Container = Clutter.assertClass("Container");
+        // Container was removed in Clutter-14
+        const Container = Number(version) < 14 ? Clutter.assertClass("Container") : null;
         const LayoutManager = Clutter.assertClass("LayoutManager");
         const ClutterBoxLayout = Clutter.assertClass("BoxLayout");
 
@@ -50,16 +51,18 @@ const stTemplate = (version: string) => ({
             constraint: Content.getType()
         });
 
-        Container.addGeneric({
-            default: Actor.getType(),
-            constraint: Actor.getType()
-        });
+        if (Container) {
+            Container.addGeneric({
+                default: Actor.getType(),
+                constraint: Actor.getType()
+            });
 
-        StBoxLayout.addGeneric({
-            deriveFrom: Container.getType(),
-            default: Actor.getType(),
-            constraint: Actor.getType()
-        });
+            StBoxLayout.addGeneric({
+                deriveFrom: Container.getType(),
+                default: Actor.getType(),
+                constraint: Actor.getType()
+            });
+        }
 
         if (StBoxLayout.superType) {
             StBoxLayout.superType = new GenerifiedTypeIdentifier(
@@ -114,3 +117,5 @@ const stTemplate = (version: string) => ({
 export const st1 = stTemplate("1.0");
 export const st12 = stTemplate("12");
 export const st13 = stTemplate("13");
+export const st14 = stTemplate("14");
+export const st15 = stTemplate("15");
diff --git a/packages/lib/src/gir-module.ts b/packages/lib/src/gir-module.ts
@@ -423,7 +423,7 @@ export class GirModule {
         const clazz = this.getClass(name)
 
         if (!clazz) {
-            throw new Error(`Class ${name} does not exist in namespace ${this.namespace}.`)
+            throw new Error(`[${this.packageName}] Class ${name} does not exist in namespace ${this.namespace}.`)
         }
 
         return clazz