@open-mercato/shared 0.7.1-develop.7203.1.9396450b78 → 0.8.1-develop.7204.1.83330e271e

package/dist/lib/utils.js

@@ -1,7 +1,13 @@
 import { clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
+import { extendTailwindMerge } from "tailwind-merge";
+const mergeClasses = extendTailwindMerge({
+  extend: {
+    classGroups: { "font-size": [{ text: ["overline", "compact", "title-4", "ai-body"] }] },
+    theme: { radius: ["alert", "content-card", "textarea", "upload", "selection-card", "ai-control", "ai-input", "ai-prompt", "ai-prompt-inner", "ai-prompt-mobile", "ai-prompt-mobile-inner"] }
+  }
+});
 function cn(...inputs) {
-  return twMerge(clsx(inputs));
+  return mergeClasses(clsx(inputs));
 }
 function isRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);

package/dist/lib/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/utils.ts"],
-  "sourcesContent": ["import { clsx, type ClassValue } from \"clsx\"\nimport { twMerge } from \"tailwind-merge\"\n\nexport function cn(...inputs: ClassValue[]) {\n  return twMerge(clsx(inputs))\n}\n\nexport function isRecord(value: unknown): value is Record<string, unknown> {\n  return !!value && typeof value === 'object' && !Array.isArray(value)\n}\n\nexport function slugifyTagLabel(label: string): string {\n  return (\n    label\n      .toLowerCase()\n      .trim()\n      .replace(/[^a-z0-9]+/g, \"-\")\n      .replace(/(?:^-+|-+$)/g, \"\")\n      .slice(0, 80) || `tag-${Math.random().toString(36).slice(2, 10)}`\n  )\n}\n"],
-  "mappings": "AAAA,SAAS,YAA6B;AACtC,SAAS,eAAe;AAEjB,SAAS,MAAM,QAAsB;AAC1C,SAAO,QAAQ,KAAK,MAAM,CAAC;AAC7B;AAEO,SAAS,SAAS,OAAkD;AACzE,SAAO,CAAC,CAAC,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK;AACrE;AAEO,SAAS,gBAAgB,OAAuB;AACrD,SACE,MACG,YAAY,EACZ,KAAK,EACL,QAAQ,eAAe,GAAG,EAC1B,QAAQ,gBAAgB,EAAE,EAC1B,MAAM,GAAG,EAAE,KAAK,OAAO,KAAK,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,GAAG,EAAE,CAAC;AAErE;",
+  "sourcesContent": ["import { clsx, type ClassValue } from \"clsx\"\nimport { extendTailwindMerge } from \"tailwind-merge\"\n\nconst mergeClasses = extendTailwindMerge({\n  extend: {\n    classGroups: { \"font-size\": [{ text: [\"overline\", \"compact\", \"title-4\", \"ai-body\"] }] },\n    theme: { radius: [\"alert\", \"content-card\", \"textarea\", \"upload\", \"selection-card\", \"ai-control\", \"ai-input\", \"ai-prompt\", \"ai-prompt-inner\", \"ai-prompt-mobile\", \"ai-prompt-mobile-inner\"] },\n  },\n})\n\nexport function cn(...inputs: ClassValue[]) {\n  return mergeClasses(clsx(inputs))\n}\n\nexport function isRecord(value: unknown): value is Record<string, unknown> {\n  return !!value && typeof value === 'object' && !Array.isArray(value)\n}\n\nexport function slugifyTagLabel(label: string): string {\n  return (\n    label\n      .toLowerCase()\n      .trim()\n      .replace(/[^a-z0-9]+/g, \"-\")\n      .replace(/(?:^-+|-+$)/g, \"\")\n      .slice(0, 80) || `tag-${Math.random().toString(36).slice(2, 10)}`\n  )\n}\n"],
+  "mappings": "AAAA,SAAS,YAA6B;AACtC,SAAS,2BAA2B;AAEpC,MAAM,eAAe,oBAAoB;AAAA,EACvC,QAAQ;AAAA,IACN,aAAa,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,YAAY,WAAW,WAAW,SAAS,EAAE,CAAC,EAAE;AAAA,IACtF,OAAO,EAAE,QAAQ,CAAC,SAAS,gBAAgB,YAAY,UAAU,kBAAkB,cAAc,YAAY,aAAa,mBAAmB,oBAAoB,wBAAwB,EAAE;AAAA,EAC7L;AACF,CAAC;AAEM,SAAS,MAAM,QAAsB;AAC1C,SAAO,aAAa,KAAK,MAAM,CAAC;AAClC;AAEO,SAAS,SAAS,OAAkD;AACzE,SAAO,CAAC,CAAC,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK;AACrE;AAEO,SAAS,gBAAgB,OAAuB;AACrD,SACE,MACG,YAAY,EACZ,KAAK,EACL,QAAQ,eAAe,GAAG,EAC1B,QAAQ,gBAAgB,EAAE,EAC1B,MAAM,GAAG,EAAE,KAAK,OAAO,KAAK,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,GAAG,EAAE,CAAC;AAErE;",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.7.1-develop.7203.1.9396450b78";
+const APP_VERSION = "0.8.1-develop.7204.1.83330e271e";
 const appVersion = APP_VERSION;
 export {
   APP_VERSION,

package/dist/lib/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/version.ts"],
-  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.7.1-develop.7203.1.9396450b78';\nexport const appVersion = APP_VERSION;\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.8.1-develop.7204.1.83330e271e';\nexport const appVersion = APP_VERSION;\n"],
   "mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/shared",
-  "version": "0.7.1-develop.7203.1.9396450b78",
+  "version": "0.8.1-develop.7204.1.83330e271e",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -113,7 +113,7 @@
     "@mikro-orm/core": "^7.1.14",
     "@mikro-orm/decorators": "^7.1.14",
     "@mikro-orm/postgresql": "^7.1.14",
-    "@open-mercato/cache": "0.7.1-develop.7203.1.9396450b78",
+    "@open-mercato/cache": "0.8.1-develop.7204.1.83330e271e",
     "@types/html-to-text": "^9.0.4",
     "@types/sanitize-html": "^2.16.1",
     "dotenv": "^17.4.2",
@@ -141,5 +141,5 @@
     "url": "https://github.com/open-mercato/open-mercato",
     "directory": "packages/shared"
   },
-  "stableVersion": "0.7.0"
+  "stableVersion": "0.8.0"
 }

package/src/lib/__tests__/utils-classes.test.ts

@@ -0,0 +1,30 @@
+import { cn } from '../utils'
+
+describe('DS class merging', () => {
+  it('preserves the overline size alongside a semantic text color', () => {
+    expect(cn('text-overline leading-3', 'text-badge-purple-text')).toBe('text-overline leading-3 text-badge-purple-text')
+    expect(cn('text-muted-foreground', 'text-overline')).toBe('text-muted-foreground text-overline')
+  })
+
+  it('lets later font sizes and colors override only their own groups', () => {
+    expect(cn('text-sm text-foreground', 'text-overline text-muted-foreground')).toBe('text-overline text-muted-foreground')
+    expect(cn('text-overline text-muted-foreground', 'text-sm')).toBe('text-muted-foreground text-sm')
+    expect(cn('md:text-overline md:text-foreground', 'md:text-sm')).toBe('md:text-foreground md:text-sm')
+  })
+
+  it('retains conditional and ordinary layout merging', () => {
+    expect(cn(['px-2', false, 'py-1'], { 'text-overline': true }, 'px-4')).toBe('py-1 text-overline px-4')
+  })
+
+  it.each(['compact', 'title-4', 'ai-body'])('retains the %s source type scale with semantic colors', size => {
+    expect(cn('text-sm text-muted-foreground', `text-${size}`)).toBe(`text-muted-foreground text-${size}`)
+    expect(cn(`text-${size}`, 'text-status-success-text')).toBe(`text-${size} text-status-success-text`)
+  })
+
+  it('lets source radii override inherited primitive radii in both directions', () => {
+    expect(cn('rounded-md border border-border', 'rounded-ai-control')).toBe('border border-border rounded-ai-control')
+    expect(cn('rounded-ai-prompt', 'rounded-none')).toBe('rounded-none')
+    expect(cn('rounded-md', 'rounded-content-card')).toBe('rounded-content-card')
+    expect(cn('rounded-ai-prompt', 'rounded-t-ai-prompt-inner')).toBe('rounded-ai-prompt rounded-t-ai-prompt-inner')
+  })
+})

package/src/lib/utils.ts

@@ -1,8 +1,15 @@
 import { clsx, type ClassValue } from "clsx"
-import { twMerge } from "tailwind-merge"
+import { extendTailwindMerge } from "tailwind-merge"
+
+const mergeClasses = extendTailwindMerge({
+  extend: {
+    classGroups: { "font-size": [{ text: ["overline", "compact", "title-4", "ai-body"] }] },
+    theme: { radius: ["alert", "content-card", "textarea", "upload", "selection-card", "ai-control", "ai-input", "ai-prompt", "ai-prompt-inner", "ai-prompt-mobile", "ai-prompt-mobile-inner"] },
+  },
+})
 
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
+  return mergeClasses(clsx(inputs))
 }
 
 export function isRecord(value: unknown): value is Record<string, unknown> {