@unocss/autocomplete 0.53.3 → 0.53.5

package/dist/index.cjs

@@ -4,6 +4,43 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const core = require('@unocss/core');
 const lruCache = require('lru-cache');
+const fzf = require('fzf');
+
+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 searchAttrKey(content, cursor) {
+  const text = content.substring(0, cursor);
+  if (text.match(/(<\w+\s*)[^>]*$/) !== null)
+    return text.match(/\S+(?=\s*=\s*["']?[^"']*$)/)?.[0];
+}
+function cartesian(arr) {
+  if (arr.length < 2)
+    return arr;
+  return arr.reduce(
+    (a, b) => {
+      const ret = [];
+      a.forEach((a2) => {
+        b.forEach((b2) => {
+          ret.push(a2.concat([b2]));
+        });
+      });
+      return ret;
+    },
+    [[]]
+  );
+}
 
 const shorthands = {
   num: `(${[0, 1, 2, 3, 4, 5, 6, 8, 10, 12, 24, 36].join("|")})`,
@@ -31,6 +68,7 @@ function parseAutocomplete(template, theme = {}) {
     return shorthands[key];
   });
   handleGroups(template);
+  const fzf$1 = new fzf.Fzf(getAllCombination(parts));
   return {
     parts,
     suggest
@@ -74,7 +112,9 @@ function parseAutocomplete(template, theme = {}) {
       }
     );
   }
-  function suggest(input) {
+  function suggest(input, matchType = "prefix") {
+    if (input.length && matchType === "fuzzy")
+      return fzf$1.find(input).map((i) => i.item);
     let rest = input;
     let matched = "";
     let combinations = [];
@@ -130,32 +170,43 @@ function parseAutocomplete(template, theme = {}) {
     return combinations.map((i) => matched + i).filter((i) => i.length >= input.length);
   }
 }
-
-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 getValuesFromPartTemplate(part) {
+  if (part.type === "static")
+    return [part.value];
+  if (part.type === "theme") {
+    return part.objects.flatMap((i) => {
+      const keys = Object.keys(i).filter((i2) => i2 && i2[0] !== "_");
+      for (const key in i) {
+        const value = i[key];
+        if (value === null || value === void 0)
+          continue;
+        if (typeof value === "object" && !Array.isArray(value)) {
+          const subKeys = getValuesFromPartTemplate({
+            type: "theme",
+            objects: [value]
+          }).map((i2) => `${key}-${i2}`);
+          keys.push(...subKeys);
+        }
+      }
+      return keys;
+    });
+  }
+  if (part.type === "group")
+    return [...part.values];
+  return [];
 }
-function searchAttrKey(content, cursor) {
-  const text = content.substring(0, cursor);
-  if (text.match(/(<\w+\s*)[^>]*$/) !== null)
-    return text.match(/\S+(?=\s*=\s*["']?[^"']*$)/)?.[0];
+function getAllCombination(parts) {
+  const values = parts.map((i) => getValuesFromPartTemplate(i));
+  const list = core.uniq(cartesian(values).flatMap((i) => i.join("").replace("-DEFAULT", "")));
+  return list;
 }
 
-function createAutocomplete(uno) {
+function createAutocomplete(uno, options = {}) {
   const templateCache = /* @__PURE__ */ new Map();
   const cache = new lruCache.LRUCache({ max: 5e3 });
   let staticUtils = [];
   const templates = [];
+  const matchType = options.matchType ?? "prefix";
   reset();
   return {
     suggest,
@@ -197,7 +248,7 @@ function createAutocomplete(uno) {
       idx = 0;
     const variantPrefix = input.slice(0, idx);
     const variantSuffix = input.slice(idx + input.length);
-    const result = processSuggestions(
+    let result = processSuggestions(
       await Promise.all([
         suggestSelf(processed),
         suggestStatic(processed),
@@ -208,6 +259,12 @@ function createAutocomplete(uno) {
       variantPrefix,
       variantSuffix
     );
+    if (matchType === "fuzzy") {
+      const fzf$1 = new fzf.Fzf(result, {
+        tiebreakers: [fzf.byStartAsc, fzf.byLengthAsc]
+      });
+      result = fzf$1.find(input).map((i) => i.item);
+    }
     cache.set(input, result);
     return result;
   }
@@ -248,6 +305,8 @@ function createAutocomplete(uno) {
     return i ? [input] : [];
   }
   async function suggestStatic(input) {
+    if (matchType === "fuzzy")
+      return staticUtils;
     return staticUtils.filter((i) => i.startsWith(input));
   }
   async function suggestUnoCache(input) {
@@ -256,12 +315,12 @@ function createAutocomplete(uno) {
   }
   function suggestFromPreset(input) {
     return templates.map(
-      (fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input)
+      (fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input, matchType)
     ) || [];
   }
   function suggestVariant(input, used) {
     return uno.config.variants.filter((v) => v.autocomplete && (v.multiPass || !used.has(v))).flatMap((v) => core.toArray(v.autocomplete || [])).map(
-      (fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input)
+      (fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input, matchType)
     );
   }
   function reset() {
@@ -280,8 +339,8 @@ function createAutocomplete(uno) {
   }
   function processSuggestions(suggestions, prefix = "", suffix = "") {
     return core.uniq(suggestions.flat()).filter((i) => !!(i && !i.match(/-$/) && !uno.isBlocked(i))).sort((a, b) => {
-      const numA = +(a.match(/\d+$/)?.[0] || NaN);
-      const numB = +(b.match(/\d+$/)?.[0] || NaN);
+      const numA = +(a.match(/\d+$/)?.[0] || Number.NaN);
+      const numB = +(b.match(/\d+$/)?.[0] || Number.NaN);
       if (!Number.isNaN(numA) && !Number.isNaN(numB))
         return numA - numB;
       return a.localeCompare(b);
@@ -289,6 +348,7 @@ function createAutocomplete(uno) {
   }
 }
 
+exports.cartesian = cartesian;
 exports.createAutocomplete = createAutocomplete;
 exports.ignoredThemeKeys = ignoredThemeKeys;
 exports.parseAutocomplete = parseAutocomplete;

package/dist/index.d.ts

@@ -1,6 +1,10 @@
 import { SuggestResult, AutoCompleteFunction, UnoGenerator } from '@unocss/core';
 import { LRUCache } from 'lru-cache';
 
+type AutoCompleteMatchType = 'prefix' | 'fuzzy';
+interface AutocompleteOptions {
+    matchType?: AutoCompleteMatchType;
+}
 type AutocompleteTemplatePart = AutocompleteTemplateStatic | AutocompleteTemplateGroup | AutocompleteTemplateTheme;
 interface AutocompleteTemplateStatic {
     type: 'static';
@@ -16,10 +20,10 @@ interface AutocompleteTemplateTheme {
 }
 interface ParsedAutocompleteTemplate {
     parts: AutocompleteTemplatePart[];
-    suggest(input: string): string[] | undefined;
+    suggest(input: string, matchType?: AutoCompleteMatchType): string[] | undefined;
 }
 interface UnocssAutocomplete {
-    suggest: (input: string) => Promise<string[]>;
+    suggest: (input: string, allowsEmptyInput?: boolean) => Promise<string[]>;
     suggestInFile: (content: string, cursor: number) => Promise<SuggestResult>;
     templates: (string | AutoCompleteFunction)[];
     cache: LRUCache<string, string[]>;
@@ -27,7 +31,7 @@ interface UnocssAutocomplete {
     enumerate: () => Promise<Set<string>>;
 }
 
-declare function createAutocomplete(uno: UnoGenerator): UnocssAutocomplete;
+declare function createAutocomplete(uno: UnoGenerator, options?: AutocompleteOptions): UnocssAutocomplete;
 
 declare const shorthands: Record<string, string>;
 declare const ignoredThemeKeys: string[];
@@ -39,5 +43,6 @@ declare function searchUsageBoundary(line: string, index: number): {
     end: number;
 };
 declare function searchAttrKey(content: string, cursor: number): string | undefined;
+declare function cartesian<T>(arr: T[][]): T[][];
 
-export { AutocompleteTemplateGroup, AutocompleteTemplatePart, AutocompleteTemplateStatic, AutocompleteTemplateTheme, ParsedAutocompleteTemplate, UnocssAutocomplete, createAutocomplete, ignoredThemeKeys, parseAutocomplete, searchAttrKey, searchUsageBoundary, shorthands };
+export { AutoCompleteMatchType, AutocompleteOptions, AutocompleteTemplateGroup, AutocompleteTemplatePart, AutocompleteTemplateStatic, AutocompleteTemplateTheme, ParsedAutocompleteTemplate, UnocssAutocomplete, cartesian, createAutocomplete, ignoredThemeKeys, parseAutocomplete, searchAttrKey, searchUsageBoundary, shorthands };

package/dist/index.mjs

@@ -1,5 +1,42 @@
-import { escapeRegExp, toArray, uniq } from '@unocss/core';
+import { uniq, escapeRegExp, toArray } from '@unocss/core';
 import { LRUCache } from 'lru-cache';
+import { Fzf, byStartAsc, byLengthAsc } from 'fzf';
+
+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 searchAttrKey(content, cursor) {
+  const text = content.substring(0, cursor);
+  if (text.match(/(<\w+\s*)[^>]*$/) !== null)
+    return text.match(/\S+(?=\s*=\s*["']?[^"']*$)/)?.[0];
+}
+function cartesian(arr) {
+  if (arr.length < 2)
+    return arr;
+  return arr.reduce(
+    (a, b) => {
+      const ret = [];
+      a.forEach((a2) => {
+        b.forEach((b2) => {
+          ret.push(a2.concat([b2]));
+        });
+      });
+      return ret;
+    },
+    [[]]
+  );
+}
 
 const shorthands = {
   num: `(${[0, 1, 2, 3, 4, 5, 6, 8, 10, 12, 24, 36].join("|")})`,
@@ -27,6 +64,7 @@ function parseAutocomplete(template, theme = {}) {
     return shorthands[key];
   });
   handleGroups(template);
+  const fzf = new Fzf(getAllCombination(parts));
   return {
     parts,
     suggest
@@ -70,7 +108,9 @@ function parseAutocomplete(template, theme = {}) {
       }
     );
   }
-  function suggest(input) {
+  function suggest(input, matchType = "prefix") {
+    if (input.length && matchType === "fuzzy")
+      return fzf.find(input).map((i) => i.item);
     let rest = input;
     let matched = "";
     let combinations = [];
@@ -126,32 +166,43 @@ function parseAutocomplete(template, theme = {}) {
     return combinations.map((i) => matched + i).filter((i) => i.length >= input.length);
   }
 }
-
-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 getValuesFromPartTemplate(part) {
+  if (part.type === "static")
+    return [part.value];
+  if (part.type === "theme") {
+    return part.objects.flatMap((i) => {
+      const keys = Object.keys(i).filter((i2) => i2 && i2[0] !== "_");
+      for (const key in i) {
+        const value = i[key];
+        if (value === null || value === void 0)
+          continue;
+        if (typeof value === "object" && !Array.isArray(value)) {
+          const subKeys = getValuesFromPartTemplate({
+            type: "theme",
+            objects: [value]
+          }).map((i2) => `${key}-${i2}`);
+          keys.push(...subKeys);
+        }
+      }
+      return keys;
+    });
+  }
+  if (part.type === "group")
+    return [...part.values];
+  return [];
 }
-function searchAttrKey(content, cursor) {
-  const text = content.substring(0, cursor);
-  if (text.match(/(<\w+\s*)[^>]*$/) !== null)
-    return text.match(/\S+(?=\s*=\s*["']?[^"']*$)/)?.[0];
+function getAllCombination(parts) {
+  const values = parts.map((i) => getValuesFromPartTemplate(i));
+  const list = uniq(cartesian(values).flatMap((i) => i.join("").replace("-DEFAULT", "")));
+  return list;
 }
 
-function createAutocomplete(uno) {
+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();
   return {
     suggest,
@@ -193,7 +244,7 @@ function createAutocomplete(uno) {
       idx = 0;
     const variantPrefix = input.slice(0, idx);
     const variantSuffix = input.slice(idx + input.length);
-    const result = processSuggestions(
+    let result = processSuggestions(
       await Promise.all([
         suggestSelf(processed),
         suggestStatic(processed),
@@ -204,6 +255,12 @@ function createAutocomplete(uno) {
       variantPrefix,
       variantSuffix
     );
+    if (matchType === "fuzzy") {
+      const fzf = new Fzf(result, {
+        tiebreakers: [byStartAsc, byLengthAsc]
+      });
+      result = fzf.find(input).map((i) => i.item);
+    }
     cache.set(input, result);
     return result;
   }
@@ -244,6 +301,8 @@ function createAutocomplete(uno) {
     return i ? [input] : [];
   }
   async function suggestStatic(input) {
+    if (matchType === "fuzzy")
+      return staticUtils;
     return staticUtils.filter((i) => i.startsWith(input));
   }
   async function suggestUnoCache(input) {
@@ -252,12 +311,12 @@ function createAutocomplete(uno) {
   }
   function suggestFromPreset(input) {
     return templates.map(
-      (fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input)
+      (fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input, matchType)
     ) || [];
   }
   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)
+      (fn) => typeof fn === "function" ? fn(input) : getParsed(fn)(input, matchType)
     );
   }
   function reset() {
@@ -276,8 +335,8 @@ function createAutocomplete(uno) {
   }
   function processSuggestions(suggestions, prefix = "", suffix = "") {
     return uniq(suggestions.flat()).filter((i) => !!(i && !i.match(/-$/) && !uno.isBlocked(i))).sort((a, b) => {
-      const numA = +(a.match(/\d+$/)?.[0] || NaN);
-      const numB = +(b.match(/\d+$/)?.[0] || NaN);
+      const numA = +(a.match(/\d+$/)?.[0] || Number.NaN);
+      const numB = +(b.match(/\d+$/)?.[0] || Number.NaN);
       if (!Number.isNaN(numA) && !Number.isNaN(numB))
         return numA - numB;
       return a.localeCompare(b);
@@ -285,4 +344,4 @@ function createAutocomplete(uno) {
   }
 }
 
-export { createAutocomplete, ignoredThemeKeys, parseAutocomplete, searchAttrKey, searchUsageBoundary, shorthands };
+export { cartesian, createAutocomplete, ignoredThemeKeys, parseAutocomplete, searchAttrKey, searchUsageBoundary, shorthands };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/autocomplete",
-  "version": "0.53.3",
+  "version": "0.53.5",
   "description": "Autocomplete utils for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,10 +33,11 @@
     "dist"
   ],
   "dependencies": {
+    "fzf": "^0.5.2",
     "lru-cache": "^10.0.0"
   },
   "devDependencies": {
-    "@unocss/core": "0.53.3"
+    "@unocss/core": "0.53.5"
   },
   "scripts": {
     "build": "unbuild",