@pikacss/core 0.0.42 → 0.0.44

package/dist/index.d.mts

@@ -39,6 +39,18 @@ declare abstract class AbstractResolver<T> {
   _resolve(string: string): Promise<ResolvedResult<T> | Nullish>;
   _setResolvedResult(string: string, resolved: T): void;
 }
+declare abstract class RecursiveResolver<T> extends AbstractResolver<T[]> {
+  resolve(string: string): Promise<T[]>;
+}
+type ResolvedRuleConfig<T> = {
+  type: 'static';
+  rule: StaticRule<T[]>;
+  autocomplete: string[];
+} | {
+  type: 'dynamic';
+  rule: DynamicRule<T[]>;
+  autocomplete: string[];
+};
 //#endregion
 //#region src/internal/plugins/selectors.d.ts
 type Selector = string | [selector: RegExp, value: (matched: RegExpMatchArray) => Awaitable<Arrayable<UnionString | ResolvedSelector>>, autocomplete?: Arrayable<string>] | [selector: string, value: Arrayable<UnionString | ResolvedSelector>] | {
@@ -81,21 +93,8 @@ declare module '@pikacss/core' {
   }
 }
 declare function selectors$1(): EnginePlugin;
-type StaticSelectorRule = StaticRule<string[]>;
-type DynamicSelectorRule = DynamicRule<string[]>;
-declare class SelectorResolver extends AbstractResolver<string[]> {
-  resolve(selector: string): Promise<string[]>;
-}
-type ResolvedSelectorConfig = {
-  type: 'static';
-  rule: StaticSelectorRule;
-  autocomplete: string[];
-} | {
-  type: 'dynamic';
-  rule: DynamicSelectorRule;
-  autocomplete: string[];
-};
-declare function resolveSelectorConfig(config: Selector): ResolvedSelectorConfig | string | Nullish;
+declare class SelectorResolver extends RecursiveResolver<string> {}
+declare function resolveSelectorConfig(config: Selector): string | Nullish | ResolvedRuleConfig<string>;
 //#endregion
 //#region src/internal/plugins/shortcuts.d.ts
 type Shortcut = string | [shortcut: RegExp, value: (matched: RegExpMatchArray) => Awaitable<Arrayable<ResolvedStyleItem>>, autocomplete?: Arrayable<string>] | {
@@ -142,9 +141,7 @@ declare module '@pikacss/core' {
   }
 }
 declare function shortcuts(): EnginePlugin;
-declare class ShortcutResolver extends AbstractResolver<InternalStyleItem[]> {
-  resolve(shortcut: string): Promise<InternalStyleItem[]>;
-}
+declare class ShortcutResolver extends RecursiveResolver<InternalStyleItem> {}
 //#endregion
 //#region src/internal/plugins/variables.d.ts
 type ResolvedCSSProperty = keyof ResolvedCSSProperties;
@@ -252,8 +249,8 @@ type IsNever<T> = [T] extends [never] ? true : false;
 type Simplify<T> = { [K in keyof T]: T[K] } & {};
 type ToKebab<T extends string> = T extends `${infer A}${infer B}` ? [A extends Uppercase<A> ? 1 : 0, A extends Lowercase<A> ? 1 : 0] extends [1, 0] ? `-${Lowercase<A>}${ToKebab<`${B}`>}` : `${A}${ToKebab<`${B}`>}` : T;
 type FromKebab<T extends string> = T extends `--${string}` ? T : T extends `-${infer A}${infer B}` ? `${Uppercase<A>}${FromKebab<`${B}`>}` : T extends `${infer A}${infer B}` ? `${A}${FromKebab<`${B}`>}` : T;
-type GetValue<Obj extends Record<string, any>, K$1 extends string> = (IsEqual<Obj, object> | IsEqual<Obj, {}> | IsEqual<Obj[K$1], unknown>) extends false ? Obj[K$1] : never;
-type ResolveFrom<T, Key$1 extends string, I, Fallback extends I> = Key$1 extends keyof T ? T[Key$1] extends I ? T[Key$1] : Fallback : Fallback;
+type GetValue<Obj extends Record<string, any>, K extends string> = (IsEqual<Obj, object> | IsEqual<Obj, {}> | IsEqual<Obj[K], unknown>) extends false ? Obj[K] : never;
+type ResolveFrom<T, Key extends string, I, Fallback extends I> = Key extends keyof T ? T[Key] extends I ? T[Key] : Fallback : Fallback;
 //#endregion
 //#region src/internal/types/autocomplete.d.ts
 interface ResolvedAutocompleteConfig {
@@ -273,7 +270,7 @@ interface _Autocomplete {
   PropertiesValue: Record<string, unknown>;
   CssPropertiesValue: Record<string, UnionString | UnionNumber>;
 }
-type DefineAutocomplete<A$1 extends _Autocomplete> = A$1;
+type DefineAutocomplete<A extends _Autocomplete> = A;
 type EmptyAutocomplete = DefineAutocomplete<{
   Selector: never;
   StyleItemString: never;

package/dist/index.mjs

@@ -80,8 +80,8 @@ function serialize(value) {
 function addToSet(set, ...values) {
 	values.forEach((value) => set.add(value));
 }
-function appendAutocompleteSelectors(config, ...selectors$1) {
-	addToSet(config.autocomplete.selectors, ...selectors$1);
+function appendAutocompleteSelectors(config, ...selectors) {
+	addToSet(config.autocomplete.selectors, ...selectors);
 }
 function appendAutocompleteStyleItemStrings(config, ...styleItemStrings) {
 	addToSet(config.autocomplete.styleItemStrings, ...styleItemStrings);
@@ -130,8 +130,8 @@ const RE_SPLIT = /\s*,\s*/g;
 const DEFAULT_SELECTOR_PLACEHOLDER_RE_GLOBAL = /\$/g;
 const ATTRIBUTE_SUFFIX_MATCH = "$=";
 const ATTRIBUTE_SUFFIX_MATCH_RE_GLOBAL = /\$=/g;
-function normalizeSelectors({ selectors: selectors$1, defaultSelector }) {
-	return selectors$1.map((s) => replaceBySplitAndJoin(s.replace(RE_SPLIT, ","), ATOMIC_STYLE_ID_PLACEHOLDER_RE_GLOBAL, (a) => replaceBySplitAndJoin(a, ATTRIBUTE_SUFFIX_MATCH_RE_GLOBAL, (b) => replaceBySplitAndJoin(b, DEFAULT_SELECTOR_PLACEHOLDER_RE_GLOBAL, null, defaultSelector), ATTRIBUTE_SUFFIX_MATCH), ATOMIC_STYLE_ID_PLACEHOLDER));
+function normalizeSelectors({ selectors, defaultSelector }) {
+	return selectors.map((s) => replaceBySplitAndJoin(s.replace(RE_SPLIT, ","), ATOMIC_STYLE_ID_PLACEHOLDER_RE_GLOBAL, (a) => replaceBySplitAndJoin(a, ATTRIBUTE_SUFFIX_MATCH_RE_GLOBAL, (b) => replaceBySplitAndJoin(b, DEFAULT_SELECTOR_PLACEHOLDER_RE_GLOBAL, null, defaultSelector), ATTRIBUTE_SUFFIX_MATCH), ATOMIC_STYLE_ID_PLACEHOLDER));
 }
 function normalizeValue(value) {
 	if (value == null) return value;
@@ -218,7 +218,7 @@ const hooks = {
 	rawConfigConfigured: (plugins, config) => execSyncHook(plugins, "rawConfigConfigured", config),
 	configureResolvedConfig: (plugins, resolvedConfig) => execAsyncHook(plugins, "configureResolvedConfig", resolvedConfig),
 	configureEngine: (plugins, engine) => execAsyncHook(plugins, "configureEngine", engine),
-	transformSelectors: (plugins, selectors$1) => execAsyncHook(plugins, "transformSelectors", selectors$1),
+	transformSelectors: (plugins, selectors) => execAsyncHook(plugins, "transformSelectors", selectors),
 	transformStyleItems: (plugins, styleItems) => execAsyncHook(plugins, "transformStyleItems", styleItems),
 	transformStyleDefinitions: (plugins, styleDefinitions) => execAsyncHook(plugins, "transformStyleDefinitions", styleDefinitions),
 	preflightUpdated: (plugins) => execSyncHook(plugins, "preflightUpdated", void 0),
@@ -298,20 +298,20 @@ function keyframes() {
 				}
 			};
 			engine.keyframes.add(...configList);
-			engine.addPreflight((engine$1) => {
+			engine.addPreflight((engine) => {
 				const maybeUsedName = /* @__PURE__ */ new Set();
-				engine$1.store.atomicStyles.forEach(({ content: { property, value } }) => {
+				engine.store.atomicStyles.forEach(({ content: { property, value } }) => {
 					if (property === "animationName") {
 						value.forEach((name) => maybeUsedName.add(name));
 						return;
 					}
-					if (property === "animation") value.forEach((value$1) => {
-						value$1.split(",").map((v) => v.trim()).forEach((animation) => {
+					if (property === "animation") value.forEach((value) => {
+						value.split(",").map((v) => v.trim()).forEach((animation) => {
 							addToSet(maybeUsedName, ...animation.split(" "));
 						});
 					});
 				});
-				const maybeUsedKeyframes = Array.from(engine$1.keyframes.store.values()).filter(({ name, frames, pruneUnused }) => (pruneUnused === false || maybeUsedName.has(name)) && frames != null);
+				const maybeUsedKeyframes = Array.from(engine.keyframes.store.values()).filter(({ name, frames, pruneUnused }) => (pruneUnused === false || maybeUsedName.has(name)) && frames != null);
 				const preflightDefinition = {};
 				maybeUsedKeyframes.forEach(({ name, frames }) => {
 					preflightDefinition[`@keyframes ${name}`] = Object.fromEntries(Object.entries(frames).map(([frame, properties]) => [frame, properties]));
@@ -330,12 +330,12 @@ function createResolveConfigFn({ pruneUnused: defaultPruneUnused = true } = {})
 			pruneUnused: defaultPruneUnused
 		};
 		if (Array.isArray(config)) {
-			const [name$1, frames$1, autocomplete$1 = [], pruneUnused$1 = defaultPruneUnused] = config;
+			const [name, frames, autocomplete = [], pruneUnused = defaultPruneUnused] = config;
 			return {
-				name: name$1,
-				frames: frames$1,
-				autocomplete: autocomplete$1,
-				pruneUnused: pruneUnused$1
+				name,
+				frames,
+				autocomplete,
+				pruneUnused
 			};
 		}
 		const { name, frames, autocomplete = [], pruneUnused = defaultPruneUnused } = config;
@@ -436,60 +436,20 @@ var AbstractResolver = class {
 		this._resolvedResultsMap.set(string, { value: resolved });
 	}
 };
-
-//#endregion
-//#region src/internal/plugins/selectors.ts
-function selectors() {
-	let engine;
-	let configList;
-	return defineEnginePlugin({
-		name: "core:selectors",
-		rawConfigConfigured(config) {
-			configList = config.selectors?.selectors ?? [];
-		},
-		configureEngine(_engine) {
-			engine = _engine;
-			engine.selectors = {
-				resolver: new SelectorResolver(),
-				add: (...list) => {
-					list.forEach((config) => {
-						const resolved = resolveSelectorConfig(config);
-						if (resolved == null) return;
-						if (typeof resolved === "string") {
-							engine.appendAutocompleteSelectors(resolved);
-							return;
-						}
-						if (resolved.type === "static") engine.selectors.resolver.addStaticRule(resolved.rule);
-						else if (resolved.type === "dynamic") engine.selectors.resolver.addDynamicRule(resolved.rule);
-						engine.appendAutocompleteSelectors(...resolved.autocomplete);
-					});
-				}
-			};
-			engine.selectors.add(...configList);
-			engine.selectors.resolver.onResolved = (string, type) => {
-				if (type === "dynamic") engine.appendAutocompleteSelectors(string);
-			};
-		},
-		async transformSelectors(selectors$1) {
-			const result = [];
-			for (const selector of selectors$1) result.push(...await engine.selectors.resolver.resolve(selector));
-			return result;
-		}
-	});
-}
-var SelectorResolver = class extends AbstractResolver {
-	async resolve(selector) {
-		const resolved = await this._resolve(selector).catch((error) => {
-			log.warn(`Failed to resolve selector "${selector}": ${error.message}`, error);
+var RecursiveResolver = class extends AbstractResolver {
+	async resolve(string) {
+		const resolved = await this._resolve(string).catch((error) => {
+			log.warn(`Failed to resolve "${string}": ${error.message}`, error);
 		});
-		if (resolved == null) return [selector];
+		if (resolved == null) return [string];
 		const result = [];
-		for (const s of resolved.value) result.push(...await this.resolve(s));
-		this._setResolvedResult(selector, result);
+		for (const partial of resolved.value) if (typeof partial === "string") result.push(...await this.resolve(partial));
+		else result.push(partial);
+		this._setResolvedResult(string, result);
 		return result;
 	}
 };
-function resolveSelectorConfig(config) {
+function resolveRuleConfig(config, keyName) {
 	if (typeof config === "string") return config;
 	if (Array.isArray(config)) {
 		if (typeof config[0] === "string" && typeof config[1] !== "function") return {
@@ -515,22 +475,24 @@ function resolveSelectorConfig(config) {
 		}
 		return;
 	}
-	if (typeof config.selector === "string" && typeof config.value !== "function") return {
+	if (typeof config !== "object" || config === null) return;
+	const configKey = config[keyName];
+	if (typeof configKey === "string" && typeof config.value !== "function") return {
 		type: "static",
 		rule: {
-			key: config.selector,
-			string: config.selector,
+			key: configKey,
+			string: configKey,
 			resolved: [config.value].flat(1)
 		},
-		autocomplete: [config.selector]
+		autocomplete: [configKey]
 	};
-	if (config.selector instanceof RegExp && typeof config.value === "function") {
+	if (configKey instanceof RegExp && typeof config.value === "function") {
 		const fn = config.value;
 		return {
 			type: "dynamic",
 			rule: {
-				key: config.selector.source,
-				stringPattern: config.selector,
+				key: configKey.source,
+				stringPattern: configKey,
 				createResolved: async (match) => [await fn(match)].flat(1)
 			},
 			autocomplete: "autocomplete" in config && config.autocomplete != null ? [config.autocomplete].flat(1) : []
@@ -538,6 +500,51 @@ function resolveSelectorConfig(config) {
 	}
 }
 
+//#endregion
+//#region src/internal/plugins/selectors.ts
+function selectors() {
+	let engine;
+	let configList;
+	return defineEnginePlugin({
+		name: "core:selectors",
+		rawConfigConfigured(config) {
+			configList = config.selectors?.selectors ?? [];
+		},
+		configureEngine(_engine) {
+			engine = _engine;
+			engine.selectors = {
+				resolver: new SelectorResolver(),
+				add: (...list) => {
+					list.forEach((config) => {
+						const resolved = resolveSelectorConfig(config);
+						if (resolved == null) return;
+						if (typeof resolved === "string") {
+							engine.appendAutocompleteSelectors(resolved);
+							return;
+						}
+						if (resolved.type === "static") engine.selectors.resolver.addStaticRule(resolved.rule);
+						else if (resolved.type === "dynamic") engine.selectors.resolver.addDynamicRule(resolved.rule);
+						engine.appendAutocompleteSelectors(...resolved.autocomplete);
+					});
+				}
+			};
+			engine.selectors.add(...configList);
+			engine.selectors.resolver.onResolved = (string, type) => {
+				if (type === "dynamic") engine.appendAutocompleteSelectors(string);
+			};
+		},
+		async transformSelectors(selectors) {
+			const result = [];
+			for (const selector of selectors) result.push(...await engine.selectors.resolver.resolve(selector));
+			return result;
+		}
+	});
+}
+var SelectorResolver = class extends RecursiveResolver {};
+function resolveSelectorConfig(config) {
+	return resolveRuleConfig(config, "selector");
+}
+
 //#endregion
 //#region src/internal/plugins/shortcuts.ts
 function shortcuts() {
@@ -600,64 +607,9 @@ function shortcuts() {
 		}
 	});
 }
-var ShortcutResolver = class extends AbstractResolver {
-	async resolve(shortcut) {
-		const resolved = await this._resolve(shortcut).catch((error) => {
-			log.warn(`Failed to resolve shortcut "${shortcut}": ${error.message}`, error);
-		});
-		if (resolved == null) return [shortcut];
-		const result = [];
-		for (const partial of resolved.value) if (typeof partial === "string") result.push(...await this.resolve(partial));
-		else result.push(partial);
-		this._setResolvedResult(shortcut, result);
-		return result;
-	}
-};
+var ShortcutResolver = class extends RecursiveResolver {};
 function resolveShortcutConfig(config) {
-	if (typeof config === "string") return config;
-	else if (Array.isArray(config)) {
-		if (typeof config[0] === "string" && typeof config[1] !== "function") return {
-			type: "static",
-			rule: {
-				key: config[0],
-				string: config[0],
-				resolved: [config[1]].flat(1)
-			},
-			autocomplete: [config[0]]
-		};
-		if (config[0] instanceof RegExp && typeof config[1] === "function") {
-			const fn = config[1];
-			return {
-				type: "dynamic",
-				rule: {
-					key: config[0].source,
-					stringPattern: config[0],
-					createResolved: async (match) => [await fn(match)].flat(1)
-				},
-				autocomplete: config[2] != null ? [config[2]].flat(1) : []
-			};
-		}
-	} else if (typeof config.shortcut === "string" && typeof config.value !== "function") return {
-		type: "static",
-		rule: {
-			key: config.shortcut,
-			string: config.shortcut,
-			resolved: [config.value].flat(1)
-		},
-		autocomplete: [config.shortcut]
-	};
-	else if (config.shortcut instanceof RegExp && typeof config.value === "function") {
-		const fn = config.value;
-		return {
-			type: "dynamic",
-			rule: {
-				key: config.shortcut.source,
-				stringPattern: config.shortcut,
-				createResolved: async (match) => [await fn(match)].flat(1)
-			},
-			autocomplete: "autocomplete" in config && config.autocomplete != null ? [config.autocomplete].flat(1) : []
-		};
-	}
+	return resolveRuleConfig(config, "shortcut");
 }
 
 //#endregion
@@ -676,8 +628,8 @@ function variables() {
 		configureEngine(engine) {
 			engine.variables = {
 				store: /* @__PURE__ */ new Map(),
-				add: (variables$1) => {
-					resolveVariables(variables$1).forEach((resolved) => {
+				add: (variables) => {
+					resolveVariables(variables).forEach((resolved) => {
 						const { name, value, autocomplete: { asValueOf, asProperty } } = resolved;
 						asValueOf.forEach((p) => {
 							if (p !== "-") engine.appendAutocompleteCssPropertyValues(p, `var(${name})`);
@@ -692,16 +644,16 @@ function variables() {
 					engine.notifyPreflightUpdated();
 				}
 			};
-			rawVariables.forEach((variables$1) => engine.variables.add(variables$1));
-			engine.addPreflight(async (engine$1) => {
+			rawVariables.forEach((variables) => engine.variables.add(variables));
+			engine.addPreflight(async (engine) => {
 				const used = /* @__PURE__ */ new Set();
-				engine$1.store.atomicStyles.forEach(({ content: { value } }) => {
+				engine.store.atomicStyles.forEach(({ content: { value } }) => {
 					value.flatMap(extractUsedVarNames).forEach((name) => used.add(normalizeVariableName(name)));
 				});
-				const usedVariables = Array.from(engine$1.variables.store.values()).flat().filter(({ name, pruneUnused, value }) => (safeSet.has(name) || pruneUnused === false || used.has(name)) && value != null);
+				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$1.pluginHooks.transformSelectors(engine$1.config.plugins, _selector);
+					const selector = await engine.pluginHooks.transformSelectors(engine.config.plugins, _selector);
 					let current = preflightDefinition;
 					selector.forEach((s) => {
 						current[s] ||= {};
@@ -715,8 +667,8 @@ function variables() {
 	});
 }
 function createResolveVariablesFn({ pruneUnused: defaultPruneUnused = true } = {}) {
-	function _resolveVariables(variables$1, levels, result) {
-		for (const [key, value] of Object.entries(variables$1)) if (key.startsWith("--")) {
+	function _resolveVariables(variables, levels, result) {
+		for (const [key, value] of Object.entries(variables)) if (key.startsWith("--")) {
 			const { value: varValue, autocomplete = {}, pruneUnused = defaultPruneUnused } = typeof value === "object" && value !== null && !Array.isArray(value) ? value : { value };
 			result.push({
 				name: key,
@@ -731,8 +683,8 @@ function createResolveVariablesFn({ pruneUnused: defaultPruneUnused = true } = {
 		} else _resolveVariables(value, [...levels, key], result);
 		return result;
 	}
-	return function resolveVariables(variables$1) {
-		return _resolveVariables(variables$1, [], []);
+	return function resolveVariables(variables) {
+		return _resolveVariables(variables, [], []);
 	};
 }
 const VAR_NAME_RE = /var\((--[\w-]+)/g;
@@ -795,7 +747,7 @@ var Engine = class {
 		this.config = config;
 		this.extract = createExtractFn({
 			defaultSelector: this.config.defaultSelector,
-			transformSelectors: (selectors$1) => hooks.transformSelectors(this.config.plugins, selectors$1),
+			transformSelectors: (selectors) => hooks.transformSelectors(this.config.plugins, selectors),
 			transformStyleItems: (styleItems) => hooks.transformStyleItems(this.config.plugins, styleItems),
 			transformStyleDefinitions: (styleDefinitions) => hooks.transformStyleDefinitions(this.config.plugins, styleDefinitions)
 		});
@@ -809,8 +761,8 @@ var Engine = class {
 	notifyAutocompleteConfigUpdated() {
 		hooks.autocompleteConfigUpdated(this.config.plugins);
 	}
-	appendAutocompleteSelectors(...selectors$1) {
-		appendAutocompleteSelectors(this.config, ...selectors$1);
+	appendAutocompleteSelectors(...selectors) {
+		appendAutocompleteSelectors(this.config, ...selectors);
 		this.notifyAutocompleteConfigUpdated();
 	}
 	appendAutocompleteStyleItemStrings(...styleItemStrings) {
@@ -1107,14 +1059,14 @@ function renderAtomicStyles(payload) {
 async function _renderPreflightDefinition({ engine, preflightDefinition, blocks = /* @__PURE__ */ new Map() }) {
 	for (const [selector, propertiesOrDefinition] of Object.entries(preflightDefinition)) {
 		if (propertiesOrDefinition == null) continue;
-		const selectors$1 = normalizeSelectors({
+		const selectors = normalizeSelectors({
 			selectors: await hooks.transformSelectors(engine.config.plugins, [selector]),
 			defaultSelector: ""
 		}).filter(Boolean);
 		let currentBlocks = blocks;
 		let currentBlockBody = null;
-		selectors$1.forEach((s, i) => {
-			const isLast = i === selectors$1.length - 1;
+		selectors.forEach((s, i) => {
+			const isLast = i === selectors.length - 1;
 			currentBlocks.set(s, currentBlocks.get(s) || { properties: [] });
 			if (isLast) {
 				currentBlockBody = currentBlocks.get(s);
@@ -1160,8 +1112,8 @@ function defineStyleDefinition(styleDefinition) {
 function definePreflight(preflight) {
 	return preflight;
 }
-function defineKeyframes(keyframes$1) {
-	return keyframes$1;
+function defineKeyframes(keyframes) {
+	return keyframes;
 }
 function defineSelector(selector) {
 	return selector;
@@ -1169,8 +1121,8 @@ function defineSelector(selector) {
 function defineShortcut(shortcut) {
 	return shortcut;
 }
-function defineVariables(variables$1) {
-	return variables$1;
+function defineVariables(variables) {
+	return variables;
 }
 /* c8 ignore end */
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikacss/core",
   "type": "module",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "author": "DevilTea <ch19980814@gmail.com>",
   "license": "MIT",
   "repository": {
@@ -23,14 +23,9 @@
       "import": {
         "types": "./dist/index.d.mts",
         "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
       }
     }
   },
-  "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",
   "publishConfig": {