@pikacss/core 0.0.45 → 0.0.46

package/dist/index.d.mts

@@ -233,6 +233,11 @@ interface ResolvedVariable {
 }
 declare function extractUsedVarNames(input: string): string[];
 declare function normalizeVariableName(name: string): string;
+/**
+ * Recursively extract all CSS variable names referenced inside a preflight
+ * result (either a plain CSS string or a `PreflightDefinition` object).
+ */
+declare function extractUsedVarNamesFromPreflightResult(result: string | PreflightDefinition): string[];
 //#endregion
 //#region src/internal/types/utils.d.ts
 type Nullish = null | undefined;
@@ -8561,14 +8566,21 @@ type ResolvedStyleItem = ResolveFrom<PikaAugment, 'StyleItem', any, InternalStyl
 //#region src/internal/types/preflight.d.ts
 type PreflightDefinition = { [selector in UnionString | ResolvedSelector]?: ResolvedCSSProperties | PreflightDefinition };
 type PreflightFn = (engine: Engine, isFormatted: boolean) => Awaitable<string | PreflightDefinition>;
-interface WithLayer<T extends string | PreflightDefinition | PreflightFn> {
-  layer: string;
-  preflight: T;
-}
 interface ResolvedPreflight {
   layer?: string;
+  id?: string;
   fn: PreflightFn;
 }
+interface WithId<T> {
+  id: string;
+  preflight: T;
+}
+type MaybeWithId<T> = WithId<T> | T;
+interface WithLayer<T> {
+  layer: string;
+  preflight: T;
+}
+type MaybeWithLayer<T> = WithLayer<T> | T;
 /**
  * Preflight can be a string, object, function, or a layer-wrapped variant.
  *
@@ -8577,7 +8589,7 @@ interface ResolvedPreflight {
  * 3. A `PreflightFn` is a dynamic preflight that receives the engine instance.
  * 4. A `WithLayer` wrapper assigns any of the above to a specific CSS `@layer`.
  */
-type Preflight = string | PreflightDefinition | PreflightFn | WithLayer<string | PreflightDefinition | PreflightFn>;
+type Preflight = MaybeWithLayer<MaybeWithId<string | PreflightDefinition | PreflightFn>>;
 //#endregion
 //#region src/internal/types/engine.d.ts
 interface EngineConfig$1 {
@@ -8784,4 +8796,4 @@ declare function defineSelector<const T extends Selector>(selector: T): T;
 declare function defineShortcut<const T extends Shortcut>(shortcut: T): T;
 declare function defineVariables<const T extends VariablesDefinition>(variables: T): T;
 //#endregion
-export { Arrayable, Awaitable, type CSSProperty, type CSSSelector, type CSSStyleBlockBody, type CSSStyleBlocks, type DefineAutocomplete, type Engine, type EngineConfig$1 as EngineConfig, type EnginePlugin, FromKebab, GetValue, IsEqual, IsNever, Keyframes, KeyframesConfig, KeyframesProgress, Nullish, type PikaAugment, type Preflight, type PreflightDefinition, type PreflightFn, type Properties, type PropertyValue, ResolveFrom, type ResolvedLayerName, type ResolvedPreflight, Selector, SelectorsConfig, Shortcut, ShortcutsConfig, Simplify, type StyleDefinition, type StyleDefinitionMap, type StyleItem, ToKebab, UnionString, UnionToIntersection, Variable, VariableAutocomplete, VariableObject, VariablesConfig, VariablesDefinition, type WithLayer, appendAutocompleteCssPropertyValues, appendAutocompleteExtraCssProperties, appendAutocompleteExtraProperties, appendAutocompletePropertyValues, appendAutocompleteSelectors, appendAutocompleteStyleItemStrings, createEngine, createLogger, defineEngineConfig, defineEnginePlugin, defineKeyframes, definePreflight, defineSelector, defineShortcut, defineStyleDefinition, defineVariables, extractUsedVarNames, important, keyframes, log, normalizeVariableName, renderCSSStyleBlocks, resolveSelectorConfig, selectors$1 as selectors, shortcuts, sortLayerNames, variables };
+export { Arrayable, Awaitable, type CSSProperty, type CSSSelector, type CSSStyleBlockBody, type CSSStyleBlocks, type DefineAutocomplete, type Engine, type EngineConfig$1 as EngineConfig, type EnginePlugin, FromKebab, GetValue, IsEqual, IsNever, Keyframes, KeyframesConfig, KeyframesProgress, Nullish, type PikaAugment, type Preflight, type PreflightDefinition, type PreflightFn, type Properties, type PropertyValue, ResolveFrom, type ResolvedLayerName, type ResolvedPreflight, Selector, SelectorsConfig, Shortcut, ShortcutsConfig, Simplify, type StyleDefinition, type StyleDefinitionMap, type StyleItem, ToKebab, UnionString, UnionToIntersection, Variable, VariableAutocomplete, VariableObject, VariablesConfig, VariablesDefinition, appendAutocompleteCssPropertyValues, appendAutocompleteExtraCssProperties, appendAutocompleteExtraProperties, appendAutocompletePropertyValues, appendAutocompleteSelectors, appendAutocompleteStyleItemStrings, createEngine, createLogger, defineEngineConfig, defineEnginePlugin, defineKeyframes, definePreflight, defineSelector, defineShortcut, defineStyleDefinition, defineVariables, extractUsedVarNames, extractUsedVarNamesFromPreflightResult, important, keyframes, log, normalizeVariableName, renderCSSStyleBlocks, resolveSelectorConfig, selectors$1 as selectors, shortcuts, sortLayerNames, variables };

package/dist/index.mjs

@@ -684,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;
 			});
 		}
 	});
@@ -734,6 +757,20 @@ 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
@@ -925,16 +962,27 @@ function isWithLayer(p) {
 	const record = p;
 	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;
 	}
-	return { fn: typeof preflight === "function" ? preflight : () => preflight };
+	if (isWithId(preflight)) {
+		id = preflight.id;
+		preflight = 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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikacss/core",
   "type": "module",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "author": "DevilTea <ch19980814@gmail.com>",
   "license": "MIT",
   "repository": {