@unocss/core 0.50.7 → 0.51.0

package/README.md

@@ -2,15 +2,9 @@
 
 The core engine of [UnoCSS](https://github.com/unocss/unocss) without any presets. It can be used as the engine of your own atomic CSS framework.
 
-## Usage
+## Documentation
 
-```ts
-import { createGenerator } from '@unocss/core'
-
-const generator = createGenerator({ /* user options */ }, { /* default options */ })
-
-const { css } = await generator.generate(code)
-```
+Please refer to the [documentation](https://unocss.dev/tools/core).
 
 ## License
 

package/dist/index.cjs

@@ -327,48 +327,18 @@ function createValueHandler(handlers) {
 }
 
 const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
-const splitWithVariantGroupRE = /[\\:]?([\s"'`;<>*]|:\(|\)"|\)\s)/g;
-const quotedArbitraryValuesRE = /(?:[\w&:[\]-]|\[\S+=\S+\])+\[\\?['"]?\S+?['"]\]\]?[\w:-]*/g;
-const arbitraryPropertyRE = /\[(\\\W|[\w-])+:[^\s:]*?("\S+?"|'\S+?'|`\S+?`|[^\s:]+?)[^\s:]*?\)?\]/g;
-const arbitraryPropertyCandidateRE = /^\[(\\\W|[\w-])+:['"]?\S+?['"]?\]$/;
+const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>*]|:\(|\)"|\)\s)/g;
 function splitCode(code) {
-  const result = /* @__PURE__ */ new Set();
-  for (const match of code.matchAll(arbitraryPropertyRE)) {
-    if (!code[match.index - 1]?.match(/^[\s'"`]/))
-      continue;
-    result.add(match[0]);
-  }
-  for (const match of code.matchAll(quotedArbitraryValuesRE))
-    result.add(match[0]);
-  code.split(defaultSplitRE).forEach((match) => {
-    if (isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match))
-      result.add(match);
-  });
-  return [...result];
+  return [...new Set(code.split(defaultSplitRE))];
 }
 const extractorSplit = {
-  name: "split",
+  name: "@unocss/core/extractor-split",
   order: 0,
   extract({ code }) {
     return splitCode(code);
   }
 };
 
-const rightTrimRe = /=$/;
-const extractorSvelte = {
-  name: "svelte",
-  order: 0,
-  extract({ code, id }) {
-    let result = splitCode(code);
-    if (id && id.endsWith(".svelte")) {
-      result = result.map((r) => {
-        return r.startsWith("class:") ? r.slice(6).replace(rightTrimRe, "") : r;
-      });
-    }
-    return new Set(result);
-  }
-};
-
 function createNanoEvents() {
   return {
     events: {},
@@ -432,8 +402,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ]);
   }
   const extractors = mergePresets("extractors");
-  if (!extractors.length)
-    extractors.push(extractorSplit);
+  let extractorDefault = [...sortedPresets, config].reverse().find((i) => i.extractorDefault !== void 0)?.extractorDefault;
+  if (extractorDefault === void 0)
+    extractorDefault = extractorSplit;
+  if (extractorDefault && !extractors.includes(extractorDefault))
+    extractors.unshift(extractorDefault);
   extractors.sort((a, b) => (a.order || 0) - (b.order || 0));
   const rules = mergePresets("rules");
   const rulesStaticMap = {};
@@ -448,11 +421,13 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     }
     return [i, ...rule];
   }).filter(Boolean).reverse();
-  const theme = clone([
+  let theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {}));
-  mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
+  const extendThemes = toArray(mergePresets("extendTheme"));
+  for (const extendTheme of extendThemes)
+    theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
     extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
@@ -460,7 +435,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   let separators = toArray(mergePresets("separators"));
   if (!separators.length)
     separators = [":", "-"];
-  return {
+  const resolved = {
     mergeSelectors: true,
     warn: true,
     blocklist: [],
@@ -484,9 +459,13 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     safelist: mergePresets("safelist"),
     separators
   };
+  for (const p of sortedPresets)
+    p?.configResolved?.(resolved);
+  userConfig?.configResolved?.(resolved);
+  return resolved;
 }
 
-const version = "0.50.7";
+const version = "0.51.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -512,22 +491,21 @@ class UnoGenerator {
     this.config = resolveConfig(userConfig, this.defaults);
     this.events.emit("config", this.config);
   }
-  async applyExtractors(code, id, set = /* @__PURE__ */ new Set()) {
+  async applyExtractors(code, id, extracted = /* @__PURE__ */ new Set()) {
     const context = {
-      get original() {
-        return code;
-      },
+      original: code,
       code,
-      id
+      id,
+      extracted
     };
     for (const extractor of this.config.extractors) {
-      const result = await extractor.extract(context);
+      const result = await extractor.extract?.(context);
       if (result) {
         for (const token of result)
-          set.add(token);
+          extracted.add(token);
       }
     }
-    return set;
+    return extracted;
   }
   makeContext(raw, applied) {
     const context = {
@@ -975,7 +953,6 @@ exports.BetterMap = BetterMap;
 exports.CONTROL_SHORTCUT_NO_MERGE = CONTROL_SHORTCUT_NO_MERGE;
 exports.TwoKeyMap = TwoKeyMap;
 exports.UnoGenerator = UnoGenerator;
-exports.arbitraryPropertyRE = arbitraryPropertyRE;
 exports.attributifyRE = attributifyRE;
 exports.clearIdenticalEntries = clearIdenticalEntries;
 exports.clone = clone;
@@ -989,8 +966,8 @@ exports.entriesToCss = entriesToCss;
 exports.escapeRegExp = escapeRegExp;
 exports.escapeSelector = escapeSelector;
 exports.expandVariantGroup = expandVariantGroup;
+exports.extractorDefault = extractorSplit;
 exports.extractorSplit = extractorSplit;
-exports.extractorSvelte = extractorSvelte;
 exports.hasScopePlaceholder = hasScopePlaceholder;
 exports.isAttributifySelector = isAttributifySelector;
 exports.isObject = isObject;
@@ -1007,7 +984,6 @@ exports.normalizeCSSValues = normalizeCSSValues;
 exports.normalizeVariant = normalizeVariant;
 exports.notNull = notNull;
 exports.parseVariantGroup = parseVariantGroup;
-exports.quotedArbitraryValuesRE = quotedArbitraryValuesRE;
 exports.regexScopePlaceholder = regexScopePlaceholder;
 exports.splitWithVariantGroupRE = splitWithVariantGroupRE;
 exports.toArray = toArray;

package/dist/index.d.ts

@@ -64,7 +64,7 @@ declare class UnoGenerator<Theme extends {} = {}> {
     }>;
     constructor(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>);
     setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): void;
-    applyExtractors(code: string, id?: string, set?: Set<string>): Promise<Set<string>>;
+    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>;
     generate(input: string | Set<string> | string[], options?: GenerateOptions): Promise<GenerateResult>;
@@ -263,6 +263,7 @@ interface ExtractorContext {
     readonly original: string;
     code: string;
     id?: string;
+    extracted: Set<string>;
 }
 interface PreflightContext<Theme extends {} = {}> {
     /**
@@ -276,8 +277,13 @@ interface PreflightContext<Theme extends {} = {}> {
 }
 interface Extractor {
     name: string;
-    extract(ctx: ExtractorContext): Awaitable<Set<string> | string[] | undefined>;
     order?: number;
+    /**
+     * Extract the code and return a list of selectors.
+     *
+     * Return `undefined` to skip this extractor.
+     */
+    extract?(ctx: ExtractorContext): Awaitable<Set<string> | string[] | undefined | void>;
 }
 interface RuleMeta {
     /**
@@ -428,7 +434,7 @@ interface VariantObject<Theme extends {} = {}> {
 type Variant<Theme extends {} = {}> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
 type Postprocessor = (util: UtilObject) => void;
-type ThemeExtender<T> = (theme: T) => void;
+type ThemeExtender<T> = (theme: T) => T | void;
 interface ConfigBase<Theme extends {} = {}> {
     /**
      * Rules to generate CSS utilities.
@@ -468,6 +474,20 @@ interface ConfigBase<Theme extends {} = {}> {
      * Can be language-aware.
      */
     extractors?: Extractor[];
+    /**
+     * Default extractor that are always applied.
+     * By default it split the source code by whitespace and quotes.
+     *
+     * It maybe be replaced by preset or user config,
+     * only one default extractor can be presented,
+     * later one will override the previous one.
+     *
+     * Pass `null` or `false` to disable the default extractor.
+     *
+     * @see https://github.com/antfu/unocss/blob/main/packages/core/src/extractors/split.ts
+     * @default import('@unocss/core').defaultExtractor
+     */
+    extractorDefault?: Extractor | null | false;
     /**
      * Raw CSS injections.
      */
@@ -493,7 +513,9 @@ interface ConfigBase<Theme extends {} = {}> {
      */
     postprocess?: Arrayable<Postprocessor>;
     /**
-     * Custom functions to extend the theme object
+     * Custom functions mutate the theme object.
+     *
+     * It's also possible to return a new theme object to completely replace the original one.
      */
     extendTheme?: Arrayable<ThemeExtender<Theme>>;
     /**
@@ -510,6 +532,12 @@ interface ConfigBase<Theme extends {} = {}> {
          */
         extractors?: Arrayable<AutoCompleteExtractor>;
     };
+    /**
+     * Hook to modify the resolved config.
+     *
+     * First presets runs first and the user config
+     */
+    configResolved?: (config: ResolvedConfig) => void;
     /**
      * Expose internal details for debugging / inspecting
      *
@@ -572,6 +600,9 @@ interface AutoCompleteExtractor {
 }
 interface Preset<Theme extends {} = {}> extends ConfigBase<Theme> {
     name: string;
+    /**
+     * Enforce the preset to be applied before or after other presets
+     */
     enforce?: 'pre' | 'post';
     /**
      * Preset options for other tools like IDE to consume
@@ -827,10 +858,6 @@ interface GenerateOptions {
 
 declare const defaultSplitRE: RegExp;
 declare const splitWithVariantGroupRE: RegExp;
-declare const quotedArbitraryValuesRE: RegExp;
-declare const arbitraryPropertyRE: RegExp;
 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, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, 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, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, regexScopePlaceholder, 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, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, 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, 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, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -323,48 +323,18 @@ function createValueHandler(handlers) {
 }
 
 const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
-const splitWithVariantGroupRE = /[\\:]?([\s"'`;<>*]|:\(|\)"|\)\s)/g;
-const quotedArbitraryValuesRE = /(?:[\w&:[\]-]|\[\S+=\S+\])+\[\\?['"]?\S+?['"]\]\]?[\w:-]*/g;
-const arbitraryPropertyRE = /\[(\\\W|[\w-])+:[^\s:]*?("\S+?"|'\S+?'|`\S+?`|[^\s:]+?)[^\s:]*?\)?\]/g;
-const arbitraryPropertyCandidateRE = /^\[(\\\W|[\w-])+:['"]?\S+?['"]?\]$/;
+const splitWithVariantGroupRE = /([\\:]?[\s"'`;<>*]|:\(|\)"|\)\s)/g;
 function splitCode(code) {
-  const result = /* @__PURE__ */ new Set();
-  for (const match of code.matchAll(arbitraryPropertyRE)) {
-    if (!code[match.index - 1]?.match(/^[\s'"`]/))
-      continue;
-    result.add(match[0]);
-  }
-  for (const match of code.matchAll(quotedArbitraryValuesRE))
-    result.add(match[0]);
-  code.split(defaultSplitRE).forEach((match) => {
-    if (isValidSelector(match) && !arbitraryPropertyCandidateRE.test(match))
-      result.add(match);
-  });
-  return [...result];
+  return [...new Set(code.split(defaultSplitRE))];
 }
 const extractorSplit = {
-  name: "split",
+  name: "@unocss/core/extractor-split",
   order: 0,
   extract({ code }) {
     return splitCode(code);
   }
 };
 
-const rightTrimRe = /=$/;
-const extractorSvelte = {
-  name: "svelte",
-  order: 0,
-  extract({ code, id }) {
-    let result = splitCode(code);
-    if (id && id.endsWith(".svelte")) {
-      result = result.map((r) => {
-        return r.startsWith("class:") ? r.slice(6).replace(rightTrimRe, "") : r;
-      });
-    }
-    return new Set(result);
-  }
-};
-
 function createNanoEvents() {
   return {
     events: {},
@@ -428,8 +398,11 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ]);
   }
   const extractors = mergePresets("extractors");
-  if (!extractors.length)
-    extractors.push(extractorSplit);
+  let extractorDefault = [...sortedPresets, config].reverse().find((i) => i.extractorDefault !== void 0)?.extractorDefault;
+  if (extractorDefault === void 0)
+    extractorDefault = extractorSplit;
+  if (extractorDefault && !extractors.includes(extractorDefault))
+    extractors.unshift(extractorDefault);
   extractors.sort((a, b) => (a.order || 0) - (b.order || 0));
   const rules = mergePresets("rules");
   const rulesStaticMap = {};
@@ -444,11 +417,13 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     }
     return [i, ...rule];
   }).filter(Boolean).reverse();
-  const theme = clone([
+  let theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {}));
-  mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
+  const extendThemes = toArray(mergePresets("extendTheme"));
+  for (const extendTheme of extendThemes)
+    theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
     extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
@@ -456,7 +431,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   let separators = toArray(mergePresets("separators"));
   if (!separators.length)
     separators = [":", "-"];
-  return {
+  const resolved = {
     mergeSelectors: true,
     warn: true,
     blocklist: [],
@@ -480,9 +455,13 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     safelist: mergePresets("safelist"),
     separators
   };
+  for (const p of sortedPresets)
+    p?.configResolved?.(resolved);
+  userConfig?.configResolved?.(resolved);
+  return resolved;
 }
 
-const version = "0.50.7";
+const version = "0.51.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -508,22 +487,21 @@ class UnoGenerator {
     this.config = resolveConfig(userConfig, this.defaults);
     this.events.emit("config", this.config);
   }
-  async applyExtractors(code, id, set = /* @__PURE__ */ new Set()) {
+  async applyExtractors(code, id, extracted = /* @__PURE__ */ new Set()) {
     const context = {
-      get original() {
-        return code;
-      },
+      original: code,
       code,
-      id
+      id,
+      extracted
     };
     for (const extractor of this.config.extractors) {
-      const result = await extractor.extract(context);
+      const result = await extractor.extract?.(context);
       if (result) {
         for (const token of result)
-          set.add(token);
+          extracted.add(token);
       }
     }
-    return set;
+    return extracted;
   }
   makeContext(raw, applied) {
     const context = {
@@ -967,4 +945,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, quotedArbitraryValuesRE, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, 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, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

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