@unocss/core 0.58.3 → 0.58.5

package/dist/index.cjs

@@ -590,7 +590,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "0.58.3";
+const version = "0.58.5";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -764,7 +764,7 @@ class UnoGenerator {
     })();
     const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const layerCache = {};
-    const getLayer = (layer) => {
+    const getLayer = (layer = LAYER_DEFAULT) => {
       if (layerCache[layer])
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {

package/dist/index.d.cts

@@ -296,7 +296,7 @@ interface Extractor {
      *
      * Return `undefined` to skip this extractor.
      */
-    extract?(ctx: ExtractorContext): Awaitable<Set<string> | CountableSet<string> | string[] | undefined | void>;
+    extract?: (ctx: ExtractorContext) => Awaitable<Set<string> | CountableSet<string> | string[] | undefined | void>;
 }
 interface RuleMeta {
     /**
@@ -702,7 +702,7 @@ interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
     /**
      * Await all pending tasks
      */
-    flushTasks(): Promise<any>;
+    flushTasks: () => Promise<any>;
     filter: (code: string, id: string) => boolean;
     extract: (code: string, id?: string) => Promise<void>;
     reloadConfig: () => Promise<LoadConfigResult<Config>>;
@@ -824,7 +824,7 @@ interface PluginOptions {
      *
      * Supported sources:
      * - `filesystem` - extract from file system
-     * - `plain` - extract from plain inline text
+     * - `inline` - extract from plain inline text
      * - `pipeline` - extract from build tools' transformation pipeline, such as Vite and Webpack
      *
      * The usage extracted from each source will be **merged** together.
@@ -869,8 +869,8 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
 interface GenerateResult<T = Set<string>> {
     css: string;
     layers: string[];
-    getLayer(name?: string): string | undefined;
-    getLayers(includes?: string[], excludes?: string[]): string;
+    getLayer: (name?: string) => string | undefined;
+    getLayers: (includes?: string[], excludes?: string[]) => string;
     matched: T;
 }
 type VariantMatchedResult<Theme extends object = object> = readonly [

package/dist/index.d.mts

@@ -296,7 +296,7 @@ interface Extractor {
      *
      * Return `undefined` to skip this extractor.
      */
-    extract?(ctx: ExtractorContext): Awaitable<Set<string> | CountableSet<string> | string[] | undefined | void>;
+    extract?: (ctx: ExtractorContext) => Awaitable<Set<string> | CountableSet<string> | string[] | undefined | void>;
 }
 interface RuleMeta {
     /**
@@ -702,7 +702,7 @@ interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
     /**
      * Await all pending tasks
      */
-    flushTasks(): Promise<any>;
+    flushTasks: () => Promise<any>;
     filter: (code: string, id: string) => boolean;
     extract: (code: string, id?: string) => Promise<void>;
     reloadConfig: () => Promise<LoadConfigResult<Config>>;
@@ -824,7 +824,7 @@ interface PluginOptions {
      *
      * Supported sources:
      * - `filesystem` - extract from file system
-     * - `plain` - extract from plain inline text
+     * - `inline` - extract from plain inline text
      * - `pipeline` - extract from build tools' transformation pipeline, such as Vite and Webpack
      *
      * The usage extracted from each source will be **merged** together.
@@ -869,8 +869,8 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
 interface GenerateResult<T = Set<string>> {
     css: string;
     layers: string[];
-    getLayer(name?: string): string | undefined;
-    getLayers(includes?: string[], excludes?: string[]): string;
+    getLayer: (name?: string) => string | undefined;
+    getLayers: (includes?: string[], excludes?: string[]) => string;
     matched: T;
 }
 type VariantMatchedResult<Theme extends object = object> = readonly [

package/dist/index.d.ts

@@ -296,7 +296,7 @@ interface Extractor {
      *
      * Return `undefined` to skip this extractor.
      */
-    extract?(ctx: ExtractorContext): Awaitable<Set<string> | CountableSet<string> | string[] | undefined | void>;
+    extract?: (ctx: ExtractorContext) => Awaitable<Set<string> | CountableSet<string> | string[] | undefined | void>;
 }
 interface RuleMeta {
     /**
@@ -702,7 +702,7 @@ interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
     /**
      * Await all pending tasks
      */
-    flushTasks(): Promise<any>;
+    flushTasks: () => Promise<any>;
     filter: (code: string, id: string) => boolean;
     extract: (code: string, id?: string) => Promise<void>;
     reloadConfig: () => Promise<LoadConfigResult<Config>>;
@@ -824,7 +824,7 @@ interface PluginOptions {
      *
      * Supported sources:
      * - `filesystem` - extract from file system
-     * - `plain` - extract from plain inline text
+     * - `inline` - extract from plain inline text
      * - `pipeline` - extract from build tools' transformation pipeline, such as Vite and Webpack
      *
      * The usage extracted from each source will be **merged** together.
@@ -869,8 +869,8 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
 interface GenerateResult<T = Set<string>> {
     css: string;
     layers: string[];
-    getLayer(name?: string): string | undefined;
-    getLayers(includes?: string[], excludes?: string[]): string;
+    getLayer: (name?: string) => string | undefined;
+    getLayers: (includes?: string[], excludes?: string[]) => string;
     matched: T;
 }
 type VariantMatchedResult<Theme extends object = object> = readonly [

package/dist/index.mjs

@@ -588,7 +588,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "0.58.3";
+const version = "0.58.5";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -762,7 +762,7 @@ class UnoGenerator {
     })();
     const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const layerCache = {};
-    const getLayer = (layer) => {
+    const getLayer = (layer = LAYER_DEFAULT) => {
       if (layerCache[layer])
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.58.3",
+  "version": "0.58.5",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.30.5",
+    "magic-string": "^0.30.6",
     "unconfig": "^0.3.11"
   },
   "scripts": {