unocss-merge 0.6.0 → 0.7.1

package/dist/{index-DT_3AX6M.d.ts → index.d.mts}

@@ -1,11 +1,13 @@
+import { ClassValue } from "clsx";
+
 //#region src/index.d.ts
-declare function getClassList(className: string | null | undefined | boolean): string[];
+declare function getClassList(className: string): string[];
 /**
  * Match steps
  *  1. `getMergeMapKeyValue`: exact-string + regex match
  *  2. `findInKnownPrefixHasDashValue`: prefix match; may replace alias via `PREFIX_ALIAS`
  *  3. `lastIndexOf('-')` based split; may replace alias via `PREFIX_ALIAS`
  */
-declare function unoMerge(...classNames: Array<string | undefined | null | boolean>): string;
+declare function unoMerge(...classValues: ClassValue[]): string;
 //#endregion
 export { getClassList, unoMerge };

package/dist/index.mjs

@@ -0,0 +1 @@
+import{n as e,t}from"./src-B7ULDBrR.mjs";export{t as getClassList,e as unoMerge};

package/dist/{memoize.d.ts → memoize.d.mts}

@@ -1,4 +1,4 @@
-import { unoMerge } from "./index-DT_3AX6M.js";
+import { unoMerge } from "./index.mjs";
 import { Options } from "memoize";
 
 //#region src/memoize.d.ts

package/dist/memoize.mjs

@@ -0,0 +1 @@
+import{n as e}from"./src-B7ULDBrR.mjs";import t,{memoizeClear as n}from"memoize";function r(r){let i=t(e,{cacheKey:e=>e.flat().join(`,`),...r});return Object.defineProperty(i,`clear`,{value:()=>{n(i)}}),i}const i=r();export{r as createUnoMergeMemoized,i as unoMergeMemoized};

package/dist/react.d.mts

@@ -0,0 +1,10 @@
+import { ClassValue } from "clsx";
+
+//#region src/react.d.ts
+
+/**
+ * @note `useMemo` `deps array`.length should not change in runtime
+ */
+declare function useUnoMerge(...classValues: ClassValue[]): string;
+//#endregion
+export { useUnoMerge };

package/dist/react.mjs

@@ -0,0 +1 @@
+import{n as e}from"./src-B7ULDBrR.mjs";import{useMemo as t}from"react";function n(...n){return t(()=>e(...n),[...n])}export{n as useUnoMerge};

package/dist/src-B7ULDBrR.mjs

@@ -0,0 +1 @@
+import{clsx as e}from"clsx";function t(e){return[...new Set(e)]}function n(e,t){if(!e)throw typeof t==`string`?Error(t):t}const r=String.raw,i=(e,...t)=>new RegExp(r(e,...t)),a=r`(\d+(\.\d+)?)?(xs|sm|md|lg|xl)`,o=`(solid|dashed|dotted|double|none|hidden)`,s=[[[...[`block`,`flex`,`grid`,`table`].flatMap(e=>[e,`inline-${e}`]),`inline`,`flow-root`,`contents`,`list-item`,`hidden`,...h(`table-`,[`row`,`column`,`cell`,`caption`,`row-group`,`column-group`,`header-group`,`footer-group`])],`display`],[[`isolate`,`isolation-auto`],`isolation`],[[`static`,`fixed`,`absolute`,`relative`,`sticky`],`position`],[[`visible`,`invisible`,`collapse`],`visibility`],[h(`flex-`,[`row`,`row-reverse`,`col`,`col-reverse`]),`flex-direction`],[h(`flex-`,[`wrap`,`wrap-reverse`,`nowrap`]),`flex-wrap`],[h(`object-`,[`contain`,`cover`,`fill`,`none`,`scale-down`]),`object-fit`],[h(`object-`,[`bottom`,`center`,`left`,`left-bottom`,`left-top`,`right`,`right-bottom`,`right-top`,`top`]),`object-position`],[[`antialiased`,`subpixel-antialiased`],`font-smoothing`],[[`italic`,`not-italic`,`oblique`,`not-oblique`],`font-style`],[h(`font-`,[`mono`,`sans`,`serif`]),`font-family`],[/^(?:font|fw)-?(thin|extralight|light|normal|medium|semibold|bold|extrabold|black|\d+)$/,`font-weight`],[[`normal-nums`,`ordinal`,`slashed-zero`,`lining-nums`,`oldstyle-nums`,`proportional-nums`,`tabular-nums`,`diagonal-fractions`,`stacked-fractions`],`font-variant-numeric`],[i`^(text|text-size|font-size)-(\d+|${a}$)`,`font-size`],[h(`list-`,[`inside`,`outside`]),`list-style-position`],[h(`list-`,[`none`,`disc`,`decimal`]),`list-style-type`],[h(`text-`,[`left`,`center`,`right`,`justify`,`start`,`end`]),`text-align`],[[`underline`,`overline`,`line-through`,`no-underline`],`text-decoration-line`],[h(`decoration-`,[`solid`,`double`,`dotted`,`dashed`,`wavy`]),`text-decoration-style`],[/^decoration-(\d+|(auto|from-font)$)/,`text-decoration-thickness`],[[`truncate`,`text-ellipsis`,`text-clip`],`text-overflow`],[h(`text-`,[`wrap`,`nowrap`,`balance`,`pretty`]),`text-wrap`],[h(`bg-`,[`bottom`,`center`,`left`,`left-bottom`,`left-top`,`right`,`right-bottom`,`right-top`,`top`]),`background-position`],[/^bg(-no)?-repeat($|-)/,`background-repeat`],[h(`bg-`,[`auto`,`cover`,`contain`]),`background-size`],[[`bg-none`,/^bg-gradient-to-/],`background-image`],[/^(?:border-|b-)?(?:rounded|rd)(?:-(.+))?$/,`rounded`],[i`^b(?:order)?-${o}$`,`border-style`],[i`^b(?:order)?-([tblrxyse])-${o}$`,(e,t)=>`border-${t?.[1]}-style`],[/^b(?:order)?($|-\d+)/,`border-width`],[/^b(?:order)?-([tblrxyse])($|-\d+)/,(e,t)=>`border-${t?.[1]}-width`],[/^(?:border|b)-(?:color-)?(.+)$/,`border-color`],[/^(?:border|b)-([rltbse])-(?:color-)?(.+)$/,(e,t)=>`border-${t?.[1]}-color`],[/^outline-\d+/,`outline-width`],[[`outline`,i`^outline-${o}$`],`outline-style`],[i`^divide-${o}$`,`divide-style`],[/^divide-(x|y)($|-\d+)/,(e,t)=>`divide-${t?.[1]}-width`],[[`ring`,/^ring-\d+/],`ring-width`],[[/^ring-offset-\d+/],`ring-offset-width`],[[`shadow`,...h(`shadow-`,[`inner`,`none`]),i`^shadow-${a}$`],`box-shadow`],[h(`border-`,[`collapse`,`separate`]),`border-collapse`],[h(`table-`,[`auto`,`fixed`]),`table-layout`],[h(`caption-`,[`top`,`bottom`]),`caption-side`],[h(`scroll-`,[`auto`,`smooth`]),`scroll-behavior`],[h(`snap-`,[`start`,`end`,`center`,`align-none`]),`scroll-snap-align`],[h(`snap-`,[`normal`,`always`]),`scroll-snap-stop`],[h(`snap-`,[`none`,`x`,`y`,`both`,`mandatory`,`proximity`]),`scroll-snap-type`],[/^stroke-\d+/,`stroke-width`],[[`sr-only`,`not-sr-only`],`Screen-Readers`],[/^(flex-)?grow($|-\d+$)/,`flex-grow`],[/^(flex-)?shrink($|-\d+$)/,`flex-shrink`],...[`ring-inset`,`divide-x-reverse`,`divide-y-reverse`].map(e=>[e,e]),...[`resize`,`blur`,`drop-shadow`,`grayscale`,`invert`,`sepia`,`backdrop-blur`,`backdrop-grayscale`,`backdrop-invert`,`backdrop-sepia`].map(e=>[i`^${e}($|-)`,e])],c=new Map,l=new Map;for(let[e,t]of s){let n=[e].flat(),r=n.filter(e=>typeof e==`string`),i=n.filter(e=>typeof e==`object`&&e instanceof RegExp);r.forEach(e=>{let n=typeof t==`string`?t:t(e);c.set(e,n)}),i.forEach(e=>{l.set(e,t)})}function u(e){if(c.has(e))return c.get(e);for(let[t,n]of l.entries())if(t.test(e)){let r=t.exec(e);return typeof n==`string`?n:n(e,r)}}function d(e){return f.map(e=>typeof e==`string`?[e,e]:e).find(([t,n])=>e.startsWith(`${t}-`))}const f=[`break-after`,`break-before`,`break-inside`,`grid-flow`,`align`,`whitespace`,`mix-blend`,`bg-blend`,`ease`,`origin`,`cursor`,`touch`,`color`,[`text`,`color`],[`c`,`color`],[`bg`,`background-color`],[`decoration`,`text-decoration-color`],[`from`,`gradient-color-stops`],[`divide`,`divide-color`],[`outline`,`outline-color`],[`ring`,`ring-color`],[`ring-offset`,`ring-offset-color`],[`shadow`,`box-shadow-color`],[`accent`,`accent-color`],[`caret`,`caret-color`],`fill`,`stroke`];function p(e){return m.has(e)?m.get(e):e}const m=new Map(Object.entries({leading:`line-height`,col:`grid-column`,"col-span":`grid-column`,"col-start":`grid-column-start`,"col-end":`grid-column-end`,row:`grid-row`,"row-span":`grid-row`,"row-start":`grid-row-start`,"row-end":`grid-row-end`,m:[`mt`,`mb`,`ml`,`mr`],mx:[`ml`,`mr`],my:[`mt`,`mb`],p:[`pt`,`pb`,`pl`,`pr`],px:[`pl`,`pr`],py:[`pt`,`pb`]}));function h(e,t){return n(e.endsWith(`-`),"prefix must end with `-`"),t.map(t=>e+t)}function g(e){return(e||``).split(` `).map(e=>e.trim()).filter(Boolean)}function _(...n){let r=new Map;return g(e(...n)).filter(Boolean).forEach(e=>v(e,r)),t(Array.from(r.values())).join(` `)}function v(e,t){let n=e,r;function i(e){[e].flat().forEach(e=>{t.set(r?r+e:e,n)})}function a(){let t=u(e);if(t)return i(t),!0}function o(){let t=d(e);if(!t)return;let[n,r]=t;return i(p(r)),!0}function s(){let t=e,n=/(\[[\w,()/-]+\])$/;n.test(e)&&(t=e.replace(n,function(e,t){return`*`.repeat(t.length)})),t=t.replaceAll(/--(?=\d)/g,`-*`);let r=t.lastIndexOf(`-`);if(r!==-1)return i(p(e.slice(0,r))),!0}function c(){return i(p(e))}function l(){let t=/^(?:(?:[\w-]+|\[[^\s[\]]+\]):)+/.exec(e);t&&(r=t[0].split(/(?<=:)(?:\b|$)/).filter(Boolean).sort().join(``),e=e.slice(r.length))}function f(){if(e.startsWith(`!`)){e=`important:`+e.slice(1);return}if(e.endsWith(`!`)){e=`important:`+e.slice(0,-1);return}}a()||o()||(f(),l(),a()||o()||s()||c())}export{_ as n,g as t};

package/package.json

@@ -1,29 +1,24 @@
 {
   "name": "unocss-merge",
-  "version": "0.6.0",
-  "packageManager": "pnpm@10.14.0-0+sha512.2cd47a0cbf5f1d1de7693a88307a0ede5be94e0d3b34853d800ee775efbea0650cb562b77605ec80bc8d925f5cd27c4dfe8bb04d3a0b76090784c664450d32d6",
-  "description": "simple utility to merge unocss class names",
   "type": "module",
-  "keywords": [
-    "unocss",
-    "merge",
-    "tw-merge"
-  ],
+  "version": "0.7.1",
+  "packageManager": "pnpm@10.26.1+sha512.664074abc367d2c9324fdc18037097ce0a8f126034160f709928e9e9f95d98714347044e5c3164d65bd5da6c59c6be362b107546292a8eecb7999196e5ce58fa",
+  "description": "simple utility to merge unocss class names",
+  "author": "magicdawn",
   "license": "MIT",
   "homepage": "https://github.com/magicdawn/unocss-merge#readme",
-  "bugs": {
-    "url": "https://github.com/magicdawn/unocss-merge/issues"
-  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/magicdawn/unocss-merge.git"
   },
-  "author": "magicdawn",
-  "files": [
-    "dist/"
+  "bugs": {
+    "url": "https://github.com/magicdawn/unocss-merge/issues"
+  },
+  "keywords": [
+    "unocss",
+    "merge",
+    "tw-merge"
   ],
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
@@ -39,6 +34,11 @@
       "default": "./dist/memoize.js"
     }
   },
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/"
+  ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
@@ -64,20 +64,22 @@
       "optional": true
     }
   },
+  "dependencies": {
+    "clsx": "^2.1.1"
+  },
   "devDependencies": {
-    "@magicdawn/eslint-config": "^1.5.7",
+    "@magicdawn/eslint-config": "^1.5.14",
     "@magicdawn/prettier-config": "^0.1.0",
-    "@types/node": "^24.1.0",
-    "@types/react": "^19.1.8",
-    "@vitest/coverage-v8": "^3.2.4",
-    "es-toolkit": "^1.39.7",
-    "eslint": "^9.31.0",
+    "@types/react": "^19.2.7",
+    "@vitest/coverage-v8": "^4.0.16",
+    "es-toolkit": "^1.43.0",
+    "eslint": "^9.39.2",
     "husky": "^9.1.7",
-    "lint-staged": "^16.1.2",
-    "prettier": "^3.6.2",
-    "tsdown": "^0.13.0",
-    "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
+    "lint-staged": "^16.2.7",
+    "prettier": "^3.7.4",
+    "tsdown": "^0.18.2",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.16"
   },
   "lint-staged": {
     "*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-import { getClassList, unoMerge } from "./index-DT_3AX6M.js";
-export { getClassList, unoMerge };

package/dist/index.js

@@ -1 +0,0 @@
-import{getClassList as e,unoMerge as t}from"./src-Diw-4Z6_.js";export{e as getClassList,t as unoMerge};

package/dist/memoize.js

@@ -1 +0,0 @@
-import{unoMerge as e}from"./src-Diw-4Z6_.js";import t,{memoizeClear as n}from"memoize";function r(r){let i=t(e,{cacheKey:e=>e.join(),...r});return Object.defineProperty(i,`clear`,{value:()=>{n(i)}}),i}const i=r();export{r as createUnoMergeMemoized,i as unoMergeMemoized};

package/dist/react.d.ts

@@ -1,7 +0,0 @@
-//#region src/react.d.ts
-/**
- * @note `useMemo` `deps array`.length should not change in runtime
- */
-declare function useUnoMerge(...classNames: Array<string | undefined | null | boolean>): string;
-//#endregion
-export { useUnoMerge };

package/dist/react.js

@@ -1 +0,0 @@
-import{unoMerge as e}from"./src-Diw-4Z6_.js";import{useMemo as t}from"react";function n(...n){return t(()=>e(...n),[...n])}export{n as useUnoMerge};

package/dist/src-Diw-4Z6_.js

@@ -1 +0,0 @@
-function e(e){return Array.from(new Set(e))}function t(e,t){if(!e)throw typeof t==`string`?Error(t):t}const n=String.raw,r=(e,...t)=>new RegExp(n(e,...t)),i=n`(\d+(\.\d+)?)?(xs|sm|md|lg|xl)`,a=`(solid|dashed|dotted|double|none|hidden)`,o=[[[...[`block`,`flex`,`grid`,`table`].flatMap(e=>[e,`inline-${e}`]),`inline`,`flow-root`,`contents`,`list-item`,`hidden`,...m(`table-`,[`row`,`column`,`cell`,`caption`,`row-group`,`column-group`,`header-group`,`footer-group`])],`display`],[[`isolate`,`isolation-auto`],`isolation`],[[`static`,`fixed`,`absolute`,`relative`,`sticky`],`position`],[[`visible`,`invisible`,`collapse`],`visibility`],[m(`flex-`,[`row`,`row-reverse`,`col`,`col-reverse`]),`flex-direction`],[m(`flex-`,[`wrap`,`wrap-reverse`,`nowrap`]),`flex-wrap`],[m(`object-`,[`contain`,`cover`,`fill`,`none`,`scale-down`]),`object-fit`],[m(`object-`,[`bottom`,`center`,`left`,`left-bottom`,`left-top`,`right`,`right-bottom`,`right-top`,`top`]),`object-position`],[[`antialiased`,`subpixel-antialiased`],`font-smoothing`],[[`italic`,`not-italic`,`oblique`,`not-oblique`],`font-style`],[m(`font-`,[`mono`,`sans`,`serif`]),`font-family`],[/^(?:font|fw)-?(thin|extralight|light|normal|medium|semibold|bold|extrabold|black|\d+)$/,`font-weight`],[[`normal-nums`,`ordinal`,`slashed-zero`,`lining-nums`,`oldstyle-nums`,`proportional-nums`,`tabular-nums`,`diagonal-fractions`,`stacked-fractions`],`font-variant-numeric`],[r`^(text|text-size|font-size)-(\d+|${i}$)`,`font-size`],[m(`list-`,[`inside`,`outside`]),`list-style-position`],[m(`list-`,[`none`,`disc`,`decimal`]),`list-style-type`],[m(`text-`,[`left`,`center`,`right`,`justify`,`start`,`end`]),`text-align`],[[`underline`,`overline`,`line-through`,`no-underline`],`text-decoration-line`],[m(`decoration-`,[`solid`,`double`,`dotted`,`dashed`,`wavy`]),`text-decoration-style`],[/^decoration-(\d+|(auto|from-font)$)/,`text-decoration-thickness`],[[`truncate`,`text-ellipsis`,`text-clip`],`text-overflow`],[m(`text-`,[`wrap`,`nowrap`,`balance`,`pretty`]),`text-wrap`],[m(`bg-`,[`bottom`,`center`,`left`,`left-bottom`,`left-top`,`right`,`right-bottom`,`right-top`,`top`]),`background-position`],[/^bg(-no)?-repeat($|-)/,`background-repeat`],[m(`bg-`,[`auto`,`cover`,`contain`]),`background-size`],[[`bg-none`,/^bg-gradient-to-/],`background-image`],[/^(?:border-|b-)?(?:rounded|rd)(?:-(.+))?$/,`rounded`],[r`^b(?:order)?-${a}$`,`border-style`],[r`^b(?:order)?-([tblrxyse])-${a}$`,(e,t)=>`border-${t?.[1]}-style`],[/^b(?:order)?($|-\d+)/,`border-width`],[/^b(?:order)?-([tblrxyse])($|-\d+)/,(e,t)=>`border-${t?.[1]}-width`],[/^(?:border|b)-(?:color-)?(.+)$/,`border-color`],[/^(?:border|b)-([rltbse])-(?:color-)?(.+)$/,(e,t)=>`border-${t?.[1]}-color`],[/^outline-\d+/,`outline-width`],[[`outline`,r`^outline-${a}$`],`outline-style`],[r`^divide-${a}$`,`divide-style`],[/^divide-(x|y)($|-\d+)/,(e,t)=>`divide-${t?.[1]}-width`],[[`ring`,/^ring-\d+/],`ring-width`],[[/^ring-offset-\d+/],`ring-offset-width`],[[`shadow`,...m(`shadow-`,[`inner`,`none`]),r`^shadow-${i}$`],`box-shadow`],[m(`border-`,[`collapse`,`separate`]),`border-collapse`],[m(`table-`,[`auto`,`fixed`]),`table-layout`],[m(`caption-`,[`top`,`bottom`]),`caption-side`],[m(`scroll-`,[`auto`,`smooth`]),`scroll-behavior`],[m(`snap-`,[`start`,`end`,`center`,`align-none`]),`scroll-snap-align`],[m(`snap-`,[`normal`,`always`]),`scroll-snap-stop`],[m(`snap-`,[`none`,`x`,`y`,`both`,`mandatory`,`proximity`]),`scroll-snap-type`],[/^stroke-\d+/,`stroke-width`],[[`sr-only`,`not-sr-only`],`Screen-Readers`],[/^(flex-)?grow($|-\d+$)/,`flex-grow`],[/^(flex-)?shrink($|-\d+$)/,`flex-shrink`],...[`ring-inset`,`divide-x-reverse`,`divide-y-reverse`].map(e=>[e,e]),...[`resize`,`blur`,`drop-shadow`,`grayscale`,`invert`,`sepia`,`backdrop-blur`,`backdrop-grayscale`,`backdrop-invert`,`backdrop-sepia`].map(e=>[r`^${e}($|-)`,e])],s=new Map,c=new Map;for(let[e,t]of o){let n=[e].flat(),r=n.filter(e=>typeof e==`string`),i=n.filter(e=>typeof e==`object`&&e instanceof RegExp);r.forEach(e=>{let n=typeof t==`string`?t:t(e);s.set(e,n)}),i.forEach(e=>{c.set(e,t)})}function l(e){if(s.has(e))return s.get(e);for(let[t,n]of c.entries())if(t.test(e)){let r=t.exec(e),i=typeof n==`string`?n:n(e,r);return i}}function u(e){return d.map(e=>typeof e==`string`?[e,e]:e).find(([t,n])=>e.startsWith(`${t}-`))}const d=[`break-after`,`break-before`,`break-inside`,`grid-flow`,`align`,`whitespace`,`mix-blend`,`bg-blend`,`ease`,`origin`,`cursor`,`touch`,`color`,[`text`,`color`],[`c`,`color`],[`bg`,`background-color`],[`decoration`,`text-decoration-color`],[`from`,`gradient-color-stops`],[`divide`,`divide-color`],[`outline`,`outline-color`],[`ring`,`ring-color`],[`ring-offset`,`ring-offset-color`],[`shadow`,`box-shadow-color`],[`accent`,`accent-color`],[`caret`,`caret-color`],`fill`,`stroke`];function f(e){return p.has(e)?p.get(e):e}const p=new Map(Object.entries({leading:`line-height`,col:`grid-column`,"col-span":`grid-column`,"col-start":`grid-column-start`,"col-end":`grid-column-end`,row:`grid-row`,"row-span":`grid-row`,"row-start":`grid-row-start`,"row-end":`grid-row-end`,m:[`mt`,`mb`,`ml`,`mr`],mx:[`ml`,`mr`],my:[`mt`,`mb`],p:[`pt`,`pb`,`pl`,`pr`],px:[`pl`,`pr`],py:[`pt`,`pb`]}));function m(e,n){return t(e.endsWith(`-`),"prefix must end with `-`"),n.map(t=>e+t)}function h(t){return typeof t==`boolean`?[]:e((t||``).split(` `).map(e=>e.trim()).filter(Boolean))}function g(...t){let n=new Map,r=t.map(h).flat().filter(Boolean);return r.forEach(e=>_(e,n)),e(Array.from(n.values())).join(` `)}function _(e,t){let n=e,r;function i(e){[e].flat().forEach(e=>{t.set(r?r+e:e,n)})}function a(){let t=l(e);if(t)return i(t),!0}function o(){let t=u(e);if(!t)return;let[n,r]=t,a=f(r);return i(a),!0}function s(){let t=e,n=/(\[[\w,()/-]+\])$/;n.test(e)&&(t=e.replace(n,function(e,t){return`*`.repeat(t.length)})),t=t.replaceAll(/--(?=\d)/g,`-*`);let r=t.lastIndexOf(`-`);if(r===-1)return;let a=f(e.slice(0,r));return i(a),!0}function c(){return i(f(e))}function d(){let t=/^(?:(?:[\w-]+|\[[^\s[\]]+\]):)+/,n=t.exec(e);n&&(r=n[0].split(/(?<=:)(?:\b|$)/).filter(Boolean).sort().join(``),e=e.slice(r.length))}function p(){if(e.startsWith(`!`)){e=`important:`+e.slice(1);return}if(e.endsWith(`!`)){e=`important:`+e.slice(0,-1);return}}a()||o()||(p(),d(),a()||o()||s()||c())}export{h as getClassList,g as unoMerge};