@unocss/autocomplete 0.35.0 → 0.35.3

package/dist/index.cjs

@@ -142,7 +142,7 @@ function searchUsageBoundary(line, index) {
 
 function createAutocomplete(uno) {
   const templateCache = /* @__PURE__ */ new Map();
-  const cache = new LRU__default({ max: 1e3 });
+  const cache = new LRU__default({ max: 5e3 });
   let staticUtils = [];
   const templates = [];
   reset();
@@ -177,14 +177,15 @@ function createAutocomplete(uno) {
     if (cache.has(input))
       return cache.get(input);
     const [, processed, , variants] = uno.matchVariants(input);
-    const idx = processed ? input.search(core.escapeRegExp(processed)) : input.length;
+    let idx = processed ? input.search(core.escapeRegExp(processed)) : input.length;
     if (idx === -1)
-      return [];
+      idx = 0;
     const variantPrefix = input.slice(0, idx);
     const variantSuffix = input.slice(idx + input.length);
     const result = processSuggestions(await Promise.all([
       suggestSelf(processed),
       suggestStatic(processed),
+      suggestUnoCache(processed),
       ...suggestFromPreset(processed),
       ...suggestVariant(processed, variants)
     ]), variantPrefix, variantSuffix);
@@ -229,6 +230,10 @@ function createAutocomplete(uno) {
   async function suggestStatic(input) {
     return staticUtils.filter((i) => i.startsWith(input));
   }
+  async function suggestUnoCache(input) {
+    const keys = Array.from(uno._cache.entries());
+    return keys.filter((i) => i[1] && i[0].startsWith(input)).map((i) => i[0]);
+  }
   function suggestFromPreset(input) {
     return templates.map((fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input)) || [];
   }
@@ -238,9 +243,12 @@ function createAutocomplete(uno) {
   function reset() {
     templateCache.clear();
     cache.clear();
-    staticUtils = Object.keys(uno.config.rulesStaticMap);
+    staticUtils = [
+      ...Object.keys(uno.config.rulesStaticMap),
+      ...uno.config.shortcuts.filter((i) => typeof i[0] === "string").map((i) => i[0])
+    ];
     templates.length = 0;
-    templates.push(...uno.config.autocomplete.templates || [], ...uno.config.rulesDynamic.flatMap((i) => core.toArray(i?.[2]?.autocomplete || [])));
+    templates.push(...uno.config.autocomplete.templates || [], ...uno.config.rulesDynamic.flatMap((i) => core.toArray(i?.[2]?.autocomplete || [])), ...uno.config.shortcuts.flatMap((i) => core.toArray(i?.[2]?.autocomplete || [])));
   }
   function processSuggestions(suggestions, prefix = "", suffix = "") {
     return core.uniq(suggestions.flat()).filter((i) => !!(i && !i.match(/-$/))).sort((a, b) => {

package/dist/index.mjs

@@ -134,7 +134,7 @@ function searchUsageBoundary(line, index) {
 
 function createAutocomplete(uno) {
   const templateCache = /* @__PURE__ */ new Map();
-  const cache = new LRU({ max: 1e3 });
+  const cache = new LRU({ max: 5e3 });
   let staticUtils = [];
   const templates = [];
   reset();
@@ -169,14 +169,15 @@ function createAutocomplete(uno) {
     if (cache.has(input))
       return cache.get(input);
     const [, processed, , variants] = uno.matchVariants(input);
-    const idx = processed ? input.search(escapeRegExp(processed)) : input.length;
+    let idx = processed ? input.search(escapeRegExp(processed)) : input.length;
     if (idx === -1)
-      return [];
+      idx = 0;
     const variantPrefix = input.slice(0, idx);
     const variantSuffix = input.slice(idx + input.length);
     const result = processSuggestions(await Promise.all([
       suggestSelf(processed),
       suggestStatic(processed),
+      suggestUnoCache(processed),
       ...suggestFromPreset(processed),
       ...suggestVariant(processed, variants)
     ]), variantPrefix, variantSuffix);
@@ -221,6 +222,10 @@ function createAutocomplete(uno) {
   async function suggestStatic(input) {
     return staticUtils.filter((i) => i.startsWith(input));
   }
+  async function suggestUnoCache(input) {
+    const keys = Array.from(uno._cache.entries());
+    return keys.filter((i) => i[1] && i[0].startsWith(input)).map((i) => i[0]);
+  }
   function suggestFromPreset(input) {
     return templates.map((fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input)) || [];
   }
@@ -230,9 +235,12 @@ function createAutocomplete(uno) {
   function reset() {
     templateCache.clear();
     cache.clear();
-    staticUtils = Object.keys(uno.config.rulesStaticMap);
+    staticUtils = [
+      ...Object.keys(uno.config.rulesStaticMap),
+      ...uno.config.shortcuts.filter((i) => typeof i[0] === "string").map((i) => i[0])
+    ];
     templates.length = 0;
-    templates.push(...uno.config.autocomplete.templates || [], ...uno.config.rulesDynamic.flatMap((i) => toArray(i?.[2]?.autocomplete || [])));
+    templates.push(...uno.config.autocomplete.templates || [], ...uno.config.rulesDynamic.flatMap((i) => toArray(i?.[2]?.autocomplete || [])), ...uno.config.shortcuts.flatMap((i) => toArray(i?.[2]?.autocomplete || [])));
   }
   function processSuggestions(suggestions, prefix = "", suffix = "") {
     return uniq(suggestions.flat()).filter((i) => !!(i && !i.match(/-$/))).sort((a, b) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/autocomplete",
-  "version": "0.35.0",
+  "version": "0.35.3",
   "description": "Autocomplete utils for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -21,8 +21,8 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs"
     }
   },
   "main": "./dist/index.cjs",
@@ -35,7 +35,7 @@
     "lru-cache": "^7.10.1"
   },
   "devDependencies": {
-    "@unocss/core": "0.35.0"
+    "@unocss/core": "0.35.3"
   },
   "scripts": {
     "build": "unbuild",