@unocss/core 0.45.14 → 0.45.19

package/dist/index.cjs

@@ -282,12 +282,12 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const splitCode = (code) => code.split(/\\?[\s'"`;={}]+/g).filter(isValidSelector);
+const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;={}]+/g))].filter(isValidSelector);
 const extractorSplit = {
   name: "split",
   order: 0,
   extract({ code }) {
-    return new Set(splitCode(code));
+    return splitCode(code);
   }
 };
 
@@ -374,13 +374,14 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const rules = mergePresets("rules");
   const rulesStaticMap = {};
   const rulesSize = rules.length;
-  rules.forEach((rule, i) => {
+  const rulesDynamic = rules.map((rule, i) => {
     if (isStaticRule(rule)) {
       const prefix = rule[2]?.prefix || "";
       rulesStaticMap[prefix + rule[0]] = [i, rule[1], rule[2], rule];
-      delete rules[i];
+      return void 0;
     }
-  });
+    return [i, ...rule];
+  }).filter(Boolean).reverse();
   const theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
@@ -402,7 +403,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     layers,
     theme,
     rulesSize,
-    rulesDynamic: rules,
+    rulesDynamic,
     rulesStaticMap,
     preprocess: mergePresets("preprocess"),
     postprocess: mergePresets("postprocess"),
@@ -415,7 +416,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.45.14";
+const version = "0.45.19";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -451,7 +452,10 @@ class UnoGenerator {
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
-      result?.forEach((t) => set.add(t));
+      if (result) {
+        for (const token of result)
+          set.add(token);
+      }
     }
     return set;
   }
@@ -716,14 +720,13 @@ class UnoGenerator {
   }
   async parseUtil(input, context, internal = false) {
     const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
-    const recordRule = this.config.details ? (r) => {
+    if (this.config.details)
       context.rules = context.rules ?? [];
-      context.rules.push(r);
-    } : noop;
     const staticMatch = this.config.rulesStaticMap[processed];
     if (staticMatch) {
       if (staticMatch[1] && (internal || !staticMatch[2]?.internal)) {
-        recordRule(staticMatch[3]);
+        if (this.config.details)
+          context.rules.push(staticMatch[3]);
         const index = staticMatch[0];
         const entry = normalizeCSSEntries(staticMatch[1]);
         const meta = staticMatch[2];
@@ -734,24 +737,24 @@ class UnoGenerator {
       }
     }
     context.variantHandlers = variantHandlers;
-    const { rulesDynamic, rulesSize } = this.config;
-    for (let i = rulesSize - 1; i >= 0; i--) {
-      const rule = rulesDynamic[i];
-      if (!rule)
+    const { rulesDynamic } = this.config;
+    for (const [i, matcher, handler, meta] of rulesDynamic) {
+      if (meta?.internal && !internal)
         continue;
-      if (rule[2]?.internal && !internal)
-        continue;
-      const [matcher, handler, meta] = rule;
-      if (meta?.prefix && !processed.startsWith(meta.prefix))
-        continue;
-      const unprefixed = meta?.prefix ? processed.slice(meta.prefix.length) : processed;
+      let unprefixed = processed;
+      if (meta?.prefix) {
+        if (!processed.startsWith(meta.prefix))
+          continue;
+        unprefixed = processed.slice(meta.prefix.length);
+      }
       const match = unprefixed.match(matcher);
       if (!match)
         continue;
       const result = await handler(match, context);
       if (!result)
         continue;
-      recordRule(rule);
+      if (this.config.details)
+        context.rules.push([matcher, handler, meta]);
       const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length) {
         return entries.map((e2) => {
@@ -884,7 +887,8 @@ function applyScope(css, scope) {
 function movePseudoElementsEnd(selector) {
   const pseudoElements = selector.match(/::[\w-]+(\([\w-]+\))?/g);
   if (pseudoElements) {
-    pseudoElements.forEach((e2) => selector = selector.replace(e2, ""));
+    for (const e2 of pseudoElements)
+      selector = selector.replace(e2, "");
     selector += pseudoElements.join("");
   }
   return selector;

package/dist/index.d.ts

@@ -129,7 +129,7 @@ declare class BetterMap<K, V> extends Map<K, V> {
     map<R>(mapFn: (value: V, key: K) => R): R[];
 }
 
-declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
+declare function withLayer<T extends {}>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare const regexClassGroup: RegExp;
 declare function expandVariantGroup(str: string, seperators?: string[], depth?: number): string;
@@ -183,7 +183,7 @@ interface ParsedColorValue {
      */
     name: string;
     /**
-     * Color scale, preferrably 000 - 999.
+     * Color scale, preferably 000 - 999.
      */
     no: string;
     /**
@@ -223,7 +223,7 @@ interface RuleContext<Theme extends {} = {}> {
      */
     variantMatch: VariantMatchedResult;
     /**
-     * Constrcut a custom CSS rule.
+     * Construct a custom CSS rule.
      * Variants and selector escaping will be handled automatically.
      */
     constructCSS: (body: CSSEntries | CSSObject, overrideSelector?: string) => string;
@@ -271,7 +271,7 @@ interface PreflightContext<Theme extends {} = {}> {
 }
 interface Extractor {
     name: string;
-    extract(ctx: ExtractorContext): Awaitable<Set<string> | undefined>;
+    extract(ctx: ExtractorContext): Awaitable<Set<string> | string[] | undefined>;
     order?: number;
 }
 interface RuleMeta {
@@ -328,11 +328,11 @@ interface VariantHandlerContext {
      */
     prefix: string;
     /**
-     * Rewrite the output selector. Often be used to append pesudo classes.
+     * Rewrite the output selector. Often be used to append pseudo classes.
      */
     selector: string;
     /**
-     * Rewrite the output selector. Often be used to append pesudo elements.
+     * Rewrite the output selector. Often be used to append pseudo elements.
      */
     pseudo: string;
     /**
@@ -375,7 +375,7 @@ interface VariantHandler {
      */
     order?: number;
     /**
-     * Rewrite the output selector. Often be used to append pesudo classes or parents.
+     * Rewrite the output selector. Often be used to append pseudo classes or parents.
      */
     selector?: (input: string, body: CSSEntries) => string | undefined;
     /**
@@ -402,7 +402,7 @@ interface VariantObject<Theme extends {} = {}> {
      */
     name?: string;
     /**
-     * The entry function to match and rewrite the selector for futher processing.
+     * The entry function to match and rewrite the selector for further processing.
      */
     match: VariantFunction<Theme>;
     /**
@@ -621,6 +621,7 @@ interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
     onInvalidate: (fn: () => void) => void;
     root: string;
     updateRoot: (root: string) => Promise<LoadConfigResult<Config>>;
+    getConfigFileList: () => string[];
 }
 interface SourceMap {
     file?: string;
@@ -691,7 +692,7 @@ interface ResolvedConfig extends Omit<RequiredByKey<UserConfig, 'mergeSelectors'
     preprocess: Preprocessor[];
     postprocess: Postprocessor[];
     rulesSize: number;
-    rulesDynamic: (DynamicRule | undefined)[];
+    rulesDynamic: [number, ...DynamicRule][];
     rulesStaticMap: Record<string, [number, CSSObject | CSSEntries, RuleMeta | undefined, Rule] | undefined>;
     autocomplete: {
         templates: (AutoCompleteFunction | AutoCompleteTemplate)[];
@@ -761,12 +762,12 @@ interface GenerateOptions {
      */
     safelist?: boolean;
     /**
-     * Genreate minified CSS
+     * Generate minified CSS
      * @default false
      */
     minify?: boolean;
     /**
-     * @expiremental
+     * @experimental
      */
     scope?: string;
 }

package/dist/index.mjs

@@ -278,12 +278,12 @@ function createValueHandler(handlers) {
   return handler;
 }
 
-const splitCode = (code) => code.split(/\\?[\s'"`;={}]+/g).filter(isValidSelector);
+const splitCode = (code) => [...new Set(code.split(/\\?[\s'"`;={}]+/g))].filter(isValidSelector);
 const extractorSplit = {
   name: "split",
   order: 0,
   extract({ code }) {
-    return new Set(splitCode(code));
+    return splitCode(code);
   }
 };
 
@@ -370,13 +370,14 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const rules = mergePresets("rules");
   const rulesStaticMap = {};
   const rulesSize = rules.length;
-  rules.forEach((rule, i) => {
+  const rulesDynamic = rules.map((rule, i) => {
     if (isStaticRule(rule)) {
       const prefix = rule[2]?.prefix || "";
       rulesStaticMap[prefix + rule[0]] = [i, rule[1], rule[2], rule];
-      delete rules[i];
+      return void 0;
     }
-  });
+    return [i, ...rule];
+  }).filter(Boolean).reverse();
   const theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
@@ -398,7 +399,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     layers,
     theme,
     rulesSize,
-    rulesDynamic: rules,
+    rulesDynamic,
     rulesStaticMap,
     preprocess: mergePresets("preprocess"),
     postprocess: mergePresets("postprocess"),
@@ -411,7 +412,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.45.14";
+const version = "0.45.19";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -447,7 +448,10 @@ class UnoGenerator {
     };
     for (const extractor of this.config.extractors) {
       const result = await extractor.extract(context);
-      result?.forEach((t) => set.add(t));
+      if (result) {
+        for (const token of result)
+          set.add(token);
+      }
     }
     return set;
   }
@@ -712,14 +716,13 @@ class UnoGenerator {
   }
   async parseUtil(input, context, internal = false) {
     const [raw, processed, variantHandlers] = isString(input) ? this.matchVariants(input) : input;
-    const recordRule = this.config.details ? (r) => {
+    if (this.config.details)
       context.rules = context.rules ?? [];
-      context.rules.push(r);
-    } : noop;
     const staticMatch = this.config.rulesStaticMap[processed];
     if (staticMatch) {
       if (staticMatch[1] && (internal || !staticMatch[2]?.internal)) {
-        recordRule(staticMatch[3]);
+        if (this.config.details)
+          context.rules.push(staticMatch[3]);
         const index = staticMatch[0];
         const entry = normalizeCSSEntries(staticMatch[1]);
         const meta = staticMatch[2];
@@ -730,24 +733,24 @@ class UnoGenerator {
       }
     }
     context.variantHandlers = variantHandlers;
-    const { rulesDynamic, rulesSize } = this.config;
-    for (let i = rulesSize - 1; i >= 0; i--) {
-      const rule = rulesDynamic[i];
-      if (!rule)
+    const { rulesDynamic } = this.config;
+    for (const [i, matcher, handler, meta] of rulesDynamic) {
+      if (meta?.internal && !internal)
         continue;
-      if (rule[2]?.internal && !internal)
-        continue;
-      const [matcher, handler, meta] = rule;
-      if (meta?.prefix && !processed.startsWith(meta.prefix))
-        continue;
-      const unprefixed = meta?.prefix ? processed.slice(meta.prefix.length) : processed;
+      let unprefixed = processed;
+      if (meta?.prefix) {
+        if (!processed.startsWith(meta.prefix))
+          continue;
+        unprefixed = processed.slice(meta.prefix.length);
+      }
       const match = unprefixed.match(matcher);
       if (!match)
         continue;
       const result = await handler(match, context);
       if (!result)
         continue;
-      recordRule(rule);
+      if (this.config.details)
+        context.rules.push([matcher, handler, meta]);
       const entries = normalizeCSSValues(result).filter((i2) => i2.length);
       if (entries.length) {
         return entries.map((e2) => {
@@ -880,7 +883,8 @@ function applyScope(css, scope) {
 function movePseudoElementsEnd(selector) {
   const pseudoElements = selector.match(/::[\w-]+(\([\w-]+\))?/g);
   if (pseudoElements) {
-    pseudoElements.forEach((e2) => selector = selector.replace(e2, ""));
+    for (const e2 of pseudoElements)
+      selector = selector.replace(e2, "");
     selector += pseudoElements.join("");
   }
   return selector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.45.14",
+  "version": "0.45.19",
   "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.26.2",
-    "unconfig": "^0.3.5"
+    "magic-string": "^0.26.3",
+    "unconfig": "^0.3.6"
   },
   "scripts": {
     "build": "unbuild",