unocss-merge 0.0.1 → 0.2.0

package/README.md

@@ -16,13 +16,23 @@ $ 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')
 ```
 
 ## Changelog
 
-[CHANGELOG.md](CHANGELOG.md)
+See https://github.com/magicdawn/unocss-merge/releases
 
 ## License
 

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,8 +1 @@
-import {
-  getClassList,
-  unoMerge
-} from "./chunk-XPETEQCQ.js";
-export {
-  getClassList,
-  unoMerge
-};
+import{getClassList as e,unoMerge as t}from"./src-DkzuEjkD.js";export{e as getClassList,t as unoMerge};

package/dist/react.d.ts

@@ -1,6 +1,8 @@
+//#region src/react.d.ts
 /**
- * @note `useMemo` `deps array`.length should not change in runtime
- */
+* @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,12 +1 @@
-import {
-  unoMerge
-} from "./chunk-XPETEQCQ.js";
-
-// src/react.ts
-import { useMemo } from "react";
-function useUnoMerge(...classNames) {
-  return useMemo(() => unoMerge(...classNames), [...classNames]);
-}
-export {
-  useUnoMerge
-};
+import{unoMerge as e}from"./src-DkzuEjkD.js";import{useMemo as t}from"react";function n(...n){return t(()=>e(...n),[...n])}export{n as useUnoMerge};

package/dist/src-DkzuEjkD.js

@@ -0,0 +1,6 @@
+function e(e){return Array.from(new Set(e))}function t(e,t){if(!e)throw Error(t)}const n=[[u(`
+      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`],[[`flex-row`,`flex-row-reverse`,`flex-col`,`flex-col-reverse`],`flex-direction`],[[`flex-wrap`,`flex-wrap-reverse`,`flex-nowrap`],`flex-wrap`],[d(`object-`,[`contain`,`cover`,`fill`,`none`,`scale-down`]),`object-fit`],[d(`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`],[d(`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`],[d(`text-`,[`left`,`center`,`right`,`justify`,`start`,`end`]),`text-align`],[[`underline`,`overline`,`line-through`,`no-underline`],`text-decoration-line`],[d(`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`],[d(`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+)/,(e,t)=>`border-${t?.[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+)/,(e,t)=>`divide-${t?.[1]}-width`],[[`ring`,/^ring-\d+/],`ring-width`],[[/^ring-offset-\d+/],`ring-offset-width`],[[`shadow`,...d(`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`],[/^(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])],r=new Map,i=new Map;for(let[e,t]of n){let n=[e].flat(),a=n.filter(e=>typeof e==`string`),o=n.filter(e=>typeof e==`object`&&e instanceof RegExp);a.forEach(e=>{let n=typeof t==`string`?t:t(e);r.set(e,n)}),o.forEach(e=>{i.set(e,t)})}function a(e){if(r.has(e))return r.get(e);for(let[t,n]of i.entries())if(t.test(e)){let r=t.exec(e),i=typeof n==`string`?n:n(e,r);return i}}function o(e){return s.map(e=>typeof e==`string`?[e,e]:e).find(([t,n])=>e.startsWith(t+`-`))}const s=[`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 c(e){return l.has(e)?l.get(e):e}const l=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 u(e){return e.split(`
+`).map(e=>e.trim()).filter(Boolean).map(e=>e.split(`,`).map(e=>e.trim()).filter(Boolean)).flat()}function d(e,n){return t(e.endsWith(`-`),"prefix must end with `-`"),n.map(t=>e+t)}function f(t){return e((t||``).split(` `).map(e=>e.trim()).filter(Boolean))}function p(...e){let t=e.map(f).flat().filter(Boolean),n=new Map;for(let e of t){{let t=a(e);if(t){n.set(t,e);continue}}let t=o(e);if(t){let[r,i]=t,a=c(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.replace(/--/g,`-*`));let s=r.lastIndexOf(`-`);if(s===-1){n.set(c(e),e);continue}let l=c(e.slice(0,s));n.set(l,e)}return Array.from(n.values()).join(` `)}export{f as getClassList,p as unoMerge};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unocss-merge",
-  "version": "0.0.1",
+  "version": "0.2.0",
   "description": "simple utility to merge unocss class names",
   "type": "module",
   "exports": {
@@ -19,30 +19,29 @@
   ],
   "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"
-  },
   "devDependencies": {
     "@magicdawn/prettier-config": "^0.0.4",
     "@swc/core": "^1.11.22",
-    "@types/node": "^22.15.0",
+    "@types/node": "^22.15.2",
+    "@types/react": "^19.1.2",
     "@typescript-eslint/eslint-plugin": "^8.31.0",
     "@typescript-eslint/parser": "^8.31.0",
     "@vitest/coverage-v8": "^3.1.2",
+    "es-toolkit": "^1.36.0",
     "eslint": "^9.25.1",
     "eslint-config-prettier": "^10.1.2",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.1",
     "prettier": "^3.5.3",
-    "tsup": "^8.4.0",
+    "tsdown": "^0.9.8",
     "typescript": "^5.8.3",
     "vitest": "^3.1.2"
   },

package/dist/chunk-XPETEQCQ.js

@@ -1,180 +0,0 @@
-// src/index.ts
-import { uniq } from "es-toolkit";
-
-// src/config.ts
-var singleValues = {
-  "display": toValues(`
-    block,inline-block,inline,flex,inline-flex,
-    table,inline-table,table-caption,table-cell,table-column,table-row,
-    table-column-group,table-footer-group,table-header-group,table-row-group,
-    flow-root,grid,inline-grid,contents,list-item,hidden
-  `),
-  "isolation": ["isolate", "isolation-auto"],
-  "position": ["static", "fixed", "absolute", "relative", "stick"],
-  "visibility": ["visible", "invisible", "collapse"],
-  "flex-direction": ["flex-row", "flex-row-reverse", "flex-col", "flex-col-reverse"],
-  "flex-wrap": ["flex-wrap", "flex-wrap-reverse", "flex-nowrap"],
-  "object-fit": [
-    "object-contain",
-    "object-cover",
-    "object-fill",
-    "object-none",
-    "object-scale-down"
-  ],
-  "object-position": [
-    "object-bottom",
-    "object-center",
-    "object-left",
-    "object-left-bottom",
-    "object-left-top",
-    "object-right",
-    "object-right-bottom",
-    "object-right-top",
-    "object-top"
-  ],
-  "font-smoothing": ["antialiased", "subpixel-antialiased"],
-  "font-style": ["italic", "not-italic"],
-  "font-weight": [
-    "font-thin",
-    "font-extralight",
-    "font-light",
-    "font-normal",
-    "font-medium",
-    "font-semibold",
-    "font-bold",
-    "font-extrabold",
-    "font-black"
-  ],
-  "font-variant-numeric": [
-    "normal-nums",
-    "ordinal",
-    "slashed-zero",
-    "lining-nums",
-    "oldstyle-nums",
-    "proportional-nums",
-    "tabular-nums",
-    "diagonal-fractions",
-    "stacked-fractions"
-  ],
-  // TODO:
-  "font-size": [
-    "text-xs",
-    "text-sm",
-    "text-base",
-    "text-lg",
-    "text-xl",
-    "text-2xl",
-    "text-3xl",
-    "text-4xl",
-    "text-5xl",
-    "text-6xl",
-    "text-7xl",
-    "text-8xl",
-    "text-9xl"
-  ],
-  "list-style-position": ["list-inside", "list-outside"],
-  "list-style-type": ["list-none", "list-disc", "list-decimal"],
-  "text-align": [
-    "text-left",
-    "text-center",
-    "text-right",
-    "text-justify",
-    "text-start",
-    "text-end"
-  ]
-};
-var specialValues = {
-  "grow": { key: "flex-grow", value: "1" },
-  "shrink": { key: "flex-shrink", value: "1" },
-  "flex-grow": { key: "flex-grow", value: "1" },
-  "flex-shrink": { key: "flex-shrink", value: "1" }
-};
-var classNameMap = /* @__PURE__ */ new Map();
-for (const [prop, values] of Object.entries(singleValues)) {
-  for (const cls of values) {
-    classNameMap.set(cls, { key: prop, value: cls });
-  }
-}
-for (const [cls, config] of Object.entries(specialValues)) {
-  classNameMap.set(cls, config);
-}
-var knownPrefixHasDashValue = [
-  "break-after",
-  // break-after-avoid-page
-  "break-before",
-  "break-inside",
-  // grid
-  "grid-flow"
-  // grid-flow-row-dense
-];
-var ShortcutMap = new Map(
-  Object.entries({
-    "grow": "flex-grow",
-    "shrink": "flex-shrink",
-    "col": "grid-column",
-    // `col-auto` =>	`grid-column: auto;`
-    "col-span": "grid-column",
-    "col-start": "grid-column-start",
-    "col-end": "grid-column-end",
-    "row": "grid-row",
-    // `row-auto` =>	`grid-row: auto;`
-    "row-span": "grid-row",
-    "row-start": "grid-row-start",
-    "row-end": "grid-row-end",
-    "leading": "line-height"
-  })
-);
-function toValues(str) {
-  return str.split("\n").map((line) => line.trim()).filter(Boolean).map(
-    (line) => line.split(",").map((x) => x.trim()).filter(Boolean)
-  ).flat();
-}
-
-// src/index.ts
-function getClassList(className) {
-  return uniq(
-    (className || "").split(" ").map((x) => x.trim()).filter(Boolean)
-  );
-}
-function unoMerge(...classNames) {
-  const classList = classNames.map(getClassList).flat().filter(Boolean);
-  const map = /* @__PURE__ */ new Map();
-  for (const cls of classList) {
-    if (classNameMap.has(cls)) {
-      const { key: key2, value } = classNameMap.get(cls);
-      map.set(key2, value);
-      continue;
-    }
-    const prefix = knownPrefixHasDashValue.find((prefix2) => cls.startsWith(prefix2 + "-"));
-    if (prefix) {
-      map.set(prefix, cls);
-      continue;
-    }
-    let clsForSearing = cls;
-    const reg = /(\[[\w_,-]+\])$/;
-    if (reg.test(cls)) {
-      clsForSearing = cls.replace(reg, function(match, p1) {
-        return "*".repeat(p1.length);
-      });
-    }
-    if (clsForSearing.includes("--")) {
-      clsForSearing = clsForSearing.replace(/--/g, "-*");
-    }
-    const lastHyphenIndex = clsForSearing.lastIndexOf("-");
-    if (lastHyphenIndex === -1) {
-      map.set(cls, cls);
-      continue;
-    }
-    let key = cls.slice(0, lastHyphenIndex);
-    if (ShortcutMap.has(key)) {
-      key = ShortcutMap.get(key);
-    }
-    map.set(key, cls);
-  }
-  return Array.from(map.values()).join(" ");
-}
-
-export {
-  getClassList,
-  unoMerge
-};