@unocss/core 0.22.5 → 0.24.0

package/README.md

@@ -1,6 +1,6 @@
 # @unocss/core
 
-The core engine of [UnoCSS](https://github.com/antfu/unocss) without any presets. It can be used as the engine of your own atomic CSS framework.
+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
 

package/dist/index.cjs

@@ -137,28 +137,6 @@ function mergeSet(target, append) {
   return target;
 }
 
-const hexRE = /^#?([\da-f]+)$/i;
-function hex2rgba(hex = "") {
-  const [, body] = hex.match(hexRE) || [];
-  if (!body)
-    return;
-  switch (body.length) {
-    case 3:
-    case 4:
-      const digits = Array.from(body, (s) => Number.parseInt(s, 16)).map((n) => n << 4 | n);
-      if (body.length === 3)
-        return digits;
-      digits[3] = Math.round(digits[3] / 255 * 100) / 100;
-      return digits;
-    case 6:
-    case 8:
-      const value = Number.parseInt(body, 16);
-      if (body.length === 6)
-        return [value >> 16 & 255, value >> 8 & 255, value & 255];
-      return [value >> 24 & 255, value >> 16 & 255, value >> 8 & 255, Math.round((value & 255) / 255 * 100) / 100];
-  }
-}
-
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
 const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
 const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
@@ -388,7 +366,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.22.5";
+const version = "0.24.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -425,6 +403,49 @@ class UnoGenerator {
     }
     return set;
   }
+  async parseToken(raw) {
+    if (this.blocked.has(raw))
+      return;
+    if (this._cache.has(raw))
+      return this._cache.get(raw);
+    let current = raw;
+    for (const p of this.config.preprocess)
+      current = p(raw);
+    if (this.isBlocked(current)) {
+      this.blocked.add(raw);
+      this._cache.set(raw, null);
+      return;
+    }
+    const applied = this.matchVariants(raw, current);
+    if (!applied || this.isBlocked(applied[1])) {
+      this.blocked.add(raw);
+      this._cache.set(raw, null);
+      return;
+    }
+    const context = {
+      rawSelector: raw,
+      currentSelector: applied[1],
+      theme: this.config.theme,
+      generator: this,
+      variantHandlers: applied[2],
+      constructCSS: (...args) => this.constructCustomCSS(context, ...args)
+    };
+    const expanded = this.expandShortcut(applied[1], context);
+    if (expanded) {
+      const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
+      if (utils?.length) {
+        this._cache.set(raw, utils);
+        return utils;
+      }
+    } else {
+      const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
+      if (utils?.length) {
+        this._cache.set(raw, utils);
+        return utils;
+      }
+    }
+    this._cache.set(raw, null);
+  }
   async generate(input, {
     id,
     scope,
@@ -439,8 +460,12 @@ class UnoGenerator {
     const layerSet = /* @__PURE__ */ new Set(["default"]);
     const matched = /* @__PURE__ */ new Set();
     const sheet = /* @__PURE__ */ new Map();
-    const hit = (raw, payload) => {
-      this._cache.set(raw, payload);
+    await Promise.all(Array.from(tokens).map(async (raw) => {
+      if (matched.has(raw))
+        return;
+      const payload = await this.parseToken(raw);
+      if (payload == null)
+        return;
       matched.add(raw);
       for (const item of payload) {
         const parent = item[3] || "";
@@ -450,47 +475,6 @@ class UnoGenerator {
         if (item[4]?.layer)
           layerSet.add(item[4].layer);
       }
-    };
-    const block = (raw) => {
-      this.blocked.add(raw);
-      this._cache.set(raw, null);
-    };
-    await Promise.all(Array.from(tokens).map(async (raw) => {
-      if (matched.has(raw) || this.blocked.has(raw))
-        return;
-      if (this._cache.has(raw)) {
-        const r = this._cache.get(raw);
-        if (r)
-          hit(raw, r);
-        return;
-      }
-      let current = raw;
-      for (const p of this.config.preprocess)
-        current = p(raw);
-      if (this.isBlocked(current))
-        return block(current);
-      const applied = this.matchVariants(raw, current);
-      if (!applied || this.isBlocked(applied[1]))
-        return block(raw);
-      const context = {
-        rawSelector: raw,
-        currentSelector: applied[1],
-        theme: this.config.theme,
-        generator: this,
-        variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
-      };
-      const expanded = this.expandShortcut(applied[1], context);
-      if (expanded) {
-        const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
-        if (utils?.length)
-          return hit(raw, utils);
-      } else {
-        const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
-        if (utils?.length)
-          return hit(raw, utils);
-      }
-      this._cache.set(raw, null);
     }));
     if (preflights) {
       this.config.preflights.forEach((i) => {
@@ -591,7 +575,8 @@ class UnoGenerator {
     const obj = {
       selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
       entries,
-      parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
+      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)
     };
     for (const p of this.config.postprocess)
       p(obj);
@@ -639,11 +624,12 @@ class UnoGenerator {
       return;
     if (isRawUtil(parsed))
       return [parsed[0], void 0, parsed[1], void 0, parsed[2]];
-    const { selector, entries, parent } = this.applyVariants(parsed);
+    const { selector, entries, parent, layer: variantLayer } = this.applyVariants(parsed);
     const body = entriesToCss(entries);
     if (!body)
       return;
-    return [parsed[0], selector, body, parent, parsed[3]];
+    const { layer: metaLayer, ...meta } = parsed[3] ?? {};
+    return [parsed[0], selector, body, parent, { ...meta, layer: variantLayer ?? metaLayer }];
   }
   expandShortcut(processed, context, depth = 3) {
     if (depth === 0)
@@ -749,7 +735,6 @@ exports.expandVariantGroup = expandVariantGroup;
 exports.extractorSplit = extractorSplit;
 exports.extractorSvelte = extractorSvelte;
 exports.hasScopePlaceholder = hasScopePlaceholder;
-exports.hex2rgba = hex2rgba;
 exports.isAttributifySelector = isAttributifySelector;
 exports.isObject = isObject;
 exports.isRawUtil = isRawUtil;

package/dist/index.d.ts

@@ -9,6 +9,7 @@ declare class UnoGenerator {
     constructor(userConfig?: UserConfig, defaults?: UserConfigDefaults);
     setConfig(userConfig?: UserConfig, defaults?: UserConfigDefaults): void;
     applyExtractors(code: string, id?: string, set?: Set<string>): Promise<Set<string>>;
+    parseToken(raw: string): Promise<StringifiedUtil[] | null | undefined>;
     generate(input: string | Set<string>, { id, scope, preflights, safelist, minify, }?: GenerateOptions): Promise<GenerateResult>;
     matchVariants(raw: string, current?: string): VariantMatchedResult;
     applyVariants(parsed: ParsedUtil, variantHandlers?: VariantHandler[], raw?: string): UtilObject;
@@ -37,6 +38,11 @@ declare type PartialByKeys<T, K extends keyof T = keyof T> = FlatObjectTuple<Par
 declare type RequiredByKey<T, K extends keyof T = keyof T> = FlatObjectTuple<Required<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
 declare type CSSObject = Record<string, string | number | undefined>;
 declare type CSSEntries = [string, string | number | undefined][];
+interface CSSColorValue {
+    type: string;
+    components: (string | number)[];
+    alpha: string | number | undefined;
+}
 declare type RGBAColorValue = [number, number, number, number] | [number, number, number];
 interface ParsedColorValue {
     /**
@@ -56,13 +62,13 @@ interface ParsedColorValue {
      */
     no: string;
     /**
-     * {@link RGBAColorValue}
+     * {@link CSSColorValue}
      */
-    rgba?: RGBAColorValue;
+    cssColor: CSSColorValue | undefined;
     /**
-     * Parsed rgba's alpha value.
+     * Parsed alpha value from opacity
      */
-    alpha?: number | string;
+    alpha: string | number | undefined;
 }
 declare type PresetOptions = Record<string, any>;
 interface RuleContext<Theme extends {} = {}> {
@@ -172,6 +178,10 @@ interface VariantHandler {
      * Variant ordering.
      */
     order?: number;
+    /**
+     * Override layer to the output css.
+     */
+    layer?: string | undefined;
 }
 declare type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => string | VariantHandler | undefined;
 interface VariantObject<Theme extends {} = {}> {
@@ -363,6 +373,7 @@ interface UtilObject {
     selector: string;
     entries: CSSEntries;
     parent: string | undefined;
+    layer: string | undefined;
 }
 interface GenerateOptions {
     /**
@@ -411,8 +422,6 @@ declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
 declare function mergeSet<T>(target: Set<T>, append: Set<T>): Set<T>;
 
-declare function hex2rgba(hex?: string): RGBAColorValue | undefined;
-
 declare const attributifyRE: RegExp;
 declare const validateFilterRE: RegExp;
 declare const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
@@ -458,4 +467,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, ThemeExtender, TwoKeyMap, UnoGenerator, 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, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, 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, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, ThemeExtender, TwoKeyMap, UnoGenerator, 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, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -133,28 +133,6 @@ function mergeSet(target, append) {
   return target;
 }
 
-const hexRE = /^#?([\da-f]+)$/i;
-function hex2rgba(hex = "") {
-  const [, body] = hex.match(hexRE) || [];
-  if (!body)
-    return;
-  switch (body.length) {
-    case 3:
-    case 4:
-      const digits = Array.from(body, (s) => Number.parseInt(s, 16)).map((n) => n << 4 | n);
-      if (body.length === 3)
-        return digits;
-      digits[3] = Math.round(digits[3] / 255 * 100) / 100;
-      return digits;
-    case 6:
-    case 8:
-      const value = Number.parseInt(body, 16);
-      if (body.length === 6)
-        return [value >> 16 & 255, value >> 8 & 255, value & 255];
-      return [value >> 24 & 255, value >> 16 & 255, value >> 8 & 255, Math.round((value & 255) / 255 * 100) / 100];
-  }
-}
-
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
 const validateFilterRE = /(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:%-?]/;
 const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
@@ -384,7 +362,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.22.5";
+const version = "0.24.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -421,6 +399,49 @@ class UnoGenerator {
     }
     return set;
   }
+  async parseToken(raw) {
+    if (this.blocked.has(raw))
+      return;
+    if (this._cache.has(raw))
+      return this._cache.get(raw);
+    let current = raw;
+    for (const p of this.config.preprocess)
+      current = p(raw);
+    if (this.isBlocked(current)) {
+      this.blocked.add(raw);
+      this._cache.set(raw, null);
+      return;
+    }
+    const applied = this.matchVariants(raw, current);
+    if (!applied || this.isBlocked(applied[1])) {
+      this.blocked.add(raw);
+      this._cache.set(raw, null);
+      return;
+    }
+    const context = {
+      rawSelector: raw,
+      currentSelector: applied[1],
+      theme: this.config.theme,
+      generator: this,
+      variantHandlers: applied[2],
+      constructCSS: (...args) => this.constructCustomCSS(context, ...args)
+    };
+    const expanded = this.expandShortcut(applied[1], context);
+    if (expanded) {
+      const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
+      if (utils?.length) {
+        this._cache.set(raw, utils);
+        return utils;
+      }
+    } else {
+      const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
+      if (utils?.length) {
+        this._cache.set(raw, utils);
+        return utils;
+      }
+    }
+    this._cache.set(raw, null);
+  }
   async generate(input, {
     id,
     scope,
@@ -435,8 +456,12 @@ class UnoGenerator {
     const layerSet = /* @__PURE__ */ new Set(["default"]);
     const matched = /* @__PURE__ */ new Set();
     const sheet = /* @__PURE__ */ new Map();
-    const hit = (raw, payload) => {
-      this._cache.set(raw, payload);
+    await Promise.all(Array.from(tokens).map(async (raw) => {
+      if (matched.has(raw))
+        return;
+      const payload = await this.parseToken(raw);
+      if (payload == null)
+        return;
       matched.add(raw);
       for (const item of payload) {
         const parent = item[3] || "";
@@ -446,47 +471,6 @@ class UnoGenerator {
         if (item[4]?.layer)
           layerSet.add(item[4].layer);
       }
-    };
-    const block = (raw) => {
-      this.blocked.add(raw);
-      this._cache.set(raw, null);
-    };
-    await Promise.all(Array.from(tokens).map(async (raw) => {
-      if (matched.has(raw) || this.blocked.has(raw))
-        return;
-      if (this._cache.has(raw)) {
-        const r = this._cache.get(raw);
-        if (r)
-          hit(raw, r);
-        return;
-      }
-      let current = raw;
-      for (const p of this.config.preprocess)
-        current = p(raw);
-      if (this.isBlocked(current))
-        return block(current);
-      const applied = this.matchVariants(raw, current);
-      if (!applied || this.isBlocked(applied[1]))
-        return block(raw);
-      const context = {
-        rawSelector: raw,
-        currentSelector: applied[1],
-        theme: this.config.theme,
-        generator: this,
-        variantHandlers: applied[2],
-        constructCSS: (...args) => this.constructCustomCSS(context, ...args)
-      };
-      const expanded = this.expandShortcut(applied[1], context);
-      if (expanded) {
-        const utils = await this.stringifyShortcuts(applied, context, expanded[0], expanded[1]);
-        if (utils?.length)
-          return hit(raw, utils);
-      } else {
-        const utils = (await this.parseUtil(applied, context))?.map((i) => this.stringifyUtil(i)).filter(notNull);
-        if (utils?.length)
-          return hit(raw, utils);
-      }
-      this._cache.set(raw, null);
     }));
     if (preflights) {
       this.config.preflights.forEach((i) => {
@@ -587,7 +571,8 @@ class UnoGenerator {
     const obj = {
       selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
       entries,
-      parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0)
+      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)
     };
     for (const p of this.config.postprocess)
       p(obj);
@@ -635,11 +620,12 @@ class UnoGenerator {
       return;
     if (isRawUtil(parsed))
       return [parsed[0], void 0, parsed[1], void 0, parsed[2]];
-    const { selector, entries, parent } = this.applyVariants(parsed);
+    const { selector, entries, parent, layer: variantLayer } = this.applyVariants(parsed);
     const body = entriesToCss(entries);
     if (!body)
       return;
-    return [parsed[0], selector, body, parent, parsed[3]];
+    const { layer: metaLayer, ...meta } = parsed[3] ?? {};
+    return [parsed[0], selector, body, parent, { ...meta, layer: variantLayer ?? metaLayer }];
   }
   expandShortcut(processed, context, depth = 3) {
     if (depth === 0)
@@ -728,4 +714,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, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+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, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.22.5",
+  "version": "0.24.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",
@@ -10,13 +10,13 @@
     "tailwind",
     "windicss"
   ],
-  "homepage": "https://github.com/antfu/unocss/tree/main/packages/core#readme",
+  "homepage": "https://github.com/unocss/unocss/tree/main/packages/core#readme",
   "bugs": {
-    "url": "https://github.com/antfu/unocss/issues"
+    "url": "https://github.com/unocss/unocss/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/antfu/unocss.git",
+    "url": "git+https://github.com/unocss/unocss.git",
     "directory": "packages/core"
   },
   "funding": "https://github.com/sponsors/antfu",