@unocss/core 0.33.4 → 0.34.1

package/dist/index.cjs

@@ -371,17 +371,18 @@ const extractorSvelte = {
   }
 };
 
-let createNanoEvents = () => ({
-  events: {},
-  emit(event, ...args) {
-(this.events[event] || []).forEach(i => i(...args));
-  },
-  on(event, cb) {
-(this.events[event] = this.events[event] || []).push(cb);
-    return () =>
-      (this.events[event] = (this.events[event] || []).filter(i => i !== cb))
-  }
-});
+function createNanoEvents() {
+  return {
+    events: {},
+    emit(event, ...args) {
+      (this.events[event] || []).forEach((i) => i(...args));
+    },
+    on(event, cb) {
+      (this.events[event] = this.events[event] || []).push(cb);
+      return () => this.events[event] = (this.events[event] || []).filter((i) => i !== cb);
+    }
+  };
+}
 
 function resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
@@ -435,7 +436,6 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     mergeSelectors: true,
     warn: true,
     blocklist: [],
-    safelist: [],
     sortLayers: (layers2) => layers2,
     ...config,
     presets: sortedPresets,
@@ -452,11 +452,12 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     autocomplete,
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors
+    extractors,
+    safelist: mergePresets("safelist")
   };
 }
 
-const version = "0.33.4";
+const version = "0.34.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -660,7 +661,7 @@ class UnoGenerator {
         processed = handler.matcher;
         if (Array.isArray(handler.parent))
           this.parentOrders.set(handler.parent[0], handler.parent[1]);
-        handlers.push(handler);
+        handlers.unshift(handler);
         variants.add(v);
         applied = true;
         break;
@@ -675,8 +676,9 @@ class UnoGenerator {
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
     const handlers = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0));
     const entries = handlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
+    const selector = handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw));
     const obj = {
-      selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      selector: movePseudoElementsEnd(selector),
       entries,
       parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0),
       layer: handlers.reduce((p, v) => v.layer || p, void 0),
@@ -839,6 +841,14 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
+function movePseudoElementsEnd(selector) {
+  const pseudoElements = selector.match(/::[\w-]+/g);
+  if (pseudoElements) {
+    pseudoElements.forEach((e2) => selector = selector.replace(e2, ""));
+    selector += pseudoElements.join("");
+  }
+  return selector;
+}
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
   if (attributifyRe.test(raw))
@@ -874,6 +884,7 @@ exports.isValidSelector = isValidSelector;
 exports.matchingPair = matchingPair;
 exports.mergeDeep = mergeDeep;
 exports.mergeSet = mergeSet;
+exports.movePseudoElementsEnd = movePseudoElementsEnd;
 exports.noop = noop;
 exports.normalizeCSSEntries = normalizeCSSEntries;
 exports.normalizeCSSValues = normalizeCSSValues;

package/dist/index.d.ts

@@ -1,63 +1,54 @@
 import { LoadConfigResult } from 'unconfig';
 import MagicString from 'magic-string';
 
-interface EventsMap {
-  [event: string]: any
-}
-
+declare type EventsMap = Record<string, any>;
 interface DefaultEvents extends EventsMap {
-  [event: string]: (...args: any) => void
+    [event: string]: (...args: any) => void;
 }
-
 interface Unsubscribe {
-  (): void
+    (): void;
 }
-
 declare class Emitter<Events extends EventsMap = DefaultEvents> {
-  /**
-   * Event names in keys and arrays with listeners in values.
-   *
-   * ```js
-   * emitter1.events = emitter2.events
-   * emitter2.events = { }
-   * ```
-   */
-  events: Partial<{ [E in keyof Events]: Events[E][] }>
-
-  /**
-   * Add a listener for a given event.
-   *
-   * ```js
-   * const unbind = ee.on('tick', (tickType, tickDuration) => {
-   *   count += 1
-   * })
-   *
-   * disable () {
-   *   unbind()
-   * }
-   * ```
-   *
-   * @param event The event name.
-   * @param cb The listener function.
-   * @returns Unbind listener from event.
-   */
-  on<K extends keyof Events>(this: this, event: K, cb: Events[K]): Unsubscribe
-
-  /**
-   * Calls each of the listeners registered for a given event.
-   *
-   * ```js
-   * ee.emit('tick', tickType, tickDuration)
-   * ```
-   *
-   * @param event The event name.
-   * @param args The arguments for listeners.
-   */
-  emit<K extends keyof Events>(
-    this: this,
-    event: K,
-    ...args: Parameters<Events[K]>
-  ): void
+    /**
+     * Event names in keys and arrays with listeners in values.
+     *
+     * ```js
+     * emitter1.events = emitter2.events
+     * emitter2.events = { }
+     * ```
+     */
+    events: Partial<{
+        [E in keyof Events]: Events[E][];
+    }>;
+    /**
+     * Add a listener for a given event.
+     *
+     * ```js
+     * const unbind = ee.on('tick', (tickType, tickDuration) => {
+     *   count += 1
+     * })
+     *
+     * disable () {
+     *   unbind()
+     * }
+     * ```
+     *
+     * @param event The event name.
+     * @param cb The listener function.
+     * @returns Unbind listener from event.
+     */
+    on<K extends keyof Events>(this: this, event: K, cb: Events[K]): Unsubscribe;
+    /**
+     * Calls each of the listeners registered for a given event.
+     *
+     * ```js
+     * ee.emit('tick', tickType, tickDuration)
+     * ```
+     *
+     * @param event The event name.
+     * @param args The arguments for listeners.
+     */
+    emit<K extends keyof Events>(this: this, event: K, ...args: Parameters<Events[K]>): void;
 }
 
 declare class UnoGenerator {
@@ -89,6 +80,7 @@ declare class UnoGenerator {
 declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
 declare const regexScopePlaceholder: RegExp;
 declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
+declare function movePseudoElementsEnd(selector: string): string;
 declare function toEscapedSelector(raw: string): string;
 
 declare function escapeRegExp(string: string): string;
@@ -730,4 +722,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, 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, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, 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, 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, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -367,17 +367,18 @@ const extractorSvelte = {
   }
 };
 
-let createNanoEvents = () => ({
-  events: {},
-  emit(event, ...args) {
-(this.events[event] || []).forEach(i => i(...args));
-  },
-  on(event, cb) {
-(this.events[event] = this.events[event] || []).push(cb);
-    return () =>
-      (this.events[event] = (this.events[event] || []).filter(i => i !== cb))
-  }
-});
+function createNanoEvents() {
+  return {
+    events: {},
+    emit(event, ...args) {
+      (this.events[event] || []).forEach((i) => i(...args));
+    },
+    on(event, cb) {
+      (this.events[event] = this.events[event] || []).push(cb);
+      return () => this.events[event] = (this.events[event] || []).filter((i) => i !== cb);
+    }
+  };
+}
 
 function resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
@@ -431,7 +432,6 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     mergeSelectors: true,
     warn: true,
     blocklist: [],
-    safelist: [],
     sortLayers: (layers2) => layers2,
     ...config,
     presets: sortedPresets,
@@ -448,11 +448,12 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     autocomplete,
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
-    extractors
+    extractors,
+    safelist: mergePresets("safelist")
   };
 }
 
-const version = "0.33.4";
+const version = "0.34.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -656,7 +657,7 @@ class UnoGenerator {
         processed = handler.matcher;
         if (Array.isArray(handler.parent))
           this.parentOrders.set(handler.parent[0], handler.parent[1]);
-        handlers.push(handler);
+        handlers.unshift(handler);
         variants.add(v);
         applied = true;
         break;
@@ -671,8 +672,9 @@ class UnoGenerator {
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
     const handlers = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0));
     const entries = handlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
+    const selector = handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw));
     const obj = {
-      selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      selector: movePseudoElementsEnd(selector),
       entries,
       parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0),
       layer: handlers.reduce((p, v) => v.layer || p, void 0),
@@ -835,6 +837,14 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
+function movePseudoElementsEnd(selector) {
+  const pseudoElements = selector.match(/::[\w-]+/g);
+  if (pseudoElements) {
+    pseudoElements.forEach((e2) => selector = selector.replace(e2, ""));
+    selector += pseudoElements.join("");
+  }
+  return selector;
+}
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
   if (attributifyRe.test(raw))
@@ -842,4 +852,4 @@ function toEscapedSelector(raw) {
   return `.${e(raw)}`;
 }
 
-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, isValidSelector, matchingPair, mergeDeep, mergeSet, 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, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, 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.33.4",
+  "version": "0.34.1",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",
@@ -38,7 +38,6 @@
   "sideEffects": false,
   "devDependencies": {
     "magic-string": "^0.26.2",
-    "nanoevents": "^6.0.2",
     "unconfig": "^0.3.4"
   },
   "scripts": {