@vitus-labs/rocketstyle 2.0.0-alpha.26 → 2.0.0-alpha.27

package/lib/index.d.ts

@@ -35,6 +35,11 @@ declare const DEFAULT_DIMENSIONS: {
     readonly propName: "multiple";
     readonly multi: true;
   };
+  readonly modifiers: {
+    readonly propName: "modifier";
+    readonly multi: true;
+    readonly transform: true;
+  };
 };
 type DefaultDimensions = typeof DEFAULT_DIMENSIONS;
 //#endregion
@@ -129,16 +134,17 @@ type ExtractDimensionMulti<T extends DimensionValue> = T extends DimensionValueO
 type DimensionValuePrimitive = string;
 type DimensionValueObj = {
   propName: string;
-  multi?: boolean;
+  multi?: boolean; /** When true, this dimension is evaluated last and its values receive the accumulated theme as argument. */
+  transform?: boolean;
 };
 type DimensionValue = DimensionValuePrimitive | DimensionValueObj;
 type Dimensions = Record<string, DimensionValue>;
 type MultiKeys<T extends Dimensions = Dimensions> = Partial<Record<ExtractDimensionKey<T[keyof T]>, true>>;
 type DeepPartial<T> = { [K in keyof T]?: T[K] extends ((...args: any[]) => any) ? T[K] : NonNullable<T[K]> extends Record<string, any> ? DeepPartial<NonNullable<T[K]>> | Extract<T[K], null> : T[K] };
-type DimensionResult<CT> = Record<string, boolean | null | DeepPartial<CT>>;
-type DimensionObj<CT> = DimensionResult<CT>;
-type DimensionCb<T, CT> = (theme: T, mode: ThemeModeCallback, css: Css) => DimensionResult<CT>;
-type DimensionCallbackParam<T, CT> = DimensionObj<CT> | DimensionCb<T, CT>;
+type DimensionResult<CT, T = any> = Record<string, boolean | null | DeepPartial<CT> | ((theme: CT, appTheme: T, mode: ThemeModeCallback, css: Css) => DeepPartial<CT>)>;
+type DimensionObj<CT, T = any> = DimensionResult<CT, T>;
+type DimensionCb<T, CT> = (theme: T, mode: ThemeModeCallback, css: Css) => DimensionResult<CT, T>;
+type DimensionCallbackParam<T, CT> = DimensionObj<CT, T> | DimensionCb<T, CT>;
 type TDKP = Record<ExtractDimensionKey<Dimensions[keyof Dimensions]>, Record<string, boolean | never | Record<string, boolean>> | unknown>;
 type DimensionProps<K extends DimensionValue, D extends Dimensions, P extends CallBackParam, DKP extends TDKP> = { [I in ExtractDimensionKey<D[keyof D]>]: I extends ExtractDimensionKey<K> ? ExtractNullableDimensionKeys<Spread<[DKP[I], NullableKeys<ReturnCbParam<P>>]>> : DKP[I] };
 type DimensionTypesHelper<DKP extends TDKP> = { [I in keyof DKP]: keyof DKP[I] };
@@ -181,6 +187,7 @@ type InitConfiguration<C, D> = {
   dimensionKeys: ArrayOfKeys<D>;
   dimensionValues: ArrayOfValues<D>;
   multiKeys: MultiKeys;
+  transformKeys: Partial<Record<string, true>>;
 };
 type Configuration<C = ElementType | unknown, D extends Dimensions = Dimensions> = InitConfiguration<C, D> & {
   provider?: boolean;

package/lib/index.js

@@ -85,6 +85,11 @@ const DEFAULT_DIMENSIONS = {
 	multiple: {
 		propName: "multiple",
 		multi: true
+	},
+	modifiers: {
+		propName: "modifier",
+		multi: true,
+		transform: true
 	}
 };
 
@@ -393,6 +398,12 @@ const getMultipleDimensions = (obj) => getValues(obj).reduce((accumulator, value
 	}
 	return accumulator;
 }, {});
+const getTransformDimensions = (obj) => getValues(obj).reduce((accumulator, value) => {
+	if (typeof value === "object") {
+		if (value.transform === true) accumulator[value.propName] = true;
+	}
+	return accumulator;
+}, {});
 
 //#endregion
 //#region src/utils/statics.ts
@@ -442,15 +453,21 @@ const getDimensionThemes = (theme, options) => {
 		return acc;
 	}, result);
 };
-const getTheme = ({ rocketstate, themes, baseTheme }) => {
+const getTheme = ({ rocketstate, themes, baseTheme, transformKeys, appTheme }) => {
 	let finalTheme = { ...baseTheme };
+	const deferredTransforms = [];
 	Object.entries(rocketstate).forEach(([key, value]) => {
 		const keyTheme = themes[key];
-		if (Array.isArray(value)) value.forEach((item) => {
-			finalTheme = merge({}, finalTheme, keyTheme[item]);
-		});
-		else finalTheme = merge({}, finalTheme, keyTheme[value]);
+		const isTransform = transformKeys?.[key];
+		const mergeValue = (item) => {
+			const val = keyTheme[item];
+			if (isTransform && typeof val === "function") deferredTransforms.push(val);
+			else finalTheme = merge({}, finalTheme, val);
+		};
+		if (Array.isArray(value)) value.forEach(mergeValue);
+		else mergeValue(value);
 	});
+	for (const transform of deferredTransforms) finalTheme = merge({}, finalTheme, transform(finalTheme, appTheme ?? {}, themeModeCallback, config.css));
 	return finalTheme;
 };
 const getThemeByMode = (object, mode) => Object.keys(object).reduce((acc, key) => {
@@ -556,11 +573,14 @@ const rocketComponent = (options) => {
 		const rocketstyle = useMemo(() => getTheme({
 			rocketstate,
 			themes: currentModeThemes,
-			baseTheme: currentModeBaseTheme
+			baseTheme: currentModeBaseTheme,
+			transformKeys: options.transformKeys,
+			appTheme: theme
 		}), [
 			rsKey,
 			currentModeThemes,
-			currentModeBaseTheme
+			currentModeBaseTheme,
+			theme
 		]);
 		const finalProps = {
 			...omit(mergeProps, [
@@ -672,6 +692,7 @@ const rocketstyle = ({ dimensions = DEFAULT_DIMENSIONS, useBooleans = true } = {
 		dimensionKeys: getKeys(dimensions),
 		dimensionValues: getDimensionsValues(dimensions),
 		multiKeys: getMultipleDimensions(dimensions),
+		transformKeys: getTransformDimensions(dimensions),
 		styled: true
 	});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitus-labs/rocketstyle",
-  "version": "2.0.0-alpha.26",
+  "version": "2.0.0-alpha.27",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.cz>",
   "maintainers": [
@@ -64,16 +64,16 @@
     "version": "node ../../scripts/sync-peer-deps.mjs"
   },
   "peerDependencies": {
-    "@vitus-labs/core": "2.0.0-alpha.25",
+    "@vitus-labs/core": "2.0.0-alpha.26",
     "react": ">= 19"
   },
   "devDependencies": {
-    "@vitus-labs/core": "2.0.0-alpha.26",
-    "@vitus-labs/elements": "2.0.0-alpha.26",
+    "@vitus-labs/core": "2.0.0-alpha.27",
+    "@vitus-labs/elements": "2.0.0-alpha.27",
     "@vitus-labs/tools-rolldown": "1.9.1-alpha.19",
     "@vitus-labs/tools-storybook": "1.9.1-alpha.19",
     "@vitus-labs/tools-typescript": "1.9.1-alpha.19",
-    "@vitus-labs/unistyle": "2.0.0-alpha.26"
+    "@vitus-labs/unistyle": "2.0.0-alpha.27"
   },
-  "gitHead": "69d22f18b093f86a0bee235356ef3064f90c2d40"
+  "gitHead": "6230c7b4eb1f8fe52bd47275cf72cdcab706cb45"
 }