@unocss/core 0.53.6 → 0.54.1

package/dist/index.cjs

@@ -233,27 +233,71 @@ function makeRegexClassGroup(separators = ["-", ":"]) {
 }
 function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
   const regexClassGroup = makeRegexClassGroup(separators);
-  let hasChanged = false;
+  let hasChanged;
   let content = str.toString();
   const prefixes = /* @__PURE__ */ new Set();
+  const groupsByOffset = /* @__PURE__ */ new Map();
   do {
-    const before = content;
+    hasChanged = false;
     content = content.replace(
       regexClassGroup,
-      (from, pre, sep, body) => {
+      (from, pre, sep, body, groupOffset) => {
         if (!separators.includes(sep))
           return from;
+        hasChanged = true;
         prefixes.add(pre + sep);
-        return body.split(/\s/g).filter(Boolean).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
+        const bodyOffset = groupOffset + pre.length + sep.length + 1;
+        const group = { length: from.length, items: [] };
+        groupsByOffset.set(groupOffset, group);
+        for (const itemMatch of [...body.matchAll(/\S+/g)]) {
+          const itemOffset = bodyOffset + itemMatch.index;
+          let innerItems = groupsByOffset.get(itemOffset)?.items;
+          if (innerItems) {
+            groupsByOffset.delete(itemOffset);
+          } else {
+            innerItems = [{
+              offset: itemOffset,
+              length: itemMatch[0].length,
+              className: itemMatch[0]
+            }];
+          }
+          for (const item of innerItems) {
+            item.className = item.className === "~" ? pre : item.className.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`);
+            group.items.push(item);
+          }
+        }
+        return "$".repeat(from.length);
       }
     );
-    hasChanged = content !== before;
     depth -= 1;
   } while (hasChanged && depth);
+  let expanded;
+  if (typeof str === "string") {
+    expanded = "";
+    let prevOffset = 0;
+    for (const [offset, group] of groupsByOffset) {
+      expanded += str.slice(prevOffset, offset);
+      expanded += group.items.map((item) => item.className).join(" ");
+      prevOffset = offset + group.length;
+    }
+    expanded += str.slice(prevOffset);
+  } else {
+    expanded = str;
+    for (const [offset, group] of groupsByOffset) {
+      expanded.overwrite(
+        offset,
+        offset + group.length,
+        group.items.map((item) => item.className).join(" ")
+      );
+    }
+  }
   return {
     prefixes: Array.from(prefixes),
-    expanded: content,
-    hasChanged
+    hasChanged,
+    groupsByOffset,
+    get expanded() {
+      return expanded.toString();
+    }
   };
 }
 function collapseVariantGroup(str, prefixes) {
@@ -282,14 +326,8 @@ function collapseVariantGroup(str, prefixes) {
   }).join(" ");
 }
 function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
-  const {
-    expanded
-  } = parseVariantGroup(str.toString(), separators, depth);
-  if (typeof str === "string") {
-    return expanded;
-  } else {
-    return str.length() ? str.overwrite(0, str.original.length, expanded) : str;
-  }
+  const res = parseVariantGroup(str, separators, depth);
+  return typeof str === "string" ? res.expanded : str;
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -359,7 +397,9 @@ function createNanoEvents() {
 const LAYER_DEFAULT = "default";
 const LAYER_PREFLIGHTS = "preflights";
 const LAYER_SHORTCUTS = "shortcuts";
+const LAYER_IMPORTS = "imports";
 const DEFAULT_LAYERS = {
+  [LAYER_IMPORTS]: -200,
   [LAYER_PREFLIGHTS]: -100,
   [LAYER_SHORTCUTS]: -10,
   [LAYER_DEFAULT]: 0
@@ -448,7 +488,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sources.flatMap((p) => toArray(p.autocomplete?.templates))),
-    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0))
+    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0)),
+    shorthands: mergeAutocompleteShorthands(sources.map((p) => p.autocomplete?.shorthands || {}))
   };
   let separators = getMerged("separators");
   if (!separators.length)
@@ -506,8 +547,27 @@ function mergeConfigs(configs) {
 function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
+function mergeAutocompleteShorthands(shorthands) {
+  return shorthands.reduce(
+    (a, b) => {
+      const rs = {};
+      for (const key in b) {
+        const value = b[key];
+        if (Array.isArray(value))
+          rs[key] = `(${value.join("|")})`;
+        else
+          rs[key] = value;
+      }
+      return {
+        ...a,
+        ...rs
+      };
+    },
+    {}
+  );
+}
 
-const version = "0.53.6";
+const version = "0.54.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -729,8 +789,11 @@ class UnoGenerator {
         let handler = await v.match(processed, context);
         if (!handler)
           continue;
-        if (isString(handler))
+        if (isString(handler)) {
+          if (handler === processed)
+            continue;
           handler = { matcher: handler };
+        }
         processed = handler.matcher;
         handlers.unshift(handler);
         variants.add(v);

package/dist/index.d.ts

@@ -66,7 +66,7 @@ declare class UnoGenerator<Theme extends object = object> {
     setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): void;
     applyExtractors(code: string, id?: string, extracted?: Set<string>): Promise<Set<string>>;
     makeContext(raw: string, applied: VariantMatchedResult<Theme>): RuleContext<Theme>;
-    parseToken(raw: string, alias?: string): Promise<StringifiedUtil<Theme>[] | null | undefined>;
+    parseToken(raw: string, alias?: string): Promise<StringifiedUtil<Theme>[] | undefined | null>;
     generate(input: string | Set<string> | string[], options?: GenerateOptions): Promise<GenerateResult>;
     matchVariants(raw: string, current?: string): Promise<VariantMatchedResult<Theme>>;
     private applyVariants;
@@ -134,10 +134,15 @@ declare class BetterMap<K, V> extends Map<K, V> {
 declare function withLayer<T extends object>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare function makeRegexClassGroup(separators?: string[]): RegExp;
-declare function parseVariantGroup(str: string, separators?: string[], depth?: number): {
+interface VariantGroup {
+    length: number;
+    items: HighlightAnnotation[];
+}
+declare function parseVariantGroup(str: string | MagicString, separators?: string[], depth?: number): {
     prefixes: string[];
-    expanded: string;
     hasChanged: boolean;
+    groupsByOffset: Map<number, VariantGroup>;
+    readonly expanded: string;
 };
 declare function collapseVariantGroup(str: string, prefixes: string[]): string;
 declare function expandVariantGroup(str: string, separators?: string[], depth?: number): string;
@@ -546,6 +551,11 @@ interface ConfigBase<Theme extends object = object> {
          * transform class-name style suggestions to the correct format
          */
         extractors?: Arrayable<AutoCompleteExtractor>;
+        /**
+         * Custom shorthands to provide autocomplete suggestions.
+         * if values is an array, it will be joined with `|` and wrapped with `()`
+         */
+        shorthands?: Record<string, string | string[]>;
     };
     /**
      * Hook to modify the resolved config.
@@ -706,12 +716,10 @@ interface SourceMap {
     sourcesContent?: string[];
     version?: number;
 }
-interface TransformResult {
-    code: string;
-    map?: SourceMap | null;
-    etag?: string;
-    deps?: string[];
-    dynamicDeps?: string[];
+interface HighlightAnnotation {
+    offset: number;
+    length: number;
+    className: string;
 }
 type SourceCodeTransformerEnforce = 'pre' | 'post' | 'default';
 interface SourceCodeTransformer {
@@ -727,7 +735,9 @@ interface SourceCodeTransformer {
     /**
      * The transform function
      */
-    transform: (code: MagicString, id: string, ctx: UnocssPluginContext) => Awaitable<void>;
+    transform: (code: MagicString, id: string, ctx: UnocssPluginContext) => Awaitable<{
+        highlightAnnotations?: HighlightAnnotation[];
+    } | void>;
 }
 interface ContentOptions {
     /**
@@ -846,6 +856,7 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
     autocomplete: {
         templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
         extractors: AutoCompleteExtractor[];
+        shorthands: Record<string, string>;
     };
     separators: string[];
 }
@@ -945,4 +956,4 @@ declare function resolveConfig<Theme extends object = object>(userConfig?: UserC
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, HighlightAnnotation, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -229,27 +229,71 @@ function makeRegexClassGroup(separators = ["-", ":"]) {
 }
 function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
   const regexClassGroup = makeRegexClassGroup(separators);
-  let hasChanged = false;
+  let hasChanged;
   let content = str.toString();
   const prefixes = /* @__PURE__ */ new Set();
+  const groupsByOffset = /* @__PURE__ */ new Map();
   do {
-    const before = content;
+    hasChanged = false;
     content = content.replace(
       regexClassGroup,
-      (from, pre, sep, body) => {
+      (from, pre, sep, body, groupOffset) => {
         if (!separators.includes(sep))
           return from;
+        hasChanged = true;
         prefixes.add(pre + sep);
-        return body.split(/\s/g).filter(Boolean).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
+        const bodyOffset = groupOffset + pre.length + sep.length + 1;
+        const group = { length: from.length, items: [] };
+        groupsByOffset.set(groupOffset, group);
+        for (const itemMatch of [...body.matchAll(/\S+/g)]) {
+          const itemOffset = bodyOffset + itemMatch.index;
+          let innerItems = groupsByOffset.get(itemOffset)?.items;
+          if (innerItems) {
+            groupsByOffset.delete(itemOffset);
+          } else {
+            innerItems = [{
+              offset: itemOffset,
+              length: itemMatch[0].length,
+              className: itemMatch[0]
+            }];
+          }
+          for (const item of innerItems) {
+            item.className = item.className === "~" ? pre : item.className.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`);
+            group.items.push(item);
+          }
+        }
+        return "$".repeat(from.length);
       }
     );
-    hasChanged = content !== before;
     depth -= 1;
   } while (hasChanged && depth);
+  let expanded;
+  if (typeof str === "string") {
+    expanded = "";
+    let prevOffset = 0;
+    for (const [offset, group] of groupsByOffset) {
+      expanded += str.slice(prevOffset, offset);
+      expanded += group.items.map((item) => item.className).join(" ");
+      prevOffset = offset + group.length;
+    }
+    expanded += str.slice(prevOffset);
+  } else {
+    expanded = str;
+    for (const [offset, group] of groupsByOffset) {
+      expanded.overwrite(
+        offset,
+        offset + group.length,
+        group.items.map((item) => item.className).join(" ")
+      );
+    }
+  }
   return {
     prefixes: Array.from(prefixes),
-    expanded: content,
-    hasChanged
+    hasChanged,
+    groupsByOffset,
+    get expanded() {
+      return expanded.toString();
+    }
   };
 }
 function collapseVariantGroup(str, prefixes) {
@@ -278,14 +322,8 @@ function collapseVariantGroup(str, prefixes) {
   }).join(" ");
 }
 function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
-  const {
-    expanded
-  } = parseVariantGroup(str.toString(), separators, depth);
-  if (typeof str === "string") {
-    return expanded;
-  } else {
-    return str.length() ? str.overwrite(0, str.original.length, expanded) : str;
-  }
+  const res = parseVariantGroup(str, separators, depth);
+  return typeof str === "string" ? res.expanded : str;
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -355,7 +393,9 @@ function createNanoEvents() {
 const LAYER_DEFAULT = "default";
 const LAYER_PREFLIGHTS = "preflights";
 const LAYER_SHORTCUTS = "shortcuts";
+const LAYER_IMPORTS = "imports";
 const DEFAULT_LAYERS = {
+  [LAYER_IMPORTS]: -200,
   [LAYER_PREFLIGHTS]: -100,
   [LAYER_SHORTCUTS]: -10,
   [LAYER_DEFAULT]: 0
@@ -444,7 +484,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sources.flatMap((p) => toArray(p.autocomplete?.templates))),
-    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0))
+    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0)),
+    shorthands: mergeAutocompleteShorthands(sources.map((p) => p.autocomplete?.shorthands || {}))
   };
   let separators = getMerged("separators");
   if (!separators.length)
@@ -502,8 +543,27 @@ function mergeConfigs(configs) {
 function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
+function mergeAutocompleteShorthands(shorthands) {
+  return shorthands.reduce(
+    (a, b) => {
+      const rs = {};
+      for (const key in b) {
+        const value = b[key];
+        if (Array.isArray(value))
+          rs[key] = `(${value.join("|")})`;
+        else
+          rs[key] = value;
+      }
+      return {
+        ...a,
+        ...rs
+      };
+    },
+    {}
+  );
+}
 
-const version = "0.53.6";
+const version = "0.54.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -725,8 +785,11 @@ class UnoGenerator {
         let handler = await v.match(processed, context);
         if (!handler)
           continue;
-        if (isString(handler))
+        if (isString(handler)) {
+          if (handler === processed)
+            continue;
           handler = { matcher: handler };
+        }
         processed = handler.matcher;
         handlers.unshift(handler);
         variants.add(v);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.53.6",
+  "version": "0.54.1",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,8 +37,8 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.30.1",
-    "unconfig": "^0.3.9"
+    "magic-string": "^0.30.2",
+    "unconfig": "^0.3.10"
   },
   "scripts": {
     "build": "unbuild",