@unocss/transformer-compile-class 0.52.5 → 0.52.7

package/dist/index.cjs

@@ -4,7 +4,7 @@ const core = require('@unocss/core');
 
 function transformerCompileClass(options = {}) {
   const {
-    trigger = /(["'`]):uno:\s([^\1]*?)\1/g,
+    trigger = /(["'`]):uno(?:-)?(?<name>[^\s\1]+)?:\s([^\1]*?)\1/g,
     classPrefix = "uno-",
     hashFn = hash,
     keepUnknown = true
@@ -30,9 +30,20 @@ function transformerCompileClass(options = {}) {
         }
         if (body) {
           body = body.split(/\s+/).sort().join(" ");
-          const className = match.groups && match.groups.name ? `${classPrefix}${match.groups.name}` : `${classPrefix}${hashFn(body)}`;
-          if (tokens && tokens.has(className))
-            throw new Error(`duplicate compile class name '${className}', please choose different class name`);
+          let hash2;
+          let explicitName = false;
+          if (match.groups && match.groups.name) {
+            hash2 = match.groups.name;
+            explicitName = true;
+          } else {
+            hash2 = hashFn(body);
+          }
+          const className = `${classPrefix}${hash2}`;
+          if (tokens && tokens.has(className) && explicitName) {
+            const existing = uno.config.shortcuts.find((i) => i[0] === className);
+            if (existing && existing[1] !== body)
+              throw new Error(`Duplicated compile class name "${className}". One is "${body}" and the other is "${existing[1]}" Please choose different class name`);
+          }
           replacements.unshift(className);
           if (options.layer)
             uno.config.shortcuts.push([className, body, { layer: options.layer }]);

package/dist/index.d.ts

@@ -28,7 +28,7 @@ interface CompileClassOptions {
      * This parameter is backwards compatible. It accepts string only trigger
      * words, like `:uno:` or a regex literal.
      *
-     * @default `/(["'`]):uno:\s([^\1]*?)\1/g`
+     * @default `/(["'`]):uno(?:-)?(?<name>[^\s\1]+)?:\s([^\1]*?)\1/g`
      */
     trigger?: string | RegExp;
     /**

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { escapeRegExp, expandVariantGroup } from '@unocss/core';
 
 function transformerCompileClass(options = {}) {
   const {
-    trigger = /(["'`]):uno:\s([^\1]*?)\1/g,
+    trigger = /(["'`]):uno(?:-)?(?<name>[^\s\1]+)?:\s([^\1]*?)\1/g,
     classPrefix = "uno-",
     hashFn = hash,
     keepUnknown = true
@@ -28,9 +28,20 @@ function transformerCompileClass(options = {}) {
         }
         if (body) {
           body = body.split(/\s+/).sort().join(" ");
-          const className = match.groups && match.groups.name ? `${classPrefix}${match.groups.name}` : `${classPrefix}${hashFn(body)}`;
-          if (tokens && tokens.has(className))
-            throw new Error(`duplicate compile class name '${className}', please choose different class name`);
+          let hash2;
+          let explicitName = false;
+          if (match.groups && match.groups.name) {
+            hash2 = match.groups.name;
+            explicitName = true;
+          } else {
+            hash2 = hashFn(body);
+          }
+          const className = `${classPrefix}${hash2}`;
+          if (tokens && tokens.has(className) && explicitName) {
+            const existing = uno.config.shortcuts.find((i) => i[0] === className);
+            if (existing && existing[1] !== body)
+              throw new Error(`Duplicated compile class name "${className}". One is "${body}" and the other is "${existing[1]}" Please choose different class name`);
+          }
           replacements.unshift(className);
           if (options.layer)
             uno.config.shortcuts.push([className, body, { layer: options.layer }]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/transformer-compile-class",
-  "version": "0.52.5",
+  "version": "0.52.7",
   "description": "Compile group of classes into one class",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/core": "0.52.5"
+    "@unocss/core": "0.52.7"
   },
   "devDependencies": {
     "magic-string": "^0.30.0"