@unocss/core 0.46.2 → 0.46.4

package/dist/index.cjs

@@ -291,6 +291,7 @@ const extractorSplit = {
   }
 };
 
+const rightTrimRe = /=$/;
 const extractorSvelte = {
   name: "svelte",
   order: 0,
@@ -298,7 +299,7 @@ const extractorSvelte = {
     let result = splitCode(code);
     if (id && id.endsWith(".svelte")) {
       result = result.map((r) => {
-        return r.startsWith("class:") ? r.slice(6) : r;
+        return r.startsWith("class:") ? r.slice(6).replace(rightTrimRe, "") : r;
       });
     }
     return new Set(result);
@@ -416,7 +417,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.46.2";
+const version = "0.46.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/dist/index.d.ts

@@ -51,33 +51,33 @@ declare class Emitter<Events extends EventsMap = DefaultEvents> {
     emit<K extends keyof Events>(this: this, event: K, ...args: Parameters<Events[K]>): void;
 }
 
-declare class UnoGenerator {
-    userConfig: UserConfig;
-    defaults: UserConfigDefaults;
+declare class UnoGenerator<Theme extends {} = {}> {
+    userConfig: UserConfig<Theme>;
+    defaults: UserConfigDefaults<Theme>;
     version: string;
     private _cache;
-    config: ResolvedConfig;
+    config: ResolvedConfig<Theme>;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
     events: Emitter<{
-        config: (config: ResolvedConfig) => void;
+        config: (config: ResolvedConfig<Theme>) => void;
     }>;
-    constructor(userConfig?: UserConfig, defaults?: UserConfigDefaults);
-    setConfig(userConfig?: UserConfig, defaults?: UserConfigDefaults): void;
+    constructor(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>);
+    setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): void;
     applyExtractors(code: string, id?: string, set?: Set<string>): Promise<Set<string>>;
-    makeContext(raw: string, applied: VariantMatchedResult): RuleContext<{}>;
-    parseToken(raw: string, alias?: string): Promise<StringifiedUtil[] | null | undefined>;
+    makeContext(raw: string, applied: VariantMatchedResult<Theme>): RuleContext<Theme>;
+    parseToken(raw: string, alias?: string): Promise<StringifiedUtil<Theme>[] | null | undefined>;
     generate(input: string | Set<string> | string[], options?: GenerateOptions): Promise<GenerateResult>;
-    matchVariants(raw: string, current?: string): VariantMatchedResult;
+    matchVariants(raw: string, current?: string): VariantMatchedResult<Theme>;
     private applyVariants;
-    constructCustomCSS(context: Readonly<RuleContext>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
-    parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal?: boolean, shortcutPrefix?: string | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
-    stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext): StringifiedUtil | undefined;
-    expandShortcut(input: string, context: RuleContext, depth?: number): [ShortcutValue[], RuleMeta | undefined] | undefined;
-    stringifyShortcuts(parent: VariantMatchedResult, context: RuleContext, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
+    constructCustomCSS(context: Readonly<RuleContext<Theme>>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
+    parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
+    stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme> | undefined;
+    expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): [ShortcutValue[], RuleMeta | undefined] | undefined;
+    stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: ShortcutValue[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
     isBlocked(raw: string): boolean;
 }
-declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
+declare function createGenerator<Theme extends {} = {}>(config?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): UnoGenerator<Theme>;
 declare const regexScopePlaceholder: RegExp;
 declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
 declare function movePseudoElementsEnd(selector: string): string;
@@ -97,8 +97,8 @@ declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
 declare function mergeDeep<T>(original: T, patch: DeepPartial<T>): T;
 declare function clone<T>(val: T): T;
-declare function isStaticRule(rule: Rule): rule is StaticRule;
-declare function isStaticShortcut(sc: Shortcut): sc is StaticShortcut;
+declare function isStaticRule(rule: Rule<any>): rule is StaticRule;
+declare function isStaticShortcut(sc: Shortcut<any>): sc is StaticShortcut;
 
 declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
@@ -110,7 +110,7 @@ declare const validateFilterRE: RegExp;
 declare const CONTROL_SHORTCUT_NO_MERGE = "$$shortcut-no-merge";
 declare function isAttributifySelector(selector: string): RegExpMatchArray | null;
 declare function isValidSelector(selector?: string): selector is string;
-declare function normalizeVariant(variant: Variant): VariantObject;
+declare function normalizeVariant(variant: Variant<any>): VariantObject<any>;
 declare function isRawUtil(util: ParsedUtil | RawUtil | StringifiedUtil): util is RawUtil;
 declare function notNull<T>(value: T | null | undefined): value is T;
 declare function noop(): void;
@@ -209,7 +209,7 @@ interface RuleContext<Theme extends {} = {}> {
     /**
      * UnoCSS generator instance
      */
-    generator: UnoGenerator;
+    generator: UnoGenerator<Theme>;
     /**
      * The theme object
      */
@@ -221,7 +221,7 @@ interface RuleContext<Theme extends {} = {}> {
     /**
      * The result of variant matching.
      */
-    variantMatch: VariantMatchedResult;
+    variantMatch: VariantMatchedResult<Theme>;
     /**
      * Construct a custom CSS rule.
      * Variants and selector escaping will be handled automatically.
@@ -230,15 +230,15 @@ interface RuleContext<Theme extends {} = {}> {
     /**
      * Available only when `details` option is enabled.
      */
-    rules?: Rule[];
+    rules?: Rule<Theme>[];
     /**
      * Available only when `details` option is enabled.
      */
-    shortcuts?: Shortcut[];
+    shortcuts?: Shortcut<Theme>[];
     /**
      * Available only when `details` option is enabled.
      */
-    variants?: Variant[];
+    variants?: Variant<Theme>[];
 }
 interface VariantContext<Theme extends {} = {}> {
     /**
@@ -248,7 +248,7 @@ interface VariantContext<Theme extends {} = {}> {
     /**
      * UnoCSS generator instance
      */
-    generator: UnoGenerator;
+    generator: UnoGenerator<Theme>;
     /**
      * The theme object
      */
@@ -263,7 +263,7 @@ interface PreflightContext<Theme extends {} = {}> {
     /**
      * UnoCSS generator instance
      */
-    generator: UnoGenerator;
+    generator: UnoGenerator<Theme>;
     /**
      * The theme object
      */
@@ -693,15 +693,15 @@ interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyO
 }
 interface UserConfigDefaults<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme> {
 }
-interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>, 'rules' | 'shortcuts' | 'autocomplete'> {
-    presets: Preset[];
-    shortcuts: Shortcut[];
-    variants: VariantObject[];
+interface ResolvedConfig<Theme extends {} = {}> 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>[];
     preprocess: Preprocessor[];
     postprocess: Postprocessor[];
     rulesSize: number;
-    rulesDynamic: [number, ...DynamicRule][];
-    rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined, Rule] | undefined>;
+    rulesDynamic: [number, ...DynamicRule<Theme>][];
+    rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined, Rule<Theme>] | undefined>;
     autocomplete: {
         templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
         extractors: AutoCompleteExtractor[];
@@ -714,11 +714,11 @@ interface GenerateResult {
     getLayers(includes?: string[], excludes?: string[]): string;
     matched: Set<string>;
 }
-declare type VariantMatchedResult = readonly [
+declare type VariantMatchedResult<Theme extends {} = {}> = readonly [
     raw: string,
     current: string,
     variantHandlers: VariantHandler[],
-    variants: Set<Variant>
+    variants: Set<Variant<Theme>>
 ];
 declare type ParsedUtil = readonly [
     index: number,
@@ -732,13 +732,13 @@ declare type RawUtil = readonly [
     rawCSS: string,
     meta: RuleMeta | undefined
 ];
-declare type StringifiedUtil = readonly [
+declare type StringifiedUtil<Theme extends {} = {}> = readonly [
     index: number,
     selector: string | undefined,
     body: string,
     parent: string | undefined,
     meta: RuleMeta | undefined,
-    context: RuleContext | undefined,
+    context: RuleContext<Theme> | undefined,
     noMerge: boolean | undefined
 ];
 declare type PreparedRule = readonly [

package/dist/index.mjs

@@ -287,6 +287,7 @@ const extractorSplit = {
   }
 };
 
+const rightTrimRe = /=$/;
 const extractorSvelte = {
   name: "svelte",
   order: 0,
@@ -294,7 +295,7 @@ const extractorSvelte = {
     let result = splitCode(code);
     if (id && id.endsWith(".svelte")) {
       result = result.map((r) => {
-        return r.startsWith("class:") ? r.slice(6) : r;
+        return r.startsWith("class:") ? r.slice(6).replace(rightTrimRe, "") : r;
       });
     }
     return new Set(result);
@@ -412,7 +413,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.46.2";
+const version = "0.46.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.46.2",
+  "version": "0.46.4",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",