@unocss/core 0.43.0 → 0.44.0

package/dist/index.cjs

@@ -224,17 +224,23 @@ function withLayer(layer, rules) {
 }
 
 const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
-function expandVariantGroup(str) {
+function expandVariantGroup(str, seperators = ["-", ":"]) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
+  let content = str.toString();
   do {
-    const before = str.toString();
-    str = str.replace(regexClassGroup, (_, pre, sep, body) => {
+    const before = content;
+    content = content.replace(regexClassGroup, (from, pre, sep, body) => {
+      if (!seperators.includes(sep))
+        return from;
       return body.split(/\s/g).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
     });
-    hasChanged = str.toString() !== before;
+    hasChanged = content !== before;
   } while (hasChanged);
-  return str;
+  if (typeof str === "string")
+    return content;
+  else
+    return str.overwrite(0, str.length(), content);
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -275,84 +281,6 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-function matchingPair(text, [left, right], i, allowEscape) {
-  const len = text.length;
-  let stack = +(text[i] === left);
-  while (++i < len) {
-    const char = text[i];
-    if (char === left) {
-      stack++;
-    } else if (char === right) {
-      stack--;
-      if (stack === 0)
-        return i;
-    } else if (allowEscape && char === "\\") {
-      i++;
-    }
-  }
-  return -1;
-}
-const QUOTES = ["'", '"', "`"];
-function extractQuoted(str, options = {}) {
-  const {
-    deep = false,
-    templateStaticOnly = false,
-    details = false,
-    range: [rstart, rend] = [0, str.length]
-  } = options;
-  const result = [];
-  let quote;
-  const addResult = (start, end) => result.push(details ? {
-    value: str.slice(start, end),
-    range: [start, end],
-    quote
-  } : str.slice(start, end));
-  let i = rstart;
-  while (i < rend) {
-    const char = str[i];
-    if (QUOTES.includes(char)) {
-      quote = char;
-      const start = i + 1;
-      const isTemplate = quote === "`";
-      let templateStart = start;
-      let end = start;
-      while (end < rend) {
-        const nextChar = str[end];
-        if (nextChar === quote) {
-          if (isTemplate && templateStaticOnly) {
-            addResult(templateStart, end);
-            break;
-          }
-          addResult(start, end);
-          break;
-        }
-        if (nextChar === "\\") {
-          end += 2;
-        } else if (isTemplate && nextChar === "$" && str[end + 1] === "{") {
-          const nestStart = end + 2;
-          end = matchingPair(str, "{}", end + 1, true);
-          if (templateStaticOnly) {
-            addResult(templateStart, nestStart - 2);
-          }
-          templateStart = end + 1;
-          if (deep) {
-            result.push(...extractQuoted(str, {
-              ...options,
-              range: [nestStart, end]
-            }));
-          }
-        } else {
-          end += 1;
-        }
-      }
-      i = end + 1;
-    } else {
-      i++;
-    }
-  }
-  return result;
-}
-
 const splitCode = (code) => code.split(/[\s'"`;=]+/g).filter(isValidSelector);
 const extractorSplit = {
   name: "split",
@@ -486,7 +414,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.43.0";
+const version = "0.44.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -968,7 +896,6 @@ exports.entriesToCss = entriesToCss;
 exports.escapeRegExp = escapeRegExp;
 exports.escapeSelector = escapeSelector;
 exports.expandVariantGroup = expandVariantGroup;
-exports.extractQuoted = extractQuoted;
 exports.extractorSplit = extractorSplit;
 exports.extractorSvelte = extractorSvelte;
 exports.hasScopePlaceholder = hasScopePlaceholder;
@@ -979,7 +906,6 @@ exports.isStaticRule = isStaticRule;
 exports.isStaticShortcut = isStaticShortcut;
 exports.isString = isString;
 exports.isValidSelector = isValidSelector;
-exports.matchingPair = matchingPair;
 exports.mergeDeep = mergeDeep;
 exports.mergeSet = mergeSet;
 exports.movePseudoElementsEnd = movePseudoElementsEnd;

package/dist/index.d.ts

@@ -133,8 +133,8 @@ declare class BetterMap<K, V> extends Map<K, V> {
 declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare const regexClassGroup: RegExp;
-declare function expandVariantGroup(str: string): string;
-declare function expandVariantGroup(str: MagicString): MagicString;
+declare function expandVariantGroup(str: string, seperators?: ('-' | ':')[]): string;
+declare function expandVariantGroup(str: MagicString, seperators?: ('-' | ':')[]): MagicString;
 
 declare function warnOnce(msg: string): void;
 
@@ -149,22 +149,6 @@ declare type ValueHandler<K extends string> = {
 };
 declare function createValueHandler<K extends string>(handlers: Record<K, ValueHandlerCallback>): ValueHandler<K>;
 
-declare type Range = [start: number, end: number];
-interface ExtractStringOptions<Details extends boolean = false> {
-    deep?: boolean;
-    templateStaticOnly?: boolean;
-    details?: Details;
-    range?: Range;
-}
-interface DetailString {
-    value: string;
-    range: Range;
-    quote: '\'' | '"' | '`';
-}
-declare function matchingPair(text: string, [left, right]: Iterable<string>, i: number, allowEscape?: boolean): number;
-declare function extractQuoted(str: string, options?: ExtractStringOptions<false>): string[];
-declare function extractQuoted(str: string, options: ExtractStringOptions<true>): DetailString[];
-
 declare type Awaitable<T> = T | Promise<T>;
 declare type Arrayable<T> = T | T[];
 declare type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
@@ -786,4 +770,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, 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, ConfigBase, 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, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -220,17 +220,23 @@ function withLayer(layer, rules) {
 }
 
 const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
-function expandVariantGroup(str) {
+function expandVariantGroup(str, seperators = ["-", ":"]) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
+  let content = str.toString();
   do {
-    const before = str.toString();
-    str = str.replace(regexClassGroup, (_, pre, sep, body) => {
+    const before = content;
+    content = content.replace(regexClassGroup, (from, pre, sep, body) => {
+      if (!seperators.includes(sep))
+        return from;
       return body.split(/\s/g).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
     });
-    hasChanged = str.toString() !== before;
+    hasChanged = content !== before;
   } while (hasChanged);
-  return str;
+  if (typeof str === "string")
+    return content;
+  else
+    return str.overwrite(0, str.length(), content);
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -271,84 +277,6 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-function matchingPair(text, [left, right], i, allowEscape) {
-  const len = text.length;
-  let stack = +(text[i] === left);
-  while (++i < len) {
-    const char = text[i];
-    if (char === left) {
-      stack++;
-    } else if (char === right) {
-      stack--;
-      if (stack === 0)
-        return i;
-    } else if (allowEscape && char === "\\") {
-      i++;
-    }
-  }
-  return -1;
-}
-const QUOTES = ["'", '"', "`"];
-function extractQuoted(str, options = {}) {
-  const {
-    deep = false,
-    templateStaticOnly = false,
-    details = false,
-    range: [rstart, rend] = [0, str.length]
-  } = options;
-  const result = [];
-  let quote;
-  const addResult = (start, end) => result.push(details ? {
-    value: str.slice(start, end),
-    range: [start, end],
-    quote
-  } : str.slice(start, end));
-  let i = rstart;
-  while (i < rend) {
-    const char = str[i];
-    if (QUOTES.includes(char)) {
-      quote = char;
-      const start = i + 1;
-      const isTemplate = quote === "`";
-      let templateStart = start;
-      let end = start;
-      while (end < rend) {
-        const nextChar = str[end];
-        if (nextChar === quote) {
-          if (isTemplate && templateStaticOnly) {
-            addResult(templateStart, end);
-            break;
-          }
-          addResult(start, end);
-          break;
-        }
-        if (nextChar === "\\") {
-          end += 2;
-        } else if (isTemplate && nextChar === "$" && str[end + 1] === "{") {
-          const nestStart = end + 2;
-          end = matchingPair(str, "{}", end + 1, true);
-          if (templateStaticOnly) {
-            addResult(templateStart, nestStart - 2);
-          }
-          templateStart = end + 1;
-          if (deep) {
-            result.push(...extractQuoted(str, {
-              ...options,
-              range: [nestStart, end]
-            }));
-          }
-        } else {
-          end += 1;
-        }
-      }
-      i = end + 1;
-    } else {
-      i++;
-    }
-  }
-  return result;
-}
-
 const splitCode = (code) => code.split(/[\s'"`;=]+/g).filter(isValidSelector);
 const extractorSplit = {
   name: "split",
@@ -482,7 +410,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.43.0";
+const version = "0.44.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -949,4 +877,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",