@gjsify/adwaita-web 0.64.12-next.280 → 0.64.12-next.281

package/lib/types/namespace/gio.d.ts

@@ -1,5 +1,6 @@
 import '../file-chooser-host.js';
 export { GioMenu as Menu, GioMenuItem as MenuItem } from '@gjsify/adwaita-core';
+export { ListModel } from '@gjsify/adwaita-core';
 export { GioFile as File, GioListStore as ListStore, GioOutputStream as OutputStream, GioFileOutputStream as FileOutputStream, FileCreateFlags, IOErrorEnum, promisify as _promisify, } from '@gjsify/adwaita-core';
 export { SimpleAction, SimpleActionGroup, ApplicationFlags } from '@gjsify/adwaita-core';
 export { GioResource as Resource, ResourceError, ResourceLookupFlags, resources_enumerate_children, resources_get_info, resources_lookup_data, resources_register, resources_unregister, } from '@gjsify/adwaita-core';

package/lib/types/namespace/gtk.d.ts

@@ -65,7 +65,7 @@ export { GtkStack as Stack } from '../elements/gtk-stack.js';
 export { GtkStackPage as StackPage } from '../elements/gtk-stack-page.js';
 export { GtkStackSidebar as StackSidebar } from '../elements/gtk-stack-sidebar.js';
 export { GtkStackSwitcher as StackSwitcher } from '../elements/gtk-stack-switcher.js';
-export { GtkStringList as StringList } from '@gjsify/adwaita-core';
+export { GtkStringList as StringList, GtkStringObject as StringObject } from '@gjsify/adwaita-core';
 export { GtkSwitch as Switch } from '../elements/gtk-switch.js';
 export { GtkText as Text } from '../elements/gtk-text.js';
 export { GtkTextView as TextView } from '../elements/gtk-text-view.js';

package/lib/types/shared-tree-builder.d.ts

@@ -34,6 +34,8 @@ interface BuildRecord {
     menus?: SharedTreeNode['menus'];
     /** Present when the tree is the template of a registered class (ADR 0096): handlers and binds go through it. */
     template?: TemplateScope;
+    /** A template's handler connections, made once every id exists: `object=` may name a node built later. */
+    connects?: (() => void)[];
 }
 /** Calls `onSize` with the host's measured size, now and on every change; returns its disposer. */
 export type SizeSource = (element: Element, onSize: (size: BreakpointSize) => void) => () => void;
@@ -141,6 +143,11 @@ export interface BuiltTemplateTree {
  * to their handlers and binds through `scope`, none appended and nothing written to `host`'s
  * attributes, because `host` is still inside its constructor. `finish` and the caller's own append
  * belong to the first `connectedCallback`.
+ *
+ * Objects written beside the template (`Adw.AlertDialog dialog { }`, `$Learn learn { }`) are built in
+ * the same id scope and named in `objects`, which is what `InternalChildren` and `Children` read —
+ * `gtk_widget_class_bind_template_child` reaches any object id of the template's builder. They are
+ * not in `children`: a sibling is an independent object, placed by the class or not at all.
  */
 export declare function buildTemplateTree(tree: SharedTreeNode, scope: TemplateScope, host: HTMLElement): BuiltTemplateTree;
 /** A tree {@link mountSharedTree} built and connected. */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/adwaita-web",
-    "version": "0.64.12-next.280",
+    "version": "0.64.12-next.281",
     "description": "Adwaita/Libadwaita web components for browser targets",
     "type": "module",
     "main": "./src/index.ts",
@@ -58,14 +58,14 @@
         "@codemirror/language": "^6.12.4",
         "@codemirror/state": "^6.7.0",
         "@codemirror/view": "^6.43.4",
-        "@gjsify/adwaita-core": "0.64.12-next.280",
-        "@gjsify/adwaita-fonts": "0.64.12-next.280",
-        "@gjsify/adwaita-icons": "0.64.12-next.280",
-        "@gjsify/gtksource-core": "0.64.12-next.280",
+        "@gjsify/adwaita-core": "0.64.12-next.281",
+        "@gjsify/adwaita-fonts": "0.64.12-next.281",
+        "@gjsify/adwaita-icons": "0.64.12-next.281",
+        "@gjsify/gtksource-core": "0.64.12-next.281",
         "@lezer/highlight": "^1.2.3"
     },
     "peerDependencies": {
-        "@gjsify/app-settings": "0.64.12-next.280"
+        "@gjsify/app-settings": "0.64.12-next.281"
     },
     "peerDependenciesMeta": {
         "@gjsify/app-settings": {
@@ -73,11 +73,11 @@
         }
     },
     "devDependencies": {
-        "@gjsify/app-settings": "0.64.12-next.280",
-        "@gjsify/blueprint": "0.64.12-next.280",
-        "@gjsify/cli": "0.64.12-next.280",
-        "@gjsify/unit": "0.64.12-next.280",
-        "@gjsify/vite-plugin-blueprint": "0.64.12-next.280",
+        "@gjsify/app-settings": "0.64.12-next.281",
+        "@gjsify/blueprint": "0.64.12-next.281",
+        "@gjsify/cli": "0.64.12-next.281",
+        "@gjsify/unit": "0.64.12-next.281",
+        "@gjsify/vite-plugin-blueprint": "0.64.12-next.281",
         "sass": "^1.101.0",
         "typescript": "^6.0.3"
     },
@@ -115,5 +115,5 @@
         "url": "https://github.com/gjsify/gjsify/issues"
     },
     "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/web/adwaita-web#readme",
-    "gitHead": "0a9185d91127072fce6aa54dc126e87e6ecd0c3d"
+    "gitHead": "c4d2e266c0d9849860b9828c14ebfe37b6d493b8"
 }

package/src/gobject-door.spec.ts

@@ -91,6 +91,45 @@ GObject.registerClass(
     GoWebSensitive as never,
 );
 
+const SiblingsTemplate = tree(`template $GoWebSiblings : Adw.Bin {
+    child: Gtk.Box {
+        Gtk.Label caption { label: bind peer.title; }
+    };
+}
+
+Adw.AlertDialog unsavedChangesDialog { heading: "Save changes?"; }
+
+$GoWebPeer peer { }`);
+
+class GoWebPeer extends Adw.Bin {
+    declare title: string;
+}
+GObject.registerClass(
+    {
+        GTypeName: 'GoWebPeer',
+        Properties: { title: GObject.ParamSpec.string('title', '', '', GObject.ParamFlags.READWRITE, 'first') },
+    },
+    GoWebPeer as never,
+);
+
+class GoWebSiblings extends Adw.Bin {
+    declare _unsavedChangesDialog: HTMLElement & { heading: string };
+    declare _peer: GoWebPeer;
+    declare _caption: HTMLElement & { label: string };
+    constructor(params?: Record<string, unknown>) {
+        // @ts-expect-error the element's own constructor takes none; the registered class's takes the params
+        super(params);
+    }
+}
+GObject.registerClass(
+    {
+        GTypeName: 'GoWebSiblings',
+        Template: SiblingsTemplate,
+        InternalChildren: ['unsavedChangesDialog', 'peer', 'caption'],
+    },
+    GoWebSiblings as never,
+);
+
 export const GObjectDoorTest = async () => {
     await driveGObjectVectors(subject, { describe, it, expect }, GOBJECT_VECTORS);
     await describe('adwaita-web: GObject.registerClass end to end (ADR 0096)', async () => {
@@ -98,6 +137,24 @@ export const GObjectDoorTest = async () => {
             expect(tagForTypeName('Hexdump')).toBe('gjsify-hexdump');
             expect(customElements.get('gjsify-go-web-hexdump')).toBe(GoWebHexdump);
         });
+        await it('reaches the objects written beside the template through InternalChildren, outside its children', () => {
+            const el = new GoWebSiblings();
+            expect(el._unsavedChangesDialog.localName).toBe('adw-alert-dialog');
+            expect(el._peer instanceof GoWebPeer).toBe(true);
+            document.body.append(el);
+            try {
+                // Independent objects, as in GTK: neither is a child of the template widget.
+                expect(el.contains(el._unsavedChangesDialog)).toBe(false);
+                expect(el.contains(el._peer)).toBe(false);
+                expect(el.contains(el._caption)).toBe(true);
+                // A template child names a sibling by id, and follows it.
+                expect(el._caption.label).toBe('first');
+                el._peer.title = 'second';
+                expect(el._caption.label).toBe('second');
+            } finally {
+                el.remove();
+            }
+        });
         await it('refuses a second class under the same tag', () => {
             expect(() =>
                 GObject.registerClass({ GTypeName: 'GoWebHexdump' }, class extends Adw.Bin {} as never),

package/src/namespace/gio.ts

@@ -29,6 +29,9 @@ import { createAppInfo } from '@gjsify/adwaita-core';
 import { webPlatformHost } from '../platform-host.js';
 
 export { GioMenu as Menu, GioMenuItem as MenuItem } from '@gjsify/adwaita-core';
+// ADR 0122 § 2: the interface a `Gtk.StringList` implements and an `Implements: [Gio.ListModel]`
+// names. It is a token, not a class — the whole of the subset's interface support.
+export { ListModel } from '@gjsify/adwaita-core';
 export {
     GioFile as File,
     GioListStore as ListStore,

package/src/namespace/gtk.ts

@@ -11,14 +11,18 @@
 // which is what `<adw-radio>`'s own `why` in the ledger says. So the plain form takes the
 // GIR name and the grouped one keeps its flat export in `src/index.ts`.
 //
-// TWO MEMBERS HERE ARE NOT WIDGETS — `Gtk.Adjustment` and `Gtk.StringList`, the values an
-// `adjustment` and a `model` property take. ADR 0034 § Amendment 19 is what lets a
-// clause-2 namespace carry them, `CONSTRUCTIBLE_VALUES` in `scripts/value-types.mjs` is
-// where each one is declared, and the GIR answers for both in gtk-host's committed
-// `generated/value-types.mts`. They are re-exported from `@gjsify/adwaita-core`, which is
-// where the portable list and adjustment already live: the class IS that value wearing the
-// GIR spelling, so `model: ['a','b']` and `model: new Gtk.StringList({ strings: ['a','b'] })`
-// are the same write and nothing in this package had to learn a second input shape.
+// THREE MEMBERS HERE ARE NOT WIDGETS — `Gtk.Adjustment`, `Gtk.StringList` and the
+// `Gtk.StringObject` the list holds, the values an `adjustment` and a `model` property take.
+// ADR 0034 § Amendment 19 is what lets a clause-2 namespace carry them,
+// `CONSTRUCTIBLE_VALUES` in `scripts/value-types.mjs` is where each one is declared, and the
+// GIR answers for all three in gtk-host's committed `generated/value-types.mts`. They are
+// re-exported from `@gjsify/adwaita-core`, which is where the portable list and adjustment
+// already live.
+//
+// `Gtk.StringList` IS A LIST MODEL, NOT AN ARRAY (ADR 0122). The first version of it was an
+// `Array` subclass, which made `model: ['a','b']` and `model: new Gtk.StringList(…)` the same
+// write; it is now what GTK ships — `Implements: [Gio.ListModel]`, items that are
+// `Gtk.StringObject`s, read by `get_n_items` / `get_item` and never by `length` or `[0]`.
 
 export { GtkAdjustment as Adjustment } from '@gjsify/adwaita-core';
 // ADR 0100: the file dialog is no element either — `present`-less, it asks the driver
@@ -89,7 +93,7 @@ export { GtkStack as Stack } from '../elements/gtk-stack.js';
 export { GtkStackPage as StackPage } from '../elements/gtk-stack-page.js';
 export { GtkStackSidebar as StackSidebar } from '../elements/gtk-stack-sidebar.js';
 export { GtkStackSwitcher as StackSwitcher } from '../elements/gtk-stack-switcher.js';
-export { GtkStringList as StringList } from '@gjsify/adwaita-core';
+export { GtkStringList as StringList, GtkStringObject as StringObject } from '@gjsify/adwaita-core';
 export { GtkSwitch as Switch } from '../elements/gtk-switch.js';
 export { GtkText as Text } from '../elements/gtk-text.js';
 export { GtkTextView as TextView } from '../elements/gtk-text-view.js';

package/src/shared-tree-builder.ts

@@ -101,6 +101,8 @@ interface BuildRecord {
     menus?: SharedTreeNode['menus'];
     /** Present when the tree is the template of a registered class (ADR 0096): handlers and binds go through it. */
     template?: TemplateScope;
+    /** A template's handler connections, made once every id exists: `object=` may name a node built later. */
+    connects?: (() => void)[];
 }
 
 /** Calls `onSize` with the host's measured size, now and on every change; returns its disposer. */
@@ -229,13 +231,8 @@ function refuseSiblings(node: SharedTreeNode, door: string): void {
     );
 }
 
-/** Every node, its siblings in the same id scope, then the binds and breakpoints that name them. */
-function buildTree(node: SharedTreeNode, record: BuildRecord): BuiltTree {
-    // ADR 0093 § 2: the whole tree is checked against the capability table before an element is
-    // created. A refused `layout` is named with its node and the reason the table gives.
-    assertTreeConstructs('adwaita-web', capabilities, node, Object.keys(ARIA_OF));
-    if (node.menus !== undefined) record.menus = node.menus;
-    const root = buildNode(node, record);
+/** The sibling objects of `node` built in `record`'s id scope, by id; each has to have one, or nothing could ask for it. */
+function buildSiblings(node: SharedTreeNode, record: BuildRecord): Map<string, HTMLElement> {
     const siblings = new Map<string, HTMLElement>();
     for (const sibling of node.siblings ?? []) {
         if (sibling.id === undefined) {
@@ -245,6 +242,17 @@ function buildTree(node: SharedTreeNode, record: BuildRecord): BuiltTree {
         }
         siblings.set(sibling.id, buildNode(sibling, record));
     }
+    return siblings;
+}
+
+/** Every node, its siblings in the same id scope, then the binds and breakpoints that name them. */
+function buildTree(node: SharedTreeNode, record: BuildRecord): BuiltTree {
+    // ADR 0093 § 2: the whole tree is checked against the capability table before an element is
+    // created. A refused `layout` is named with its node and the reason the table gives.
+    assertTreeConstructs('adwaita-web', capabilities, node, Object.keys(ARIA_OF));
+    if (node.menus !== undefined) record.menus = node.menus;
+    const root = buildNode(node, record);
+    const siblings = buildSiblings(node, record);
     for (const bind of record.binds) bindProperty(bind, record);
     for (const host of record.breakpointHosts) bindBreakpoints(host.el, host.node, record);
     return { root, siblings, objects: new Map(record.ids) };
@@ -265,7 +273,7 @@ function newRecord(
         disposers: [],
         ...(scope === undefined ? {} : { scope }),
         ...(observeSize === undefined ? {} : { observeSize }),
-        ...(template === undefined ? {} : { template }),
+        ...(template === undefined ? {} : { template, connects: [] }),
     };
 }
 
@@ -606,9 +614,13 @@ export interface BuiltTemplateTree {
  * to their handlers and binds through `scope`, none appended and nothing written to `host`'s
  * attributes, because `host` is still inside its constructor. `finish` and the caller's own append
  * belong to the first `connectedCallback`.
+ *
+ * Objects written beside the template (`Adw.AlertDialog dialog { }`, `$Learn learn { }`) are built in
+ * the same id scope and named in `objects`, which is what `InternalChildren` and `Children` read —
+ * `gtk_widget_class_bind_template_child` reaches any object id of the template's builder. They are
+ * not in `children`: a sibling is an independent object, placed by the class or not at all.
  */
 export function buildTemplateTree(tree: SharedTreeNode, scope: TemplateScope, host: HTMLElement): BuiltTemplateTree {
-    refuseSiblings(tree, 'buildTemplateTree');
     assertTreeConstructs('adwaita-web', capabilities, tree, Object.keys(ARIA_OF));
     const record = newRecord(undefined, undefined, scope);
     record.menus = tree.menus;
@@ -616,6 +628,8 @@ export function buildTemplateTree(tree: SharedTreeNode, scope: TemplateScope, ho
     collectNode(host, tree, record);
     bindSignals(host, tree, record);
     const children = buildChildren(host, tree, record);
+    buildSiblings(tree, record);
+    for (const connect of record.connects ?? []) connect();
     for (const bind of record.binds) bindProperty(bind, record);
     for (const breakpointHost of record.breakpointHosts) {
         bindBreakpoints(breakpointHost.el, breakpointHost.node, record);
@@ -648,21 +662,26 @@ function bindSignals(el: HTMLElement, node: SharedTreeNode, record: BuildRecord)
                     `the handler '${signal.handler}' for '${name}' uses after, which is not in the GObject subset.`,
                 );
             }
-            const object =
-                signal.object === undefined
-                    ? undefined
-                    : signal.object === 'template'
-                      ? record.template.instance
-                      : record.ids.get(signal.object);
-            if (signal.object !== undefined && object === undefined) {
-                throw new Error(
-                    `the handler '${signal.handler}' for '${name}' names the object '${signal.object}', which nothing in this tree has.`,
+            const template = record.template;
+            // `object=` is resolved when the whole tree exists, as `gtk_builder_connect_signals` does: it may
+            // name a node built after this one, or a sibling object written beside the template.
+            record.connects!.push(() => {
+                const object =
+                    signal.object === undefined
+                        ? undefined
+                        : signal.object === 'template'
+                          ? template.instance
+                          : record.ids.get(signal.object);
+                if (signal.object !== undefined && object === undefined) {
+                    throw new Error(
+                        `the handler '${signal.handler}' for '${name}' names the object '${signal.object}', which nothing in this tree has.`,
+                    );
+                }
+                (el as unknown as GObjectInstance).connect(
+                    name,
+                    template.handler(signal.handler, { object, flags: signal.flags }),
                 );
-            }
-            (el as unknown as GObjectInstance).connect(
-                name,
-                record.template.handler(signal.handler, { object, flags: signal.flags }),
-            );
+            });
             continue;
         }
         if (signal.object !== undefined || (signal.flags?.length ?? 0) > 0) {