unocss-merge 0.2.1 → 0.3.1

package/README.md

@@ -16,6 +16,8 @@ $ pnpm add unocss-merge
 
 ## API
 
+### `unoMerge`
+
 ```ts
 import { unoMerge } from 'unocss-merge'
 
@@ -30,6 +32,23 @@ expect(unoMerge('mr-1', 'mr--4px')).toBe('mr--4px')
 expect(unoMerge('cursor-pointer', 'cursor-not-allowed')).toBe('cursor-not-allowed')
 ```
 
+> [!TIP]
+> This function does not provide any cache mechanism, wrap with your own cache if needed. [memoize](https://github.com/sindresorhus/memoize#install) or others.
+
+### `useUnoMerge`
+
+```tsx
+import { useUnoMerge } from 'unocss-merge/react'
+
+function Component(props) {
+  const className = useUnoMerge('cursor-pointer', props.className)
+  return <div className={className} />
+}
+```
+
+> [!TIP]
+> `useMemo` `deps array`.length should not change in runtime
+
 ## Why
 
 - `twMerge` don't support [arbitrary value without brackets](https://github.com/dcastil/tailwind-merge/blob/v3.2.0/src/lib/validators.ts#L1)
@@ -49,12 +68,22 @@ console.log(twMerge('size-16px', 'size-18px')) // `size-16px size-18px` ❌
 console.log(twMerge('ml-4px', 'ml-10px')) // `ml-4px ml-10px` ❌
 ```
 
-## Status: What is **NOT** Supported
+## Status
+
+### ✅ What is **KNOWN** Supported
+
+- ✅ simple class name `mr-4px` `mr-4`
+- ✅ arbitrary value `mr-[4px]` `mr-[4]`
+- ✅ negative value `mr--4px`
+- ✅ simple colon separated variants `hover:mr-4px` `dark:ml-4px` `hover:dark:ml-4px`
+
+### ❌ What is **NOT** Supported
 
 - complex features are not supported !!!
-  - ❌ [variants](https://unocss.dev/config/variants) like `dark:` / `hover:`
-  - ❌ [Variant group](https://unocss.dev/transformers/variant-group)
-- shorthand: for example merge `mx` with `ml / mr` are not supported
+  - ❌ [Complex Variants](https://github.com/unocss/unocss/tree/main/packages-presets/preset-mini/src/_variants) are not recongized
+  - ❌ [Variant Group](https://unocss.dev/transformers/variant-group)
+  - ❌ [Shortcuts](https://unocss.dev/config/shortcuts) are not recongized
+- ❌ shorthand: for example merge `mx` with `ml / mr` are not supported
 
 ## Changelog
 

package/dist/index.js

@@ -1 +1 @@
-import{getClassList as e,unoMerge as t}from"./src-BrrP8tFs.js";export{e as getClassList,t as unoMerge};
+import{getClassList as e,unoMerge as t}from"./src-3trPJuWE.js";export{e as getClassList,t as unoMerge};

package/dist/react.js

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

package/dist/{src-BrrP8tFs.js → src-3trPJuWE.js}

@@ -3,4 +3,4 @@ function e(e){return Array.from(new Set(e))}function t(e,t){if(!e)throw typeof t
       table,inline-table,table-caption,table-cell,table-column,table-row,
       table-column-group,table-footer-group,table-header-group,table-row-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`],`font-style`],[h(`font-`,[`thin`,`extralight`,`light`,`normal`,`medium`,`semibold`,`bold`,`extrabold`,`black`]),`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`],[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`],[r`^b(?:order)?-${a}$`,`border-style`],[/^b(?:order)?($|-\d+)/,`border-width`],[/^b(?:order)?-([tblrxyse])($|-\d+)/,(e,t)=>`border-${t==null?void 0:t[1]}-width`],[/^outline-\d+/,`outline-width`],[[`outline`,r`^outline-${a}$`],`outline-style`],[r`^divide-${a}$`,`divide-style`],[/^divide-(x|y)($|-\d+)/,(e,t)=>`divide-${t==null?void 0:t[1]}-width`],[[`ring`,/^ring-\d+/],`ring-width`],[[/^ring-offset-\d+/],`ring-offset-width`],[[`shadow`,...h(`shadow-`,[`inner`,`none`]),r`^shadow-${i}$`],`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=>[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`,[`text`,`color`],`color`,[`bg`,`background-color`],[`b`,`border-color`],[`border`,`border-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`}));function m(e){return e.split(`
-`).map(e=>e.trim()).filter(Boolean).map(e=>e.split(`,`).map(e=>e.trim()).filter(Boolean)).flat()}function h(e,n){return t(e.endsWith(`-`),"prefix must end with `-`"),n.map(t=>e+t)}function g(t){return e((t||``).split(` `).map(e=>e.trim()).filter(Boolean))}function _(...e){let t=e.map(g).flat().filter(Boolean),n=new Map;for(let e of t){{let t=l(e);if(t){n.set(t,e);continue}}let t=u(e);if(t){let[r,i]=t,a=f(i);n.set(a,e);continue}let r=e,i=/(\[[\w,-]+\])$/;i.test(e)&&(r=e.replace(i,function(e,t){return`*`.repeat(t.length)})),r.includes(`--`)&&(r=r.replaceAll(`--`,`-*`));let a=r.lastIndexOf(`-`);if(a===-1){n.set(f(e),e);continue}let o=f(e.slice(0,a));n.set(o,e)}return Array.from(n.values()).join(` `)}export{g as getClassList,_ as unoMerge};
+`).map(e=>e.trim()).filter(Boolean).map(e=>e.split(`,`).map(e=>e.trim()).filter(Boolean)).flat()}function h(e,n){return t(e.endsWith(`-`),"prefix must end with `-`"),n.map(t=>e+t)}function g(t){return e((t||``).split(` `).map(e=>e.trim()).filter(Boolean))}function _(...e){let t=new Map,n=e.map(g).flat().filter(Boolean);return n.forEach(r),Array.from(t.values()).join(` `);function r(e){let n=e,r;function i(e){t.set(r?r+e:e,n)}{let t=/^(?:[\w-]+:)+/g,n=t.exec(e);n&&(r=n[0].split(/(?<=:)(?:\b|$)/).filter(Boolean).sort().join(``),e=e.slice(r.length))}{let t=l(e);if(t)return i(t)}let a=u(e);if(a){let[e,t]=a,n=f(t);return i(n)}let o=e,s=/(\[[\w,-]+\])$/;s.test(e)&&(o=e.replace(s,function(e,t){return`*`.repeat(t.length)})),o.includes(`--`)&&(o=o.replaceAll(`--`,`-*`));let c=o.lastIndexOf(`-`);if(c===-1)return i(f(e));let d=f(e.slice(0,c));i(d)}}export{g as getClassList,_ as unoMerge};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unocss-merge",
-  "version": "0.2.1",
-  "packageManager": "pnpm@10.12.1+sha512.f0dda8580f0ee9481c5c79a1d927b9164f2c478e90992ad268bbb2465a736984391d6333d2c327913578b2804af33474ca554ba29c04a8b13060a717675ae3ac",
+  "version": "0.3.1",
+  "packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184",
   "description": "simple utility to merge unocss class names",
   "type": "module",
   "keywords": [
@@ -50,23 +50,23 @@
     "react": ">=18"
   },
   "devDependencies": {
-    "@magicdawn/eslint-config": "^1.5.4",
+    "@magicdawn/eslint-config": "^1.5.6",
     "@magicdawn/prettier-config": "^0.1.0",
-    "@swc/core": "^1.12.1",
-    "@types/node": "^24.0.3",
+    "@swc/core": "^1.12.9",
+    "@types/node": "^24.0.10",
     "@types/react": "^19.1.8",
-    "@typescript-eslint/eslint-plugin": "^8.34.1",
-    "@typescript-eslint/parser": "^8.34.1",
-    "@vitest/coverage-v8": "^3.2.3",
-    "es-toolkit": "^1.39.3",
-    "eslint": "^9.29.0",
+    "@typescript-eslint/eslint-plugin": "^8.35.1",
+    "@typescript-eslint/parser": "^8.35.1",
+    "@vitest/coverage-v8": "^3.2.4",
+    "es-toolkit": "^1.39.5",
+    "eslint": "^9.30.1",
     "eslint-config-prettier": "^10.1.5",
     "husky": "^9.1.7",
     "lint-staged": "^16.1.2",
-    "prettier": "^3.5.3",
-    "tsdown": "^0.12.8",
+    "prettier": "^3.6.2",
+    "tsdown": "^0.12.9",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.3"
+    "vitest": "^3.2.4"
   },
   "lint-staged": {
     "*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [