@unocss/core 0.16.3 → 0.18.0

package/dist/index.cjs

@@ -359,7 +359,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.16.3";
+const version = "0.18.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -629,7 +629,7 @@ class UnoGenerator {
     if (!result)
       return;
     return [
-      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]),
+      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]).filter((r) => r !== ""),
       meta
     ];
   }

package/dist/index.d.ts

@@ -36,6 +36,29 @@ 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][];
+declare type RGBAColorValue = [number, number, number, number] | [number, number, number];
+declare type ParsedColorValue = {
+    /**
+     * Parsed color value.
+     */
+    color?: string;
+    /**
+     * Parsed opacity value.
+     */
+    opacity: string;
+    /**
+     * Color name.
+     */
+    name: string;
+    /**
+     * Color scale. Preferrably 000 - 999
+     */
+    no: string;
+    /**
+     * {@link RGBAColorValue}
+     */
+    rgba?: RGBAColorValue;
+};
 interface RuleContext<Theme extends {} = {}> {
     /**
      * Unprocessed selector from user input.
@@ -87,11 +110,11 @@ interface RuleMeta {
     internal?: boolean;
 }
 declare type CSSValues = CSSObject | CSSEntries | (CSSObject | CSSEntries)[];
-declare type DynamicMatcher<Theme extends {} = {}> = ((match: string[], context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValues | string | undefined>);
+declare type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValues | string | undefined>);
 declare type DynamicRule<Theme extends {} = {}> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
 declare type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
 declare type Rule<Theme extends {} = {}> = DynamicRule<Theme> | StaticRule;
-declare type DynamicShortcutMatcher<Theme extends {} = {}> = ((match: string[], context: Readonly<RuleContext<Theme>>) => (string | string[] | undefined));
+declare type DynamicShortcutMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | string[] | undefined));
 declare type StaticShortcut = [string, string | string[]] | [string, string | string[], RuleMeta];
 declare type StaticShortcutMap = Record<string, string | string[]>;
 declare type DynamicShortcut<Theme extends {} = {}> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
@@ -340,7 +363,7 @@ 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): [number, number, number, number] | [number, number, number] | undefined;
+declare function hex2rgba(hex?: string): RGBAColorValue | undefined;
 
 declare const attributifyRE: RegExp;
 declare const validateFilterRE: RegExp;
@@ -386,4 +409,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, PartialByKeys, PluginOptions, Preflight, Preset, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, ValueHandler, ValueHandlerCallback, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, 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, Awaitable, BetterMap, BlocklistRule, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Preflight, Preset, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, ValueHandler, ValueHandlerCallback, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, 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 };

package/dist/index.mjs

@@ -355,7 +355,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.16.3";
+const version = "0.18.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -625,7 +625,7 @@ class UnoGenerator {
     if (!result)
       return;
     return [
-      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]),
+      result.flatMap((r) => this.expandShortcut(r, context, depth - 1)?.[0] || [r]).filter((r) => r !== ""),
       meta
     ];
   }

package/package.json

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