@unocss/core 0.5.1 → 0.6.0

package/dist/index.d.ts

@@ -14,7 +14,7 @@ declare class UnoGenerator {
     parseUtil(input: string | VariantMatchedResult): Promise<ParsedUtil | RawUtil | undefined>;
     stringifyUtil(parsed?: ParsedUtil | RawUtil): StringifiedUtil | undefined;
     expandShortcut(processed: string, depth?: number): [string[], RuleMeta | undefined] | undefined;
-    stringifyShortcuts(parent: VariantMatchedResult, expanded: string[], meta: RuleMeta | undefined): Promise<StringifiedUtil[] | undefined>;
+    stringifyShortcuts(parent: VariantMatchedResult, expanded: string[], meta?: RuleMeta): Promise<StringifiedUtil[] | undefined>;
     isExcluded(raw: string): boolean;
 }
 declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
@@ -57,7 +57,16 @@ interface RuleContext<Theme extends {} = {}> {
      */
     constructCSS: (body: CSSEntries | CSSObject, overrideSelector?: string) => string;
 }
-declare type Extractor = (code: string, id?: string) => Awaitable<Set<string> | undefined>;
+interface ExtractorContext {
+    readonly original: string;
+    code: string;
+    id?: string;
+}
+interface Extractor {
+    name: string;
+    extract(ctx: ExtractorContext): Awaitable<Set<string> | undefined>;
+    order?: number;
+}
 interface RuleMeta {
     layer?: string;
 }
@@ -167,13 +176,31 @@ interface GeneratorOptions {
      */
     warnExcluded?: boolean;
 }
-interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, GeneratorOptions {
+interface UserOnlyOptions<Theme extends {} = {}> {
+    /**
+     * The theme object, will be merged with the theme provides by presets
+     */
     theme?: Theme;
+    /**
+     * Layout name of shortcuts
+     *
+     * @default 'shortcuts'
+     */
+    shortcutsLayer?: string;
+    /**
+     * Presets
+     */
     presets?: Preset[];
+    /**
+     * Environment mode
+     *
+     * @default 'build'
+     */
+    envMode?: 'dev' | 'build';
 }
-interface UserConfigDefaults<Theme extends {} = {}> extends ConfigBase<Theme> {
-    theme?: Theme;
-    presets?: Preset[];
+interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions {
+}
+interface UserConfigDefaults<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme> {
 }
 interface ResolvedConfig extends Omit<Required<UserConfig>, 'presets' | 'rules' | 'shortcuts'> {
     shortcuts: Shortcut[];
@@ -280,4 +307,4 @@ declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare const extractorSplit: Extractor;
 
-export { ArgumentType, Awaitable, BetterMap, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExcludeRule, Extractor, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, Preflight, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, toArray, uniq, validateFilterRE, withLayer };
+export { ArgumentType, Awaitable, BetterMap, CSSEntries, CSSObject, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExcludeRule, Extractor, ExtractorContext, GenerateOptions, GenerateResult, GeneratorOptions, ParsedUtil, Preflight, Preset, RawUtil, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, TwoKeyMap, UnoGenerator, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, Variant, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, createGenerator, e, entriesToCss, escapeRegExp, escapeSelector, extractorSplit, hasScopePlaceholder, hex2rgba, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeVariant, toArray, uniq, validateFilterRE, withLayer };

package/dist/index.js

@@ -230,7 +230,13 @@ function withLayer(layer, rules) {
 }
 
 // src/extractors/split.ts
-var extractorSplit = (code) => new Set(code.split(/[\s'"`;>=]+/g).filter(isValidSelector));
+var extractorSplit = {
+  name: "split",
+  order: 0,
+  extract({ code }) {
+    return new Set(code.split(/[\s'"`;>=]+/g).filter(isValidSelector));
+  }
+};
 
 // src/config.ts
 function resolveShortcuts(shortcuts) {
@@ -240,6 +246,10 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
+var defaultLayers = {
+  shortcuts: -1,
+  default: 0
+};
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
   const rawPresets = config.presets || [];
@@ -248,7 +258,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign({}, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign(defaultLayers, ...rawPresets.map((i) => i.layers), userConfig.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -258,6 +268,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const extractors = mergePresets("extractors");
   if (!extractors.length)
     extractors.push(extractorSplit);
+  extractors.sort((a, b) => (a.order || 0) - (b.order || 0));
   const rules = mergePresets("rules");
   const rulesStaticMap = {};
   const rulesSize = rules.length;
@@ -277,6 +288,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     excluded: [],
     sortLayers: (layers2) => layers2,
     ...config,
+    envMode: config.envMode || "build",
+    shortcutsLayer: config.shortcutsLayer || "shortcuts",
     layers,
     theme,
     rulesSize,
@@ -309,10 +322,17 @@ var UnoGenerator = class {
     this._cache = new Map();
   }
   async applyExtractors(code, id, set = new Set()) {
-    await Promise.all(this.config.extractors.map(async (i) => {
-      const result = await i(code, id);
+    const context = {
+      get original() {
+        return code;
+      },
+      code,
+      id
+    };
+    for (const extractor of this.config.extractors) {
+      const result = await extractor.extract(context);
       result == null ? void 0 : result.forEach((t) => set.add(t));
-    }));
+    }
     return set;
   }
   async generate(input, {
@@ -421,11 +441,11 @@ ${rules}
           css
         ].join("\n");
       }
-      return layerCache[layer] = layerComments ? `/* layer: ${layer} */
+      return layerCache[layer] = layerComments && css ? `/* layer: ${layer} */
 ${css}` : css;
     };
     const getLayers = (excludes) => {
-      return layers.filter((i) => !(excludes == null ? void 0 : excludes.includes(i))).map((i) => getLayer(i) || "").join("\n");
+      return layers.filter((i) => !(excludes == null ? void 0 : excludes.includes(i))).map((i) => getLayer(i) || "").filter(Boolean).join("\n");
     };
     return {
       get css() {
@@ -565,7 +585,7 @@ ${css}` : css;
       meta
     ];
   }
-  async stringifyShortcuts(parent, expanded, meta) {
+  async stringifyShortcuts(parent, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;

package/dist/index.mjs

@@ -193,7 +193,13 @@ function withLayer(layer, rules) {
 }
 
 // src/extractors/split.ts
-var extractorSplit = (code) => new Set(code.split(/[\s'"`;>=]+/g).filter(isValidSelector));
+var extractorSplit = {
+  name: "split",
+  order: 0,
+  extract({ code }) {
+    return new Set(code.split(/[\s'"`;>=]+/g).filter(isValidSelector));
+  }
+};
 
 // src/config.ts
 function resolveShortcuts(shortcuts) {
@@ -203,6 +209,10 @@ function resolveShortcuts(shortcuts) {
     return Object.entries(s);
   });
 }
+var defaultLayers = {
+  shortcuts: -1,
+  default: 0
+};
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
   const rawPresets = config.presets || [];
@@ -211,7 +221,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     ...rawPresets.filter((p) => !p.enforce),
     ...rawPresets.filter((p) => p.enforce === "post")
   ];
-  const layers = Object.assign({}, ...rawPresets.map((i) => i.layers), userConfig.layers);
+  const layers = Object.assign(defaultLayers, ...rawPresets.map((i) => i.layers), userConfig.layers);
   function mergePresets(key) {
     return uniq([
       ...sortedPresets.flatMap((p) => toArray(p[key] || [])),
@@ -221,6 +231,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const extractors = mergePresets("extractors");
   if (!extractors.length)
     extractors.push(extractorSplit);
+  extractors.sort((a, b) => (a.order || 0) - (b.order || 0));
   const rules = mergePresets("rules");
   const rulesStaticMap = {};
   const rulesSize = rules.length;
@@ -240,6 +251,8 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     excluded: [],
     sortLayers: (layers2) => layers2,
     ...config,
+    envMode: config.envMode || "build",
+    shortcutsLayer: config.shortcutsLayer || "shortcuts",
     layers,
     theme,
     rulesSize,
@@ -272,10 +285,17 @@ var UnoGenerator = class {
     this._cache = new Map();
   }
   async applyExtractors(code, id, set = new Set()) {
-    await Promise.all(this.config.extractors.map(async (i) => {
-      const result = await i(code, id);
+    const context = {
+      get original() {
+        return code;
+      },
+      code,
+      id
+    };
+    for (const extractor of this.config.extractors) {
+      const result = await extractor.extract(context);
       result == null ? void 0 : result.forEach((t) => set.add(t));
-    }));
+    }
     return set;
   }
   async generate(input, {
@@ -384,11 +404,11 @@ ${rules}
           css
         ].join("\n");
       }
-      return layerCache[layer] = layerComments ? `/* layer: ${layer} */
+      return layerCache[layer] = layerComments && css ? `/* layer: ${layer} */
 ${css}` : css;
     };
     const getLayers = (excludes) => {
-      return layers.filter((i) => !(excludes == null ? void 0 : excludes.includes(i))).map((i) => getLayer(i) || "").join("\n");
+      return layers.filter((i) => !(excludes == null ? void 0 : excludes.includes(i))).map((i) => getLayer(i) || "").filter(Boolean).join("\n");
     };
     return {
       get css() {
@@ -528,7 +548,7 @@ ${css}` : css;
       meta
     ];
   }
-  async stringifyShortcuts(parent, expanded, meta) {
+  async stringifyShortcuts(parent, expanded, meta = { layer: this.config.shortcutsLayer }) {
     const selectorMap = new TwoKeyMap();
     const parsed = (await Promise.all(uniq(expanded).map((i) => this.parseUtil(i)))).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",