@adea-ai/ui 0.72.4 → 0.73.0

package/dist/components/ui/entity-icon/entity-icon.d.ts

@@ -26,7 +26,7 @@ import { type VariantProps } from '#lib/variants';
  * hold a face.
  */
 export declare const entityIconVariants: (props?: ({
-    shape?: "rounded" | "circle" | "square" | null | undefined;
+    shape?: "circle" | "square" | "rounded" | null | undefined;
     size?: "xs" | "sm" | "md" | "lg" | "xl" | null | undefined;
     tone?: "success" | "warning" | "info" | "neutral" | "primary" | "bare" | "danger" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/components/ui/sheet/sheet.d.ts

@@ -14,7 +14,7 @@ import { type VariantProps } from '#lib/variants';
  * follows from the side, so a caller never pairs them by hand.
  */
 declare const sheetVariants: (props?: ({
-    side?: "bottom" | "end" | "start" | "top" | null | undefined;
+    side?: "end" | "start" | "bottom" | "top" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 export type SheetContentProps = ComponentProps<typeof KobalteDialogContent> & VariantProps<typeof sheetVariants> & {
     closeButton?: JSX.Element | false;

package/dist/lib/utils.d.ts

@@ -1,18 +1,4 @@
-import { type ClassValue } from 'clsx';
-/**
- * `twMerge` needs to be told about the utilities this design system adds.
- *
- * Every token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …)
- * is an unknown name to a default `tailwind-merge` instance. Left
- * unregistered, `cn('h-control-md', 'h-control-sm')` keeps both classes and
- * the winner is decided by stylesheet order rather than by the caller — a bug
- * that only shows up as a control that ignores its `size` prop, long after the
- * line that caused it was written.
- *
- * Registering the families here is what makes "the last class wins" true for
- * the whole system, including for consumers overriding a component's default.
- */
-export declare const twMergeConfig: (...classLists: import("tailwind-merge").ClassNameValue[]) => string;
+import type { CnFunction } from 'cn';
 /**
  * Merge conditional class values, letting the last conflicting utility win.
  *
@@ -24,6 +10,17 @@ export declare const twMergeConfig: (...classLists: import("tailwind-merge").Cla
  * A template literal (`cn(`base--${value}`)`) is invisible to the linter and
  * will be reported, because a class the linter cannot read is a class it
  * cannot check against the theme.
+ *
+ * `cn` also has to be told about the utilities this design system adds. Every
+ * token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …) is an
+ * unknown name to a default merge instance. Left unregistered,
+ * `cn('h-control-md', 'h-control-sm')` keeps both classes and the winner is
+ * decided by stylesheet order rather than by the caller — a bug that only
+ * shows up as a control that ignores its `size` prop, long after the line
+ * that caused it was written.
+ *
+ * Registering the families below is what makes "the last class wins" true for
+ * the whole system, including for consumers overriding a component's default.
  */
-export declare function cn(...inputs: ClassValue[]): string;
+export declare const cn: CnFunction;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,MAAM,CAAA;AAG5C;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,aAAa,sEA2CxB,CAAA;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,EAAE,CAAC,GAAG,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAElD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,IAAI,CAAA;AAEpC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,EAAE,EAAE,UA2Cf,CAAA"}

package/dist/lib/utils.js

@@ -1,20 +1,29 @@
-import { clsx } from "clsx";
-import { extendTailwindMerge } from "tailwind-merge";
+import { createCn } from "cn/config";
 //#region src/lib/utils.ts
 /**
-* `twMerge` needs to be told about the utilities this design system adds.
+* Merge conditional class values, letting the last conflicting utility win.
+*
+* Accepts an object whose keys are classes and whose values enable them, which
+* is the form the design-system linter can read statically:
 *
-* Every token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …)
-* is an unknown name to a default `tailwind-merge` instance. Left
-* unregistered, `cn('h-control-md', 'h-control-sm')` keeps both classes and
-* the winner is decided by stylesheet order rather than by the caller — a bug
-* that only shows up as a control that ignores its `size` prop, long after the
-* line that caused it was written.
+*   cn('base', { 'is-open': open(), 'is-disabled': disabled() })
 *
-* Registering the families here is what makes "the last class wins" true for
+* A template literal (`cn(`base--${value}`)`) is invisible to the linter and
+* will be reported, because a class the linter cannot read is a class it
+* cannot check against the theme.
+*
+* `cn` also has to be told about the utilities this design system adds. Every
+* token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …) is an
+* unknown name to a default merge instance. Left unregistered,
+* `cn('h-control-md', 'h-control-sm')` keeps both classes and the winner is
+* decided by stylesheet order rather than by the caller — a bug that only
+* shows up as a control that ignores its `size` prop, long after the line
+* that caused it was written.
+*
+* Registering the families below is what makes "the last class wins" true for
 * the whole system, including for consumers overriding a component's default.
 */
-var twMergeConfig = extendTailwindMerge({ extend: { classGroups: {
+var cn = createCn({ extend: { classGroups: {
 	"ds-height": [{ h: [
 		"control-2xs",
 		"control-xs",
@@ -45,22 +54,7 @@ var twMergeConfig = extendTailwindMerge({ extend: { classGroups: {
 		"rail-item"
 	] }]
 } } });
-/**
-* Merge conditional class values, letting the last conflicting utility win.
-*
-* Accepts an object whose keys are classes and whose values enable them, which
-* is the form the design-system linter can read statically:
-*
-*   cn('base', { 'is-open': open(), 'is-disabled': disabled() })
-*
-* A template literal (`cn(`base--${value}`)`) is invisible to the linter and
-* will be reported, because a class the linter cannot read is a class it
-* cannot check against the theme.
-*/
-function cn(...inputs) {
-	return twMergeConfig(clsx(inputs));
-}
 //#endregion
-export { cn, twMergeConfig };
+export { cn };
 
 //# sourceMappingURL=utils.js.map

package/dist/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../../src/lib/utils.ts"],"sourcesContent":["import { type ClassValue, clsx } from 'clsx'\nimport { extendTailwindMerge } from 'tailwind-merge'\n\n/**\n * `twMerge` needs to be told about the utilities this design system adds.\n *\n * Every token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …)\n * is an unknown name to a default `tailwind-merge` instance. Left\n * unregistered, `cn('h-control-md', 'h-control-sm')` keeps both classes and\n * the winner is decided by stylesheet order rather than by the caller — a bug\n * that only shows up as a control that ignores its `size` prop, long after the\n * line that caused it was written.\n *\n * Registering the families here is what makes \"the last class wins\" true for\n * the whole system, including for consumers overriding a component's default.\n */\nexport const twMergeConfig = extendTailwindMerge<'ds-height' | 'ds-width' | 'ds-size'>({\n  extend: {\n    classGroups: {\n      'ds-height': [\n        {\n          h: [\n            'control-2xs',\n            'control-xs',\n            'control-sm',\n            'control-md',\n            'control-lg',\n            'control-xl',\n            'row-sm',\n            'row-md',\n            'row-lg',\n            'rail-item',\n            'topbar',\n            'statusbar',\n          ],\n        },\n      ],\n      'ds-width': [\n        {\n          w: ['rail', 'rail-expanded', 'sidebar', 'sidebar-compact'],\n        },\n      ],\n      // `size-*` is a real Tailwind group, but the token-derived values are\n      // not, so they need the same treatment as height and width.\n      'ds-size': [\n        {\n          size: [\n            'control-2xs',\n            'control-xs',\n            'control-sm',\n            'control-md',\n            'control-lg',\n            'control-xl',\n            'rail-item',\n          ],\n        },\n      ],\n    },\n  },\n})\n\n/**\n * Merge conditional class values, letting the last conflicting utility win.\n *\n * Accepts an object whose keys are classes and whose values enable them, which\n * is the form the design-system linter can read statically:\n *\n *   cn('base', { 'is-open': open(), 'is-disabled': disabled() })\n *\n * A template literal (`cn(`base--${value}`)`) is invisible to the linter and\n * will be reported, because a class the linter cannot read is a class it\n * cannot check against the theme.\n */\nexport function cn(...inputs: ClassValue[]): string {\n  return twMergeConfig(clsx(inputs))\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAgBA,IAAa,gBAAgB,oBAA0D,EACrF,QAAQ,EACN,aAAa;CACX,aAAa,CACX,EACE,GAAG;EACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF,EACF,CACF;CACA,YAAY,CACV,EACE,GAAG;EAAC;EAAQ;EAAiB;EAAW;CAAiB,EAC3D,CACF;CAGA,WAAW,CACT,EACE,MAAM;EACJ;EACA;EACA;EACA;EACA;EACA;EACA;CACF,EACF,CACF;AACF,EACF,EACF,CAAC;;;;;;;;;;;;;AAcD,SAAgB,GAAG,GAAG,QAA8B;CAClD,OAAO,cAAc,KAAK,MAAM,CAAC;AACnC"}
+{"version":3,"file":"utils.js","names":[],"sources":["../../src/lib/utils.ts"],"sourcesContent":["import { createCn } from 'cn/config'\nimport type { CnFunction } from 'cn'\n\n/**\n * Merge conditional class values, letting the last conflicting utility win.\n *\n * Accepts an object whose keys are classes and whose values enable them, which\n * is the form the design-system linter can read statically:\n *\n *   cn('base', { 'is-open': open(), 'is-disabled': disabled() })\n *\n * A template literal (`cn(`base--${value}`)`) is invisible to the linter and\n * will be reported, because a class the linter cannot read is a class it\n * cannot check against the theme.\n *\n * `cn` also has to be told about the utilities this design system adds. Every\n * token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …) is an\n * unknown name to a default merge instance. Left unregistered,\n * `cn('h-control-md', 'h-control-sm')` keeps both classes and the winner is\n * decided by stylesheet order rather than by the caller — a bug that only\n * shows up as a control that ignores its `size` prop, long after the line\n * that caused it was written.\n *\n * Registering the families below is what makes \"the last class wins\" true for\n * the whole system, including for consumers overriding a component's default.\n */\nexport const cn: CnFunction = createCn({\n  extend: {\n    classGroups: {\n      'ds-height': [\n        {\n          h: [\n            'control-2xs',\n            'control-xs',\n            'control-sm',\n            'control-md',\n            'control-lg',\n            'control-xl',\n            'row-sm',\n            'row-md',\n            'row-lg',\n            'rail-item',\n            'topbar',\n            'statusbar',\n          ],\n        },\n      ],\n      'ds-width': [\n        {\n          w: ['rail', 'rail-expanded', 'sidebar', 'sidebar-compact'],\n        },\n      ],\n      // `size-*` is a real Tailwind group, but the token-derived values are\n      // not, so they need the same treatment as height and width.\n      'ds-size': [\n        {\n          size: [\n            'control-2xs',\n            'control-xs',\n            'control-sm',\n            'control-md',\n            'control-lg',\n            'control-xl',\n            'rail-item',\n          ],\n        },\n      ],\n    },\n  },\n})\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA0BA,IAAa,KAAiB,SAAS,EACrC,QAAQ,EACN,aAAa;CACX,aAAa,CACX,EACE,GAAG;EACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF,EACF,CACF;CACA,YAAY,CACV,EACE,GAAG;EAAC;EAAQ;EAAiB;EAAW;CAAiB,EAC3D,CACF;CAGA,WAAW,CACT,EACE,MAAM;EACJ;EACA;EACA;EACA;EACA;EACA;EACA;CACF,EACF,CACF;AACF,EACF,EACF,CAAC"}

package/dist/r/lib.json

@@ -6,8 +6,7 @@
   "dependencies": [
     "@adea-ai/themes@^0.6.2",
     "class-variance-authority@^0.7.1",
-    "clsx@^2.1.1",
-    "tailwind-merge@^3.7.0"
+    "cn@^0.4.0"
   ],
   "registryDependencies": [],
   "files": [

package/dist/r/registry.json

@@ -2066,8 +2066,7 @@
       "dependencies": [
         "@adea-ai/themes@^0.6.2",
         "class-variance-authority@^0.7.1",
-        "clsx@^2.1.1",
-        "tailwind-merge@^3.7.0"
+        "cn@^0.4.0"
       ],
       "registryDependencies": [],
       "files": [

package/dist/r/src/lib/utils.ts

@@ -1,20 +1,30 @@
-import { type ClassValue, clsx } from 'clsx'
-import { extendTailwindMerge } from 'tailwind-merge'
+import { createCn } from 'cn/config'
+import type { CnFunction } from 'cn'
 
 /**
- * `twMerge` needs to be told about the utilities this design system adds.
+ * Merge conditional class values, letting the last conflicting utility win.
+ *
+ * Accepts an object whose keys are classes and whose values enable them, which
+ * is the form the design-system linter can read statically:
+ *
+ *   cn('base', { 'is-open': open(), 'is-disabled': disabled() })
  *
- * Every token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …)
- * is an unknown name to a default `tailwind-merge` instance. Left
- * unregistered, `cn('h-control-md', 'h-control-sm')` keeps both classes and
- * the winner is decided by stylesheet order rather than by the caller — a bug
- * that only shows up as a control that ignores its `size` prop, long after the
- * line that caused it was written.
+ * A template literal (`cn(`base--${value}`)`) is invisible to the linter and
+ * will be reported, because a class the linter cannot read is a class it
+ * cannot check against the theme.
  *
- * Registering the families here is what makes "the last class wins" true for
+ * `cn` also has to be told about the utilities this design system adds. Every
+ * token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …) is an
+ * unknown name to a default merge instance. Left unregistered,
+ * `cn('h-control-md', 'h-control-sm')` keeps both classes and the winner is
+ * decided by stylesheet order rather than by the caller — a bug that only
+ * shows up as a control that ignores its `size` prop, long after the line
+ * that caused it was written.
+ *
+ * Registering the families below is what makes "the last class wins" true for
  * the whole system, including for consumers overriding a component's default.
  */
-export const twMergeConfig = extendTailwindMerge<'ds-height' | 'ds-width' | 'ds-size'>({
+export const cn: CnFunction = createCn({
   extend: {
     classGroups: {
       'ds-height': [
@@ -58,19 +68,3 @@ export const twMergeConfig = extendTailwindMerge<'ds-height' | 'ds-width' | 'ds-
     },
   },
 })
-
-/**
- * Merge conditional class values, letting the last conflicting utility win.
- *
- * Accepts an object whose keys are classes and whose values enable them, which
- * is the form the design-system linter can read statically:
- *
- *   cn('base', { 'is-open': open(), 'is-disabled': disabled() })
- *
- * A template literal (`cn(`base--${value}`)`) is invisible to the linter and
- * will be reported, because a class the linter cannot read is a class it
- * cannot check against the theme.
- */
-export function cn(...inputs: ClassValue[]): string {
-  return twMergeConfig(clsx(inputs))
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adea-ai/ui",
-  "version": "0.72.4",
+  "version": "0.73.0",
   "description": "The Adea design system: Kobalte-backed Solid components, semantic OKLCH tokens, and the app-shell layout primitives shared by Adea and Cortana.",
   "keywords": [
     "adea",
@@ -117,11 +117,10 @@
     "@fontsource-variable/space-grotesk": "^5.3.0",
     "@kobalte/core": "^0.13.14",
     "class-variance-authority": "^0.7.1",
-    "clsx": "^2.1.1",
     "cmdk-solid": "^1.2.0",
+    "cn": "^0.4.0",
     "lucide-solid": "^1.48.0",
     "solid-motionone": "^1.0.4",
-    "tailwind-merge": "^3.7.0",
     "tw-animate-css": "^1.4.0"
   },
   "devDependencies": {

package/registry.json

@@ -2066,8 +2066,7 @@
       "dependencies": [
         "@adea-ai/themes@^0.6.2",
         "class-variance-authority@^0.7.1",
-        "clsx@^2.1.1",
-        "tailwind-merge@^3.7.0"
+        "cn@^0.4.0"
       ],
       "registryDependencies": [],
       "files": [

package/src/lib/utils.ts

@@ -1,20 +1,30 @@
-import { type ClassValue, clsx } from 'clsx'
-import { extendTailwindMerge } from 'tailwind-merge'
+import { createCn } from 'cn/config'
+import type { CnFunction } from 'cn'
 
 /**
- * `twMerge` needs to be told about the utilities this design system adds.
+ * Merge conditional class values, letting the last conflicting utility win.
+ *
+ * Accepts an object whose keys are classes and whose values enable them, which
+ * is the form the design-system linter can read statically:
+ *
+ *   cn('base', { 'is-open': open(), 'is-disabled': disabled() })
  *
- * Every token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …)
- * is an unknown name to a default `tailwind-merge` instance. Left
- * unregistered, `cn('h-control-md', 'h-control-sm')` keeps both classes and
- * the winner is decided by stylesheet order rather than by the caller — a bug
- * that only shows up as a control that ignores its `size` prop, long after the
- * line that caused it was written.
+ * A template literal (`cn(`base--${value}`)`) is invisible to the linter and
+ * will be reported, because a class the linter cannot read is a class it
+ * cannot check against the theme.
  *
- * Registering the families here is what makes "the last class wins" true for
+ * `cn` also has to be told about the utilities this design system adds. Every
+ * token-derived utility (`h-control-md`, `w-rail`, `p-control-lg`, …) is an
+ * unknown name to a default merge instance. Left unregistered,
+ * `cn('h-control-md', 'h-control-sm')` keeps both classes and the winner is
+ * decided by stylesheet order rather than by the caller — a bug that only
+ * shows up as a control that ignores its `size` prop, long after the line
+ * that caused it was written.
+ *
+ * Registering the families below is what makes "the last class wins" true for
  * the whole system, including for consumers overriding a component's default.
  */
-export const twMergeConfig = extendTailwindMerge<'ds-height' | 'ds-width' | 'ds-size'>({
+export const cn: CnFunction = createCn({
   extend: {
     classGroups: {
       'ds-height': [
@@ -58,19 +68,3 @@ export const twMergeConfig = extendTailwindMerge<'ds-height' | 'ds-width' | 'ds-
     },
   },
 })
-
-/**
- * Merge conditional class values, letting the last conflicting utility win.
- *
- * Accepts an object whose keys are classes and whose values enable them, which
- * is the form the design-system linter can read statically:
- *
- *   cn('base', { 'is-open': open(), 'is-disabled': disabled() })
- *
- * A template literal (`cn(`base--${value}`)`) is invisible to the linter and
- * will be reported, because a class the linter cannot read is a class it
- * cannot check against the theme.
- */
-export function cn(...inputs: ClassValue[]): string {
-  return twMergeConfig(clsx(inputs))
-}