@blotch/dolan 22.2.3 → 22.2.5

package/dist/utils/tailwind.js

@@ -0,0 +1,90 @@
+import { existsSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { join } from 'node:path';
+/** The config files Tailwind 3 reads. Tailwind 4 needs none. */
+export const TAILWIND_CONFIG_FILES = [
+    'tailwind.config.ts',
+    'tailwind.config.js',
+    'tailwind.config.mjs',
+    'tailwind.config.cjs',
+];
+/** The Tailwind config in the project's folder, if it has one. */
+export const tailwindConfigFile = (cwd) => TAILWIND_CONFIG_FILES.find((file) => existsSync(join(cwd, file)));
+/**
+ * The version of `tailwindcss` that `require` finds, if any. Both majors'
+ * package.json resolve: Tailwind 3 has no `exports` map, and Tailwind 4's
+ * lists `./package.json`.
+ */
+const tailwindVersion = (require) => {
+    try {
+        return require('tailwindcss/package.json').version;
+    }
+    catch {
+        return undefined;
+    }
+};
+/**
+ * The version of Tailwind CSS installed for the project, resolved from its
+ * folder as the build resolves it. Reading the project's package.json missed
+ * two setups that build fine: a workspace whose root installs `tailwindcss`
+ * for every package, and a Tailwind 4 app that lists only
+ * `@tailwindcss/postcss`, which depends on `tailwindcss` itself.
+ *
+ * npm hoists that dependency next to the plugin, where the app finds it.
+ * pnpm's strict layout keeps it out of the app's reach, so this looks from
+ * the plugin's own folder too. The build still finds it under pnpm: pnpm's
+ * bin scripts, `ng` among them, put the packages pnpm hoists on `NODE_PATH`,
+ * and Tailwind resolves the stylesheet's `@import 'tailwindcss'` against it.
+ * Undefined when neither finds it.
+ */
+export const installedTailwindVersion = (cwd) => {
+    const require = createRequire(join(cwd, 'package.json'));
+    const version = tailwindVersion(require);
+    if (version !== undefined)
+        return version;
+    try {
+        // The plugin's `exports` map doesn't list its package.json, so this
+        // starts from its entry point.
+        return tailwindVersion(createRequire(require.resolve('@tailwindcss/postcss')));
+    }
+    catch {
+        return undefined;
+    }
+};
+/** A version's major, `4` for `4.3.3`. */
+export const majorVersion = (version) => Number.parseInt(version, 10);
+/**
+ * Whether the project is set up for Tailwind 4, where the stylesheet imports
+ * the theme's `tailwind.css` rather than `tailwind.config.ts` listing its
+ * plugin: it has no Tailwind config, and Tailwind 4 installed, as
+ * `ng add @blotch/angular-lynx` and `ng new --style=tailwind` set it up. A
+ * config means a Tailwind 3 setup, even with Tailwind 4 installed, as
+ * `doctor` warns.
+ */
+export const usesTailwind4 = (cwd) => {
+    if (tailwindConfigFile(cwd))
+        return false;
+    const version = installedTailwindVersion(cwd);
+    return version !== undefined && majorVersion(version) >= 4;
+};
+/**
+ * The theme files a project takes: the colors, and what maps them to
+ * Tailwind's utilities, `tailwind.css` for Tailwind 4 (imported in the
+ * stylesheet) or `tailwind-plugin.ts` for Tailwind 3 (a config plugin).
+ *
+ * With `tests`, the plugin comes with its test, for the same reason as a
+ * component's (see getComponentFiles): it covers the plugin in the app's
+ * coverage report. `tailwind.css` has no code to cover. The theme folder's
+ * other tests stay behind: they check the theme in packages/ui with Node,
+ * against the components and Tailwind's own builds, which an app's `ng test`
+ * can't do.
+ */
+export const themeFilesFor = (cwd, { tests = false } = {}) => usesTailwind4(cwd)
+    ? ['default.css', 'dark.css', 'tailwind.css']
+    : [
+        'default.css',
+        'dark.css',
+        'tailwind-plugin.ts',
+        ...(tests ? ['tailwind-plugin.test.ts'] : []),
+    ];
+//# sourceMappingURL=tailwind.js.map

package/dist/utils/tailwind.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tailwind.js","sourceRoot":"","sources":["../../src/utils/tailwind.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,gEAAgE;AAChE,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,oBAAoB;IACpB,oBAAoB;IACpB,qBAAqB;IACrB,qBAAqB;CACtB,CAAC;AAEF,kEAAkE;AAClE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAsB,EAAE,CACpE,qBAAqB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpE;;;;GAIG;AACH,MAAM,eAAe,GAAG,CAAC,OAAuB,EAAsB,EAAE;IACtE,IAAI,CAAC;QACH,OAAQ,OAAO,CAAC,0BAA0B,CAAyB,CAAC,OAAO,CAAC;IAC9E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAW,EAAsB,EAAE;IAC1E,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC;IAC1C,IAAI,CAAC;QACH,oEAAoE;QACpE,+BAA+B;QAC/B,OAAO,eAAe,CACpB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CACvD,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAe,EAAU,EAAE,CACtD,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAW,EAAW,EAAE;IACpD,IAAI,kBAAkB,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1C,MAAM,OAAO,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAC9C,OAAO,OAAO,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,GAAW,EACX,EAAE,KAAK,GAAG,KAAK,KAA0B,EAAE,EACjC,EAAE,CACZ,aAAa,CAAC,GAAG,CAAC;IAChB,CAAC,CAAC,CAAC,aAAa,EAAE,UAAU,EAAE,cAAc,CAAC;IAC7C,CAAC,CAAC;QACE,aAAa;QACb,UAAU;QACV,oBAAoB;QACpB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC"}

package/dist/utils/tailwind.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/tailwind.test.js

@@ -0,0 +1,134 @@
+import { describe, expect, it, afterEach } from 'vitest';
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { createFixture, installPackage } from '../test-utils';
+import { getUiSourceDir } from './resolve-paths';
+import { installedTailwindVersion, majorVersion, tailwindConfigFile, themeFilesFor, usesTailwind4, } from './tailwind';
+let fixtures = [];
+afterEach(() => {
+    for (const fixture of fixtures)
+        fixture.cleanup();
+    fixtures = [];
+});
+/**
+ * A project with these packages installed, and these other files. Its
+ * package.json lists none of them: what's installed is what counts.
+ */
+const project = (installed = {}, files = {}) => {
+    const fixture = createFixture({});
+    fixtures.push(fixture);
+    writeFileSync(join(fixture.dir, 'package.json'), '{}');
+    for (const [name, version] of Object.entries(installed)) {
+        installPackage(fixture.dir, name, version);
+    }
+    for (const [file, content] of Object.entries(files)) {
+        writeFileSync(join(fixture.dir, file), content);
+    }
+    return fixture.dir;
+};
+/**
+ * A project that lists only `@tailwindcss/postcss`, with Tailwind in the
+ * plugin's own node_modules, out of the project's reach, as pnpm installs it.
+ */
+const postcssOnly = () => {
+    const dir = project();
+    installPackage(installPackage(dir, '@tailwindcss/postcss', '4.3.3'), 'tailwindcss', '4.3.3');
+    return dir;
+};
+describe('installedTailwindVersion', () => {
+    it("reads the version of the project's own Tailwind, 3 or 4", () => {
+        expect(installedTailwindVersion(project({ tailwindcss: '4.3.3' }))).toBe('4.3.3');
+        expect(installedTailwindVersion(project({ tailwindcss: '3.4.19' }))).toBe('3.4.19');
+    });
+    it('finds the Tailwind a workspace root installs', () => {
+        // The app's package.json lists no Tailwind: the root's is every package's.
+        const root = project({ tailwindcss: '4.3.3' });
+        const app = join(root, 'apps', 'app');
+        mkdirSync(app, { recursive: true });
+        writeFileSync(join(app, 'package.json'), '{}');
+        expect(installedTailwindVersion(app)).toBe('4.3.3');
+    });
+    it('finds the Tailwind @tailwindcss/postcss depends on, hoisted next to it', () => {
+        // npm's layout: the plugin's dependency sits in the app's node_modules.
+        expect(installedTailwindVersion(project({ '@tailwindcss/postcss': '4.3.3', tailwindcss: '4.3.3' }))).toBe('4.3.3');
+    });
+    it("finds it from the plugin's own folder when the project can't", () => {
+        expect(installedTailwindVersion(postcssOnly())).toBe('4.3.3');
+    });
+    it("prefers the project's own Tailwind to the plugin's", () => {
+        // What the stylesheet's `@import 'tailwindcss'` finds first.
+        const dir = project({ tailwindcss: '4.2.0' });
+        installPackage(installPackage(dir, '@tailwindcss/postcss', '4.3.3'), 'tailwindcss', '4.3.3');
+        expect(installedTailwindVersion(dir)).toBe('4.2.0');
+    });
+    it('is undefined without Tailwind, even when the plugin is there', () => {
+        expect(installedTailwindVersion(project())).toBeUndefined();
+        expect(installedTailwindVersion(project({ '@tailwindcss/postcss': '4.3.3' }))).toBeUndefined();
+    });
+});
+describe('majorVersion', () => {
+    it("reads a version's major", () => {
+        expect(majorVersion('4.3.3')).toBe(4);
+        expect(majorVersion('3.4.19')).toBe(3);
+        expect(majorVersion('4.0.0-beta.1')).toBe(4);
+    });
+});
+describe('tailwindConfigFile', () => {
+    it('names the Tailwind config in the project, if any', () => {
+        expect(tailwindConfigFile(project({}, { 'tailwind.config.js': '' }))).toBe('tailwind.config.js');
+        expect(tailwindConfigFile(project())).toBeUndefined();
+    });
+});
+describe('usesTailwind4', () => {
+    it('is true for a project with Tailwind 4 installed and no Tailwind config', () => {
+        expect(usesTailwind4(project({ tailwindcss: '4.3.3' }))).toBe(true);
+        expect(usesTailwind4(postcssOnly())).toBe(true);
+    });
+    it('is false for Tailwind 3, a Tailwind config, or no Tailwind', () => {
+        expect(usesTailwind4(project({ tailwindcss: '3.4.19' }))).toBe(false);
+        // A config is a Tailwind 3 setup, whatever's installed.
+        expect(usesTailwind4(project({ tailwindcss: '4.3.3' }, { 'tailwind.config.js': '' }))).toBe(false);
+        expect(usesTailwind4(project())).toBe(false);
+    });
+    it('reads the installed version, not the one package.json asks for', () => {
+        const dir = project({ tailwindcss: '3.4.19' });
+        writeFileSync(join(dir, 'package.json'), JSON.stringify({ devDependencies: { tailwindcss: '^4.3.3' } }));
+        expect(usesTailwind4(dir)).toBe(false);
+    });
+});
+describe('themeFilesFor', () => {
+    it('takes tailwind.css on Tailwind 4, and the config plugin on Tailwind 3', () => {
+        expect(themeFilesFor(project({ tailwindcss: '4.3.3' }))).toEqual([
+            'default.css',
+            'dark.css',
+            'tailwind.css',
+        ]);
+        expect(themeFilesFor(project({ tailwindcss: '3.4.19' }))).toEqual([
+            'default.css',
+            'dark.css',
+            'tailwind-plugin.ts',
+        ]);
+    });
+    it("adds the Tailwind plugin's test with the components' tests", () => {
+        // It covers the plugin in the app's coverage report. Tailwind 4's
+        // tailwind.css has no code to cover.
+        expect(themeFilesFor(project({ tailwindcss: '3.4.19' }), { tests: true })).toEqual([
+            'default.css',
+            'dark.css',
+            'tailwind-plugin.ts',
+            'tailwind-plugin.test.ts',
+        ]);
+        expect(themeFilesFor(project({ tailwindcss: '4.3.3' }), { tests: true })).toEqual(['default.css', 'dark.css', 'tailwind.css']);
+    });
+    it('lists only files the theme folder has', () => {
+        for (const version of ['3.4.19', '4.3.3']) {
+            const files = themeFilesFor(project({ tailwindcss: version }), {
+                tests: true,
+            });
+            for (const file of files) {
+                expect(existsSync(join(getUiSourceDir(), 'theme', file)), file).toBe(true);
+            }
+        }
+    });
+});
+//# sourceMappingURL=tailwind.test.js.map

package/dist/utils/tailwind.test.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blotch/dolan",
-  "version": "22.2.3",
+  "version": "22.2.5",
   "description": "CLI for adding @blotch/ui components to your project",
   "homepage": "https://github.com/Blotch-Smart-Frames/AngularLynx#readme",
   "bugs": {
@@ -31,6 +31,14 @@
     "./testing/set-input-signal": {
       "types": "./dist/testing/set-input-signal.d.ts",
       "default": "./dist/testing/set-input-signal.js"
+    },
+    "./testing/fire-lynx-event": {
+      "types": "./dist/testing/fire-lynx-event.d.ts",
+      "default": "./dist/testing/fire-lynx-event.js"
+    },
+    "./testing/lynx-main-thread": {
+      "types": "./dist/testing/lynx-main-thread.d.ts",
+      "default": "./dist/testing/lynx-main-thread.js"
     }
   },
   "scripts": {

package/dist/ui/components/area-chart/area-chart-render.test.ts

@@ -1,63 +0,0 @@
-import { render } from '@blotch/angular-lynx-testing-library';
-import { createChartRuntime } from '@tanstack/charts/runtime';
-import type {
-  ChartDefinition,
-  ChartPoint,
-  SceneNode,
-} from '@tanstack/charts/types';
-import { describe, expect, it, vi } from 'vitest';
-import { setInputSignal } from '../../../test-utils/set-input-signal';
-import { UiAreaChart } from './area-chart';
-
-const data = [
-  { x: 0, y: 4 },
-  { x: 1, y: -2 },
-  { x: 2, y: 6 },
-];
-
-/**
- * Every drawn shape in a definition's scene, labels excluded.
- */
-const shapes = (definition: ChartDefinition<any, any, any>) => {
-  const scene = createChartRuntime().render(definition, {
-    width: 300,
-    height: 200,
-  });
-  const found: SceneNode[] = [];
-  const walk = (nodes: readonly SceneNode[]) => {
-    for (const node of nodes) {
-      if (node.kind === 'group') {
-        if (!node.focus) walk(node.children);
-      } else if (node.kind !== 'label') found.push(node);
-    }
-  };
-  walk(scene.nodes);
-  return { scene, found };
-};
-
-describe('UiAreaChart', () => {
-  type Internals = {
-    definition: () => ChartDefinition<any, any, any>;
-    onSelect(point: ChartPoint | null): void;
-  };
-
-  it('builds its definition from its inputs', async () => {
-    const { componentRef } = await render(UiAreaChart);
-    const chart = componentRef.instance as UiAreaChart;
-    setInputSignal(chart.data, data);
-    setInputSignal(chart.baseline, -20);
-    const { scene } = shapes((chart as unknown as Internals).definition());
-    expect(scene.scales['y']!.domain[0]).toBeLessThanOrEqual(-20);
-  });
-
-  it('emits the tapped datum', async () => {
-    const { componentRef } = await render(UiAreaChart);
-    const chart = componentRef.instance as UiAreaChart;
-    const tapped = vi.fn();
-    chart.pointTap.subscribe(tapped);
-    const internals = chart as unknown as Internals;
-    internals.onSelect({ datum: data[0] } as ChartPoint);
-    internals.onSelect(null);
-    expect(tapped.mock.calls).toEqual([[data[0]]]);
-  });
-});

package/dist/ui/components/bar-chart/bar-chart-render.test.ts

@@ -1,58 +0,0 @@
-import { render } from '@blotch/angular-lynx-testing-library';
-import { createChartRuntime } from '@tanstack/charts/runtime';
-import type {
-  ChartDefinition,
-  ChartPoint,
-  SceneNode,
-  SceneRect,
-} from '@tanstack/charts/types';
-import { describe, expect, it, vi } from 'vitest';
-import { setInputSignal } from '../../../test-utils/set-input-signal';
-import { UiBarChart } from './bar-chart';
-
-/**
- * Every bar in a definition's scene.
- */
-const bars = (definition: ChartDefinition<any, any, any>) => {
-  const scene = createChartRuntime().render(definition, {
-    width: 300,
-    height: 200,
-  });
-  const found: SceneRect[] = [];
-  const walk = (nodes: readonly SceneNode[]) => {
-    for (const node of nodes) {
-      if (node.kind === 'group') {
-        if (!node.focus) walk(node.children);
-      } else if (node.kind === 'rect') found.push(node);
-    }
-  };
-  walk(scene.nodes);
-  return { scene, found };
-};
-
-describe('UiBarChart', () => {
-  type Internals = {
-    definition: () => ChartDefinition<any, any, any>;
-    onSelect(point: ChartPoint | null): void;
-  };
-
-  it('builds its definition from its inputs', async () => {
-    const { componentRef } = await render(UiBarChart);
-    const chart = componentRef.instance as UiBarChart;
-    setInputSignal(chart.data, [{ x: 'a', y: 1 }]);
-    setInputSignal(chart.color, 'red');
-    const { found } = bars((chart as unknown as Internals).definition());
-    expect(found[0]!.style?.fill).toBe('red');
-  });
-
-  it('emits the tapped datum', async () => {
-    const { componentRef } = await render(UiBarChart);
-    const chart = componentRef.instance as UiBarChart;
-    const tapped = vi.fn();
-    chart.barTap.subscribe(tapped);
-    const internals = chart as unknown as Internals;
-    internals.onSelect({ datum: { x: 'a', y: 1 } } as ChartPoint);
-    internals.onSelect(null);
-    expect(tapped.mock.calls).toEqual([[{ x: 'a', y: 1 }]]);
-  });
-});

package/dist/ui/components/button/button-render.test.ts

@@ -1,132 +0,0 @@
-import { Component } from '@angular/core';
-import { render, waitForUpdate } from '@blotch/angular-lynx-testing-library';
-import { LYNX_ELEMENTS } from '@blotch/angular-lynx';
-import { describe, expect, it, vi } from 'vitest';
-import { setInputSignal } from '../../../test-utils/set-input-signal';
-import { UiButton } from './button';
-
-@Component({
-  standalone: true,
-  imports: [UiButton, LYNX_ELEMENTS],
-  template: `<ui-button (pressed)="onPressed()"><text>Go</text></ui-button>`,
-})
-class ButtonHost {
-  count = 0;
-  onPressed = () => {
-    this.count++;
-  };
-}
-
-describe('UiButton (render)', () => {
-  it('renders and mounts without throwing', async () => {
-    const { container } = await render(ButtonHost);
-    expect(container).toBeTruthy();
-  });
-
-  it('emits `pressed` from onTap() when not disabled/loading', async () => {
-    const { componentRef } = await render(UiButton);
-    const inst = componentRef.instance as unknown as {
-      onTap: () => void;
-      pressed: { subscribe: (cb: () => void) => void };
-    };
-    const emitted = vi.fn();
-    inst.pressed.subscribe(emitted);
-    inst.onTap();
-    expect(emitted).toHaveBeenCalledTimes(1);
-  });
-
-  it('onTap() is a no-op when disabled', async () => {
-    const { componentRef } = await render(UiButton);
-    const inst = componentRef.instance as unknown as UiButton & {
-      onTap: () => void;
-    };
-    setInputSignal(inst.disabled, true);
-    const emitted = vi.fn();
-    inst.pressed.subscribe(emitted);
-    inst.onTap();
-    expect(emitted).not.toHaveBeenCalled();
-  });
-
-  it('onTap() is a no-op when loading', async () => {
-    const { componentRef } = await render(UiButton);
-    const inst = componentRef.instance as unknown as UiButton & {
-      onTap: () => void;
-    };
-    setInputSignal(inst.loading, true);
-    const emitted = vi.fn();
-    inst.pressed.subscribe(emitted);
-    inst.onTap();
-    expect(emitted).not.toHaveBeenCalled();
-  });
-
-  it('shows the spinner while loading', async () => {
-    const { componentRef, container } = await render(UiButton);
-    setInputSignal((componentRef.instance as UiButton).loading, true);
-    await waitForUpdate();
-    // Spinner renders as a nested view with an svg — searching for that
-    // suffices without asserting on the internal Lynx tree.
-    expect(container.querySelector('svg')).toBeTruthy();
-  });
-
-  it('applies disabled dim opacity when disabled or loading', async () => {
-    const { componentRef, container } = await render(UiButton);
-    setInputSignal((componentRef.instance as UiButton).disabled, true);
-    await waitForUpdate();
-    const outer = container.querySelector('view');
-    expect(outer?.getAttribute('class')).toContain('opacity-50');
-  });
-
-  it('picks the right spinner size for each button size', async () => {
-    // spinnerSize returns 'xs' for size='sm' and 'sm' otherwise. Cover both.
-    const { componentRef } = await render(UiButton);
-    const inst = componentRef.instance as unknown as UiButton & {
-      spinnerSize: () => 'xs' | 'sm';
-    };
-    setInputSignal(inst.size, 'sm');
-    await waitForUpdate();
-    expect(inst.spinnerSize()).toBe('xs');
-
-    setInputSignal(inst.size, 'default');
-    await waitForUpdate();
-    expect(inst.spinnerSize()).toBe('sm');
-  });
-
-  it("colors the spinner like each variant's label", async () => {
-    // The template binding doesn't reach the spinner's input under JIT (see
-    // setInputSignal), so check the value the button passes it.
-    const { componentRef } = await render(UiButton);
-    const inst = componentRef.instance as unknown as UiButton & {
-      spinnerColor: () => string;
-    };
-    for (const [variant, color] of [
-      ['default', 'var(--primary-foreground)'],
-      ['destructive', 'var(--destructive-foreground)'],
-      ['outline', 'var(--foreground)'],
-      ['secondary', 'var(--secondary-foreground)'],
-      ['ghost', 'var(--foreground)'],
-    ] as const) {
-      setInputSignal(inst.variant, variant);
-      expect(inst.spinnerColor()).toBe(color);
-    }
-  });
-
-  it('press handlers run cleanly (guarded by disabled/loading state)', async () => {
-    // onPressStart/End are no-ops when the button is disabled/loading; the
-    // active-press path relies on the ref being wired up on-device — assert
-    // only that the handlers run without throwing here.
-    const { componentRef } = await render(UiButton);
-    const inst = componentRef.instance as unknown as {
-      onPressStart: () => void;
-      onPressEnd: () => void;
-      onPressCancel: () => void;
-    };
-    expect(() => inst.onPressStart()).not.toThrow();
-    expect(() => inst.onPressEnd()).not.toThrow();
-    expect(() => inst.onPressCancel()).not.toThrow();
-
-    // Disabled path (early return in onPressStart / onPressEnd)
-    setInputSignal((componentRef.instance as UiButton).disabled, true);
-    expect(() => inst.onPressStart()).not.toThrow();
-    expect(() => inst.onPressEnd()).not.toThrow();
-  });
-});

package/dist/ui/components/button-group/button-group-render.test.ts

@@ -1,146 +0,0 @@
-import { Component } from '@angular/core';
-import { render, waitForUpdate } from '@blotch/angular-lynx-testing-library';
-import { LYNX_ELEMENTS } from '@blotch/angular-lynx';
-import { describe, expect, it, vi } from 'vitest';
-import { setInputSignal } from '../../../test-utils/set-input-signal';
-import { UiButtonGroup, UiButtonGroupItem } from './button-group';
-
-@Component({
-  standalone: true,
-  imports: [UiButtonGroup, UiButtonGroupItem, LYNX_ELEMENTS],
-  template: `
-    <ui-button-group [orientation]="orientation">
-      <ui-button-group-item (pressed)="onPressed()"
-        ><text>A</text></ui-button-group-item
-      >
-      <ui-button-group-item [disabled]="disabled" (pressed)="onPressed()"
-        ><text>B</text></ui-button-group-item
-      >
-    </ui-button-group>
-  `,
-})
-class ButtonGroupHost {
-  orientation: 'horizontal' | 'vertical' = 'horizontal';
-  disabled = false;
-  onPressed = () => {};
-}
-
-describe('UiButtonGroup (render)', () => {
-  it('renders horizontally by default', async () => {
-    const { container } = await render(ButtonGroupHost);
-    expect(container).toBeTruthy();
-    const flexRow = container.querySelector('.flex-row');
-    expect(flexRow).toBeTruthy();
-  });
-
-  it('switches to vertical layout when orientation is flipped', async () => {
-    const { componentRef, container } = await render(UiButtonGroup);
-    setInputSignal(
-      (componentRef.instance as UiButtonGroup).orientation,
-      'vertical',
-    );
-    await waitForUpdate();
-    expect(container.querySelector('.flex-col')).toBeTruthy();
-  });
-
-  it('applies a user class from the alias input', async () => {
-    const { componentRef, container } = await render(UiButtonGroup);
-    setInputSignal(
-      (componentRef.instance as UiButtonGroup).userClass,
-      'w-full',
-    );
-    await waitForUpdate();
-    const outer = container.querySelector('view');
-    expect(outer?.getAttribute('class')).toContain('w-full');
-  });
-});
-
-describe('UiButtonGroupItem', () => {
-  const renderItem = async (
-    variant: 'default' | 'outline' = 'default',
-    size: 'default' | 'sm' | 'lg' = 'default',
-    disabledGroup = false,
-  ) => {
-    const parentResult = await render(UiButtonGroup);
-    const parent = parentResult.componentRef.instance as UiButtonGroup;
-    setInputSignal(parent.variant, variant);
-    setInputSignal(parent.size, size);
-    setInputSignal(parent.disabled, disabledGroup);
-    await waitForUpdate();
-
-    const itemResult = await render(UiButtonGroupItem, {
-      providers: [{ provide: UiButtonGroup, useValue: parent }],
-    });
-    await waitForUpdate();
-    return { parent, itemResult };
-  };
-
-  it('onTap emits `pressed` when neither the group nor the item is disabled', async () => {
-    const { itemResult } = await renderItem();
-    const inst = itemResult.componentRef
-      .instance as unknown as UiButtonGroupItem & {
-      onTap: () => void;
-    };
-    const emitted = vi.fn();
-    inst.pressed.subscribe(emitted);
-    inst.onTap();
-    expect(emitted).toHaveBeenCalledTimes(1);
-  });
-
-  it('onTap is a no-op when the group is disabled', async () => {
-    const { itemResult } = await renderItem('default', 'default', true);
-    const inst = itemResult.componentRef
-      .instance as unknown as UiButtonGroupItem & {
-      onTap: () => void;
-    };
-    const emitted = vi.fn();
-    inst.pressed.subscribe(emitted);
-    inst.onTap();
-    expect(emitted).not.toHaveBeenCalled();
-  });
-
-  it('onTap is a no-op when the item itself is disabled', async () => {
-    const { itemResult } = await renderItem();
-    const inst = itemResult.componentRef
-      .instance as unknown as UiButtonGroupItem & {
-      onTap: () => void;
-    };
-    setInputSignal(inst.disabled, true);
-    await waitForUpdate();
-    const emitted = vi.fn();
-    inst.pressed.subscribe(emitted);
-    inst.onTap();
-    expect(emitted).not.toHaveBeenCalled();
-  });
-
-  it('press handlers run cleanly on both enabled and disabled paths', async () => {
-    const { itemResult } = await renderItem();
-    const inst = itemResult.componentRef.instance as unknown as {
-      onPressStart: () => void;
-      onPressEnd: () => void;
-      onPressCancel: () => void;
-      disabled: unknown;
-    };
-    expect(() => inst.onPressStart()).not.toThrow();
-    expect(() => inst.onPressEnd()).not.toThrow();
-    expect(() => inst.onPressCancel()).not.toThrow();
-    setInputSignal((inst as unknown as UiButtonGroupItem).disabled, true);
-    await waitForUpdate();
-    expect(() => inst.onPressStart()).not.toThrow();
-    expect(() => inst.onPressEnd()).not.toThrow();
-  });
-
-  it('renders label with `outline` group variant classes', async () => {
-    // Covers the `outline` branch of both buttonGroupItemVariants and
-    // buttonGroupTextVariants.
-    const { itemResult } = await renderItem('outline', 'lg');
-    const view = itemResult.container.querySelector('view');
-    expect(view?.getAttribute('class')).toContain('bg-background');
-  });
-
-  it('renders with size sm variant classes', async () => {
-    const { itemResult } = await renderItem('default', 'sm');
-    const view = itemResult.container.querySelector('view');
-    expect(view?.getAttribute('class')).toContain('h-9');
-  });
-});