@unocss/core 66.6.7 → 66.7.0-beta.1

package/dist/index.mjs

@@ -43,9 +43,9 @@ function isString(s) {
 //#endregion
 //#region src/utils/countable-set.ts
 var CountableSet = class extends Set {
+	_map = /* @__PURE__ */ new Map();
 	constructor(values) {
 		super();
-		this._map = /* @__PURE__ */ new Map();
 		if (values) for (const key of values) this.add(key);
 	}
 	add(key) {
@@ -183,9 +183,7 @@ function withLayer(layer, rules) {
 //#endregion
 //#region src/utils/map.ts
 var TwoKeyMap = class {
-	constructor() {
-		this._map = /* @__PURE__ */ new Map();
-	}
+	_map = /* @__PURE__ */ new Map();
 	get(key1, key2) {
 		const m2 = this._map.get(key1);
 		if (m2) return m2.get(key2);
@@ -254,7 +252,7 @@ function normalizeCSSEntries(obj) {
 	return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
 }
 function normalizeCSSValues(obj) {
-	if (Array.isArray(obj)) if (obj.find((i) => !Array.isArray(i) || Array.isArray(i[0]))) return obj.map((i) => normalizeCSSEntries(i));
+	if (Array.isArray(obj)) if (obj.some((i) => !Array.isArray(i) || Array.isArray(i[0]))) return obj.map((i) => normalizeCSSEntries(i));
 	else return [obj];
 	else return [normalizeCSSEntries(obj)];
 }
@@ -604,7 +602,7 @@ function definePreset(preset) {
 }
 //#endregion
 //#region package.json
-var version = "66.6.7";
+var version = "66.7.0-beta.1";
 //#endregion
 //#region src/generator.ts
 const symbols = {
@@ -619,76 +617,18 @@ const symbols = {
 	body: "$$symbol-body"
 };
 var UnoGeneratorInternal = class UnoGeneratorInternal {
+	userConfig;
+	defaults;
+	version = version;
+	events = createNanoEvents();
+	config = void 0;
+	cache = /* @__PURE__ */ new Map();
+	blocked = /* @__PURE__ */ new Set();
+	parentOrders = /* @__PURE__ */ new Map();
+	activatedRules = /* @__PURE__ */ new Set();
 	constructor(userConfig = {}, defaults = {}) {
 		this.userConfig = userConfig;
 		this.defaults = defaults;
-		this.version = version;
-		this.events = createNanoEvents();
-		this.config = void 0;
-		this.cache = /* @__PURE__ */ new Map();
-		this.blocked = /* @__PURE__ */ new Set();
-		this.parentOrders = /* @__PURE__ */ new Map();
-		this.activatedRules = /* @__PURE__ */ new Set();
-		this.resolveCSSResult = (raw, result, rule, context) => {
-			const entries = normalizeCSSValues(result).filter((i) => i.length);
-			if (entries.length) {
-				if (this.config.details) context.rules.push(rule);
-				context.generator.activatedRules.add(rule);
-				const meta = rule[2];
-				return entries.map((css) => {
-					if (isString(css)) return [
-						meta.__index,
-						css,
-						meta
-					];
-					let variants = context.variantHandlers;
-					let entryMeta = meta;
-					const setVariant = (variant) => {
-						variants = [variant, ...variants];
-					};
-					const setMeta = (partial) => {
-						entryMeta = {
-							...entryMeta,
-							...partial
-						};
-					};
-					for (const entry of css) switch (entry[0]) {
-						case symbols.variants:
-							if (typeof entry[1] === "function") variants = entry[1](variants) || variants;
-							else variants = [...toArray(entry[1]), ...variants];
-							break;
-						case symbols.parent:
-							setVariant({ parent: entry[1] });
-							break;
-						case symbols.selector:
-							setVariant({ selector: entry[1] });
-							break;
-						case symbols.layer:
-							setVariant({ layer: entry[1] });
-							break;
-						case symbols.sort:
-							setMeta({ sort: entry[1] });
-							break;
-						case symbols.noMerge:
-							setMeta({ noMerge: entry[1] });
-							break;
-						case symbols.noScope:
-							setMeta({ noScope: entry[1] });
-							break;
-						case symbols.body:
-							entry[0] = VirtualKey;
-							break;
-					}
-					return [
-						meta.__index,
-						raw,
-						css,
-						entryMeta,
-						variants
-					];
-				});
-			}
-		};
 	}
 	static async create(userConfig = {}, defaults = {}) {
 		const uno = new UnoGeneratorInternal(userConfig, defaults);
@@ -1058,6 +998,66 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		if (!parsed.length) return void 0;
 		return parsed;
 	}
+	resolveCSSResult = (raw, result, rule, context) => {
+		const entries = normalizeCSSValues(result).filter((i) => i.length);
+		if (entries.length) {
+			if (this.config.details) context.rules.push(rule);
+			context.generator.activatedRules.add(rule);
+			const meta = rule[2];
+			return entries.map((css) => {
+				if (isString(css)) return [
+					meta.__index,
+					css,
+					meta
+				];
+				let variants = context.variantHandlers;
+				let entryMeta = meta;
+				const setVariant = (variant) => {
+					variants = [variant, ...variants];
+				};
+				const setMeta = (partial) => {
+					entryMeta = {
+						...entryMeta,
+						...partial
+					};
+				};
+				for (const entry of css) switch (entry[0]) {
+					case symbols.variants:
+						if (typeof entry[1] === "function") variants = entry[1](variants) || variants;
+						else variants = [...toArray(entry[1]), ...variants];
+						break;
+					case symbols.parent:
+						setVariant({ parent: entry[1] });
+						break;
+					case symbols.selector:
+						setVariant({ selector: entry[1] });
+						break;
+					case symbols.layer:
+						setVariant({ layer: entry[1] });
+						break;
+					case symbols.sort:
+						setMeta({ sort: entry[1] });
+						break;
+					case symbols.noMerge:
+						setMeta({ noMerge: entry[1] });
+						break;
+					case symbols.noScope:
+						setMeta({ noScope: entry[1] });
+						break;
+					case symbols.body:
+						entry[0] = VirtualKey;
+						break;
+				}
+				return [
+					meta.__index,
+					raw,
+					css,
+					entryMeta,
+					variants
+				];
+			});
+		}
+	};
 	stringifyUtil(parsed, context) {
 		if (!parsed) return;
 		if (isRawUtil(parsed)) return [[

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.6.7",
+  "version": "66.7.0-beta.1",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",