unocss-transformer-alias 0.0.2 → 0.0.3

package/dist/index.cjs

@@ -13,28 +13,55 @@ function transformerAlias(options = {}) {
     }
   };
 }
-function transformAlias(code, uno, options = {}) {
+async function transformAlias(code, uno, options = {}) {
   const prefix = options.prefix ?? "*";
   const extraRE = new RegExp(`${escapeRegExp(prefix)}([\\w-]+)`, "g");
+  const map = /* @__PURE__ */ new Map();
   for (const item of Array.from(code.original.matchAll(extraRE))) {
-    for (const shortcut of uno.config.shortcuts) {
-      let result;
-      if (core.isStaticShortcut(shortcut)) {
-        if (shortcut[0] === item[1])
-          result = shortcut[1];
+    let result = map.get(item[0]);
+    if (result === false) {
+      continue;
+    } else if (!result) {
+      const r = await expandShortcut(item[1], uno);
+      if (r) {
+        result = r[0].join(" ");
+        map.set(item[0], result);
       } else {
-        const match = item[1].match(shortcut[0]);
-        if (match !== null)
-          result = shortcut[1](match, uno.config);
+        map.set(item[0], false);
+        continue;
       }
-      if (core.isString(result))
-        code.overwrite(item.index, item.index + item[0].length, core.expandVariantGroup(result.trim()));
     }
+    code.overwrite(item.index, item.index + item[0].length, result);
   }
 }
+async function expandShortcut(input, uno, depth = 5) {
+  if (depth <= 0)
+    return;
+  let result;
+  for (const shortcut of uno.config.shortcuts) {
+    if (core.isStaticShortcut(shortcut)) {
+      if (shortcut[0] === input)
+        result = shortcut[1];
+    } else {
+      const match = input.match(shortcut[0]);
+      if (match != null)
+        result = shortcut[1](match, {});
+    }
+  }
+  if (core.isString(result))
+    result = core.expandVariantGroup(result.trim()).split(/\s+/g);
+  if (!result)
+    return;
+  return [
+    (await Promise.all(
+      result.filter((s) => s !== input).map(async (r) => (core.isString(r) ? (await expandShortcut(r, uno, depth - 1))?.[0] : void 0) || [r])
+    )).flat(1).filter(Boolean)
+  ];
+}
 function escapeRegExp(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
 exports.default = transformerAlias;
+exports.expandShortcut = expandShortcut;
 exports.transformAlias = transformAlias;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SourceCodeTransformer, UnoGenerator } from '@unocss/core';
+import { SourceCodeTransformer, UnoGenerator, ShortcutValue } from '@unocss/core';
 import MagicString from 'magic-string';
 
 interface TransformerAliasOptions {
@@ -10,6 +10,7 @@ interface TransformerAliasOptions {
     prefix?: string;
 }
 declare function transformerAlias(options?: TransformerAliasOptions): SourceCodeTransformer;
-declare function transformAlias(code: MagicString, uno: UnoGenerator, options?: TransformerAliasOptions): void;
+declare function transformAlias(code: MagicString, uno: UnoGenerator, options?: TransformerAliasOptions): Promise<void>;
+declare function expandShortcut(input: string, uno: UnoGenerator, depth?: number): Promise<[ShortcutValue[]] | undefined>;
 
-export { TransformerAliasOptions, transformerAlias as default, transformAlias };
+export { TransformerAliasOptions, transformerAlias as default, expandShortcut, transformAlias };

package/dist/index.mjs

@@ -9,27 +9,53 @@ function transformerAlias(options = {}) {
     }
   };
 }
-function transformAlias(code, uno, options = {}) {
+async function transformAlias(code, uno, options = {}) {
   const prefix = options.prefix ?? "*";
   const extraRE = new RegExp(`${escapeRegExp(prefix)}([\\w-]+)`, "g");
+  const map = /* @__PURE__ */ new Map();
   for (const item of Array.from(code.original.matchAll(extraRE))) {
-    for (const shortcut of uno.config.shortcuts) {
-      let result;
-      if (isStaticShortcut(shortcut)) {
-        if (shortcut[0] === item[1])
-          result = shortcut[1];
+    let result = map.get(item[0]);
+    if (result === false) {
+      continue;
+    } else if (!result) {
+      const r = await expandShortcut(item[1], uno);
+      if (r) {
+        result = r[0].join(" ");
+        map.set(item[0], result);
       } else {
-        const match = item[1].match(shortcut[0]);
-        if (match !== null)
-          result = shortcut[1](match, uno.config);
+        map.set(item[0], false);
+        continue;
       }
-      if (isString(result))
-        code.overwrite(item.index, item.index + item[0].length, expandVariantGroup(result.trim()));
     }
+    code.overwrite(item.index, item.index + item[0].length, result);
   }
 }
+async function expandShortcut(input, uno, depth = 5) {
+  if (depth <= 0)
+    return;
+  let result;
+  for (const shortcut of uno.config.shortcuts) {
+    if (isStaticShortcut(shortcut)) {
+      if (shortcut[0] === input)
+        result = shortcut[1];
+    } else {
+      const match = input.match(shortcut[0]);
+      if (match != null)
+        result = shortcut[1](match, {});
+    }
+  }
+  if (isString(result))
+    result = expandVariantGroup(result.trim()).split(/\s+/g);
+  if (!result)
+    return;
+  return [
+    (await Promise.all(
+      result.filter((s) => s !== input).map(async (r) => (isString(r) ? (await expandShortcut(r, uno, depth - 1))?.[0] : void 0) || [r])
+    )).flat(1).filter(Boolean)
+  ];
+}
 function escapeRegExp(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
-export { transformerAlias as default, transformAlias };
+export { transformerAlias as default, expandShortcut, transformAlias };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unocss-transformer-alias",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Transform alias for UnoCSS shortcuts",
   "author": "Chris <https://github.com/zyyv>",
   "license": "MIT",
@@ -62,6 +62,7 @@
     "lint": "eslint .",
     "test": "vitest",
     "test:update": "vitest -u",
-    "typecheck": "tcs --noEmit"
+    "typecheck": "tcs --noEmit",
+    "play": "npm -C playground run dev"
   }
 }