asheeui 0.5.0 → 0.6.1

package/dist/scripts/AsheeThemeScript.js

@@ -1,9 +1,7 @@
 "use client";
-import { jsx as i } from "react/jsx-runtime";
-import c from "virtual:ashee-config";
-import { resolveConfig as m } from "../config/resolve-config.js";
-import { THEME_STORAGE_KEY as d } from "../theme/controller.js";
-const h = {
+import { jsx as c } from "react/jsx-runtime";
+import { THEME_STORAGE_KEY as i } from "../theme/controller.js";
+const d = {
   background: "--ashee-background",
   foreground: "--ashee-foreground",
   primary: "--ashee-primary",
@@ -14,25 +12,25 @@ const h = {
   success: "--ashee-success",
   scrollbarThumb: "--ashee-scrollbar-thumb",
   scrollbarTrack: "--ashee-scrollbar-track"
-}, a = "ashee-theme-vars";
-function y(e) {
-  return Object.entries(e).map(([t, s]) => {
-    const r = Object.entries(s).map(([o, l]) => `  ${h[o]}: ${l};`).join(`
+}, l = "ashee-theme-vars";
+function h(e) {
+  return Object.entries(e).map(([s, t]) => {
+    const r = Object.entries(t).map(([a, n]) => `  ${d[a]}: ${n};`).join(`
 `);
-    return `${t === "light" ? ":root, .theme-light" : `.theme-${t}`} {
+    return `${s === "light" ? ":root, .theme-light" : `.theme-${s}`} {
 ${r}
 }`;
   }).join(`
 
 `);
 }
-function v() {
-  const e = m(c ?? {}), t = Object.keys(e.color ?? {}), s = e.defaultTheme ?? "system", r = d, n = y(e.color), o = `
+function u({ config: e }) {
+  const s = Object.keys(e.color ?? {}), t = e.defaultTheme ?? "system", r = i, o = h(e.color), a = `
     (function() {
       var el = document.documentElement;
       var storageKey = ${JSON.stringify(r)};
-      var defaultTheme = ${JSON.stringify(s)};
-      var themes = ${JSON.stringify(t)};
+      var defaultTheme = ${JSON.stringify(t)};
+      var themes = ${JSON.stringify(s)};
       var systemDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
       
       var stored = null;
@@ -53,25 +51,25 @@ function v() {
       el.style.colorScheme = resolved;
 
       // Synchronously inject style tag before first paint
-      var styleEl = document.getElementById(${JSON.stringify(a)});
+      var styleEl = document.getElementById(${JSON.stringify(l)});
       if (!styleEl) {
         styleEl = document.createElement('style');
-        styleEl.id = ${JSON.stringify(a)};
-        styleEl.textContent = ${JSON.stringify(n)};
+        styleEl.id = ${JSON.stringify(l)};
+        styleEl.textContent = ${JSON.stringify(o)};
         document.head.appendChild(styleEl);
       }
     })();
   `;
-  return /* @__PURE__ */ i(
+  return /* @__PURE__ */ c(
     "script",
     {
       id: "ashee-theme-script",
-      dangerouslySetInnerHTML: { __html: o },
+      dangerouslySetInnerHTML: { __html: a },
       suppressHydrationWarning: !0
     }
   );
 }
 export {
-  v as AsheeThemeScript,
-  a as THEME_VARS_STYLE_ID
+  u as AsheeThemeScript,
+  l as THEME_VARS_STYLE_ID
 };

package/dist/shared/variant.d.ts

@@ -1,4 +1,4 @@
 export type Variant = "solid" | "ghost" | "bordered" | "faded" | "underlined";
-export type Color = "none" | "default" | "primary" | "secondary" | "danger" | "warning" | "success";
+export type Color = "none" | "primary" | "secondary" | "danger" | "warning" | "success";
 export declare function resolveVariantClass(variant: Variant, color: Color): string;
 //# sourceMappingURL=variant.d.ts.map

package/dist/shared/variant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variant.d.ts","sourceRoot":"","sources":["../../src/shared/variant.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,YAAY,CAAC;AAC9E,MAAM,MAAM,KAAK,GACb,MAAM,GACN,SAAS,GACT,SAAS,GACT,WAAW,GACX,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AA+Dd,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAE1E"}
+{"version":3,"file":"variant.d.ts","sourceRoot":"","sources":["../../src/shared/variant.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,YAAY,CAAC;AAC9E,MAAM,MAAM,KAAK,GACb,MAAM,GACN,SAAS,GACT,WAAW,GACX,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AA0Dd,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAE1E"}

package/dist/shared/variant.js

@@ -1,8 +1,7 @@
 "use client";
-import { cn as r } from "@asheeui/utils";
-const s = {
+import { cn as r } from "../utils/cn.js";
+const t = {
   none: "bg-background text-foreground",
-  default: "bg-secondary text-foreground",
   primary: "bg-primary text-secondary",
   secondary: "bg-secondary text-foreground",
   danger: "bg-danger text-secondary",
@@ -10,23 +9,20 @@ const s = {
   success: "bg-success text-secondary"
 }, e = {
   none: "bg-transparent text-foreground hover:bg-foreground/10",
-  default: "bg-transparent text-foreground hover:bg-foreground/10",
   primary: "bg-transparent text-primary hover:bg-primary/10",
   secondary: "bg-transparent text-foreground hover:bg-secondary/10",
   danger: "bg-transparent text-danger hover:bg-danger/10",
   warning: "bg-transparent text-warning hover:bg-warning/10",
   success: "bg-transparent text-success hover:bg-success/10"
-}, b = {
+}, g = {
   none: r(e.primary, "border-2 border-background"),
-  default: r(e.primary, "border-2 border-secondary"),
   primary: r(e.primary, "border-2 border-primary"),
   secondary: r(e.secondary, "border-2 border-border"),
   danger: r(e.danger, "border-2 border-danger"),
   warning: r(e.warning, "border-2 border-warning"),
   success: r(e.success, "border-2 border-success")
-}, g = {
+}, b = {
   none: "bg-secondary/40 text-foreground border-2 border-transparent",
-  default: "bg-secondary/40 text-foreground border-2 border-border",
   primary: "bg-primary/10 text-primary border-2 border-primary/20",
   secondary: "bg-secondary/15 text-foreground border-2 border-secondary/30",
   danger: "bg-danger/10 text-danger border-2 border-danger/20",
@@ -34,23 +30,22 @@ const s = {
   success: "bg-success/10 text-success border-2 border-success/20"
 }, n = "border-b-2 border-t-0 border-x-0 rounded-none bg-transparent shadow-none", c = {
   none: r(n, "border-background text-foreground"),
-  default: r(n, "border-border text-foreground"),
   primary: r(n, "border-primary text-primary"),
   secondary: r(n, "border-secondary text-secondary"),
   danger: r(n, "border-danger text-danger"),
   warning: r(n, "border-warning text-warning"),
   success: r(n, "border-success text-success")
 }, d = {
-  solid: s,
+  solid: t,
   ghost: e,
-  bordered: b,
-  faded: g,
+  bordered: g,
+  faded: b,
   underlined: c
 };
-function i(a, t) {
+function y(a, s) {
   var o;
-  return ((o = d[a]) == null ? void 0 : o[t]) ?? d.bordered.default;
+  return ((o = d[a]) == null ? void 0 : o[s]) ?? d.bordered.secondary;
 }
 export {
-  i as resolveVariantClass
+  y as resolveVariantClass
 };

package/dist/utils/cn.d.ts

@@ -0,0 +1,20 @@
+import { ClassValue } from 'clsx';
+/**
+ * Merge Tailwind CSS class names, resolving conflicts deterministically.
+ *
+ * Combines `clsx` (conditional class composition) with `tailwind-merge`
+ * (later conflicting utilities win), which keeps generated class
+ * strings short and predictable.
+ *
+ * @param inputs - Class values: strings, objects, arrays, or falsy
+ *   values that are ignored.
+ * @returns A single space-separated class string.
+ *
+ * @example
+ * ```ts
+ * cn("px-2 p-4", isActive && "bg-primary", "rounded-md");
+ * // isActive=false -> "p-4 rounded-md"; px-2 conflicts with p-4 and is dropped
+ * ```
+ */
+export declare function cn(...inputs: ClassValue[]): string;
+//# sourceMappingURL=cn.d.ts.map

package/dist/utils/cn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cn.d.ts","sourceRoot":"","sources":["../../src/utils/cn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,MAAM,CAAC;AAG7C;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,EAAE,CAAC,GAAG,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAElD"}

package/dist/utils/cn.js

@@ -0,0 +1,9 @@
+"use client";
+import { clsx as t } from "clsx";
+import { twMerge as e } from "tailwind-merge";
+function c(...r) {
+  return e(t(r));
+}
+export {
+  c as cn
+};

package/dist/utils/index.d.ts

@@ -0,0 +1,11 @@
+/**
+ * AsheeUI shared utilities.
+ *
+ * Client-safe helpers (`cn`, `mergeObject`) plus the `DeepPartial` type,
+ * migrated from the former `@asheeui/utils` package. Node-only helpers
+ * (config discovery) live under `./node`.
+ */
+export { cn } from './cn';
+export { mergeObject } from './merge-object';
+export type { DeepPartial } from './types';
+//# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC"}

package/dist/utils/index.js

@@ -0,0 +1,3 @@
+export * from "./cn.js";
+export * from "./merge-object.js";
+export * from "./resolve-token.js";

package/dist/utils/merge-object.d.ts

@@ -0,0 +1,24 @@
+import { DeepPartial } from './types';
+/**
+ * Deeply merge a partial user config over a set of defaults.
+ *
+ * Nested plain objects are merged recursively; arrays and scalar
+ * values from `userConfig` replace the default outright. Keys whose
+ * user value is `undefined` are skipped, leaving the default intact.
+ * The `defaults` object is not mutated.
+ *
+ * @param defaults - Baseline object providing fallback values.
+ * @param userConfig - Optional partial override object.
+ * @returns A new object with the user overrides applied.
+ *
+ * @example
+ * ```ts
+ * const config = mergeObject(
+ *   { theme: { color: "primary", radius: "md" } },
+ *   { theme: { radius: "lg" } },
+ * );
+ * // -> { theme: { color: "primary", radius: "lg" } }
+ * ```
+ */
+export declare function mergeObject<T extends Record<string, unknown>>(defaults: T, userConfig?: DeepPartial<T>): T;
+//# sourceMappingURL=merge-object.d.ts.map

package/dist/utils/merge-object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-object.d.ts","sourceRoot":"","sources":["../../src/utils/merge-object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAY3C;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,QAAQ,EAAE,CAAC,EACX,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAC1B,CAAC,CAuBH"}

package/dist/utils/merge-object.js

@@ -0,0 +1,17 @@
+"use client";
+function u(e) {
+  return typeof e == "object" && e !== null && !Array.isArray(e);
+}
+function l(e, n) {
+  if (!n)
+    return e;
+  const o = { ...e }, s = e, i = n;
+  for (const t of Object.keys(n)) {
+    const c = i[t], r = s[t];
+    c !== void 0 && (u(r) && u(c) ? o[t] = l(r, c) : o[t] = c);
+  }
+  return o;
+}
+export {
+  l as mergeObject
+};

package/dist/utils/types.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Recursively make every property of `T` optional.
+ *
+ * Arrays and primitives are left untouched; only object properties are
+ * mapped. Useful for typed partial configuration overrides.
+ */
+export type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
+//# sourceMappingURL=types.d.ts.map

package/dist/utils/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACzC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,GACD,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asheeui",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -28,6 +28,7 @@
     "./styles.css": "./dist/index.css"
   },
   "publishConfig": {
+    "access": "public",
     "style": "./dist/index.css"
   },
   "files": [
@@ -38,7 +39,8 @@
   ],
   "dependencies": {
     "@floating-ui/react": "^0.27.20",
-    "@asheeui/utils": "0.3.0"
+    "clsx": "^2.1.1",
+    "tailwind-merge": "^3.6.0"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",
@@ -47,22 +49,28 @@
   },
   "devDependencies": {
     "@floating-ui/react": "^0.27.20",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.1.0",
+    "@testing-library/user-event": "^14.5.2",
     "@types/node": "^26.1.2",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@vitejs/plugin-react": "^4.0.0",
+    "happy-dom": "^15.11.7",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "ts-node": "^10.9.2",
     "tsx": "^4.23.12",
     "typescript": "^5.0.0",
     "vite": "^6.0.0",
-    "vite-plugin-dts": "^4.0.0"
+    "vite-plugin-dts": "^4.0.0",
+    "vitest": "^3.2.7"
   },
   "module": "./dist/index.js",
   "license": "MIT",
   "scripts": {
     "build:registry": "tsx src/scripts/build-registry.ts",
-    "build": "vite build"
+    "build": "vite build",
+    "test": "vitest run"
   }
 }