@unocss/autocomplete 0.64.1 → 0.65.0-beta.2

package/dist/index.d.mts

@@ -27,11 +27,11 @@ interface UnocssAutocomplete {
     suggestInFile: (content: string, cursor: number) => Promise<SuggestResult | undefined>;
     templates: (string | AutoCompleteFunction)[];
     cache: LRUCache<string, string[]>;
-    reset: () => void;
+    reset: () => Promise<void>;
     enumerate: () => Promise<Set<string>>;
 }
 
-declare function createAutocomplete(uno: UnoGenerator, options?: AutocompleteOptions): UnocssAutocomplete;
+declare function createAutocomplete(_uno: UnoGenerator | Promise<UnoGenerator>, options?: AutocompleteOptions): UnocssAutocomplete;
 
 declare const shorthands: Record<string, string>;
 declare const ignoredThemeKeys: string[];

package/dist/index.d.ts

@@ -27,11 +27,11 @@ interface UnocssAutocomplete {
     suggestInFile: (content: string, cursor: number) => Promise<SuggestResult | undefined>;
     templates: (string | AutoCompleteFunction)[];
     cache: LRUCache<string, string[]>;
-    reset: () => void;
+    reset: () => Promise<void>;
     enumerate: () => Promise<Set<string>>;
 }
 
-declare function createAutocomplete(uno: UnoGenerator, options?: AutocompleteOptions): UnocssAutocomplete;
+declare function createAutocomplete(_uno: UnoGenerator | Promise<UnoGenerator>, options?: AutocompleteOptions): UnocssAutocomplete;
 
 declare const shorthands: Record<string, string>;
 declare const ignoredThemeKeys: string[];

package/dist/index.mjs

@@ -239,13 +239,14 @@ function getAllCombination(parts) {
   return list;
 }
 
-function createAutocomplete(uno, options = {}) {
+function createAutocomplete(_uno, options = {}) {
   const templateCache = /* @__PURE__ */ new Map();
   const cache = new LRUCache({ max: 5e3 });
   let staticUtils = [];
   const templates = [];
   const matchType = options.matchType ?? "prefix";
-  reset();
+  let uno;
+  const ready = reset();
   return {
     suggest,
     suggestInFile,
@@ -279,6 +280,7 @@ function createAutocomplete(uno, options = {}) {
     return templateCache.get(template).suggest;
   }
   async function suggest(input, allowsEmptyInput = false) {
+    await ready;
     if (!allowsEmptyInput && input.length < 1)
       return [];
     if (cache.has(input))
@@ -286,23 +288,26 @@ function createAutocomplete(uno, options = {}) {
     const attributify = uno.config.presets.find((i) => i.name === "@unocss/preset-attributify");
     const attributifyPrefix = attributify?.options?.prefix;
     const _input = attributifyPrefix ? input.startsWith(attributifyPrefix) ? input.slice(attributifyPrefix.length) : input.replace(`:${attributifyPrefix}`, ":") : input;
-    const [, processed, , variants] = await uno.matchVariants(_input);
-    let idx = processed ? input.search(escapeRegExp(processed)) : input.length;
-    if (idx === -1)
-      idx = 0;
-    const variantPrefix = input.slice(0, idx);
-    const variantSuffix = input.slice(idx + input.length);
-    let result = processSuggestions(
-      await Promise.all([
-        suggestSelf(processed),
-        suggestStatic(processed),
-        suggestUnoCache(processed),
-        ...suggestFromPreset(processed),
-        ...suggestVariant(processed, variants)
-      ]),
-      variantPrefix,
-      variantSuffix
-    );
+    const matched = await uno.matchVariants(_input);
+    let result = (await Promise.all(matched.map(async ([, processed, , variants]) => {
+      let idx = processed ? input.search(escapeRegExp(processed)) : input.length;
+      if (idx === -1)
+        idx = 0;
+      const variantPrefix = input.slice(0, idx);
+      const variantSuffix = input.slice(idx + input.length);
+      const result2 = processSuggestions(
+        await Promise.all([
+          suggestSelf(processed),
+          suggestStatic(processed),
+          suggestUnoCache(processed),
+          ...suggestFromPreset(processed),
+          ...suggestVariant(processed, variants)
+        ]),
+        variantPrefix,
+        variantSuffix
+      );
+      return result2;
+    }))).flat();
     if (matchType === "fuzzy") {
       const fzf = new Fzf(result, {
         tiebreakers: [byStartAsc, byLengthAsc]
@@ -313,6 +318,7 @@ function createAutocomplete(uno, options = {}) {
     return result;
   }
   async function suggestInFile(content, cursor) {
+    await ready;
     const isInsideAttrValue = searchAttrKey(content, cursor) !== void 0;
     const byExtractor = await searchUsageByExtractor(content, cursor);
     if (byExtractor) {
@@ -369,9 +375,12 @@ function createAutocomplete(uno, options = {}) {
   function suggestVariant(input, used) {
     return uno.config.variants.filter((v) => v.autocomplete && (v.multiPass || !used.has(v))).flatMap((v) => toArray(v.autocomplete || [])).map((fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input, matchType));
   }
-  function reset() {
+  async function reset() {
     templateCache.clear();
     cache.clear();
+    if (!uno) {
+      uno = await Promise.resolve(_uno);
+    }
     staticUtils = [
       ...Object.keys(uno.config.rulesStaticMap),
       ...uno.config.shortcuts.filter((i) => typeof i[0] === "string").map((i) => i[0])

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/autocomplete",
   "type": "module",
-  "version": "0.64.1",
+  "version": "0.65.0-beta.2",
   "description": "Autocomplete utils for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "lru-cache": "^10.4.3"
   },
   "devDependencies": {
-    "@unocss/core": "0.64.1"
+    "@unocss/core": "0.65.0-beta.2"
   },
   "scripts": {
     "build": "unbuild",