@unocss/core 0.54.0 → 0.54.1

package/dist/index.cjs

@@ -2,12 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const MagicString = require('magic-string');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
-
-const MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
-
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -277,9 +271,26 @@ function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
     );
     depth -= 1;
   } while (hasChanged && depth);
-  const expanded = typeof str === "string" ? new MagicString__default(str) : str;
-  for (const [offset, group] of groupsByOffset)
-    expanded.overwrite(offset, offset + group.length, group.items.map((item) => item.className).join(" "));
+  let expanded;
+  if (typeof str === "string") {
+    expanded = "";
+    let prevOffset = 0;
+    for (const [offset, group] of groupsByOffset) {
+      expanded += str.slice(prevOffset, offset);
+      expanded += group.items.map((item) => item.className).join(" ");
+      prevOffset = offset + group.length;
+    }
+    expanded += str.slice(prevOffset);
+  } else {
+    expanded = str;
+    for (const [offset, group] of groupsByOffset) {
+      expanded.overwrite(
+        offset,
+        offset + group.length,
+        group.items.map((item) => item.className).join(" ")
+      );
+    }
+  }
   return {
     prefixes: Array.from(prefixes),
     hasChanged,
@@ -386,7 +397,9 @@ function createNanoEvents() {
 const LAYER_DEFAULT = "default";
 const LAYER_PREFLIGHTS = "preflights";
 const LAYER_SHORTCUTS = "shortcuts";
+const LAYER_IMPORTS = "imports";
 const DEFAULT_LAYERS = {
+  [LAYER_IMPORTS]: -200,
   [LAYER_PREFLIGHTS]: -100,
   [LAYER_SHORTCUTS]: -10,
   [LAYER_DEFAULT]: 0
@@ -475,7 +488,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sources.flatMap((p) => toArray(p.autocomplete?.templates))),
-    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0))
+    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0)),
+    shorthands: mergeAutocompleteShorthands(sources.map((p) => p.autocomplete?.shorthands || {}))
   };
   let separators = getMerged("separators");
   if (!separators.length)
@@ -533,8 +547,27 @@ function mergeConfigs(configs) {
 function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
+function mergeAutocompleteShorthands(shorthands) {
+  return shorthands.reduce(
+    (a, b) => {
+      const rs = {};
+      for (const key in b) {
+        const value = b[key];
+        if (Array.isArray(value))
+          rs[key] = `(${value.join("|")})`;
+        else
+          rs[key] = value;
+      }
+      return {
+        ...a,
+        ...rs
+      };
+    },
+    {}
+  );
+}
 
-const version = "0.54.0";
+const version = "0.54.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/dist/index.d.ts

@@ -66,7 +66,7 @@ declare class UnoGenerator<Theme extends object = object> {
     setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): void;
     applyExtractors(code: string, id?: string, extracted?: Set<string>): Promise<Set<string>>;
     makeContext(raw: string, applied: VariantMatchedResult<Theme>): RuleContext<Theme>;
-    parseToken(raw: string, alias?: string): Promise<StringifiedUtil<Theme>[] | null | undefined>;
+    parseToken(raw: string, alias?: string): Promise<StringifiedUtil<Theme>[] | undefined | null>;
     generate(input: string | Set<string> | string[], options?: GenerateOptions): Promise<GenerateResult>;
     matchVariants(raw: string, current?: string): Promise<VariantMatchedResult<Theme>>;
     private applyVariants;
@@ -551,6 +551,11 @@ interface ConfigBase<Theme extends object = object> {
          * transform class-name style suggestions to the correct format
          */
         extractors?: Arrayable<AutoCompleteExtractor>;
+        /**
+         * Custom shorthands to provide autocomplete suggestions.
+         * if values is an array, it will be joined with `|` and wrapped with `()`
+         */
+        shorthands?: Record<string, string | string[]>;
     };
     /**
      * Hook to modify the resolved config.
@@ -851,6 +856,7 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
     autocomplete: {
         templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
         extractors: AutoCompleteExtractor[];
+        shorthands: Record<string, string>;
     };
     separators: string[];
 }

package/dist/index.mjs

@@ -1,5 +1,3 @@
-import MagicString from 'magic-string';
-
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -269,9 +267,26 @@ function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
     );
     depth -= 1;
   } while (hasChanged && depth);
-  const expanded = typeof str === "string" ? new MagicString(str) : str;
-  for (const [offset, group] of groupsByOffset)
-    expanded.overwrite(offset, offset + group.length, group.items.map((item) => item.className).join(" "));
+  let expanded;
+  if (typeof str === "string") {
+    expanded = "";
+    let prevOffset = 0;
+    for (const [offset, group] of groupsByOffset) {
+      expanded += str.slice(prevOffset, offset);
+      expanded += group.items.map((item) => item.className).join(" ");
+      prevOffset = offset + group.length;
+    }
+    expanded += str.slice(prevOffset);
+  } else {
+    expanded = str;
+    for (const [offset, group] of groupsByOffset) {
+      expanded.overwrite(
+        offset,
+        offset + group.length,
+        group.items.map((item) => item.className).join(" ")
+      );
+    }
+  }
   return {
     prefixes: Array.from(prefixes),
     hasChanged,
@@ -378,7 +393,9 @@ function createNanoEvents() {
 const LAYER_DEFAULT = "default";
 const LAYER_PREFLIGHTS = "preflights";
 const LAYER_SHORTCUTS = "shortcuts";
+const LAYER_IMPORTS = "imports";
 const DEFAULT_LAYERS = {
+  [LAYER_IMPORTS]: -200,
   [LAYER_PREFLIGHTS]: -100,
   [LAYER_SHORTCUTS]: -10,
   [LAYER_DEFAULT]: 0
@@ -467,7 +484,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sources.flatMap((p) => toArray(p.autocomplete?.templates))),
-    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0))
+    extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0)),
+    shorthands: mergeAutocompleteShorthands(sources.map((p) => p.autocomplete?.shorthands || {}))
   };
   let separators = getMerged("separators");
   if (!separators.length)
@@ -525,8 +543,27 @@ function mergeConfigs(configs) {
 function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
+function mergeAutocompleteShorthands(shorthands) {
+  return shorthands.reduce(
+    (a, b) => {
+      const rs = {};
+      for (const key in b) {
+        const value = b[key];
+        if (Array.isArray(value))
+          rs[key] = `(${value.join("|")})`;
+        else
+          rs[key] = value;
+      }
+      return {
+        ...a,
+        ...rs
+      };
+    },
+    {}
+  );
+}
 
-const version = "0.54.0";
+const version = "0.54.1";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.54.0",
+  "version": "0.54.1",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,8 +37,8 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.30.1",
-    "unconfig": "^0.3.9"
+    "magic-string": "^0.30.2",
+    "unconfig": "^0.3.10"
   },
   "scripts": {
     "build": "unbuild",