@pyreon/rocketstyle 0.1.2 → 0.3.0

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { VNode, VNodeChild } from "@pyreon/core";
+import { VNodeChild } from "@pyreon/core";
 import { config, context, render } from "@pyreon/ui-core";
 
 //#region src/context/context.d.ts
@@ -7,7 +7,7 @@ type Theme$1 = {
   breakpoints?: Record<string, number>;
 } & Record<string, unknown>;
 type TProvider = {
-  children: VNode | VNode[] | null;
+  children: VNodeChild;
   theme?: Theme$1 | undefined;
   mode?: "light" | "dark" | undefined;
   inversed?: boolean | undefined;
@@ -18,13 +18,13 @@ type TProvider = {
  * Reads the parent context, merges incoming props, and resolves
  * the active mode (with optional inversion for nested dark/light switching).
  *
- * In Pyreon, context is provided via pushContext/popContext instead of React.Provider.
+ * In Pyreon, context is provided via provide() instead of React.Provider.
  */
 declare const Provider: ({
   provider,
   inversed,
   ...props
-}: TProvider) => VNode | null;
+}: TProvider) => VNodeChild;
 //#endregion
 //#region src/constants/defaultDimensions.d.ts
 /**
@@ -72,7 +72,7 @@ type TObj = Record<string, unknown>;
 type TFn = (...args: any) => any;
 type CallBackParam = TObj | TFn;
 /** In Pyreon, components are plain functions — no forwardRef needed. */
-type ComponentFn<P = any> = ((props: P) => VNode | null) & Partial<Record<string, any>>;
+type ComponentFn<P = any> = ((props: P) => VNodeChild) & Partial<Record<string, any>>;
 type ElementType<T extends TObj | unknown = any> = ComponentFn<T>;
 type ValueOf<T> = T[keyof T];
 type ArrayOfValues<T> = T[keyof T][];
@@ -145,12 +145,12 @@ type DimensionResult<CT, T = any> = Record<string, boolean | null | DeepPartial<
 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 TDKP = Record<string, 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] };
-type DimensionObjAttrs<D extends Dimensions, DKP extends TDKP> = { [I in keyof DKP]: ExtractDimensionMulti<D[I]> extends true ? Array<keyof DKP[I]> : keyof DKP[I] };
-type DimensionBooleanAttrs<DKP extends TDKP> = Partial<Record<ValueOf<DimensionTypesHelper<DKP>>, boolean>>;
-type ExtractDimensionProps<D extends Dimensions, DKP extends TDKP, UB extends boolean> = UB extends true ? Partial<ExtractNullableDimensionKeys<DimensionObjAttrs<D, DKP> & DimensionBooleanAttrs<DKP>>> : Partial<ExtractNullableDimensionKeys<DimensionObjAttrs<D, DKP>>>;
+type DimensionTypesHelper<D extends Dimensions, DKP extends TDKP> = { [I in ExtractDimensionKey<D[keyof D]> & keyof DKP]: keyof DKP[I] };
+type DimensionObjAttrs<D extends Dimensions, DKP extends TDKP> = { [I in ExtractDimensionKey<D[keyof D]> & keyof DKP]: ExtractDimensionMulti<D[I & keyof D]> extends true ? Array<keyof DKP[I]> : keyof DKP[I] };
+type DimensionBooleanAttrs<D extends Dimensions, DKP extends TDKP> = Partial<Record<ValueOf<DimensionTypesHelper<D, DKP>>, boolean>>;
+type ExtractDimensionProps<D extends Dimensions, DKP extends TDKP, UB extends boolean> = UB extends true ? Partial<ExtractNullableDimensionKeys<DimensionObjAttrs<D, DKP> & DimensionBooleanAttrs<D, DKP>>> : Partial<ExtractNullableDimensionKeys<DimensionObjAttrs<D, DKP>>>;
 type ExtractDimensions<D extends Dimensions, DKP extends TDKP> = ExtractNullableDimensionKeys<DimensionObjAttrs<D, DKP>>;
 //#endregion
 //#region src/types/config.d.ts
@@ -173,7 +173,7 @@ type ConfigAttrs<C extends ElementType | unknown, D extends Dimensions, DKP exte
   consumer: ConsumerCb<D, DKP>;
   DEBUG: boolean;
   inversed: boolean;
-  passProps: UB extends true ? keyof DimensionBooleanAttrs<DKP>[] : never;
+  passProps: UB extends true ? keyof DimensionBooleanAttrs<D, DKP>[] : never;
   styled: boolean;
 }>;
 //#endregion
@@ -232,7 +232,7 @@ type RocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T extends
  * @param DFP  Calculated final component props
  */
 interface IRocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T extends TObj = {}, CSS extends TObj = {}, S extends TObj = {}, HOC extends TObj = {}, D extends Dimensions = Dimensions, UB extends boolean = boolean, DKP extends TDKP = TDKP, DFP = MergeTypes<[OA, EA, DefaultProps, ExtractDimensionProps<D, DKP, UB>]>> {
-  (props: DFP): VNode | null;
+  (props: DFP): VNodeChild;
   config: <NC extends ElementType | unknown = unknown>({
     name,
     component: NC,
@@ -242,9 +242,9 @@ interface IRocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T ex
     inversed,
     passProps
   }: ConfigAttrs<NC, D, DKP, UB>) => NC extends ElementType ? RocketStyleComponent<ExtractProps<NC>, EA, T, CSS, S, HOC, D, UB, DKP> : RocketStyleComponent<OA, EA, T, CSS, S, HOC, D, UB, DKP>;
-  attrs: <P extends TObj | unknown = unknown>(param: P extends TObj ? Partial<MergeTypes<[DFP, P]>> | AttrsCb<MergeTypes<[DFP, P]>, Theme<T>> : Partial<DFP> | AttrsCb<DFP, Theme<T>>, config?: Partial<{
+  attrs: <P extends TObj | unknown = unknown>(param: P extends TObj ? Partial<DFP & P> | ((props: Partial<DFP & P>, theme: Theme<T>, helpers: any) => Partial<P> & Record<string, unknown>) : Partial<DFP> | AttrsCb<DFP, Theme<T>>, config?: Partial<{
     priority: boolean;
-    filter: P extends TObj ? Partial<keyof MergeTypes<[EA, P]>>[] : Partial<keyof EA>[];
+    filter: P extends TObj ? Partial<keyof (EA & P)>[] : Partial<keyof EA>[];
   }>) => P extends TObj ? RocketStyleComponent<OA, MergeTypes<[EA, P]>, T, CSS, S, HOC, D, UB, DKP> : RocketStyleComponent<OA, EA, T, CSS, S, HOC, D, UB, DKP>;
   theme: <P extends TObj = TObj>(param: Partial<P> | Partial<Styles<CSS>> | ThemeCb<P, Theme<T>>) => RocketStyleComponent<OA, EA, T, MergeTypes<[CSS, P]>, S, HOC, D, UB, DKP>;
   styles: (param: StylesCb<CSS>) => RocketStyleComponent<OA, EA, T, CSS, S, HOC, D, UB, DKP>;
@@ -270,7 +270,7 @@ interface IRocketStyleComponent<OA extends TObj = {}, EA extends TObj = {}, T ex
 type RocketComponent<C extends ElementType = ElementType, T extends TObj = {}, CSS extends TObj = {}, D extends Dimensions = DefaultDimensions, UB extends boolean = boolean> = (props: Configuration<C, D>) => RocketStyleComponent<ExtractProps<C>, {}, T, CSS, {}, {}, D, UB, {}>;
 //#endregion
 //#region src/init.d.ts
-type Rocketstyle = <D extends Dimensions = DefaultDimensions, UB extends boolean = true>({
+type Rocketstyle = <const D extends Dimensions = DefaultDimensions, UB extends boolean = true>({
   dimensions,
   useBooleans
 }?: {

package/lib/index.js

@@ -1,4 +1,4 @@
-import { createContext, onUnmount, popContext, pushContext, useContext } from "@pyreon/core";
+import { createContext, provide, useContext } from "@pyreon/core";
 import { Provider as Provider$1, compose, config, context, get, hoistNonReactStatics, isEmpty, merge, omit, pick, render, set } from "@pyreon/ui-core";
 import { signal } from "@pyreon/reactivity";
 
@@ -53,7 +53,7 @@ const ALL_RESERVED_KEYS = [
 * Reads the parent context, merges incoming props, and resolves
 * the active mode (with optional inversion for nested dark/light switching).
 *
-* In Pyreon, context is provided via pushContext/popContext instead of React.Provider.
+* In Pyreon, context is provided via provide() instead of React.Provider.
 */
 const Provider = ({ provider = Provider$1, inversed, ...props }) => {
 	const { theme, mode, provider: RocketstyleProvider, children } = {
@@ -140,8 +140,8 @@ const useLocalContext = (consumer) => {
 * detecting pseudo-states (hover, focus, pressed) via mouse/focus events
 * and broadcasting them through local context to child rocketstyle components.
 *
-* In Pyreon, context is provided via pushContext/popContext, and state is
-* managed with signals instead of useState.
+* In Pyreon, context is provided via provide(), and state is managed
+* with signals instead of useState.
 */
 const createLocalProvider = (WrappedComponent) => {
 	const HOCComponent = ({ onMouseEnter, onMouseLeave, onMouseUp, onMouseDown, onFocus, onBlur, $rocketstate, ...props }) => {
@@ -187,8 +187,7 @@ const createLocalProvider = (WrappedComponent) => {
 				...pseudoState()
 			}
 		};
-		pushContext(new Map([[localContext.id, updatedState]]));
-		onUnmount(() => popContext());
+		provide(localContext, updatedState);
 		return WrappedComponent({
 			...props,
 			...events,
@@ -570,6 +569,10 @@ const rocketComponent = (options) => {
 		context: FinalComponent.meta,
 		options: options.statics
 	});
+	createStaticsEnhancers({
+		context: FinalComponent,
+		options: options.statics
+	});
 	Object.assign(FinalComponent, {
 		attrs: (attrs, { priority, filter } = {}) => {
 			const result = {};
@@ -625,7 +628,7 @@ const validateInit = (name, component, dimensions) => {
 	}
 	if (!isEmpty(errors)) throw Error(JSON.stringify(errors));
 };
-const rocketstyle = ({ dimensions = DEFAULT_DIMENSIONS, useBooleans = true } = {}) => ({ name, component }) => {
+const rocketstyle = (({ dimensions = DEFAULT_DIMENSIONS, useBooleans = true } = {}) => ({ name, component }) => {
 	if (process.env.NODE_ENV !== "production") validateInit(name, component, dimensions);
 	return rocketComponent({
 		name,
@@ -638,7 +641,7 @@ const rocketstyle = ({ dimensions = DEFAULT_DIMENSIONS, useBooleans = true } = {
 		transformKeys: getTransformDimensions(dimensions),
 		styled: true
 	});
-};
+});
 
 //#endregion
 //#region src/isRocketComponent.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/rocketstyle",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/pyreon/ui-system",
@@ -43,11 +43,11 @@
   "peerDependencies": {
     "@pyreon/core": ">=0.4.0 <1.0.0",
     "@pyreon/reactivity": ">=0.4.0 <1.0.0",
-    "@pyreon/ui-core": ">=0.1.2",
-    "@pyreon/styler": ">=0.1.2"
+    "@pyreon/ui-core": ">=0.3.0",
+    "@pyreon/styler": ">=0.3.0"
   },
   "devDependencies": {
     "@vitus-labs/tools-rolldown": "^1.15.3",
-    "@vitus-labs/tools-typescript": "^1.15.3"
+    "@pyreon/typescript": "^0.7.4"
   }
 }