@pyreon/attrs 0.15.0 → 0.18.0

package/lib/index.d.ts

@@ -42,8 +42,32 @@ type Spread<A extends readonly [...any]> = A extends [infer L, ...infer R] ? Spr
 /** Recursively checks whether any element in the tuple is `any`. */
 type _HasAny<A> = A extends [infer L, ...infer R] ? (0 extends 1 & L ? true : _HasAny<R>) : false;
 type MergeTypes<A extends readonly [...any]> = _HasAny<A> extends true ? any : ExtractNullableKeys<Spread<A>>;
-/** Extracts the props type from a Pyreon component function. */
-type ExtractProps<TComponentOrTProps> = TComponentOrTProps extends ComponentFn<infer TProps> ? TProps : TComponentOrTProps;
+/**
+ * Extracts the props type from a Pyreon component function — or passes
+ * through the input unchanged when it's already a props type.
+ *
+ * Multi-overload aware: matches up to 4 call signatures and produces the
+ * UNION of their first-argument types. Iterator / List / Element are
+ * 3-overload primitives — without overload-aware extraction, wrapping
+ * them through `attrs()` silently downgraded their public prop surface
+ * to the LAST (loosest) overload. Mirrors vitus-labs PR #222.
+ *
+ * See `@pyreon/rocketstyle` `ExtractProps` for the canonical shape — kept
+ * in sync across the 4 copies in core / elements / attrs / rocketstyle.
+ */
+type ExtractProps<TComponentOrTProps> = TComponentOrTProps extends {
+  (props: infer P1, ...args: any): any;
+  (props: infer P2, ...args: any): any;
+  (props: infer P3, ...args: any): any;
+  (props: infer P4, ...args: any): any;
+} ? P1 | P2 | P3 | P4 : TComponentOrTProps extends {
+  (props: infer P1, ...args: any): any;
+  (props: infer P2, ...args: any): any;
+  (props: infer P3, ...args: any): any;
+} ? P1 | P2 | P3 : TComponentOrTProps extends {
+  (props: infer P1, ...args: any): any;
+  (props: infer P2, ...args: any): any;
+} ? P1 | P2 : TComponentOrTProps extends ComponentFn<infer TProps> ? TProps : TComponentOrTProps;
 //#endregion
 //#region src/types/config.d.ts
 /** A component that has been enhanced by attrs — identified by the `IS_ATTRS` marker. */

package/lib/index.js

@@ -29,14 +29,18 @@ const calculateChainOptions = (options) => (args) => {
 const createAttrsHOC = ({ attrs, priorityAttrs }) => {
 	const calculateAttrs = calculateChainOptions(attrs);
 	const calculatePriorityAttrs = calculateChainOptions(priorityAttrs);
+	const hasAttrs = (attrs?.length ?? 0) > 0;
+	const hasPriorityAttrs = (priorityAttrs?.length ?? 0) > 0;
+	const hasAnyChain = hasAttrs || hasPriorityAttrs;
 	const attrsHoc = (WrappedComponent) => {
 		const HOCComponent = (props) => {
 			const filteredProps = removeUndefinedProps(props);
-			const prioritizedAttrs = calculatePriorityAttrs([filteredProps]);
-			const finalAttrs = calculateAttrs([{
+			if (!hasAnyChain) return WrappedComponent(filteredProps);
+			const prioritizedAttrs = hasPriorityAttrs ? calculatePriorityAttrs([filteredProps]) : null;
+			const finalAttrs = hasAttrs ? calculateAttrs([prioritizedAttrs ? {
 				...prioritizedAttrs,
 				...filteredProps
-			}]);
+			} : filteredProps]) : null;
 			return WrappedComponent({
 				...prioritizedAttrs,
 				...finalAttrs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/attrs",
-  "version": "0.15.0",
+  "version": "0.18.0",
   "description": "Attrs HOC chaining for Pyreon components",
   "license": "MIT",
   "repository": {
@@ -41,14 +41,14 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@pyreon/typescript": "^0.15.0",
+    "@pyreon/typescript": "^0.18.0",
     "@vitus-labs/tools-rolldown": "^2.3.0"
   },
-  "peerDependencies": {
-    "@pyreon/core": "^0.15.0",
-    "@pyreon/ui-core": "^0.15.0"
-  },
   "engines": {
     "node": ">= 22"
+  },
+  "dependencies": {
+    "@pyreon/core": "^0.18.0",
+    "@pyreon/ui-core": "^0.18.0"
   }
 }

package/src/hoc/attrsHoc.ts

@@ -25,21 +25,35 @@ const createAttrsHOC: AttrsStyleHOC = ({ attrs, priorityAttrs }) => {
   // Pre-build the chain reducers once (not per render).
   const calculateAttrs = calculateChainOptions(attrs)
   const calculatePriorityAttrs = calculateChainOptions(priorityAttrs)
+  // Most components never call .attrs() — short-circuit the merge work below
+  // so the no-chain mount path skips 2 reducer invocations + 3 object spreads.
+  // Mirrors vitus-labs's attrsHoc fast-path; React-side memoization
+  // (useMemo / useStableValue) is omitted because Pyreon components run once
+  // per mount, not on every render.
+  const hasAttrs = (attrs?.length ?? 0) > 0
+  const hasPriorityAttrs = (priorityAttrs?.length ?? 0) > 0
+  const hasAnyChain = hasAttrs || hasPriorityAttrs
 
   const attrsHoc = (WrappedComponent: ComponentFn<any>) => {
     const HOCComponent: ComponentFn<any> = (props) => {
       // Strip undefined values so they don't shadow defaults from attrs callbacks.
       const filteredProps = removeUndefinedProps(props)
 
+      // Fast path: no attrs configured — skip reducers + spreads entirely.
+      if (!hasAnyChain) return WrappedComponent(filteredProps)
+
       // 1. Resolve priority attrs (lowest precedence defaults).
-      const prioritizedAttrs = calculatePriorityAttrs([filteredProps])
+      const prioritizedAttrs = hasPriorityAttrs
+        ? calculatePriorityAttrs([filteredProps])
+        : null
       // 2. Resolve normal attrs — these see priority + explicit props as input.
-      const finalAttrs = calculateAttrs([
-        {
-          ...prioritizedAttrs,
-          ...filteredProps,
-        },
-      ])
+      const finalAttrs = hasAttrs
+        ? calculateAttrs([
+            prioritizedAttrs
+              ? { ...prioritizedAttrs, ...filteredProps }
+              : filteredProps,
+          ])
+        : null
 
       // 3. Merge: priority < normal attrs < explicit props (last wins).
       const finalProps = {

package/src/types/utils.ts

@@ -101,6 +101,37 @@ export type MergeTypes<A extends readonly [...any]> =
 
 // ─── ExtractProps ─────────────────────────────────────────────
 
-/** Extracts the props type from a Pyreon component function. */
-export type ExtractProps<TComponentOrTProps> =
-  TComponentOrTProps extends ComponentFn<infer TProps> ? TProps : TComponentOrTProps
+/**
+ * Extracts the props type from a Pyreon component function — or passes
+ * through the input unchanged when it's already a props type.
+ *
+ * Multi-overload aware: matches up to 4 call signatures and produces the
+ * UNION of their first-argument types. Iterator / List / Element are
+ * 3-overload primitives — without overload-aware extraction, wrapping
+ * them through `attrs()` silently downgraded their public prop surface
+ * to the LAST (loosest) overload. Mirrors vitus-labs PR #222.
+ *
+ * See `@pyreon/rocketstyle` `ExtractProps` for the canonical shape — kept
+ * in sync across the 4 copies in core / elements / attrs / rocketstyle.
+ */
+export type ExtractProps<TComponentOrTProps> = TComponentOrTProps extends {
+  (props: infer P1, ...args: any): any
+  (props: infer P2, ...args: any): any
+  (props: infer P3, ...args: any): any
+  (props: infer P4, ...args: any): any
+}
+  ? P1 | P2 | P3 | P4
+  : TComponentOrTProps extends {
+        (props: infer P1, ...args: any): any
+        (props: infer P2, ...args: any): any
+        (props: infer P3, ...args: any): any
+      }
+    ? P1 | P2 | P3
+    : TComponentOrTProps extends {
+          (props: infer P1, ...args: any): any
+          (props: infer P2, ...args: any): any
+        }
+      ? P1 | P2
+      : TComponentOrTProps extends ComponentFn<infer TProps>
+        ? TProps
+        : TComponentOrTProps