@pikacss/core 0.0.49 → 0.0.51

package/dist/index.mjs

@@ -1293,13 +1293,13 @@ function getAtomicStyleId({ content, prefix, stored }) {
 * ```
 */
 function resolveAtomicStyle({ content, prefix, store, resolvedIdsByBaseKey }) {
-	const reusableId = findReusableOrderSensitiveAtomicStyleId({
+	const reusableId = findReusableAtomicStyleId({
 		content,
 		store,
 		resolvedIdsByBaseKey
 	});
 	if (reusableId != null) {
-		log.debug(`Order-sensitive atomic style reused: ${reusableId}`);
+		log.debug(`Atomic style reused: ${reusableId}`);
 		return { id: reusableId };
 	}
 	const id = getAtomicStyleId({
@@ -1405,11 +1405,10 @@ function getRequiredAtomicStyleOrder({ dependencyKeys, store, resolvedIdsByBaseK
 	}
 	return requiredOrder;
 }
-function findReusableOrderSensitiveAtomicStyleId({ content, store, resolvedIdsByBaseKey }) {
-	if (isOrderSensitiveContent(content) === false) return void 0;
+function findReusableAtomicStyleId({ content, store, resolvedIdsByBaseKey }) {
 	const baseKey = getAtomicStyleBaseKey(content);
 	const requiredOrder = getRequiredAtomicStyleOrder({
-		dependencyKeys: content.orderSensitiveTo,
+		dependencyKeys: content.orderSensitiveTo ?? [],
 		store,
 		resolvedIdsByBaseKey
 	});
@@ -2439,6 +2438,14 @@ const VARIABLE_SEMANTIC_FAMILY_PROPERTIES = {
 };
 //#endregion
 //#region src/internal/plugins/variables.ts
+const VARIABLE_SEMANTIC_TYPE_PROPERTIES = {
+	"color": VARIABLE_SEMANTIC_FAMILY_PROPERTIES.color,
+	"length": VARIABLE_SEMANTIC_FAMILY_PROPERTIES.length,
+	"time": VARIABLE_SEMANTIC_FAMILY_PROPERTIES.time,
+	"number": VARIABLE_SEMANTIC_FAMILY_PROPERTIES.number,
+	"easing": VARIABLE_SEMANTIC_FAMILY_PROPERTIES.easing,
+	"font-family": VARIABLE_SEMANTIC_FAMILY_PROPERTIES["font-family"]
+};
 /**
 * Built-in engine plugin that provides CSS custom properties (variables) with smart pruning and autocomplete integration.
 *
@@ -2459,7 +2466,7 @@ function variables() {
 		name: "core:variables",
 		rawConfigConfigured(config) {
 			resolveVariables = createResolveVariablesFn({ pruneUnused: config.variables?.pruneUnused });
-			rawVariables = [config.variables?.variables ?? []].flat();
+			rawVariables = normalizeVariablesConfig(config.variables);
 			safeSet = new Set(config.variables?.safeList ?? []);
 		},
 		configureEngine(engine) {
@@ -2527,13 +2534,69 @@ function variables() {
 		}
 	});
 }
-function createResolveVariablesFn({ pruneUnused: defaultPruneUnused = true } = {}) {
-	function isVariableScopeObject(value) {
-		return typeof value === "object" && value !== null && !Array.isArray(value);
+function normalizeVariablesConfig(config) {
+	if (config == null) return [];
+	const merged = {};
+	mergeVariablesBucket(merged, config.colors, "color");
+	mergeVariablesBucket(merged, config.lengths, "length");
+	mergeVariablesBucket(merged, config.times, "time");
+	mergeVariablesBucket(merged, config.numbers, "number");
+	mergeVariablesBucket(merged, config.easings, "easing");
+	mergeVariablesBucket(merged, config.fontFamilies, "font-family");
+	mergeVariablesBucket(merged, config.others);
+	return Object.keys(merged).length > 0 ? [merged] : [];
+}
+function mergeVariablesBucket(target, definitions, semanticType) {
+	if (definitions == null) return;
+	[definitions].flat().forEach((definition) => mergeVariablesDefinition(target, applyBucketSemanticType(definition, semanticType)));
+}
+function mergeVariablesDefinition(target, source) {
+	for (const [key, value] of Object.entries(source)) {
+		if (!key.startsWith("--") && isPlainObjectRecord(value) && isPlainObjectRecord(target[key])) {
+			mergeVariablesDefinition(target[key], value);
+			continue;
+		}
+		target[key] = value;
 	}
+	return target;
+}
+function applyBucketSemanticType(definition, semanticType) {
+	const result = {};
+	for (const [key, value] of Object.entries(definition)) {
+		if (key.startsWith("--")) {
+			if (semanticType == null) {
+				result[key] = value;
+				continue;
+			}
+			if (isPlainObjectRecord(value)) {
+				const variableValue = value;
+				result[key] = {
+					...variableValue,
+					semanticType: mergeSemanticTypes(semanticType, variableValue.semanticType)
+				};
+				continue;
+			}
+			result[key] = {
+				value,
+				semanticType
+			};
+			continue;
+		}
+		result[key] = isPlainObjectRecord(value) ? applyBucketSemanticType(value, semanticType) : value;
+	}
+	return result;
+}
+function mergeSemanticTypes(semanticType, existingSemanticType) {
+	const merged = Array.from(new Set([semanticType, ...existingSemanticType == null ? [] : [existingSemanticType].flat()]));
+	return merged.length === 1 ? merged[0] : merged;
+}
+function isPlainObjectRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function createResolveVariablesFn({ pruneUnused: defaultPruneUnused = true } = {}) {
 	function _resolveVariables(variables, levels, result) {
 		for (const [key, value] of Object.entries(variables)) if (key.startsWith("--")) {
-			const { value: varValue, semanticType, autocomplete = {}, pruneUnused = defaultPruneUnused } = typeof value === "object" && value !== null && !Array.isArray(value) ? value : { value };
+			const { value: varValue, semanticType, autocomplete = {}, pruneUnused = defaultPruneUnused } = isPlainObjectRecord(value) ? value : { value };
 			result.push({
 				name: key,
 				value: varValue,
@@ -2549,7 +2612,7 @@ function createResolveVariablesFn({ pruneUnused: defaultPruneUnused = true } = {
 				pruneUnused
 			});
 		} else {
-			if (!isVariableScopeObject(value)) {
+			if (!isPlainObjectRecord(value)) {
 				log.warn(`Invalid variables scope for selector "${key}". Expected a nested object, received ${typeof value}. Skipping.`);
 				continue;
 			}
@@ -2571,7 +2634,7 @@ function resolveAutocompleteValueTargets({ name, asValueOf, semanticType }) {
 		targets.add(target);
 	});
 	semanticTypes.forEach((family) => {
-		const properties = VARIABLE_SEMANTIC_FAMILY_PROPERTIES[family];
+		const properties = VARIABLE_SEMANTIC_TYPE_PROPERTIES[family];
 		if (properties != null) {
 			properties.forEach((property) => targets.add(property));
 			return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikacss/core",
   "type": "module",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "author": "DevilTea <ch19980814@gmail.com>",
   "license": "MIT",
   "homepage": "https://pikacss.com",