@unocss/core 0.29.6 → 0.30.2

package/dist/index.cjs

@@ -332,6 +332,10 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {}));
   mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
+  const autocomplete = {
+    templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
+    extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
+  };
   return {
     mergeSelectors: true,
     warn: true,
@@ -350,14 +354,14 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preprocess: mergePresets("preprocess"),
     postprocess: mergePresets("postprocess"),
     preflights: mergePresets("preflights"),
-    autocomplete: mergePresets("autocomplete"),
+    autocomplete,
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
     extractors
   };
 }
 
-const version = "0.29.6";
+const version = "0.30.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -443,7 +447,7 @@ class UnoGenerator {
     }
     this._cache.set(cacheKey, null);
   }
-  async generate(input, {
+  async generate(input = "", {
     id,
     scope,
     preflights = true,

package/dist/index.d.ts

@@ -14,7 +14,7 @@ declare class UnoGenerator {
     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>;
-    generate(input: string | Set<string>, { id, scope, preflights, safelist, minify, }?: GenerateOptions): Promise<GenerateResult>;
+    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;
     constructCustomCSS(context: Readonly<RuleContext>, body: CSSObject | CSSEntries, overrideSelector?: string): string;
@@ -356,12 +356,69 @@ interface ConfigBase<Theme extends {} = {}> {
      */
     extendTheme?: Arrayable<ThemeExtender<Theme>>;
     /**
-     * Custom function for auto complete
-     */
-    autocomplete?: (AutoCompleteFunction | AutoCompleteTemplate)[];
+     * Addtional options for auto complete
+     */
+    autocomplete?: {
+        /**
+         * Custom functions / templates to provide autocomplete suggestions
+         */
+        templates?: Arrayable<AutoCompleteFunction | AutoCompleteTemplate>;
+        /**
+         * Custom extractors to pickup possible classes and
+         * transform class-name style suggestions to the correct format
+         */
+        extractors?: Arrayable<AutoCompleteExtractor>;
+    };
 }
 declare type AutoCompleteTemplate = string;
 declare type AutoCompleteFunction = (input: string) => Awaitable<string[]>;
+interface AutoCompleteExtractorContext {
+    content: string;
+    cursor: number;
+}
+interface Replacement {
+    /**
+     * The range of the original text
+     */
+    start: number;
+    end: number;
+    /**
+     * The text used to replace
+     */
+    replacement: string;
+}
+interface SuggestResult {
+    /**
+     * The generated suggestions
+     *
+     * `[original, formatted]`
+     */
+    suggestions: [string, string][];
+    /**
+     * The function to convert the selected suggestion back.
+     * Needs to pass in the original one.
+     */
+    resolveReplacement: (suggestion: string) => Replacement;
+}
+interface AutoCompleteExtractorResult {
+    /**
+     * The extracted string
+     */
+    extracted: string;
+    /**
+     * The function to convert the selected suggestion back
+     */
+    resolveReplacement: (suggestion: string) => Replacement;
+    /**
+     * The function to format suggestions
+     */
+    transformSuggestions?: (suggestions: string[]) => string[];
+}
+interface AutoCompleteExtractor {
+    name: string;
+    extract: (context: AutoCompleteExtractorContext) => Awaitable<AutoCompleteExtractorResult | null>;
+    order?: number;
+}
 interface Preset<Theme extends {} = {}> extends ConfigBase<Theme> {
     name: string;
     enforce?: 'pre' | 'post';
@@ -481,7 +538,7 @@ 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'> {
+interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>, 'rules' | 'shortcuts' | 'autocomplete'> {
     shortcuts: Shortcut[];
     variants: VariantObject[];
     preprocess: Preprocessor[];
@@ -489,6 +546,10 @@ interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors'
     rulesSize: number;
     rulesDynamic: (DynamicRule | undefined)[];
     rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined] | undefined>;
+    autocomplete: {
+        templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
+        extractors: AutoCompleteExtractor[];
+    };
 }
 interface GenerateResult {
     css: string;
@@ -559,4 +620,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteFunction, AutoCompleteTemplate, 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, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, 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, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, 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, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, 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, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -328,6 +328,10 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     config.theme || {}
   ].reduce((a, p) => mergeDeep(a, p), {}));
   mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
+  const autocomplete = {
+    templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
+    extractors: sortedPresets.map((p) => toArray(p.autocomplete?.extractors)).flat().sort((a, b) => (a.order || 0) - (b.order || 0))
+  };
   return {
     mergeSelectors: true,
     warn: true,
@@ -346,14 +350,14 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     preprocess: mergePresets("preprocess"),
     postprocess: mergePresets("postprocess"),
     preflights: mergePresets("preflights"),
-    autocomplete: mergePresets("autocomplete"),
+    autocomplete,
     variants: mergePresets("variants").map(normalizeVariant),
     shortcuts: resolveShortcuts(mergePresets("shortcuts")),
     extractors
   };
 }
 
-const version = "0.29.6";
+const version = "0.30.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -439,7 +443,7 @@ class UnoGenerator {
     }
     this._cache.set(cacheKey, null);
   }
-  async generate(input, {
+  async generate(input = "", {
     id,
     scope,
     preflights = true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.29.6",
+  "version": "0.30.2",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",
@@ -38,7 +38,7 @@
   "sideEffects": false,
   "devDependencies": {
     "magic-string": "^0.26.1",
-    "unconfig": "^0.3.1"
+    "unconfig": "^0.3.2"
   },
   "scripts": {
     "build": "unbuild",