@unocss/autocomplete 0.29.4 → 0.30.0

package/dist/index.cjs

@@ -123,6 +123,21 @@ function parseAutocomplete(template, theme = {}) {
   }
 }
 
+function searchUsageBoundary(line, index) {
+  let start = index;
+  let end = index;
+  const regex = /[^\s>"'`]/;
+  while (start && regex.test(line.charAt(start - 1)))
+    --start;
+  while (end < line.length && regex.test(line.charAt(end)))
+    ++end;
+  return {
+    content: line.slice(start, end),
+    start,
+    end
+  };
+}
+
 function createAutocomplete(uno) {
   const templateCache = /* @__PURE__ */ new Map();
   const cache = new LRU__default({ max: 1e3 });
@@ -131,6 +146,7 @@ function createAutocomplete(uno) {
   reset();
   return {
     suggest,
+    suggestInFile,
     templates,
     cache,
     reset
@@ -146,20 +162,51 @@ function createAutocomplete(uno) {
     if (cache.has(input))
       return cache.get(input);
     const [, processed, , variants] = uno.matchVariants(input);
-    const idx = input.search(processed);
+    const idx = processed ? input.search(processed) : input.length;
     if (idx === -1)
       return [];
     const variantPrefix = input.slice(0, idx);
-    const variantPostfix = input.slice(idx + input.length);
+    const variantSuffix = input.slice(idx + input.length);
     const result = processSuggestions(await Promise.all([
       suggestSelf(processed),
       suggestStatic(processed),
       ...suggestFromPreset(processed),
       ...suggestVariant(processed, variants)
-    ]), variantPrefix, variantPostfix);
+    ]), variantPrefix, variantSuffix);
     cache.set(input, result);
     return result;
   }
+  async function suggestInFile(content, cursor) {
+    const byExtractor = await searchUsageByExtractor(content, cursor);
+    if (byExtractor) {
+      const suggestions2 = await suggest(byExtractor.extracted);
+      const formatted = byExtractor.transformSuggestions ? byExtractor.transformSuggestions(suggestions2) : suggestions2;
+      return {
+        suggestions: suggestions2.map((v, i) => [v, formatted[i]]),
+        resolveReplacement: byExtractor.resolveReplacement
+      };
+    }
+    const regular = searchUsageBoundary(content, cursor);
+    const suggestions = await suggest(regular.content);
+    return {
+      suggestions: suggestions.map((v) => [v, v]),
+      resolveReplacement: (suggestion) => ({
+        start: regular.start,
+        end: regular.end,
+        replacement: suggestion
+      })
+    };
+  }
+  async function searchUsageByExtractor(content, cursor) {
+    if (!uno.config.autocomplete.extractors.length)
+      return null;
+    for (const extractor of uno.config.autocomplete.extractors) {
+      const res = await extractor.extract({ content, cursor });
+      if (res)
+        return res;
+    }
+    return null;
+  }
   async function suggestSelf(input) {
     const i = await uno.parseToken(input, "-");
     return i ? [input] : [];
@@ -178,7 +225,7 @@ function createAutocomplete(uno) {
     cache.clear();
     staticUtils = Object.keys(uno.config.rulesStaticMap);
     templates.length = 0;
-    templates.push(...uno.config.autocomplete || [], ...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 || [])));
   }
   function processSuggestions(suggestions, prefix = "", suffix = "") {
     return core.uniq(suggestions.flat()).filter((i) => !!(i && !i.match(/-$/))).sort((a, b) => {
@@ -191,21 +238,6 @@ function createAutocomplete(uno) {
   }
 }
 
-function searchUsageBoundary(line, index) {
-  let start = index;
-  let end = index;
-  const regex = /[^\s>"'`]/;
-  while (start && regex.test(line.charAt(start - 1)))
-    --start;
-  while (end < line.length && regex.test(line.charAt(end)))
-    ++end;
-  return {
-    content: line.slice(start, end),
-    start,
-    end
-  };
-}
-
 exports.createAutocomplete = createAutocomplete;
 exports.ignoredThemeKeys = ignoredThemeKeys;
 exports.parseAutocomplete = parseAutocomplete;

package/dist/index.d.ts

@@ -1,8 +1,9 @@
-import { UnoGenerator, AutoCompleteFunction } from '@unocss/core';
+import { UnoGenerator, SuggestResult, AutoCompleteFunction } from '@unocss/core';
 import LRU from 'lru-cache';
 
 declare function createAutocomplete(uno: UnoGenerator): {
     suggest: (input: string) => Promise<string[]>;
+    suggestInFile: (content: string, cursor: number) => Promise<SuggestResult>;
     templates: (string | AutoCompleteFunction)[];
     cache: LRU<string, string[]>;
     reset: () => void;

package/dist/index.mjs

@@ -115,6 +115,21 @@ function parseAutocomplete(template, theme = {}) {
   }
 }
 
+function searchUsageBoundary(line, index) {
+  let start = index;
+  let end = index;
+  const regex = /[^\s>"'`]/;
+  while (start && regex.test(line.charAt(start - 1)))
+    --start;
+  while (end < line.length && regex.test(line.charAt(end)))
+    ++end;
+  return {
+    content: line.slice(start, end),
+    start,
+    end
+  };
+}
+
 function createAutocomplete(uno) {
   const templateCache = /* @__PURE__ */ new Map();
   const cache = new LRU({ max: 1e3 });
@@ -123,6 +138,7 @@ function createAutocomplete(uno) {
   reset();
   return {
     suggest,
+    suggestInFile,
     templates,
     cache,
     reset
@@ -138,20 +154,51 @@ function createAutocomplete(uno) {
     if (cache.has(input))
       return cache.get(input);
     const [, processed, , variants] = uno.matchVariants(input);
-    const idx = input.search(processed);
+    const idx = processed ? input.search(processed) : input.length;
     if (idx === -1)
       return [];
     const variantPrefix = input.slice(0, idx);
-    const variantPostfix = input.slice(idx + input.length);
+    const variantSuffix = input.slice(idx + input.length);
     const result = processSuggestions(await Promise.all([
       suggestSelf(processed),
       suggestStatic(processed),
       ...suggestFromPreset(processed),
       ...suggestVariant(processed, variants)
-    ]), variantPrefix, variantPostfix);
+    ]), variantPrefix, variantSuffix);
     cache.set(input, result);
     return result;
   }
+  async function suggestInFile(content, cursor) {
+    const byExtractor = await searchUsageByExtractor(content, cursor);
+    if (byExtractor) {
+      const suggestions2 = await suggest(byExtractor.extracted);
+      const formatted = byExtractor.transformSuggestions ? byExtractor.transformSuggestions(suggestions2) : suggestions2;
+      return {
+        suggestions: suggestions2.map((v, i) => [v, formatted[i]]),
+        resolveReplacement: byExtractor.resolveReplacement
+      };
+    }
+    const regular = searchUsageBoundary(content, cursor);
+    const suggestions = await suggest(regular.content);
+    return {
+      suggestions: suggestions.map((v) => [v, v]),
+      resolveReplacement: (suggestion) => ({
+        start: regular.start,
+        end: regular.end,
+        replacement: suggestion
+      })
+    };
+  }
+  async function searchUsageByExtractor(content, cursor) {
+    if (!uno.config.autocomplete.extractors.length)
+      return null;
+    for (const extractor of uno.config.autocomplete.extractors) {
+      const res = await extractor.extract({ content, cursor });
+      if (res)
+        return res;
+    }
+    return null;
+  }
   async function suggestSelf(input) {
     const i = await uno.parseToken(input, "-");
     return i ? [input] : [];
@@ -170,7 +217,7 @@ function createAutocomplete(uno) {
     cache.clear();
     staticUtils = Object.keys(uno.config.rulesStaticMap);
     templates.length = 0;
-    templates.push(...uno.config.autocomplete || [], ...uno.config.rulesDynamic.flatMap((i) => toArray(i?.[2]?.autocomplete || [])));
+    templates.push(...uno.config.autocomplete.templates || [], ...uno.config.rulesDynamic.flatMap((i) => toArray(i?.[2]?.autocomplete || [])));
   }
   function processSuggestions(suggestions, prefix = "", suffix = "") {
     return uniq(suggestions.flat()).filter((i) => !!(i && !i.match(/-$/))).sort((a, b) => {
@@ -183,19 +230,4 @@ function createAutocomplete(uno) {
   }
 }
 
-function searchUsageBoundary(line, index) {
-  let start = index;
-  let end = index;
-  const regex = /[^\s>"'`]/;
-  while (start && regex.test(line.charAt(start - 1)))
-    --start;
-  while (end < line.length && regex.test(line.charAt(end)))
-    ++end;
-  return {
-    content: line.slice(start, end),
-    start,
-    end
-  };
-}
-
 export { createAutocomplete, ignoredThemeKeys, parseAutocomplete, searchUsageBoundary, shorthands };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/autocomplete",
-  "version": "0.29.4",
+  "version": "0.30.0",
   "description": "Autocomplete utils for UnoCSS",
   "keywords": [
     "unocss",
@@ -32,11 +32,11 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "lru-cache": "^7.5.1"
+    "lru-cache": "^7.7.1"
   },
   "devDependencies": {
-    "@types/lru-cache": "^7.4.0",
-    "@unocss/core": "0.29.4"
+    "@types/lru-cache": "^7.5.0",
+    "@unocss/core": "0.30.0"
   },
   "scripts": {
     "build": "unbuild",