@unocss/core 0.32.7 → 0.32.11

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Anthony Fu <https://github.com/antfu>
+Copyright (c) 2021-PRESENT Anthony Fu <https://github.com/antfu>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -14,5 +14,5 @@ const { css } = await generator.generate(code)
 
 ## License
 
-MIT License © 2021-PRESENT [Anthony Fu](https://github.com/antfu)
+MIT License © 2021-PRESENT [Anthony Fu](https://github.com/antfu)
 

package/dist/index.cjs

@@ -81,14 +81,10 @@ function mergeDeep(original, patch) {
   const output = { ...o };
   if (isObject(o) && isObject(p)) {
     Object.keys(p).forEach((key) => {
-      if (isObject(p[key])) {
-        if (!(key in o))
-          Object.assign(output, { [key]: p[key] });
-        else
-          output[key] = mergeDeep(o[key], p[key]);
-      } else {
+      if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
+        output[key] = mergeDeep(o[key], p[key]);
+      else
         Object.assign(output, { [key]: p[key] });
-      }
     });
   }
   return output;
@@ -138,6 +134,7 @@ function mergeSet(target, append) {
 }
 
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
+const cssIdRE = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
 const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
 const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 function isAttributifySelector(selector) {
@@ -374,6 +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 resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
     if (Array.isArray(s))
@@ -447,7 +456,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.32.7";
+const version = "0.32.11";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -457,7 +466,9 @@ class UnoGenerator {
     this._cache = /* @__PURE__ */ new Map();
     this.blocked = /* @__PURE__ */ new Set();
     this.parentOrders = /* @__PURE__ */ new Map();
+    this.events = createNanoEvents();
     this.config = resolveConfig(userConfig, defaults);
+    this.events.emit("config", this.config);
   }
   setConfig(userConfig, defaults) {
     if (!userConfig)
@@ -465,10 +476,11 @@ class UnoGenerator {
     if (defaults)
       this.defaults = defaults;
     this.userConfig = userConfig;
-    this.config = resolveConfig(userConfig, this.defaults);
     this.blocked.clear();
     this.parentOrders.clear();
     this._cache.clear();
+    this.config = resolveConfig(userConfig, this.defaults);
+    this.events.emit("config", this.config);
   }
   async applyExtractors(code, id, set = /* @__PURE__ */ new Set()) {
     const context = {
@@ -843,6 +855,7 @@ exports.clearIdenticalEntries = clearIdenticalEntries;
 exports.clone = clone;
 exports.createGenerator = createGenerator;
 exports.createValueHandler = createValueHandler;
+exports.cssIdRE = cssIdRE;
 exports.e = e;
 exports.entriesToCss = entriesToCss;
 exports.escapeRegExp = escapeRegExp;

package/dist/index.d.ts

@@ -1,6 +1,65 @@
 import { LoadConfigResult } from 'unconfig';
 import MagicString from 'magic-string';
 
+interface EventsMap {
+  [event: string]: any
+}
+
+interface DefaultEvents extends EventsMap {
+  [event: string]: (...args: any) => void
+}
+
+interface Unsubscribe {
+  (): 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
+}
+
 declare class UnoGenerator {
     userConfig: UserConfig;
     defaults: UserConfigDefaults;
@@ -9,6 +68,9 @@ declare class UnoGenerator {
     config: ResolvedConfig;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
+    events: Emitter<{
+        config: (config: ResolvedConfig) => void;
+    }>;
     constructor(userConfig?: UserConfig, defaults?: UserConfigDefaults);
     setConfig(userConfig?: UserConfig, defaults?: UserConfigDefaults): void;
     applyExtractors(code: string, id?: string, set?: Set<string>): Promise<Set<string>>;
@@ -51,6 +113,7 @@ declare function uniq<T>(value: T[]): T[];
 declare function mergeSet<T>(target: Set<T>, append: Set<T>): Set<T>;
 
 declare const attributifyRE: RegExp;
+declare const cssIdRE: RegExp;
 declare const validateFilterRE: RegExp;
 declare const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 declare function isAttributifySelector(selector: string): RegExpMatchArray | null;
@@ -667,4 +730,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, 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, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -77,14 +77,10 @@ function mergeDeep(original, patch) {
   const output = { ...o };
   if (isObject(o) && isObject(p)) {
     Object.keys(p).forEach((key) => {
-      if (isObject(p[key])) {
-        if (!(key in o))
-          Object.assign(output, { [key]: p[key] });
-        else
-          output[key] = mergeDeep(o[key], p[key]);
-      } else {
+      if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
+        output[key] = mergeDeep(o[key], p[key]);
+      else
         Object.assign(output, { [key]: p[key] });
-      }
     });
   }
   return output;
@@ -134,6 +130,7 @@ function mergeSet(target, append) {
 }
 
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
+const cssIdRE = /\.(css|postcss|sass|scss|less|stylus|styl)$/;
 const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
 const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 function isAttributifySelector(selector) {
@@ -370,6 +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 resolveShortcuts(shortcuts) {
   return toArray(shortcuts).flatMap((s) => {
     if (Array.isArray(s))
@@ -443,7 +452,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.32.7";
+const version = "0.32.11";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -453,7 +462,9 @@ class UnoGenerator {
     this._cache = /* @__PURE__ */ new Map();
     this.blocked = /* @__PURE__ */ new Set();
     this.parentOrders = /* @__PURE__ */ new Map();
+    this.events = createNanoEvents();
     this.config = resolveConfig(userConfig, defaults);
+    this.events.emit("config", this.config);
   }
   setConfig(userConfig, defaults) {
     if (!userConfig)
@@ -461,10 +472,11 @@ class UnoGenerator {
     if (defaults)
       this.defaults = defaults;
     this.userConfig = userConfig;
-    this.config = resolveConfig(userConfig, this.defaults);
     this.blocked.clear();
     this.parentOrders.clear();
     this._cache.clear();
+    this.config = resolveConfig(userConfig, this.defaults);
+    this.events.emit("config", this.config);
   }
   async applyExtractors(code, id, set = /* @__PURE__ */ new Set()) {
     const context = {
@@ -830,4 +842,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, 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, 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.32.7",
+  "version": "0.32.11",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",
@@ -38,11 +38,11 @@
   "sideEffects": false,
   "devDependencies": {
     "magic-string": "^0.26.1",
+    "nanoevents": "^6.0.2",
     "unconfig": "^0.3.3"
   },
   "scripts": {
     "build": "unbuild",
     "stub": "unbuild --stub"
-  },
-  "readme": "# @unocss/core\n\nThe 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.\n\n## Usage\n\n```ts\nimport { createGenerator } from '@unocss/core'\n\nconst generator = createGenerator({ /* user options */ }, { /* default options */ })\n\nconst { css } = await generator.generate(code)\n```\n\n## License\n\nMIT License © 2021-PRESENT [Anthony Fu](https://github.com/antfu)\n\n"
+  }
 }