unocss-merge 0.1.0 → 0.2.1

package/README.md

@@ -16,13 +16,49 @@ $ pnpm add unocss-merge
 
 ## API
 
-```js
-const unocssMerge = require('unocss-merge');
+```ts
+import { unoMerge } from 'unocss-merge'
+
+expect(unoMerge('hidden', 'block')).toBe('block')
+expect(unoMerge('hidden', 'block', 'flex')).toBe('flex')
+
+expect(unoMerge('mr-1', 'mr-2')).toBe('mr-2')
+expect(unoMerge('mr-1', 'mr-4px')).toBe('mr-4px')
+expect(unoMerge('mr-1', 'mr-[-4px]')).toBe('mr-[-4px]')
+expect(unoMerge('mr-1', 'mr--4px')).toBe('mr--4px')
+
+expect(unoMerge('cursor-pointer', 'cursor-not-allowed')).toBe('cursor-not-allowed')
+```
+
+## Why
+
+- `twMerge` don't support [arbitrary value without brackets](https://github.com/dcastil/tailwind-merge/blob/v3.2.0/src/lib/validators.ts#L1)
+
+```ts
+import { twMerge } from 'tailwind-merge' // "tailwind-merge": "^3.2.0",
+
+// size-16px ml-4px cursor-not-allowed size-18px ml-10px
+console.log(twMerge('cursor-pointer size-16px ml-4px', 'cursor-not-allowed size-18px ml-10px'))
+console.log(twMerge('cursor-pointer', 'cursor-not-allowed')) // `cursor-not-allowed` ✅
+
+console.log(twMerge('size-[16px]', 'size-[18px]')) // `size-[18px]` ✅
+console.log(twMerge('ml-[4px]', 'ml-[10px]')) // `ml-[10px]` ✅
+
+// twMerge don't support arbitrary value without brackets
+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
+
+- 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
+
 ## Changelog
 
-[CHANGELOG.md](CHANGELOG.md)
+See https://github.com/magicdawn/unocss-merge/releases
 
 ## License
 

package/dist/index.d.ts

@@ -1,4 +1,11 @@
-declare function getClassList(className?: string): string[];
-declare function unoMerge(...classNames: Array<string | undefined>): string;
-
-export { getClassList, unoMerge };
+//#region src/index.d.ts
+declare function getClassList(className: string | null | undefined): 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>): string;
+//#endregion
+export { getClassList, unoMerge };

package/dist/index.js

@@ -1 +1 @@
-import{a,b}from"./chunk-MBFPIAXN.js";export{a as getClassList,b as unoMerge};
+import{getClassList as e,unoMerge as t}from"./src-BrrP8tFs.js";export{e as getClassList,t as unoMerge};

package/dist/react.d.ts

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

package/dist/react.js

@@ -1 +1 @@
-import{b as e}from"./chunk-MBFPIAXN.js";import{useMemo as n}from"react";function i(...r){return n(()=>e(...r),[...r])}export{i as useUnoMerge};
+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};

package/dist/src-BrrP8tFs.js

@@ -0,0 +1,6 @@
+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=[[m(`
+      block,inline-block,inline,flex,inline-flex,flow-root,grid,inline-grid,contents,list-item,hidden
+      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};

package/package.json

@@ -1,8 +1,27 @@
 {
   "name": "unocss-merge",
-  "version": "0.1.0",
+  "version": "0.2.1",
+  "packageManager": "pnpm@10.12.1+sha512.f0dda8580f0ee9481c5c79a1d927b9164f2c478e90992ad268bbb2465a736984391d6333d2c327913578b2804af33474ca554ba29c04a8b13060a717675ae3ac",
   "description": "simple utility to merge unocss class names",
   "type": "module",
+  "keywords": [
+    "unocss",
+    "merge",
+    "tw-merge"
+  ],
+  "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/"
+  ],
   "exports": {
     "./package.json": "./package.json",
     "./react": {
@@ -14,66 +33,48 @@
       "default": "./dist/index.js"
     }
   },
-  "files": [
-    "dist/"
-  ],
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "scripts": {
     "prepare": "husky",
-    "dev": "tsup --watch",
-    "build": "tsup",
+    "dev": "tsdown --watch",
+    "build": "tsdown",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:dev": "vitest",
     "test-cover": "vitest run --coverage",
     "prepublishOnly": "pnpm typecheck && pnpm test-cover && pnpm build"
   },
-  "dependencies": {
-    "es-toolkit": "^1.36.0"
+  "peerDependencies": {
+    "react": ">=18"
   },
   "devDependencies": {
-    "@magicdawn/prettier-config": "^0.0.4",
-    "@swc/core": "^1.11.22",
-    "@types/node": "^22.15.0",
-    "@typescript-eslint/eslint-plugin": "^8.31.0",
-    "@typescript-eslint/parser": "^8.31.0",
-    "@vitest/coverage-v8": "^3.1.2",
-    "eslint": "^9.25.1",
-    "eslint-config-prettier": "^10.1.2",
+    "@magicdawn/eslint-config": "^1.5.4",
+    "@magicdawn/prettier-config": "^0.1.0",
+    "@swc/core": "^1.12.1",
+    "@types/node": "^24.0.3",
+    "@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",
+    "eslint-config-prettier": "^10.1.5",
     "husky": "^9.1.7",
-    "lint-staged": "^15.5.1",
+    "lint-staged": "^16.1.2",
     "prettier": "^3.5.3",
-    "tsup": "^8.4.0",
+    "tsdown": "^0.12.8",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.2"
-  },
-  "peerDependencies": {
-    "react": ">=18"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/magicdawn/unocss-merge.git"
-  },
-  "keywords": [
-    "unocss",
-    "merge",
-    "tw-merge"
-  ],
-  "author": "magicdawn",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/magicdawn/unocss-merge/issues"
-  },
-  "homepage": "https://github.com/magicdawn/unocss-merge#readme",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
+    "vitest": "^3.2.3"
   },
   "lint-staged": {
-    "**/*": [
-      "prettier --write --ignore-unknown"
-    ],
-    "*.{js,jsx,ts,tsx,less,md}": [
+    "*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [
+      "eslint --fix",
       "prettier --write"
+    ],
+    "!*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [
+      "prettier --write --ignore-unknown"
     ]
-  },
-  "packageManager": "pnpm@10.9.0+sha512.0486e394640d3c1fb3c9d43d49cf92879ff74f8516959c235308f5a8f62e2e19528a65cdc2a3058f587cde71eba3d5b56327c8c33a97e4c4051ca48a10ca2d5f"
+  }
 }

package/dist/chunk-MBFPIAXN.js

@@ -1,6 +0,0 @@
-import{uniq as y}from"es-toolkit";var h=[[w(`
-      block,inline-block,inline,flex,inline-flex,flow-root,grid,inline-grid,contents,list-item,hidden
-      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","stick"],"position"],[["visible","invisible","collapse"],"visibility"],[["flex-row","flex-row-reverse","flex-col","flex-col-reverse"],"flex-direction"],[["flex-wrap","flex-wrap-reverse","flex-nowrap"],"flex-wrap"],[l("object-",["contain","cover","fill","none","scale-down"]),"object-fit"],[l("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"],[l("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"],[["text-xs","text-sm","text-base","text-lg","text-xl",/^text-(size-)?\d+xl/,/^text-(size-)?\d+/,/^font-size-\d+/],"font-size"],[["list-inside","list-outside"],"list-style-position"],[["list-none","list-disc","list-decimal"],"list-style-type"],[l("text-",["left","center","right","justify","start","end"]),"text-align"],[["underline","overline","line-through","no-underline"],"text-decoration-line"],[l("decoration-",["solid","double","dotted","dashed","wavy"]),"text-decoration-style"],[["decoration-auto","decoration-from-font",/^decoration-\d+/],"text-decoration-thickness"],[["truncate","text-ellipsis","text-clip"],"text-overflow"],[["text-wrap","text-nowrap","text-balance","text-pretty"],"text-wrap"],[l("bg-",["bottom","center","left","left-bottom","left-top","right","right-bottom","right-top","top"]),"background-position"],[["bg-repeat","bg-no-repeat",/^bg-repeat-/],"background-repeat"],[["bg-auto","bg-cover","bg-contain"],"background-size"],[["bg-none",/^bg-gradient-to-/],"background-image"],[[/^(?:border-|b-)?(?:rounded|rd)()(?:-(.+))?$/],"rounded"],[/^b(?:order)?-(solid|dashed|dotted|double|hidden|none)$/,"border-style"],[/^b(?:order)?($|-\d+)/,"border-width"],[/^b(?:order)?-(t|b|l|r|x|y|s|e)($|-\d+)/,(t,e)=>`border-${e==null?void 0:e[1]}-width`],[/^outline-\d+/,"outline-width"],[["outline",/^outline-(solid|dashed|dotted|double|none)$/],"outline-style"],[/^divide-(solid|dashed|dotted|double|none)$/,"divide-style"],[/^divide-(x|y)($|-\d+)$/,(t,e)=>`divide-${e==null?void 0:e[1]}-width`],[["ring",/^ring-\d+/],"ring-width"],[[/^ring-offset-\d+/],"ring-offset-width"],[["shadow",...l("shadow",["sm","md","lg","xl","2xl","inner","none"])],"box-shadow"],[["border-collapse","border-separate"],"border-collapse"],[["table-auto","table-fixed"],"table-layout"],[["caption-top","caption-bottom"],"caption-side"],[["scroll-auto","scroll-smooth"],"scroll-behavior"],[["snap-start","snap-end","snap-center","snap-align-none"],"scroll-snap-align"],[["snap-normal","snap-always"],"scroll-snap-stop"],[["snap-none","snap-x","snap-y","snap-both","snap-mandatory","snap-proximity"],"scroll-snap-type"],[/^stroke-\d+/,"stroke-width"],[["sr-only","not-sr-only"],"Screen Readers"],[["grow","flex-grow"],"flex-grow"],[["shrink","flex-shrink"],"flex-shrink"],...["resize","ring-inset","divide-x-reverse","divide-y-reverse","blur","drop-shadow","grayscale","invert","sepia","backdrop-blur","backdrop-grayscale","backdrop-invert","backdrop-sepia"].map(t=>[t,t])],p=new Map,u=new Map;for(let[t,e]of h){let o=[t].flat(),r=o.filter(n=>typeof n=="string"),s=o.filter(n=>typeof n=="object"&&n instanceof RegExp);r.forEach(n=>{let a=typeof e=="string"?e:e(n);p.set(n,a)}),s.forEach(n=>{u.set(n,e)})}function x(t){if(p.has(t))return p.get(t);for(let[e,o]of u.entries())if(e.test(t)){let r=e.exec(t);return typeof o=="string"?o:o(t,r)}}var m=["break-after","break-before","break-inside","grid-flow","align","whitespace","mix-blend","bg-blend","ease","origin","cursor","touch","text","color","bg","b","border","decoration","from","divide","outline","ring","ring-offset","shadow","accent","caret","fill","stroke"],d=new Map(Object.entries({grow:"flex-grow",shrink:"flex-shrink",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",leading:"line-height"}));function w(t){return t.split(`
-`).map(e=>e.trim()).filter(Boolean).map(e=>e.split(",").map(o=>o.trim()).filter(Boolean)).flat()}function l(t,e){return e.map(o=>t+o)}function k(t){return y((t||"").split(" ").map(e=>e.trim()).filter(Boolean))}function E(...t){let e=t.map(k).flat().filter(Boolean),o=new Map;for(let r of e){let s=x(r);if(s){if(typeof s=="string")o.set(s,r);else{let[i,g]=s;o.set(i,g)}continue}let n=m.find(i=>r.startsWith(i+"-"));if(n){let i=n;d.has(i)&&(i=d.get(i)),o.set(i,r);continue}let a=r,f=/(\[[\w_,-]+\])$/;f.test(r)&&(a=r.replace(f,function(i,g){return"*".repeat(g.length)})),a.includes("--")&&(a=a.replace(/--/g,"-*"));let b=a.lastIndexOf("-");if(b===-1){o.set(r,r);continue}let c=r.slice(0,b);d.has(c)&&(c=d.get(c)),o.set(c,r)}return Array.from(o.values()).join(" ")}export{k as a,E as b};