@unocss/core 0.53.4 → 0.53.5

package/dist/index.cjs

@@ -288,7 +288,7 @@ function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
   if (typeof str === "string") {
     return expanded;
   } else {
-    return str.length() ? str.overwrite(0, str.length(), expanded) : str;
+    return str.length() ? str.overwrite(0, str.original.length, expanded) : str;
   }
 }
 
@@ -507,7 +507,7 @@ function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
 
-const version = "0.53.4";
+const version = "0.53.5";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -927,7 +927,7 @@ class UnoGenerator {
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
-      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
+      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Number.POSITIVE_INFINITY, "{inline}", normalizeCSSEntries(i), void 0, []]];
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
       return result || [];

package/dist/index.d.ts

@@ -51,7 +51,7 @@ declare class Emitter<Events extends EventsMap = DefaultEvents> {
     emit<K extends keyof Events>(this: this, event: K, ...args: Parameters<Events[K]>): void;
 }
 
-declare class UnoGenerator<Theme extends {} = {}> {
+declare class UnoGenerator<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
     version: string;
@@ -77,7 +77,7 @@ declare class UnoGenerator<Theme extends {} = {}> {
     stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
     isBlocked(raw: string): boolean;
 }
-declare function createGenerator<Theme extends {} = {}>(config?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): UnoGenerator<Theme>;
+declare function createGenerator<Theme extends object = object>(config?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): UnoGenerator<Theme>;
 declare const regexScopePlaceholder: RegExp;
 declare function hasScopePlaceholder(css: string): RegExpMatchArray | null;
 declare function toEscapedSelector(raw: string): string;
@@ -131,7 +131,7 @@ declare class BetterMap<K, V> extends Map<K, V> {
     map<R>(mapFn: (value: V, key: K) => R): R[];
 }
 
-declare function withLayer<T extends {}>(layer: string, rules: Rule<T>[]): Rule<T>[];
+declare function withLayer<T extends object>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare function makeRegexClassGroup(separators?: string[]): RegExp;
 declare function parseVariantGroup(str: string, separators?: string[], depth?: number): {
@@ -205,7 +205,7 @@ interface ParsedColorValue {
     alpha: string | number | undefined;
 }
 type PresetOptions = Record<string, any>;
-interface RuleContext<Theme extends {} = {}> {
+interface RuleContext<Theme extends object = object> {
     /**
      * Unprocessed selector from user input.
      * Useful for generating CSS rule.
@@ -249,7 +249,7 @@ interface RuleContext<Theme extends {} = {}> {
      */
     variants?: Variant<Theme>[];
 }
-interface VariantContext<Theme extends {} = {}> {
+interface VariantContext<Theme extends object = object> {
     /**
      * Unprocessed selector from user input.
      */
@@ -269,7 +269,7 @@ interface ExtractorContext {
     id?: string;
     extracted: Set<string>;
 }
-interface PreflightContext<Theme extends {} = {}> {
+interface PreflightContext<Theme extends object = object> {
     /**
      * UnoCSS generator instance
      */
@@ -327,19 +327,19 @@ interface RuleMeta {
 }
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
-type DynamicMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValue | string | (CSSValue | string)[] | undefined>);
-type DynamicRule<Theme extends {} = {}> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
+type DynamicMatcher<Theme extends object = object> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => Awaitable<CSSValue | string | (CSSValue | string)[] | undefined>);
+type DynamicRule<Theme extends object = object> = [RegExp, DynamicMatcher<Theme>] | [RegExp, DynamicMatcher<Theme>, RuleMeta];
 type StaticRule = [string, CSSObject | CSSEntries] | [string, CSSObject | CSSEntries, RuleMeta];
-type Rule<Theme extends {} = {}> = DynamicRule<Theme> | StaticRule;
-type DynamicShortcutMatcher<Theme extends {} = {}> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | ShortcutValue[] | undefined));
+type Rule<Theme extends object = object> = DynamicRule<Theme> | StaticRule;
+type DynamicShortcutMatcher<Theme extends object = object> = ((match: RegExpMatchArray, context: Readonly<RuleContext<Theme>>) => (string | ShortcutValue[] | undefined));
 type StaticShortcut = [string, string | ShortcutValue[]] | [string, string | ShortcutValue[], RuleMeta];
 type StaticShortcutMap = Record<string, string | ShortcutValue[]>;
-type DynamicShortcut<Theme extends {} = {}> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
-type UserShortcuts<Theme extends {} = {}> = StaticShortcutMap | (StaticShortcut | DynamicShortcut<Theme> | StaticShortcutMap)[];
-type Shortcut<Theme extends {} = {}> = StaticShortcut | DynamicShortcut<Theme>;
+type DynamicShortcut<Theme extends object = object> = [RegExp, DynamicShortcutMatcher<Theme>] | [RegExp, DynamicShortcutMatcher<Theme>, RuleMeta];
+type UserShortcuts<Theme extends object = object> = StaticShortcutMap | (StaticShortcut | DynamicShortcut<Theme> | StaticShortcutMap)[];
+type Shortcut<Theme extends object = object> = StaticShortcut | DynamicShortcut<Theme>;
 type ShortcutValue = string | CSSValue;
 type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
-interface Preflight<Theme extends {} = {}> {
+interface Preflight<Theme extends object = object> {
     getCSS: (context: PreflightContext<Theme>) => Promise<string | undefined> | string | undefined;
     layer?: string;
 }
@@ -417,8 +417,8 @@ interface VariantHandler {
      */
     layer?: string | undefined;
 }
-type VariantFunction<Theme extends {} = {}> = (matcher: string, context: Readonly<VariantContext<Theme>>) => Awaitable<string | VariantHandler | undefined>;
-interface VariantObject<Theme extends {} = {}> {
+type VariantFunction<Theme extends object = object> = (matcher: string, context: Readonly<VariantContext<Theme>>) => Awaitable<string | VariantHandler | undefined>;
+interface VariantObject<Theme extends object = object> {
     /**
      * The name of the variant.
      */
@@ -442,11 +442,11 @@ interface VariantObject<Theme extends {} = {}> {
      */
     autocomplete?: Arrayable<AutoCompleteFunction | AutoCompleteTemplate>;
 }
-type Variant<Theme extends {} = {}> = VariantFunction<Theme> | VariantObject<Theme>;
+type Variant<Theme extends object = object> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
 type Postprocessor = (util: UtilObject) => void;
 type ThemeExtender<T> = (theme: T) => T | void;
-interface ConfigBase<Theme extends {} = {}> {
+interface ConfigBase<Theme extends object = object> {
     /**
      * Rules to generate CSS utilities.
      *
@@ -613,7 +613,7 @@ interface AutoCompleteExtractor {
     extract: (context: AutoCompleteExtractorContext) => Awaitable<AutoCompleteExtractorResult | null>;
     order?: number;
 }
-interface Preset<Theme extends {} = {}> extends ConfigBase<Theme> {
+interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
     name: string;
     /**
      * Enforce the preset to be applied before or after other presets
@@ -646,7 +646,7 @@ interface GeneratorOptions {
      */
     warn?: boolean;
 }
-interface UserOnlyOptions<Theme extends {} = {}> {
+interface UserOnlyOptions<Theme extends object = object> {
     /**
      * The theme object, will be merged with the theme provides by presets
      */
@@ -830,11 +830,11 @@ interface PluginOptions {
       */
     exclude?: FilterPattern;
 }
-interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {
+interface UserConfig<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {
 }
-interface UserConfigDefaults<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme> {
+interface UserConfigDefaults<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme> {
 }
-interface ResolvedConfig<Theme extends {} = {}> extends Omit<RequiredByKey<UserConfig<Theme>, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>, 'rules' | 'shortcuts' | 'autocomplete'> {
+interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByKey<UserConfig<Theme>, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>, 'rules' | 'shortcuts' | 'autocomplete'> {
     presets: Preset<Theme>[];
     shortcuts: Shortcut<Theme>[];
     variants: VariantObject<Theme>[];
@@ -856,7 +856,7 @@ interface GenerateResult {
     getLayers(includes?: string[], excludes?: string[]): string;
     matched: Set<string>;
 }
-type VariantMatchedResult<Theme extends {} = {}> = readonly [
+type VariantMatchedResult<Theme extends object = object> = readonly [
     raw: string,
     current: string,
     variantHandlers: VariantHandler[],
@@ -874,7 +874,7 @@ type RawUtil = readonly [
     rawCSS: string,
     meta: RuleMeta | undefined
 ];
-type StringifiedUtil<Theme extends {} = {}> = readonly [
+type StringifiedUtil<Theme extends object = object> = readonly [
     index: number,
     selector: string | undefined,
     body: string,
@@ -930,19 +930,19 @@ declare const defaultSplitRE: RegExp;
 declare const splitWithVariantGroupRE: RegExp;
 declare const extractorSplit: Extractor;
 
-declare function resolveShortcuts<Theme extends {} = {}>(shortcuts: UserShortcuts<Theme>): Shortcut<Theme>[];
+declare function resolveShortcuts<Theme extends object = object>(shortcuts: UserShortcuts<Theme>): Shortcut<Theme>[];
 /**
  * Resolve a single preset, nested presets are ignored
  */
-declare function resolvePreset<Theme extends {} = {}>(preset: Preset<Theme>): Preset<Theme>;
+declare function resolvePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 /**
  * Resolve presets with nested presets
  */
-declare function resolvePresets<Theme extends {} = {}>(preset: Preset<Theme>): Preset<Theme>[];
-declare function resolveConfig<Theme extends {} = {}>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): ResolvedConfig<Theme>;
+declare function resolvePresets<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>[];
+declare function resolveConfig<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): ResolvedConfig<Theme>;
 /**
  * Merge multiple configs into one, later ones have higher priority
  */
-declare function mergeConfigs<Theme extends {} = {}>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
+declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
 
 export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, 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, ToArray, 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, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -284,7 +284,7 @@ function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
   if (typeof str === "string") {
     return expanded;
   } else {
-    return str.length() ? str.overwrite(0, str.length(), expanded) : str;
+    return str.length() ? str.overwrite(0, str.original.length, expanded) : str;
   }
 }
 
@@ -503,7 +503,7 @@ function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
 
-const version = "0.53.4";
+const version = "0.53.5";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -923,7 +923,7 @@ class UnoGenerator {
   async stringifyShortcuts(parent, context, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map(async (i) => {
-      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Infinity, "{inline}", normalizeCSSEntries(i), void 0, []]];
+      const result = isString(i) ? await this.parseUtil(i, context, true, meta.prefix) : [[Number.POSITIVE_INFINITY, "{inline}", normalizeCSSEntries(i), void 0, []]];
       if (!result)
         warnOnce(`unmatched utility "${i}" in shortcut "${parent[1]}"`);
       return result || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.30.0",
+    "magic-string": "^0.30.1",
     "unconfig": "^0.3.9"
   },
   "scripts": {