@unocss/core 0.4.7 → 0.4.8

package/dist/index.d.ts

@@ -12,7 +12,7 @@ declare class UnoGenerator {
     applyVariants(parsed: ParsedUtil, variantHandlers?: VariantHandler[], raw?: string): readonly [string, CSSEntries, string | undefined];
     parseUtil(input: string | VariantMatchedResult): Promise<ParsedUtil | RawUtil | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil): StringifiedUtil | undefined;
-    expandShortcut(processed: string): string[] | undefined;
+    expandShortcut(processed: string, depth?: number): string[] | undefined;
     stringifyShortcuts(parent: VariantMatchedResult, expanded: string[]): Promise<StringifiedUtil[]>;
     isExcluded(raw: string): boolean;
 }
@@ -164,7 +164,6 @@ declare type StringifiedUtil = readonly [
     string,
     string | undefined
 ];
-declare function defineConfig(config: UserConfig): UserConfig<{}>;
 
 declare function escapeRegExp(string: string): string;
 /**
@@ -208,4 +207,4 @@ declare class BetterMap<K, V> extends Map<K, V> {
 
 declare const extractorSplit: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicRule, DynamicShortcut, ExcludeRule, Extractor, GenerateResult, GeneratorOptions, ParsedUtil, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, defineConfig, e, entriesToCss, escapeRegExp, escapeSelector, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, toArray, uniq, validateFilterRE };
+export { ArgumentType, Awaitable, BetterMap, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicRule, DynamicShortcut, ExcludeRule, Extractor, GenerateResult, GeneratorOptions, ParsedUtil, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, toArray, uniq, validateFilterRE };

package/dist/index.js

@@ -13,7 +13,6 @@ __export(exports, {
   UnoGenerator: () => UnoGenerator,
   attributifyRE: () => attributifyRE,
   createGenerator: () => createGenerator,
-  defineConfig: () => defineConfig,
   e: () => e,
   entriesToCss: () => entriesToCss,
   escapeRegExp: () => escapeRegExp,
@@ -35,11 +34,6 @@ __export(exports, {
   validateFilterRE: () => validateFilterRE
 });
 
-// src/types.ts
-function defineConfig(config) {
-  return config;
-}
-
 // src/utils/escape.ts
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -340,7 +334,7 @@ var UnoGenerator = class {
         return;
       }
       const expanded = this.expandShortcut(applied[1]);
-      if (expanded) {
+      if (expanded == null ? void 0 : expanded.length) {
         const utils = await this.stringifyShortcuts(applied, expanded);
         if (utils.length) {
           hit(raw, utils);
@@ -467,12 +461,16 @@ ${rules}
       return;
     return [parsed[0], selector, body, mediaQuery];
   }
-  expandShortcut(processed) {
+  expandShortcut(processed, depth = 3) {
+    if (depth === 0)
+      return;
     let result;
     for (const s of this.config.shortcuts) {
       if (isStaticShortcut(s)) {
-        if (s[0] === processed)
+        if (s[0] === processed) {
           result = s[1];
+          break;
+        }
       } else {
         const match = processed.match(s[0]);
         if (match)
@@ -485,7 +483,7 @@ ${rules}
       return;
     if (typeof result === "string")
       result = result.split(/ /g);
-    return result;
+    return uniq(result.flatMap((r) => this.expandShortcut(r, depth - 1) || [r]));
   }
   async stringifyShortcuts(parent, expanded) {
     const selectorMap = new TwoKeyMap();
@@ -536,7 +534,6 @@ function normalizeEntries(obj) {
   UnoGenerator,
   attributifyRE,
   createGenerator,
-  defineConfig,
   e,
   entriesToCss,
   escapeRegExp,

package/dist/index.mjs

@@ -1,8 +1,3 @@
-// src/types.ts
-function defineConfig(config) {
-  return config;
-}
-
 // src/utils/escape.ts
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -303,7 +298,7 @@ var UnoGenerator = class {
         return;
       }
       const expanded = this.expandShortcut(applied[1]);
-      if (expanded) {
+      if (expanded == null ? void 0 : expanded.length) {
         const utils = await this.stringifyShortcuts(applied, expanded);
         if (utils.length) {
           hit(raw, utils);
@@ -430,12 +425,16 @@ ${rules}
       return;
     return [parsed[0], selector, body, mediaQuery];
   }
-  expandShortcut(processed) {
+  expandShortcut(processed, depth = 3) {
+    if (depth === 0)
+      return;
     let result;
     for (const s of this.config.shortcuts) {
       if (isStaticShortcut(s)) {
-        if (s[0] === processed)
+        if (s[0] === processed) {
           result = s[1];
+          break;
+        }
       } else {
         const match = processed.match(s[0]);
         if (match)
@@ -448,7 +447,7 @@ ${rules}
       return;
     if (typeof result === "string")
       result = result.split(/ /g);
-    return result;
+    return uniq(result.flatMap((r) => this.expandShortcut(r, depth - 1) || [r]));
   }
   async stringifyShortcuts(parent, expanded) {
     const selectorMap = new TwoKeyMap();
@@ -498,7 +497,6 @@ export {
   UnoGenerator,
   attributifyRE,
   createGenerator,
-  defineConfig,
   e,
   entriesToCss,
   escapeRegExp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "",
   "keywords": [],
   "homepage": "https://github.com/antfu/unocss#readme",