@unocss/core 0.31.3 → 0.31.5

package/dist/index.cjs

@@ -222,9 +222,15 @@ function withLayer(layer, rules) {
 const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
 function expandVariantGroup(str) {
   regexClassGroup.lastIndex = 0;
-  return str.replace(regexClassGroup, (_, pre, sep, body) => {
-    return body.split(/\s/g).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
-  });
+  let hasChanged = false;
+  do {
+    const before = str.toString();
+    str = str.replace(regexClassGroup, (_, pre, sep, body) => {
+      return body.split(/\s/g).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
+    });
+    hasChanged = str.toString() !== before;
+  } while (hasChanged);
+  return str;
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -265,6 +271,84 @@ 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",
@@ -361,7 +445,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.31.3";
+const version = "0.31.5";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -747,6 +831,7 @@ exports.entriesToCss = entriesToCss;
 exports.escapeRegExp = escapeRegExp;
 exports.escapeSelector = escapeSelector;
 exports.expandVariantGroup = expandVariantGroup;
+exports.extractQuoted = extractQuoted;
 exports.extractorSplit = extractorSplit;
 exports.extractorSvelte = extractorSvelte;
 exports.hasScopePlaceholder = hasScopePlaceholder;
@@ -756,6 +841,7 @@ exports.isRawUtil = isRawUtil;
 exports.isStaticRule = isStaticRule;
 exports.isStaticShortcut = isStaticShortcut;
 exports.isValidSelector = isValidSelector;
+exports.matchingPair = matchingPair;
 exports.mergeDeep = mergeDeep;
 exports.mergeSet = mergeSet;
 exports.normalizeCSSEntries = normalizeCSSEntries;

package/dist/index.d.ts

@@ -92,6 +92,22 @@ 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;
@@ -621,4 +637,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, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, 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, CSSValues, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -218,9 +218,15 @@ function withLayer(layer, rules) {
 const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
 function expandVariantGroup(str) {
   regexClassGroup.lastIndex = 0;
-  return str.replace(regexClassGroup, (_, pre, sep, body) => {
-    return body.split(/\s/g).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
-  });
+  let hasChanged = false;
+  do {
+    const before = str.toString();
+    str = str.replace(regexClassGroup, (_, pre, sep, body) => {
+      return body.split(/\s/g).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
+    });
+    hasChanged = str.toString() !== before;
+  } while (hasChanged);
+  return str;
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -261,6 +267,84 @@ 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",
@@ -357,7 +441,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.31.3";
+const version = "0.31.5";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -729,4 +813,4 @@ function toEscapedSelector(raw) {
   return `.${e(raw)}`;
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, 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, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.31.3",
+  "version": "0.31.5",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",