@pikacss/core 0.0.44 → 0.0.46

package/dist/index.mjs

@@ -60,6 +60,7 @@ function numberToChars(num) {
 }
 const UPPER_CASE = /[A-Z]/g;
 function toKebab(str) {
+	if (str.startsWith("--")) return str;
 	return str.replace(UPPER_CASE, (c) => `-${c.toLowerCase()}`);
 }
 function isNotNullish(value) {
@@ -69,9 +70,9 @@ function isNotString(value) {
 	return typeof value !== "string";
 }
 function isPropertyValue(v) {
-	if (Array.isArray(v)) return v.length === 2 && isPropertyValue(v[0]) && Array.isArray(v[1]) && v[1].every(isPropertyValue);
+	if (Array.isArray(v)) return v.length === 2 && typeof v[0] === "string" && Array.isArray(v[1]) && v[1].every((i) => typeof i === "string");
 	if (v == null) return true;
-	if (typeof v === "string" || typeof v === "number") return true;
+	if (typeof v === "string") return true;
 	return false;
 }
 function serialize(value) {
@@ -135,7 +136,22 @@ function normalizeSelectors({ selectors, defaultSelector }) {
 }
 function normalizeValue(value) {
 	if (value == null) return value;
-	return [...new Set([value].flat(2).map((v) => String(v).trim()))];
+	if (Array.isArray(value)) {
+		const [primary, fallbacks] = value;
+		const p = primary.trim();
+		const seen = new Set([p]);
+		const result = [];
+		for (const v of fallbacks) {
+			const s = v.trim();
+			if (!seen.has(s)) {
+				seen.add(s);
+				result.push(s);
+			}
+		}
+		result.push(p);
+		return result;
+	}
+	return [value.trim()];
 }
 async function extract({ styleDefinition, levels = [], result = [], defaultSelector, transformSelectors, transformStyleItems, transformStyleDefinitions }) {
 	for (const definition of await transformStyleDefinitions([styleDefinition])) for (const [k, v] of Object.entries(definition)) if (isPropertyValue(v)) {
@@ -183,35 +199,41 @@ function createExtractFn(options) {
 //#region src/internal/plugin.ts
 async function execAsyncHook(plugins, hook, payload) {
 	log.debug(`Executing async hook: ${hook}`);
+	let current = payload;
 	for (const plugin of plugins) {
-		if (plugin[hook] == null) continue;
+		const pluginRecord = plugin;
+		if (pluginRecord[hook] == null) continue;
 		try {
 			log.debug(`  - Plugin "${plugin.name}" executing ${hook}`);
-			const newPayload = await plugin[hook](payload);
-			if (newPayload != null) payload = newPayload;
+			const hookFn = pluginRecord[hook];
+			const newPayload = await hookFn(current);
+			if (newPayload != null) current = newPayload;
 			log.debug(`  - Plugin "${plugin.name}" completed ${hook}`);
 		} catch (error) {
-			log.error(`Plugin "${plugin.name}" failed to execute hook "${hook}": ${error.message}`, error);
+			log.error(`Plugin "${plugin.name}" failed to execute hook "${hook}": ${error instanceof Error ? error.message : error}`, error);
 		}
 	}
 	log.debug(`Async hook "${hook}" completed`);
-	return payload;
+	return current;
 }
 function execSyncHook(plugins, hook, payload) {
 	log.debug(`Executing sync hook: ${hook}`);
+	let current = payload;
 	for (const plugin of plugins) {
-		if (plugin[hook] == null) continue;
+		const pluginRecord = plugin;
+		if (pluginRecord[hook] == null) continue;
 		try {
 			log.debug(`  - Plugin "${plugin.name}" executing ${hook}`);
-			const newPayload = plugin[hook](payload);
-			if (newPayload != null) payload = newPayload;
+			const hookFn = pluginRecord[hook];
+			const newPayload = hookFn(current);
+			if (newPayload != null) current = newPayload;
 			log.debug(`  - Plugin "${plugin.name}" completed ${hook}`);
 		} catch (error) {
-			log.error(`Plugin "${plugin.name}" failed to execute hook "${hook}": ${error.message}`, error);
+			log.error(`Plugin "${plugin.name}" failed to execute hook "${hook}": ${error instanceof Error ? error.message : error}`, error);
 		}
 	}
 	log.debug(`Sync hook "${hook}" completed`);
-	return payload;
+	return current;
 }
 const hooks = {
 	configureRawConfig: (plugins, config) => execAsyncHook(plugins, "configureRawConfig", config),
@@ -231,7 +253,7 @@ const orderMap = new Map([
 	["post", 2]
 ]);
 function resolvePlugins(plugins) {
-	return plugins.sort((a, b) => orderMap.get(a.order) - orderMap.get(b.order));
+	return [...plugins].sort((a, b) => orderMap.get(a.order) - orderMap.get(b.order));
 }
 /* c8 ignore start */
 function defineEnginePlugin(plugin) {
@@ -241,10 +263,13 @@ function defineEnginePlugin(plugin) {
 
 //#endregion
 //#region src/internal/plugins/important.ts
+function appendImportant(v) {
+	return v.endsWith("!important") ? v : `${v} !important`;
+}
 function modifyPropertyValue(value) {
 	if (value == null) return null;
-	if (Array.isArray(value)) return [`${value[0]} !important`, value[1].map((i) => `${i} !important`)];
-	return `${value} !important`;
+	if (Array.isArray(value)) return [appendImportant(value[0]), value[1].map((i) => appendImportant(i))];
+	return appendImportant(value);
 }
 function important() {
 	let defaultValue;
@@ -301,7 +326,7 @@ function keyframes() {
 			engine.addPreflight((engine) => {
 				const maybeUsedName = /* @__PURE__ */ new Set();
 				engine.store.atomicStyles.forEach(({ content: { property, value } }) => {
-					if (property === "animationName") {
+					if (property === "animation-name") {
 						value.forEach((name) => maybeUsedName.add(name));
 						return;
 					}
@@ -350,6 +375,10 @@ function createResolveConfigFn({ pruneUnused: defaultPruneUnused = true } = {})
 
 //#endregion
 //#region src/internal/resolver.ts
+function stripGlobalFlag(re) {
+	if (!re.global) return re;
+	return new RegExp(re.source, re.flags.replace("g", ""));
+}
 var AbstractResolver = class {
 	_resolvedResultsMap = /* @__PURE__ */ new Map();
 	staticRulesMap = /* @__PURE__ */ new Map();
@@ -389,7 +418,10 @@ var AbstractResolver = class {
 			return this;
 		}
 		log.debug(`Removing dynamic rule: ${key}`);
-		const matchedResolvedStringList = Array.from(this._resolvedResultsMap.keys()).filter((string) => rule.stringPattern.test(string));
+		const matchedResolvedStringList = Array.from(this._resolvedResultsMap.keys()).filter((string) => {
+			rule.stringPattern.lastIndex = 0;
+			return rule.stringPattern.test(string);
+		});
 		this.dynamicRulesMap.delete(key);
 		matchedResolvedStringList.forEach((string) => this._resolvedResultsMap.delete(string));
 		log.debug(`  - Cleared ${matchedResolvedStringList.length} cached results`);
@@ -412,7 +444,8 @@ var AbstractResolver = class {
 		let dynamicRule;
 		let matched;
 		for (const rule of this.dynamicRulesMap.values()) {
-			matched = string.match(rule.stringPattern);
+			rule.stringPattern.lastIndex = 0;
+			matched = rule.stringPattern.exec(string);
 			if (matched != null) {
 				dynamicRule = rule;
 				break;
@@ -437,13 +470,19 @@ var AbstractResolver = class {
 	}
 };
 var RecursiveResolver = class extends AbstractResolver {
-	async resolve(string) {
+	async resolve(string, _visited) {
+		const visited = _visited ?? /* @__PURE__ */ new Set();
+		if (visited.has(string)) {
+			log.warn(`Circular reference detected for "${string}", returning as-is`);
+			return [string];
+		}
+		visited.add(string);
 		const resolved = await this._resolve(string).catch((error) => {
 			log.warn(`Failed to resolve "${string}": ${error.message}`, error);
 		});
 		if (resolved == null) return [string];
 		const result = [];
-		for (const partial of resolved.value) if (typeof partial === "string") result.push(...await this.resolve(partial));
+		for (const partial of resolved.value) if (typeof partial === "string") result.push(...await this.resolve(partial, new Set(visited)));
 		else result.push(partial);
 		this._setResolvedResult(string, result);
 		return result;
@@ -467,7 +506,7 @@ function resolveRuleConfig(config, keyName) {
 				type: "dynamic",
 				rule: {
 					key: config[0].source,
-					stringPattern: config[0],
+					stringPattern: stripGlobalFlag(config[0]),
 					createResolved: async (match) => [await fn(match)].flat(1)
 				},
 				autocomplete: config[2] != null ? [config[2]].flat(1) : []
@@ -492,7 +531,7 @@ function resolveRuleConfig(config, keyName) {
 			type: "dynamic",
 			rule: {
 				key: configKey.source,
-				stringPattern: configKey,
+				stringPattern: stripGlobalFlag(configKey),
 				createResolved: async (match) => [await fn(match)].flat(1)
 			},
 			autocomplete: "autocomplete" in config && config.autocomplete != null ? [config.autocomplete].flat(1) : []
@@ -645,23 +684,46 @@ function variables() {
 				}
 			};
 			rawVariables.forEach((variables) => engine.variables.add(variables));
-			engine.addPreflight(async (engine) => {
-				const used = /* @__PURE__ */ new Set();
-				engine.store.atomicStyles.forEach(({ content: { value } }) => {
-					value.flatMap(extractUsedVarNames).forEach((name) => used.add(normalizeVariableName(name)));
-				});
-				const usedVariables = Array.from(engine.variables.store.values()).flat().filter(({ name, pruneUnused, value }) => (safeSet.has(name) || pruneUnused === false || used.has(name)) && value != null);
-				const preflightDefinition = {};
-				for (const { name, value, selector: _selector } of usedVariables) {
-					const selector = await engine.pluginHooks.transformSelectors(engine.config.plugins, _selector);
-					let current = preflightDefinition;
-					selector.forEach((s) => {
-						current[s] ||= {};
-						current = current[s];
+			engine.addPreflight({
+				id: "core:variables",
+				preflight: async (engine) => {
+					const used = /* @__PURE__ */ new Set();
+					engine.store.atomicStyles.forEach(({ content: { value } }) => {
+						value.flatMap(extractUsedVarNames).forEach((name) => used.add(normalizeVariableName(name)));
+					});
+					const otherPreflights = engine.config.preflights.filter((p) => p.id !== "core:variables");
+					(await Promise.all(otherPreflights.map(({ fn }) => Promise.resolve(fn(engine, false)).catch(() => null)))).forEach((result) => {
+						if (result == null) return;
+						extractUsedVarNamesFromPreflightResult(result).forEach((name) => used.add(name));
 					});
-					Object.assign(current, { [name]: value });
+					const varMap = /* @__PURE__ */ new Map();
+					for (const [name, list] of engine.variables.store.entries()) varMap.set(name, list);
+					const queue = Array.from(used);
+					while (queue.length > 0) {
+						const name = queue.pop();
+						const entries = varMap.get(name);
+						if (!entries) continue;
+						for (const { value } of entries) {
+							if (value == null) continue;
+							for (const refName of extractUsedVarNames(String(value)).map(normalizeVariableName)) if (!used.has(refName)) {
+								used.add(refName);
+								queue.push(refName);
+							}
+						}
+					}
+					const usedVariables = Array.from(engine.variables.store.values()).flat().filter(({ name, pruneUnused, value }) => (safeSet.has(name) || pruneUnused === false || used.has(name)) && value != null);
+					const preflightDefinition = {};
+					for (const { name, value, selector: _selector } of usedVariables) {
+						const selector = await engine.pluginHooks.transformSelectors(engine.config.plugins, _selector);
+						let current = preflightDefinition;
+						selector.forEach((s) => {
+							current[s] ||= {};
+							current = current[s];
+						});
+						Object.assign(current, { [name]: value });
+					}
+					return preflightDefinition;
 				}
-				return preflightDefinition;
 			});
 		}
 	});
@@ -689,17 +751,26 @@ function createResolveVariablesFn({ pruneUnused: defaultPruneUnused = true } = {
 }
 const VAR_NAME_RE = /var\((--[\w-]+)/g;
 function extractUsedVarNames(input) {
-	const matched = input.match(VAR_NAME_RE);
-	if (!matched) return [];
-	return matched.map((match) => {
-		const varNameMatch = match.match(/--[^,)]+/);
-		return varNameMatch ? varNameMatch[0] : "";
-	}).filter(Boolean);
+	return Array.from(input.matchAll(VAR_NAME_RE), (m) => m[1]);
 }
 function normalizeVariableName(name) {
 	if (name.startsWith("--")) return name;
 	return `--${name}`;
 }
+/**
+* Recursively extract all CSS variable names referenced inside a preflight
+* result (either a plain CSS string or a `PreflightDefinition` object).
+*/
+function extractUsedVarNamesFromPreflightResult(result) {
+	if (typeof result === "string") return extractUsedVarNames(result).map(normalizeVariableName);
+	const names = [];
+	for (const value of Object.values(result)) {
+		if (value == null) continue;
+		if (typeof value === "string" || typeof value === "number") extractUsedVarNames(String(value)).forEach((n) => names.push(normalizeVariableName(n)));
+		else if (typeof value === "object") extractUsedVarNamesFromPreflightResult(value).forEach((n) => names.push(n));
+	}
+	return names;
+}
 
 //#endregion
 //#region src/internal/engine.ts
@@ -720,10 +791,13 @@ async function createEngine(config = {}) {
 	];
 	log.debug("Core plugins loaded:", corePlugins.length);
 	const plugins = resolvePlugins([...corePlugins, ...config.plugins || []]);
-	config.plugins = plugins;
+	config = {
+		...config,
+		plugins
+	};
 	log.debug(`Total plugins resolved: ${plugins.length}`);
 	config = await hooks.configureRawConfig(config.plugins, config);
-	hooks.rawConfigConfigured(resolvePlugins(config.plugins || []), config);
+	hooks.rawConfigConfigured(resolvePlugins(config.plugins ?? []), config);
 	let resolvedConfig = await resolveEngineConfig(config);
 	log.debug("Engine config resolved with prefix:", resolvedConfig.prefix);
 	resolvedConfig = await hooks.configureResolvedConfig(resolvedConfig.plugins, resolvedConfig);
@@ -886,18 +960,29 @@ function sortLayerNames(layers) {
 function isWithLayer(p) {
 	if (typeof p !== "object" || p === null) return false;
 	const record = p;
-	return typeof record.layer === "string" && "preflight" in record;
+	return typeof record.layer === "string" && record.preflight !== void 0;
+}
+function isWithId(p) {
+	if (typeof p !== "object" || p === null) return false;
+	const record = p;
+	return typeof record.id === "string" && record.preflight !== void 0;
 }
 function resolvePreflight(preflight) {
+	let layer;
+	let id;
 	if (isWithLayer(preflight)) {
-		const inner = preflight.preflight;
-		const fn = typeof inner === "function" ? inner : () => inner;
-		return {
-			layer: preflight.layer,
-			fn
-		};
+		layer = preflight.layer;
+		preflight = preflight.preflight;
+	}
+	if (isWithId(preflight)) {
+		id = preflight.id;
+		preflight = preflight.preflight;
 	}
-	return { fn: typeof preflight === "function" ? preflight : () => preflight };
+	return {
+		layer,
+		id,
+		fn: typeof preflight === "function" ? preflight : () => preflight
+	};
 }
 async function resolveEngineConfig(config) {
 	const { prefix = "", defaultSelector = `.${ATOMIC_STYLE_ID_PLACEHOLDER}`, plugins = [], preflights = [] } = config;
@@ -1063,6 +1148,7 @@ async function _renderPreflightDefinition({ engine, preflightDefinition, blocks
 			selectors: await hooks.transformSelectors(engine.config.plugins, [selector]),
 			defaultSelector: ""
 		}).filter(Boolean);
+		if (selectors.length === 0) continue;
 		let currentBlocks = blocks;
 		let currentBlockBody = null;
 		selectors.forEach((s, i) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikacss/core",
   "type": "module",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "author": "DevilTea <ch19980814@gmail.com>",
   "license": "MIT",
   "repository": {
@@ -34,10 +34,8 @@
   "files": [
     "dist"
   ],
-  "dependencies": {
-    "csstype": "^3.2.3"
-  },
   "scripts": {
+    "generate:csstype": "tsx ./scripts/generate-csstype.ts",
     "build": "tsdown && pnpm exec publint",
     "build:watch": "tsdown --watch",
     "typecheck": "pnpm typecheck:package && pnpm typecheck:test",