toiljs 0.0.11 → 0.0.12

package/test/dom/view-transitions.test.tsx

@@ -1,51 +1,53 @@
-// @vitest-environment jsdom
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
-import { navigate, setViewTransitions } from '../../src/client/navigation/navigation';
-
-interface VTDoc {
-    startViewTransition?: (cb: () => void) => unknown;
-}
-const doc = document as Document & VTDoc;
-
-afterEach(() => {
-    setViewTransitions(false);
-    delete doc.startViewTransition;
-    vi.restoreAllMocks();
-    window.history.replaceState({}, '', '/');
-});
-
-describe('view transitions', () => {
-    function stubReducedMotion(matches: boolean): void {
-        window.matchMedia = vi.fn().mockReturnValue({ matches }) as unknown as typeof window.matchMedia;
-    }
-
-    it('wraps navigation in startViewTransition when enabled and supported', () => {
-        const vt = vi.fn((cb: () => void) => {
-            cb();
-        });
-        doc.startViewTransition = vt;
-        stubReducedMotion(false);
-        setViewTransitions(true);
-        navigate('/a');
-        expect(vt).toHaveBeenCalledOnce();
-    });
-
-    it('skips the view transition under prefers-reduced-motion', () => {
-        const vt = vi.fn();
-        doc.startViewTransition = vt;
-        stubReducedMotion(true);
-        setViewTransitions(true);
-        navigate('/b');
-        expect(vt).not.toHaveBeenCalled();
-    });
-
-    it('does not use view transitions when disabled', () => {
-        const vt = vi.fn();
-        doc.startViewTransition = vt;
-        stubReducedMotion(false);
-        setViewTransitions(false);
-        navigate('/c');
-        expect(vt).not.toHaveBeenCalled();
-    });
-});
+// @vitest-environment jsdom
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { navigate, setViewTransitions } from '../../src/client/navigation/navigation';
+
+interface VTDoc {
+    startViewTransition?: (cb: () => void) => unknown;
+}
+const doc = document as Document & VTDoc;
+
+afterEach(() => {
+    setViewTransitions(false);
+    delete doc.startViewTransition;
+    vi.restoreAllMocks();
+    window.history.replaceState({}, '', '/');
+});
+
+describe('view transitions', () => {
+    function stubReducedMotion(matches: boolean): void {
+        window.matchMedia = vi
+            .fn()
+            .mockReturnValue({ matches }) as unknown as typeof window.matchMedia;
+    }
+
+    it('wraps navigation in startViewTransition when enabled and supported', () => {
+        const vt = vi.fn((cb: () => void) => {
+            cb();
+        });
+        doc.startViewTransition = vt;
+        stubReducedMotion(false);
+        setViewTransitions(true);
+        navigate('/a');
+        expect(vt).toHaveBeenCalledOnce();
+    });
+
+    it('skips the view transition under prefers-reduced-motion', () => {
+        const vt = vi.fn();
+        doc.startViewTransition = vt;
+        stubReducedMotion(true);
+        setViewTransitions(true);
+        navigate('/b');
+        expect(vt).not.toHaveBeenCalled();
+    });
+
+    it('does not use view transitions when disabled', () => {
+        const vt = vi.fn();
+        doc.startViewTransition = vt;
+        stubReducedMotion(false);
+        setViewTransitions(false);
+        navigate('/c');
+        expect(vt).not.toHaveBeenCalled();
+    });
+});

package/test/features.test.ts

@@ -1,142 +1,149 @@
-import { describe, expect, it } from 'vitest';
-
-import {
-    defaultConfigSource,
-    detectPreprocessor,
-    detectTailwind,
-    packageDiff,
-    preprocessorForExt,
-    requiredPackages,
-    setConfigImages,
-    setStyleImports,
-    styleEntry,
-    styleImportLines,
-    type StyleFeatures,
-} from '../src/cli/features';
-
-const CSS: StyleFeatures = { preprocessor: 'css', tailwind: false };
-const SASS_TW: StyleFeatures = { preprocessor: 'sass', tailwind: true };
-
-describe('styleEntry / preprocessorForExt', () => {
-    it('maps preprocessors to stylesheet paths', () => {
-        expect(styleEntry('css')).toBe('styles/main.css');
-        expect(styleEntry('sass')).toBe('styles/main.scss');
-        expect(styleEntry('less')).toBe('styles/main.less');
-        expect(styleEntry('stylus')).toBe('styles/main.styl');
-    });
-
-    it('reverses extensions back to preprocessors', () => {
-        expect(preprocessorForExt('scss')).toBe('sass');
-        expect(preprocessorForExt('.sass')).toBe('sass');
-        expect(preprocessorForExt('less')).toBe('less');
-        expect(preprocessorForExt('styl')).toBe('stylus');
-        expect(preprocessorForExt('css')).toBe('css');
-        expect(preprocessorForExt('txt')).toBeNull();
-    });
-});
-
-describe('requiredPackages / packageDiff', () => {
-    it('lists packages for a feature set', () => {
-        expect(requiredPackages(CSS)).toEqual([]);
-        expect(requiredPackages({ preprocessor: 'sass', tailwind: false })).toEqual(['sass']);
-        expect(requiredPackages({ preprocessor: 'css', tailwind: true })).toEqual([
-            'tailwindcss',
-            '@tailwindcss/vite',
-        ]);
-    });
-
-    it('diffs add/remove between two setups', () => {
-        expect(packageDiff(CSS, SASS_TW)).toEqual({
-            add: ['sass', 'tailwindcss', '@tailwindcss/vite'],
-            remove: [],
-        });
-        expect(packageDiff(SASS_TW, CSS)).toEqual({
-            add: [],
-            remove: ['sass', 'tailwindcss', '@tailwindcss/vite'],
-        });
-        expect(packageDiff({ preprocessor: 'sass', tailwind: false }, { preprocessor: 'less', tailwind: false })).toEqual(
-            { add: ['less'], remove: ['sass'] },
-        );
-    });
-});
-
-describe('styleImportLines / setStyleImports', () => {
-    it('orders Tailwind before the main stylesheet', () => {
-        expect(styleImportLines(CSS)).toEqual(["import './styles/main.css';"]);
-        expect(styleImportLines(SASS_TW)).toEqual([
-            "import './styles/tailwind.css';",
-            "import './styles/main.scss';",
-        ]);
-    });
-
-    it('rewrites the app entry imports, preserving the rest', () => {
-        const src = [
-            "import { routes, layout, notFound } from 'toiljs/routes';",
-            '',
-            "import './styles/main.css';",
-            '',
-            'Toil.mount(routes, layout, notFound);',
-            '',
-        ].join('\n');
-
-        const out = setStyleImports(src, SASS_TW);
-        expect(out).toContain("import './styles/tailwind.css';");
-        expect(out).toContain("import './styles/main.scss';");
-        expect(out).not.toContain("import './styles/main.css';");
-        expect(out).toContain("from 'toiljs/routes'");
-        expect(out).toContain('Toil.mount(routes, layout, notFound);');
-    });
-
-    it('round-trips back to plain CSS (drops Tailwind import)', () => {
-        const src = [
-            "import { routes, layout, notFound } from 'toiljs/routes';",
-            "import './styles/tailwind.css';",
-            "import './styles/main.scss';",
-            'Toil.mount(routes, layout, notFound);',
-        ].join('\n');
-
-        const out = setStyleImports(src, CSS);
-        expect(out).toContain("import './styles/main.css';");
-        expect(out).not.toContain('tailwind.css');
-        expect(out).not.toContain('main.scss');
-    });
-});
-
-describe('detect from dependencies', () => {
-    it('finds the active preprocessor and Tailwind', () => {
-        expect(detectPreprocessor({ sass: '^1' })).toBe('sass');
-        expect(detectPreprocessor({ less: '^4' })).toBe('less');
-        expect(detectPreprocessor({})).toBe('css');
-        expect(detectTailwind({ '@tailwindcss/vite': '^4' })).toBe(true);
-        expect(detectTailwind({ react: '^19' })).toBe(false);
-    });
-});
-
-describe('setConfigImages / defaultConfigSource', () => {
-    it('flips an existing images flag', () => {
-        const src = 'export default defineConfig({\n    client: {\n        images: true,\n    },\n});\n';
-        expect(setConfigImages(src, false)).toContain('images: false');
-        expect(setConfigImages(src, false)).not.toContain('images: true');
-    });
-
-    it('adds images to an existing client block', () => {
-        const out = setConfigImages('export default defineConfig({ client: { base: "/" } });', false);
-        expect(out).toContain('images: false');
-        expect(out).toContain('base: "/"');
-    });
-
-    it('adds a client block to a bare config', () => {
-        const out = setConfigImages('export default defineConfig({});', false);
-        expect(out).toContain('client: { images: false }');
-    });
-
-    it('returns null when the shape is unrecognized', () => {
-        expect(setConfigImages('const x = 1;', false)).toBeNull();
-    });
-
-    it('round-trips through defaultConfigSource', () => {
-        const src = defaultConfigSource(false);
-        expect(src).toContain('images: false');
-        expect(setConfigImages(src, true)).toContain('images: true');
-    });
-});
+import { describe, expect, it } from 'vitest';
+
+import {
+    defaultConfigSource,
+    detectPreprocessor,
+    detectTailwind,
+    packageDiff,
+    preprocessorForExt,
+    requiredPackages,
+    setConfigImages,
+    setStyleImports,
+    styleEntry,
+    type StyleFeatures,
+    styleImportLines,
+} from '../src/cli/features';
+
+const CSS: StyleFeatures = { preprocessor: 'css', tailwind: false };
+const SASS_TW: StyleFeatures = { preprocessor: 'sass', tailwind: true };
+
+describe('styleEntry / preprocessorForExt', () => {
+    it('maps preprocessors to stylesheet paths', () => {
+        expect(styleEntry('css')).toBe('styles/main.css');
+        expect(styleEntry('sass')).toBe('styles/main.scss');
+        expect(styleEntry('less')).toBe('styles/main.less');
+        expect(styleEntry('stylus')).toBe('styles/main.styl');
+    });
+
+    it('reverses extensions back to preprocessors', () => {
+        expect(preprocessorForExt('scss')).toBe('sass');
+        expect(preprocessorForExt('.sass')).toBe('sass');
+        expect(preprocessorForExt('less')).toBe('less');
+        expect(preprocessorForExt('styl')).toBe('stylus');
+        expect(preprocessorForExt('css')).toBe('css');
+        expect(preprocessorForExt('txt')).toBeNull();
+    });
+});
+
+describe('requiredPackages / packageDiff', () => {
+    it('lists packages for a feature set', () => {
+        expect(requiredPackages(CSS)).toEqual([]);
+        expect(requiredPackages({ preprocessor: 'sass', tailwind: false })).toEqual(['sass']);
+        expect(requiredPackages({ preprocessor: 'css', tailwind: true })).toEqual([
+            'tailwindcss',
+            '@tailwindcss/vite',
+        ]);
+    });
+
+    it('diffs add/remove between two setups', () => {
+        expect(packageDiff(CSS, SASS_TW)).toEqual({
+            add: ['sass', 'tailwindcss', '@tailwindcss/vite'],
+            remove: [],
+        });
+        expect(packageDiff(SASS_TW, CSS)).toEqual({
+            add: [],
+            remove: ['sass', 'tailwindcss', '@tailwindcss/vite'],
+        });
+        expect(
+            packageDiff(
+                { preprocessor: 'sass', tailwind: false },
+                { preprocessor: 'less', tailwind: false },
+            ),
+        ).toEqual({ add: ['less'], remove: ['sass'] });
+    });
+});
+
+describe('styleImportLines / setStyleImports', () => {
+    it('orders Tailwind before the main stylesheet', () => {
+        expect(styleImportLines(CSS)).toEqual(["import './styles/main.css';"]);
+        expect(styleImportLines(SASS_TW)).toEqual([
+            "import './styles/tailwind.css';",
+            "import './styles/main.scss';",
+        ]);
+    });
+
+    it('rewrites the app entry imports, preserving the rest', () => {
+        const src = [
+            "import { routes, layout, notFound } from 'toiljs/routes';",
+            '',
+            "import './styles/main.css';",
+            '',
+            'Toil.mount(routes, layout, notFound);',
+            '',
+        ].join('\n');
+
+        const out = setStyleImports(src, SASS_TW);
+        expect(out).toContain("import './styles/tailwind.css';");
+        expect(out).toContain("import './styles/main.scss';");
+        expect(out).not.toContain("import './styles/main.css';");
+        expect(out).toContain("from 'toiljs/routes'");
+        expect(out).toContain('Toil.mount(routes, layout, notFound);');
+    });
+
+    it('round-trips back to plain CSS (drops Tailwind import)', () => {
+        const src = [
+            "import { routes, layout, notFound } from 'toiljs/routes';",
+            "import './styles/tailwind.css';",
+            "import './styles/main.scss';",
+            'Toil.mount(routes, layout, notFound);',
+        ].join('\n');
+
+        const out = setStyleImports(src, CSS);
+        expect(out).toContain("import './styles/main.css';");
+        expect(out).not.toContain('tailwind.css');
+        expect(out).not.toContain('main.scss');
+    });
+});
+
+describe('detect from dependencies', () => {
+    it('finds the active preprocessor and Tailwind', () => {
+        expect(detectPreprocessor({ sass: '^1' })).toBe('sass');
+        expect(detectPreprocessor({ less: '^4' })).toBe('less');
+        expect(detectPreprocessor({})).toBe('css');
+        expect(detectTailwind({ '@tailwindcss/vite': '^4' })).toBe(true);
+        expect(detectTailwind({ react: '^19' })).toBe(false);
+    });
+});
+
+describe('setConfigImages / defaultConfigSource', () => {
+    it('flips an existing images flag', () => {
+        const src =
+            'export default defineConfig({\n    client: {\n        images: true,\n    },\n});\n';
+        expect(setConfigImages(src, false)).toContain('images: false');
+        expect(setConfigImages(src, false)).not.toContain('images: true');
+    });
+
+    it('adds images to an existing client block', () => {
+        const out = setConfigImages(
+            'export default defineConfig({ client: { base: "/" } });',
+            false,
+        );
+        expect(out).toContain('images: false');
+        expect(out).toContain('base: "/"');
+    });
+
+    it('adds a client block to a bare config', () => {
+        const out = setConfigImages('export default defineConfig({});', false);
+        expect(out).toContain('client: { images: false }');
+    });
+
+    it('returns null when the shape is unrecognized', () => {
+        expect(setConfigImages('const x = 1;', false)).toBeNull();
+    });
+
+    it('round-trips through defaultConfigSource', () => {
+        const src = defaultConfigSource(false);
+        expect(src).toContain('images: false');
+        expect(setConfigImages(src, true)).toContain('images: true');
+    });
+});

package/test/fonts.test.ts

@@ -1,26 +1,28 @@
-import { describe, expect, it } from 'vitest';
-
-import { fontPreloadTags } from '../src/compiler/fonts';
-
-describe('fontPreloadTags', () => {
-    it('builds a crossorigin preload link per font, skipping non-fonts', () => {
-        const tags = fontPreloadTags(['fonts/a-abc.woff2', 'assets/x-1.js', 'fonts/b.ttf'], '/');
-        expect(tags).toHaveLength(2);
-        expect(tags[0]).toEqual({
-            tag: 'link',
-            attrs: {
-                rel: 'preload',
-                as: 'font',
-                type: 'font/woff2',
-                href: '/fonts/a-abc.woff2',
-                crossorigin: '',
-            },
-            injectTo: 'head',
-        });
-        expect(tags[1].attrs?.type).toBe('font/ttf');
-    });
-
-    it('respects a non-root base path', () => {
-        expect(fontPreloadTags(['fonts/a.woff2'], '/app/')[0].attrs?.href).toBe('/app/fonts/a.woff2');
-    });
-});
+import { describe, expect, it } from 'vitest';
+
+import { fontPreloadTags } from '../src/compiler/fonts';
+
+describe('fontPreloadTags', () => {
+    it('builds a crossorigin preload link per font, skipping non-fonts', () => {
+        const tags = fontPreloadTags(['fonts/a-abc.woff2', 'assets/x-1.js', 'fonts/b.ttf'], '/');
+        expect(tags).toHaveLength(2);
+        expect(tags[0]).toEqual({
+            tag: 'link',
+            attrs: {
+                rel: 'preload',
+                as: 'font',
+                type: 'font/woff2',
+                href: '/fonts/a-abc.woff2',
+                crossorigin: '',
+            },
+            injectTo: 'head',
+        });
+        expect(tags[1].attrs?.type).toBe('font/ttf');
+    });
+
+    it('respects a non-root base path', () => {
+        expect(fontPreloadTags(['fonts/a.woff2'], '/app/')[0].attrs?.href).toBe(
+            '/app/fonts/a.woff2',
+        );
+    });
+});

package/test/head.test.ts

@@ -1,35 +1,45 @@
-import { describe, expect, it } from 'vitest';
-
-import { mergeHead } from '../src/client/head/head';
-
-describe('mergeHead', () => {
-    it('takes the last title and applies a titleTemplate', () => {
-        expect(mergeHead([{ title: 'Home' }]).title).toBe('Home');
-        expect(mergeHead([{ title: 'A' }, { title: 'B' }]).title).toBe('B');
-        expect(mergeHead([{ titleTemplate: '%s · toiljs' }, { title: 'About' }]).title).toBe(
-            'About · toiljs',
-        );
-    });
-
-    it('leaves title undefined when nothing sets it', () => {
-        expect(mergeHead([{ meta: [{ name: 'x', content: 'y' }] }]).title).toBeUndefined();
-    });
-
-    it('dedupes meta by name/property, last wins', () => {
-        const resolved = mergeHead([
-            { meta: [{ name: 'description', content: 'old' }] },
-            { meta: [{ name: 'description', content: 'new' }, { property: 'og:title', content: 'T' }] },
-        ]);
-        expect(resolved.meta).toHaveLength(2);
-        expect(resolved.meta.find((m) => m.name === 'description')?.content).toBe('new');
-        expect(resolved.meta.find((m) => m.property === 'og:title')?.content).toBe('T');
-    });
-
-    it('dedupes links by rel+href', () => {
-        const resolved = mergeHead([
-            { link: [{ rel: 'icon', href: '/a.svg' }] },
-            { link: [{ rel: 'icon', href: '/a.svg' }, { rel: 'canonical', href: '/x' }] },
-        ]);
-        expect(resolved.link).toHaveLength(2);
-    });
-});
+import { describe, expect, it } from 'vitest';
+
+import { mergeHead } from '../src/client/head/head';
+
+describe('mergeHead', () => {
+    it('takes the last title and applies a titleTemplate', () => {
+        expect(mergeHead([{ title: 'Home' }]).title).toBe('Home');
+        expect(mergeHead([{ title: 'A' }, { title: 'B' }]).title).toBe('B');
+        expect(mergeHead([{ titleTemplate: '%s · toiljs' }, { title: 'About' }]).title).toBe(
+            'About · toiljs',
+        );
+    });
+
+    it('leaves title undefined when nothing sets it', () => {
+        expect(mergeHead([{ meta: [{ name: 'x', content: 'y' }] }]).title).toBeUndefined();
+    });
+
+    it('dedupes meta by name/property, last wins', () => {
+        const resolved = mergeHead([
+            { meta: [{ name: 'description', content: 'old' }] },
+            {
+                meta: [
+                    { name: 'description', content: 'new' },
+                    { property: 'og:title', content: 'T' },
+                ],
+            },
+        ]);
+        expect(resolved.meta).toHaveLength(2);
+        expect(resolved.meta.find((m) => m.name === 'description')?.content).toBe('new');
+        expect(resolved.meta.find((m) => m.property === 'og:title')?.content).toBe('T');
+    });
+
+    it('dedupes links by rel+href', () => {
+        const resolved = mergeHead([
+            { link: [{ rel: 'icon', href: '/a.svg' }] },
+            {
+                link: [
+                    { rel: 'icon', href: '/a.svg' },
+                    { rel: 'canonical', href: '/x' },
+                ],
+            },
+        ]);
+        expect(resolved.link).toHaveLength(2);
+    });
+});

package/test/metadata.test.ts

@@ -1,41 +1,42 @@
-import { describe, expect, it } from 'vitest';
-
-import { resolveMetadata } from '../src/client/head/metadata';
-
-describe('resolveMetadata', () => {
-    it('expands convenience fields into meta/link tags', () => {
-        const head = resolveMetadata({
-            title: 'About',
-            titleTemplate: '%s · toiljs',
-            description: 'desc',
-            keywords: ['a', 'b'],
-            robots: 'noindex',
-            themeColor: '#000',
-            canonical: 'https://x.test/about',
-            openGraph: { title: 'OG', type: 'website', image: 'https://x.test/og.png' },
-        });
-
-        expect(head.title).toBe('About');
-        expect(head.titleTemplate).toBe('%s · toiljs');
-        const byName = (name: string) => head.meta?.find((m) => m.name === name)?.content;
-        const byProp = (property: string) => head.meta?.find((m) => m.property === property)?.content;
-        expect(byName('description')).toBe('desc');
-        expect(byName('keywords')).toBe('a, b');
-        expect(byName('robots')).toBe('noindex');
-        expect(byName('theme-color')).toBe('#000');
-        expect(byProp('og:title')).toBe('OG');
-        expect(byProp('og:type')).toBe('website');
-        expect(byProp('og:image')).toBe('https://x.test/og.png');
-        expect(head.link?.find((l) => l.rel === 'canonical')?.href).toBe('https://x.test/about');
-    });
-
-    it('passes through raw meta/link and omits unset fields', () => {
-        const head = resolveMetadata({
-            title: 'X',
-            meta: [{ name: 'author', content: 'me' }],
-            link: [{ rel: 'alternate', href: '/rss' }],
-        });
-        expect(head.meta).toEqual([{ name: 'author', content: 'me' }]);
-        expect(head.link).toEqual([{ rel: 'alternate', href: '/rss' }]);
-    });
-});
+import { describe, expect, it } from 'vitest';
+
+import { resolveMetadata } from '../src/client/head/metadata';
+
+describe('resolveMetadata', () => {
+    it('expands convenience fields into meta/link tags', () => {
+        const head = resolveMetadata({
+            title: 'About',
+            titleTemplate: '%s · toiljs',
+            description: 'desc',
+            keywords: ['a', 'b'],
+            robots: 'noindex',
+            themeColor: '#000',
+            canonical: 'https://x.test/about',
+            openGraph: { title: 'OG', type: 'website', image: 'https://x.test/og.png' },
+        });
+
+        expect(head.title).toBe('About');
+        expect(head.titleTemplate).toBe('%s · toiljs');
+        const byName = (name: string) => head.meta?.find((m) => m.name === name)?.content;
+        const byProp = (property: string) =>
+            head.meta?.find((m) => m.property === property)?.content;
+        expect(byName('description')).toBe('desc');
+        expect(byName('keywords')).toBe('a, b');
+        expect(byName('robots')).toBe('noindex');
+        expect(byName('theme-color')).toBe('#000');
+        expect(byProp('og:title')).toBe('OG');
+        expect(byProp('og:type')).toBe('website');
+        expect(byProp('og:image')).toBe('https://x.test/og.png');
+        expect(head.link?.find((l) => l.rel === 'canonical')?.href).toBe('https://x.test/about');
+    });
+
+    it('passes through raw meta/link and omits unset fields', () => {
+        const head = resolveMetadata({
+            title: 'X',
+            meta: [{ name: 'author', content: 'me' }],
+            link: [{ rel: 'alternate', href: '/rss' }],
+        });
+        expect(head.meta).toEqual([{ name: 'author', content: 'me' }]);
+        expect(head.link).toEqual([{ rel: 'alternate', href: '/rss' }]);
+    });
+});