@taicode/common-web 1.1.15 → 1.1.16

package/output/cache-api/cache-api.d.ts

@@ -1,7 +1,7 @@
 type ApiFunc<P extends unknown[], R = unknown> = (...args: P) => Promise<R>;
 export declare class CacheApi<P extends unknown[], R> {
     private func;
-    private cache;
+    private readonly cache;
     private lastArgs;
     private accessor pendingRequests;
     constructor(func: ApiFunc<P, R>);
@@ -14,6 +14,10 @@ export declare class CacheApi<P extends unknown[], R> {
      * @param force 强制刷新，清除缓存
      */
     refresh(force?: boolean): Promise<R>;
+    /**
+     * 重置缓存和状态
+     */
+    reset(): Promise<void>;
 }
 export {};
 //# sourceMappingURL=cache-api.d.ts.map

package/output/cache-api/cache-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-api.d.ts","sourceRoot":"","sources":["../../source/cache-api/cache-api.ts"],"names":[],"mappings":"AAKA,KAAK,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;AAE3E,qBAAa,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC;IAU9B,OAAO,CAAC,IAAI;IATxB,OAAO,CAAC,KAAK,CAAqB;IAGlC,OAAO,CAAC,QAAQ,CAAe;IAI/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAI;gBAEhB,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAIvC,IACI,OAAO,IAAI,OAAO,CAErB;IAED,IACI,KAAK,IAAI,OAAO,CAEnB;IAED,IACI,KAAK,IAAI,CAAC,GAAG,SAAS,CAEzB;IAGK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAuBlC;;;OAGG;IAEG,OAAO,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,CAAC,CAAC;CAalD"}
+{"version":3,"file":"cache-api.d.ts","sourceRoot":"","sources":["../../source/cache-api/cache-api.ts"],"names":[],"mappings":"AAKA,KAAK,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;AAE3E,qBAAa,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC;IAW9B,OAAO,CAAC,IAAI;IATxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAG3C,OAAO,CAAC,QAAQ,CAAe;IAI/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAI;gBAEhB,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAIvC,IACI,OAAO,IAAI,OAAO,CAErB;IAED,IACI,KAAK,IAAI,OAAO,CAEnB;IAED,IACI,KAAK,IAAI,CAAC,GAAG,SAAS,CAEzB;IAGK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAuBlC;;;OAGG;IAEG,OAAO,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IAcjD;;OAEG;IAEG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}

package/output/cache-api/cache-api.js

@@ -43,12 +43,12 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-import { action, computed, observable } from 'mobx';
+import { action, computed, observable, when } from 'mobx';
 import { catchIt } from '@taicode/common-base';
 import { SideCache } from '../side-cache';
 let CacheApi = (() => {
     var _a, _CacheApi_pendingRequests_accessor_storage;
-    var _b, _c;
+    var _b, _c, _d;
     let _instanceExtraInitializers = [];
     let _pendingRequests_decorators;
     let _pendingRequests_initializers = [];
@@ -58,6 +58,7 @@ let CacheApi = (() => {
     let _get_value_decorators;
     let _call_decorators;
     let _refresh_decorators;
+    let _reset_decorators;
     return _a = class CacheApi {
             // 记录当前正在进行的请求数量
             get pendingRequests() { return __classPrivateFieldGet(this, _CacheApi_pendingRequests_accessor_storage, "f"); }
@@ -111,6 +112,14 @@ let CacheApi = (() => {
                 // 重新调用最近一次的参数
                 return await this.call(...this.lastArgs);
             }
+            /**
+             * 重置缓存和状态
+             */
+            async reset() {
+                await when(() => this.pendingRequests === 0);
+                this.lastArgs = undefined;
+                this.cache.clear();
+            }
         },
         _CacheApi_pendingRequests_accessor_storage = new WeakMap(),
         (() => {
@@ -121,12 +130,14 @@ let CacheApi = (() => {
             _get_value_decorators = [computed];
             _call_decorators = [(_b = action).bound.bind(_b)];
             _refresh_decorators = [(_c = action).bound.bind(_c)];
+            _reset_decorators = [(_d = action).bound.bind(_d)];
             __esDecorate(_a, null, _pendingRequests_decorators, { kind: "accessor", name: "pendingRequests", static: false, private: false, access: { has: obj => "pendingRequests" in obj, get: obj => obj.pendingRequests, set: (obj, value) => { obj.pendingRequests = value; } }, metadata: _metadata }, _pendingRequests_initializers, _pendingRequests_extraInitializers);
             __esDecorate(_a, null, _get_loading_decorators, { kind: "getter", name: "loading", static: false, private: false, access: { has: obj => "loading" in obj, get: obj => obj.loading }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _get_empty_decorators, { kind: "getter", name: "empty", static: false, private: false, access: { has: obj => "empty" in obj, get: obj => obj.empty }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _get_value_decorators, { kind: "getter", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _call_decorators, { kind: "method", name: "call", static: false, private: false, access: { has: obj => "call" in obj, get: obj => obj.call }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _refresh_decorators, { kind: "method", name: "refresh", static: false, private: false, access: { has: obj => "refresh" in obj, get: obj => obj.refresh }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _reset_decorators, { kind: "method", name: "reset", static: false, private: false, access: { has: obj => "reset" in obj, get: obj => obj.reset }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;

package/output/cache-api/cache-api.test.js

@@ -446,4 +446,165 @@ describe('CacheApi', () => {
             expect(noParamMockFunc).toHaveBeenCalledTimes(2);
         });
     });
+    describe('reset 方法', () => {
+        it('应该清除所有缓存数据', async () => {
+            mockApiFunc.mockResolvedValue('test-result');
+            // 先调用 API 产生缓存
+            await cacheApi.call('param1', 123);
+            expect(cacheApi.value).toBe('test-result');
+            expect(cacheApi.empty).toBe(false);
+            // 重置
+            await cacheApi.reset();
+            // 验证缓存被清除
+            expect(cacheApi.value).toBeUndefined();
+            expect(cacheApi.empty).toBe(true);
+        });
+        it('应该清除 lastArgs 参数记录', async () => {
+            mockApiFunc.mockResolvedValue('test-result');
+            // 先调用 API
+            await cacheApi.call('param1', 123);
+            // 重置
+            await cacheApi.reset();
+            // 尝试刷新应该抛出错误，因为 lastArgs 已被清除
+            await expect(cacheApi.refresh()).rejects.toThrow('没有可用的参数来刷新数据，请先调用 call 方法');
+        });
+        it('应该在没有任何调用时也能正常重置', async () => {
+            // 直接重置，不应该抛出错误
+            await expect(cacheApi.reset()).resolves.toBeUndefined();
+            // 验证状态
+            expect(cacheApi.value).toBeUndefined();
+            expect(cacheApi.empty).toBe(true);
+            expect(cacheApi.loading).toBe(false);
+        });
+        it('应该等待所有进行中的请求完成后再重置', async () => {
+            let resolveFn;
+            const promise = new Promise((resolve) => {
+                resolveFn = resolve;
+            });
+            mockApiFunc.mockReturnValue(promise);
+            // 启动一个异步请求
+            const callPromise = cacheApi.call('test', 1);
+            expect(cacheApi.loading).toBe(true);
+            // 开始重置（应该等待请求完成）
+            const resetPromise = cacheApi.reset();
+            // 此时请求还在进行中，缓存应该还有值
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // 完成请求
+            resolveFn('result');
+            await callPromise;
+            // 等待重置完成
+            await resetPromise;
+            // 验证重置后的状态
+            expect(cacheApi.value).toBeUndefined();
+            expect(cacheApi.empty).toBe(true);
+            expect(cacheApi.loading).toBe(false);
+        });
+        it('应该等待多个并发请求都完成后再重置', async () => {
+            const resolvers = [];
+            mockApiFunc.mockImplementation((param) => {
+                return new Promise((resolve) => {
+                    resolvers.push((value) => resolve(`${param}-${value}`));
+                });
+            });
+            // 启动三个并发请求
+            const promise1 = cacheApi.call('req1', 1);
+            const promise2 = cacheApi.call('req2', 2);
+            const promise3 = cacheApi.call('req3', 3);
+            expect(cacheApi.loading).toBe(true);
+            // 开始重置
+            const resetPromise = cacheApi.reset();
+            // 等待一下
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // 依次完成所有请求
+            resolvers[0]('result1');
+            await promise1;
+            resolvers[1]('result2');
+            await promise2;
+            resolvers[2]('result3');
+            await promise3;
+            // 等待重置完成
+            await resetPromise;
+            // 验证重置后的状态
+            expect(cacheApi.value).toBeUndefined();
+            expect(cacheApi.empty).toBe(true);
+            expect(cacheApi.loading).toBe(false);
+        });
+        it('应该在请求失败后也能正常重置', async () => {
+            const error = new Error('API Error');
+            mockApiFunc.mockRejectedValue(error);
+            // 调用失败的请求
+            try {
+                await cacheApi.call('test', 1);
+            }
+            catch (e) {
+                // 忽略错误
+            }
+            // 重置应该成功
+            await expect(cacheApi.reset()).resolves.toBeUndefined();
+            // 验证状态
+            expect(cacheApi.value).toBeUndefined();
+            expect(cacheApi.empty).toBe(true);
+            expect(cacheApi.loading).toBe(false);
+        });
+        it('重置后应该能够正常调用新的请求', async () => {
+            mockApiFunc.mockResolvedValueOnce('first-result');
+            mockApiFunc.mockResolvedValueOnce('second-result');
+            // 第一次调用
+            await cacheApi.call('param1', 123);
+            expect(cacheApi.value).toBe('first-result');
+            // 重置
+            await cacheApi.reset();
+            expect(cacheApi.value).toBeUndefined();
+            // 重置后再次调用
+            await cacheApi.call('param2', 456);
+            expect(cacheApi.value).toBe('second-result');
+            expect(cacheApi.empty).toBe(false);
+        });
+        it('重置后 refresh 应该需要先调用 call', async () => {
+            mockApiFunc.mockResolvedValue('test-result');
+            // 先调用并刷新
+            await cacheApi.call('test', 1);
+            await cacheApi.refresh();
+            // 重置
+            await cacheApi.reset();
+            // 重置后 refresh 应该抛出错误
+            await expect(cacheApi.refresh()).rejects.toThrow('没有可用的参数来刷新数据，请先调用 call 方法');
+        });
+        it('应该正确处理重置期间的 loading 状态', async () => {
+            let resolveFn;
+            const promise = new Promise((resolve) => {
+                resolveFn = resolve;
+            });
+            mockApiFunc.mockReturnValue(promise);
+            // 启动请求
+            const callPromise = cacheApi.call('test', 1);
+            expect(cacheApi.loading).toBe(true);
+            // 启动重置（会等待请求完成）
+            const resetPromise = cacheApi.reset();
+            // loading 应该还是 true
+            expect(cacheApi.loading).toBe(true);
+            // 完成请求
+            resolveFn('result');
+            await callPromise;
+            // loading 变为 false
+            expect(cacheApi.loading).toBe(false);
+            // 等待重置完成
+            await resetPromise;
+            // 重置后 loading 应该仍然是 false
+            expect(cacheApi.loading).toBe(false);
+        });
+        it('应该清除所有缓存的 key', async () => {
+            mockApiFunc.mockResolvedValue('result');
+            // 调用多次产生多个缓存
+            await cacheApi.call('param1', 1);
+            await cacheApi.call('param2', 2);
+            await cacheApi.call('param3', 3);
+            expect(cacheApi.empty).toBe(false);
+            // 重置
+            await cacheApi.reset();
+            // 验证所有缓存都被清除
+            expect(cacheApi.empty).toBe(true);
+            expect(cacheApi.value).toBeUndefined();
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taicode/common-web",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "author": "Alain",
   "license": "ISC",
   "description": "",

package/output/catalyst/alert.jsx

@@ -1,55 +0,0 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import * as Headless from '@headlessui/react';
-import clsx from 'clsx';
-import { Text } from './text';
-const sizes = {
-    xs: 'sm:max-w-xs',
-    sm: 'sm:max-w-sm',
-    md: 'sm:max-w-md',
-    lg: 'sm:max-w-lg',
-    xl: 'sm:max-w-xl',
-    '2xl': 'sm:max-w-2xl',
-    '3xl': 'sm:max-w-3xl',
-    '4xl': 'sm:max-w-4xl',
-    '5xl': 'sm:max-w-5xl',
-};
-export function Alert(_a) {
-    var { size = 'md', className, children } = _a, props = __rest(_a, ["size", "className", "children"]);
-    return (<Headless.Dialog {...props}>
-      <Headless.DialogBackdrop transition className="fixed inset-0 flex w-screen justify-center overflow-y-auto bg-zinc-950/15 px-2 py-2 transition duration-100 focus:outline-0 data-closed:opacity-0 data-enter:ease-out data-leave:ease-in sm:px-6 sm:py-8 lg:px-8 lg:py-16 dark:bg-zinc-950/50"/>
-
-      <div className="fixed inset-0 w-screen overflow-y-auto pt-6 sm:pt-0">
-        <div className="grid min-h-full grid-rows-[1fr_auto_1fr] justify-items-center p-8 sm:grid-rows-[1fr_auto_3fr] sm:p-4">
-          <Headless.DialogPanel transition className={clsx(className, sizes[size], 'row-start-2 w-full rounded-2xl bg-white p-8 shadow-lg ring-1 ring-zinc-950/10 sm:rounded-2xl sm:p-6 dark:bg-zinc-900 dark:ring-white/10 forced-colors:outline', 'transition duration-100 will-change-transform data-closed:opacity-0 data-enter:ease-out data-closed:data-enter:scale-95 data-leave:ease-in')}>
-            {children}
-          </Headless.DialogPanel>
-        </div>
-      </div>
-    </Headless.Dialog>);
-}
-export function AlertTitle(_a) {
-    var { className } = _a, props = __rest(_a, ["className"]);
-    return (<Headless.DialogTitle {...props} className={clsx(className, 'text-center text-base/6 font-semibold text-balance text-zinc-950 sm:text-left sm:text-sm/6 sm:text-wrap dark:text-white')}/>);
-}
-export function AlertDescription(_a) {
-    var { className } = _a, props = __rest(_a, ["className"]);
-    return (<Headless.Description as={Text} {...props} className={clsx(className, 'mt-2 text-center text-pretty sm:text-left')}/>);
-}
-export function AlertBody(_a) {
-    var { className } = _a, props = __rest(_a, ["className"]);
-    return <div {...props} className={clsx(className, 'mt-4')}/>;
-}
-export function AlertActions(_a) {
-    var { className } = _a, props = __rest(_a, ["className"]);
-    return (<div {...props} className={clsx(className, 'mt-6 flex flex-col-reverse items-center justify-end gap-3 *:w-full sm:mt-4 sm:flex-row sm:*:w-auto')}/>);
-}

package/output/catalyst/auth-layout.jsx

@@ -1,7 +0,0 @@
-export function AuthLayout({ children }) {
-    return (<main className="flex min-h-dvh flex-col p-2">
-      <div className="flex grow items-center justify-center p-6 lg:rounded-lg lg:bg-white lg:p-10 lg:shadow-xs lg:ring-1 lg:ring-zinc-950/5 dark:lg:bg-zinc-900 dark:lg:ring-white/10">
-        {children}
-      </div>
-    </main>);
-}

package/output/catalyst/avatar.jsx

@@ -1,45 +0,0 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import * as Headless from '@headlessui/react';
-import clsx from 'clsx';
-import React, { forwardRef } from 'react';
-import { TouchTarget } from './button';
-import { Link } from './link';
-export function Avatar(_a) {
-    var { src = null, square = false, initials, alt = '', className } = _a, props = __rest(_a, ["src", "square", "initials", "alt", "className"]);
-    return (<span data-slot="avatar" {...props} className={clsx(className, 
-        // Basic layout
-        'inline-grid shrink-0 align-middle [--avatar-radius:20%] *:col-start-1 *:row-start-1', 'outline -outline-offset-1 outline-black/10 dark:outline-white/10', 
-        // Border radius
-        square ? 'rounded-(--avatar-radius) *:rounded-(--avatar-radius)' : 'rounded-full *:rounded-full')}>
-      {initials && (<svg className="size-full fill-current p-[5%] text-[48px] font-medium uppercase select-none" viewBox="0 0 100 100" aria-hidden={alt ? undefined : 'true'}>
-          {alt && <title>{alt}</title>}
-          <text x="50%" y="50%" alignmentBaseline="middle" dominantBaseline="middle" textAnchor="middle" dy=".125em">
-            {initials}
-          </text>
-        </svg>)}
-      {src && <img className="size-full" src={src} alt={alt}/>}
-    </span>);
-}
-export const AvatarButton = forwardRef(function AvatarButton(_a, ref) {
-    var { src, square = false, initials, alt, className } = _a, props = __rest(_a, ["src", "square", "initials", "alt", "className"]);
-    let classes = clsx(className, square ? 'rounded-[20%]' : 'rounded-full', 'relative inline-grid focus:not-data-focus:outline-hidden data-focus:outline-2 data-focus:outline-offset-2 data-focus:outline-blue-500');
-    return 'href' in props ? (<Link {...props} className={classes} ref={ref}>
-      <TouchTarget>
-        <Avatar src={src} square={square} initials={initials} alt={alt}/>
-      </TouchTarget>
-    </Link>) : (<Headless.Button {...props} className={classes} ref={ref}>
-      <TouchTarget>
-        <Avatar src={src} square={square} initials={initials} alt={alt}/>
-      </TouchTarget>
-    </Headless.Button>);
-});

package/output/catalyst/badge.jsx

@@ -1,53 +0,0 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import * as Headless from '@headlessui/react';
-import clsx from 'clsx';
-import React, { forwardRef } from 'react';
-import { TouchTarget } from './button';
-import { Link } from './link';
-const colors = {
-    red: 'bg-red-500/15 text-red-700 group-data-hover:bg-red-500/25 dark:bg-red-500/10 dark:text-red-400 dark:group-data-hover:bg-red-500/20',
-    orange: 'bg-orange-500/15 text-orange-700 group-data-hover:bg-orange-500/25 dark:bg-orange-500/10 dark:text-orange-400 dark:group-data-hover:bg-orange-500/20',
-    amber: 'bg-amber-400/20 text-amber-700 group-data-hover:bg-amber-400/30 dark:bg-amber-400/10 dark:text-amber-400 dark:group-data-hover:bg-amber-400/15',
-    yellow: 'bg-yellow-400/20 text-yellow-700 group-data-hover:bg-yellow-400/30 dark:bg-yellow-400/10 dark:text-yellow-300 dark:group-data-hover:bg-yellow-400/15',
-    lime: 'bg-lime-400/20 text-lime-700 group-data-hover:bg-lime-400/30 dark:bg-lime-400/10 dark:text-lime-300 dark:group-data-hover:bg-lime-400/15',
-    green: 'bg-green-500/15 text-green-700 group-data-hover:bg-green-500/25 dark:bg-green-500/10 dark:text-green-400 dark:group-data-hover:bg-green-500/20',
-    emerald: 'bg-emerald-500/15 text-emerald-700 group-data-hover:bg-emerald-500/25 dark:bg-emerald-500/10 dark:text-emerald-400 dark:group-data-hover:bg-emerald-500/20',
-    teal: 'bg-teal-500/15 text-teal-700 group-data-hover:bg-teal-500/25 dark:bg-teal-500/10 dark:text-teal-300 dark:group-data-hover:bg-teal-500/20',
-    cyan: 'bg-cyan-400/20 text-cyan-700 group-data-hover:bg-cyan-400/30 dark:bg-cyan-400/10 dark:text-cyan-300 dark:group-data-hover:bg-cyan-400/15',
-    sky: 'bg-sky-500/15 text-sky-700 group-data-hover:bg-sky-500/25 dark:bg-sky-500/10 dark:text-sky-300 dark:group-data-hover:bg-sky-500/20',
-    blue: 'bg-blue-500/15 text-blue-700 group-data-hover:bg-blue-500/25 dark:text-blue-400 dark:group-data-hover:bg-blue-500/25',
-    indigo: 'bg-indigo-500/15 text-indigo-700 group-data-hover:bg-indigo-500/25 dark:text-indigo-400 dark:group-data-hover:bg-indigo-500/20',
-    violet: 'bg-violet-500/15 text-violet-700 group-data-hover:bg-violet-500/25 dark:text-violet-400 dark:group-data-hover:bg-violet-500/20',
-    purple: 'bg-purple-500/15 text-purple-700 group-data-hover:bg-purple-500/25 dark:text-purple-400 dark:group-data-hover:bg-purple-500/20',
-    fuchsia: 'bg-fuchsia-400/15 text-fuchsia-700 group-data-hover:bg-fuchsia-400/25 dark:bg-fuchsia-400/10 dark:text-fuchsia-400 dark:group-data-hover:bg-fuchsia-400/20',
-    pink: 'bg-pink-400/15 text-pink-700 group-data-hover:bg-pink-400/25 dark:bg-pink-400/10 dark:text-pink-400 dark:group-data-hover:bg-pink-400/20',
-    rose: 'bg-rose-400/15 text-rose-700 group-data-hover:bg-rose-400/25 dark:bg-rose-400/10 dark:text-rose-400 dark:group-data-hover:bg-rose-400/20',
-    zinc: 'bg-zinc-600/10 text-zinc-700 group-data-hover:bg-zinc-600/20 dark:bg-white/5 dark:text-zinc-400 dark:group-data-hover:bg-white/10',
-};
-export function Badge(_a) {
-    var { color = 'zinc', className } = _a, props = __rest(_a, ["color", "className"]);
-    return (<span {...props} className={clsx(className, 'inline-flex items-center gap-x-1.5 rounded-md px-1.5 py-0.5 text-sm/5 font-medium sm:text-xs/5 forced-colors:outline', colors[color])}/>);
-}
-export const BadgeButton = forwardRef(function BadgeButton(_a, ref) {
-    var { color = 'zinc', className, children } = _a, props = __rest(_a, ["color", "className", "children"]);
-    let classes = clsx(className, 'group relative inline-flex rounded-md focus:not-data-focus:outline-hidden data-focus:outline-2 data-focus:outline-offset-2 data-focus:outline-blue-500');
-    return 'href' in props ? (<Link {...props} className={classes} ref={ref}>
-      <TouchTarget>
-        <Badge color={color}>{children}</Badge>
-      </TouchTarget>
-    </Link>) : (<Headless.Button {...props} className={classes} ref={ref}>
-      <TouchTarget>
-        <Badge color={color}>{children}</Badge>
-      </TouchTarget>
-    </Headless.Button>);
-});

package/output/catalyst/button.jsx

@@ -1,187 +0,0 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import * as Headless from '@headlessui/react';
-import clsx from 'clsx';
-import React, { forwardRef } from 'react';
-import { Link } from './link';
-const styles = {
-    base: [
-        // Base
-        'relative isolate inline-flex items-baseline justify-center gap-x-2 rounded-lg border text-base/6 font-semibold',
-        // Sizing
-        'px-[calc(--spacing(3.5)-1px)] py-[calc(--spacing(2.5)-1px)] sm:px-[calc(--spacing(3)-1px)] sm:py-[calc(--spacing(1.5)-1px)] sm:text-sm/6',
-        // Focus
-        'focus:not-data-focus:outline-hidden data-focus:outline-2 data-focus:outline-offset-2 data-focus:outline-blue-500',
-        // Disabled
-        'data-disabled:opacity-50',
-        // Icon
-        '*:data-[slot=icon]:-mx-0.5 *:data-[slot=icon]:my-0.5 *:data-[slot=icon]:size-5 *:data-[slot=icon]:shrink-0 *:data-[slot=icon]:self-center *:data-[slot=icon]:text-(--btn-icon) sm:*:data-[slot=icon]:my-1 sm:*:data-[slot=icon]:size-4 forced-colors:[--btn-icon:ButtonText] forced-colors:data-hover:[--btn-icon:ButtonText]',
-    ],
-    solid: [
-        // Optical border, implemented as the button background to avoid corner artifacts
-        'border-transparent bg-(--btn-border)',
-        // Dark mode: border is rendered on `after` so background is set to button background
-        'dark:bg-(--btn-bg)',
-        // Button background, implemented as foreground layer to stack on top of pseudo-border layer
-        'before:absolute before:inset-0 before:-z-10 before:rounded-[calc(var(--radius-lg)-1px)] before:bg-(--btn-bg)',
-        // Drop shadow, applied to the inset `before` layer so it blends with the border
-        'before:shadow-sm',
-        // Background color is moved to control and shadow is removed in dark mode so hide `before` pseudo
-        'dark:before:hidden',
-        // Dark mode: Subtle white outline is applied using a border
-        'dark:border-white/5',
-        // Shim/overlay, inset to match button foreground and used for hover state + highlight shadow
-        'after:absolute after:inset-0 after:-z-10 after:rounded-[calc(var(--radius-lg)-1px)]',
-        // Inner highlight shadow
-        'after:shadow-[inset_0_1px_--theme(--color-white/15%)]',
-        // White overlay on hover
-        'data-active:after:bg-(--btn-hover-overlay) data-hover:after:bg-(--btn-hover-overlay)',
-        // Dark mode: `after` layer expands to cover entire button
-        'dark:after:-inset-px dark:after:rounded-lg',
-        // Disabled
-        'data-disabled:before:shadow-none data-disabled:after:shadow-none',
-    ],
-    outline: [
-        // Base
-        'border-zinc-950/10 text-zinc-950 data-active:bg-zinc-950/2.5 data-hover:bg-zinc-950/2.5',
-        // Dark mode
-        'dark:border-white/15 dark:text-white dark:[--btn-bg:transparent] dark:data-active:bg-white/5 dark:data-hover:bg-white/5',
-        // Icon
-        '[--btn-icon:var(--color-zinc-500)] data-active:[--btn-icon:var(--color-zinc-700)] data-hover:[--btn-icon:var(--color-zinc-700)] dark:data-active:[--btn-icon:var(--color-zinc-400)] dark:data-hover:[--btn-icon:var(--color-zinc-400)]',
-    ],
-    plain: [
-        // Base
-        'border-transparent text-zinc-950 data-active:bg-zinc-950/5 data-hover:bg-zinc-950/5',
-        // Dark mode
-        'dark:text-white dark:data-active:bg-white/10 dark:data-hover:bg-white/10',
-        // Icon
-        '[--btn-icon:var(--color-zinc-500)] data-active:[--btn-icon:var(--color-zinc-700)] data-hover:[--btn-icon:var(--color-zinc-700)] dark:[--btn-icon:var(--color-zinc-500)] dark:data-active:[--btn-icon:var(--color-zinc-400)] dark:data-hover:[--btn-icon:var(--color-zinc-400)]',
-    ],
-    colors: {
-        'dark/zinc': [
-            'text-white [--btn-bg:var(--color-zinc-900)] [--btn-border:var(--color-zinc-950)]/90 [--btn-hover-overlay:var(--color-white)]/10',
-            'dark:text-white dark:[--btn-bg:var(--color-zinc-600)] dark:[--btn-hover-overlay:var(--color-white)]/5',
-            '[--btn-icon:var(--color-zinc-400)] data-active:[--btn-icon:var(--color-zinc-300)] data-hover:[--btn-icon:var(--color-zinc-300)]',
-        ],
-        light: [
-            'text-zinc-950 [--btn-bg:white] [--btn-border:var(--color-zinc-950)]/10 [--btn-hover-overlay:var(--color-zinc-950)]/2.5 data-active:[--btn-border:var(--color-zinc-950)]/15 data-hover:[--btn-border:var(--color-zinc-950)]/15',
-            'dark:text-white dark:[--btn-hover-overlay:var(--color-white)]/5 dark:[--btn-bg:var(--color-zinc-800)]',
-            '[--btn-icon:var(--color-zinc-500)] data-active:[--btn-icon:var(--color-zinc-700)] data-hover:[--btn-icon:var(--color-zinc-700)] dark:[--btn-icon:var(--color-zinc-500)] dark:data-active:[--btn-icon:var(--color-zinc-400)] dark:data-hover:[--btn-icon:var(--color-zinc-400)]',
-        ],
-        'dark/white': [
-            'text-white [--btn-bg:var(--color-zinc-900)] [--btn-border:var(--color-zinc-950)]/90 [--btn-hover-overlay:var(--color-white)]/10',
-            'dark:text-zinc-950 dark:[--btn-bg:white] dark:[--btn-hover-overlay:var(--color-zinc-950)]/5',
-            '[--btn-icon:var(--color-zinc-400)] data-active:[--btn-icon:var(--color-zinc-300)] data-hover:[--btn-icon:var(--color-zinc-300)] dark:[--btn-icon:var(--color-zinc-500)] dark:data-active:[--btn-icon:var(--color-zinc-400)] dark:data-hover:[--btn-icon:var(--color-zinc-400)]',
-        ],
-        dark: [
-            'text-white [--btn-bg:var(--color-zinc-900)] [--btn-border:var(--color-zinc-950)]/90 [--btn-hover-overlay:var(--color-white)]/10',
-            'dark:[--btn-hover-overlay:var(--color-white)]/5 dark:[--btn-bg:var(--color-zinc-800)]',
-            '[--btn-icon:var(--color-zinc-400)] data-active:[--btn-icon:var(--color-zinc-300)] data-hover:[--btn-icon:var(--color-zinc-300)]',
-        ],
-        white: [
-            'text-zinc-950 [--btn-bg:white] [--btn-border:var(--color-zinc-950)]/10 [--btn-hover-overlay:var(--color-zinc-950)]/2.5 data-active:[--btn-border:var(--color-zinc-950)]/15 data-hover:[--btn-border:var(--color-zinc-950)]/15',
-            'dark:[--btn-hover-overlay:var(--color-zinc-950)]/5',
-            '[--btn-icon:var(--color-zinc-400)] data-active:[--btn-icon:var(--color-zinc-500)] data-hover:[--btn-icon:var(--color-zinc-500)]',
-        ],
-        zinc: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-zinc-600)] [--btn-border:var(--color-zinc-700)]/90',
-            'dark:[--btn-hover-overlay:var(--color-white)]/5',
-            '[--btn-icon:var(--color-zinc-400)] data-active:[--btn-icon:var(--color-zinc-300)] data-hover:[--btn-icon:var(--color-zinc-300)]',
-        ],
-        indigo: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-indigo-500)] [--btn-border:var(--color-indigo-600)]/90',
-            '[--btn-icon:var(--color-indigo-300)] data-active:[--btn-icon:var(--color-indigo-200)] data-hover:[--btn-icon:var(--color-indigo-200)]',
-        ],
-        cyan: [
-            'text-cyan-950 [--btn-bg:var(--color-cyan-300)] [--btn-border:var(--color-cyan-400)]/80 [--btn-hover-overlay:var(--color-white)]/25',
-            '[--btn-icon:var(--color-cyan-500)]',
-        ],
-        red: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-red-600)] [--btn-border:var(--color-red-700)]/90',
-            '[--btn-icon:var(--color-red-300)] data-active:[--btn-icon:var(--color-red-200)] data-hover:[--btn-icon:var(--color-red-200)]',
-        ],
-        orange: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-orange-500)] [--btn-border:var(--color-orange-600)]/90',
-            '[--btn-icon:var(--color-orange-300)] data-active:[--btn-icon:var(--color-orange-200)] data-hover:[--btn-icon:var(--color-orange-200)]',
-        ],
-        amber: [
-            'text-amber-950 [--btn-hover-overlay:var(--color-white)]/25 [--btn-bg:var(--color-amber-400)] [--btn-border:var(--color-amber-500)]/80',
-            '[--btn-icon:var(--color-amber-600)]',
-        ],
-        yellow: [
-            'text-yellow-950 [--btn-hover-overlay:var(--color-white)]/25 [--btn-bg:var(--color-yellow-300)] [--btn-border:var(--color-yellow-400)]/80',
-            '[--btn-icon:var(--color-yellow-600)] data-active:[--btn-icon:var(--color-yellow-700)] data-hover:[--btn-icon:var(--color-yellow-700)]',
-        ],
-        lime: [
-            'text-lime-950 [--btn-hover-overlay:var(--color-white)]/25 [--btn-bg:var(--color-lime-300)] [--btn-border:var(--color-lime-400)]/80',
-            '[--btn-icon:var(--color-lime-600)] data-active:[--btn-icon:var(--color-lime-700)] data-hover:[--btn-icon:var(--color-lime-700)]',
-        ],
-        green: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-green-600)] [--btn-border:var(--color-green-700)]/90',
-            '[--btn-icon:var(--color-white)]/60 data-active:[--btn-icon:var(--color-white)]/80 data-hover:[--btn-icon:var(--color-white)]/80',
-        ],
-        emerald: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-emerald-600)] [--btn-border:var(--color-emerald-700)]/90',
-            '[--btn-icon:var(--color-white)]/60 data-active:[--btn-icon:var(--color-white)]/80 data-hover:[--btn-icon:var(--color-white)]/80',
-        ],
-        teal: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-teal-600)] [--btn-border:var(--color-teal-700)]/90',
-            '[--btn-icon:var(--color-white)]/60 data-active:[--btn-icon:var(--color-white)]/80 data-hover:[--btn-icon:var(--color-white)]/80',
-        ],
-        sky: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-sky-500)] [--btn-border:var(--color-sky-600)]/80',
-            '[--btn-icon:var(--color-white)]/60 data-active:[--btn-icon:var(--color-white)]/80 data-hover:[--btn-icon:var(--color-white)]/80',
-        ],
-        blue: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-blue-600)] [--btn-border:var(--color-blue-700)]/90',
-            '[--btn-icon:var(--color-blue-400)] data-active:[--btn-icon:var(--color-blue-300)] data-hover:[--btn-icon:var(--color-blue-300)]',
-        ],
-        violet: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-violet-500)] [--btn-border:var(--color-violet-600)]/90',
-            '[--btn-icon:var(--color-violet-300)] data-active:[--btn-icon:var(--color-violet-200)] data-hover:[--btn-icon:var(--color-violet-200)]',
-        ],
-        purple: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-purple-500)] [--btn-border:var(--color-purple-600)]/90',
-            '[--btn-icon:var(--color-purple-300)] data-active:[--btn-icon:var(--color-purple-200)] data-hover:[--btn-icon:var(--color-purple-200)]',
-        ],
-        fuchsia: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-fuchsia-500)] [--btn-border:var(--color-fuchsia-600)]/90',
-            '[--btn-icon:var(--color-fuchsia-300)] data-active:[--btn-icon:var(--color-fuchsia-200)] data-hover:[--btn-icon:var(--color-fuchsia-200)]',
-        ],
-        pink: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-pink-500)] [--btn-border:var(--color-pink-600)]/90',
-            '[--btn-icon:var(--color-pink-300)] data-active:[--btn-icon:var(--color-pink-200)] data-hover:[--btn-icon:var(--color-pink-200)]',
-        ],
-        rose: [
-            'text-white [--btn-hover-overlay:var(--color-white)]/10 [--btn-bg:var(--color-rose-500)] [--btn-border:var(--color-rose-600)]/90',
-            '[--btn-icon:var(--color-rose-300)] data-active:[--btn-icon:var(--color-rose-200)] data-hover:[--btn-icon:var(--color-rose-200)]',
-        ],
-    },
-};
-export const Button = forwardRef(function Button(_a, ref) {
-    var { color, outline, plain, className, children } = _a, props = __rest(_a, ["color", "outline", "plain", "className", "children"]);
-    let classes = clsx(className, styles.base, outline ? styles.outline : plain ? styles.plain : clsx(styles.solid, styles.colors[color !== null && color !== void 0 ? color : 'dark/zinc']));
-    return 'href' in props ? (<Link {...props} className={classes} ref={ref}>
-      <TouchTarget>{children}</TouchTarget>
-    </Link>) : (<Headless.Button {...props} className={clsx(classes, 'cursor-default')} ref={ref}>
-      <TouchTarget>{children}</TouchTarget>
-    </Headless.Button>);
-});
-/**
- * Expand the hit area to at least 44×44px on touch devices
- */
-export function TouchTarget({ children }) {
-    return (<>
-      <span className="absolute top-1/2 left-1/2 size-[max(100%,2.75rem)] -translate-x-1/2 -translate-y-1/2 pointer-fine:hidden" aria-hidden="true"/>
-      {children}
-    </>);
-}