@pyreon/attrs 0.2.0 → 0.11.0

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { VNode } from "@pyreon/core";
+import { VNode, VNodeChild } from "@pyreon/core";
 
 //#region src/types/attrs.d.ts
 /** Callback form of `.attrs()` — receives current props and returns partial overrides. */
@@ -9,9 +9,10 @@ type TObj = Record<string, unknown>;
 type TFn = (...args: any) => any;
 /**
  * A Pyreon component function that accepts additional static properties.
- * In Pyreon, components are plain functions: (props: P) => VNode | null.
+ * Aligned with @pyreon/core's ComponentFn — returns VNodeChild (not just VNode | null)
+ * to support components returning strings, numbers, undefined, etc.
  */
-type ComponentFn<P = any> = ((props: P) => VNode | null) & Partial<Record<string, any>>;
+type ComponentFn<P = any> = ((props: P) => VNodeChild) & Partial<Record<string, any>>;
 /**
  * An element type — either a Pyreon component function or an intrinsic tag string.
  */
@@ -80,9 +81,9 @@ interface AttrsComponent<C extends ElementType = ElementType, OA extends TObj =
     component: NC,
     DEBUG
   }: ConfigAttrs<NC>) => NC extends ElementType ? AttrsComponent<NC, ExtractProps<NC>, EA, S, HOC> : AttrsComponent<C, OA, EA, S, HOC>;
-  attrs: <P extends TObj | unknown = unknown>(param: P extends TObj ? Partial<MergeTypes<[DFP, P]>> | AttrsCb<MergeTypes<[DFP, P]>> : Partial<DFP> | AttrsCb<DFP>, config?: Partial<{
+  attrs: <P extends TObj | unknown = unknown>(param: P extends TObj ? Partial<DFP & P> | AttrsCb<DFP & P> : Partial<DFP> | AttrsCb<DFP>, config?: Partial<{
     priority: boolean;
-    filter: unknown extends P ? string[] : (keyof MergeTypes<[EA, P]>)[];
+    filter: unknown extends P ? string[] : (keyof (EA & P))[];
   }>) => P extends TObj ? AttrsComponent<C, OA, MergeTypes<[EA, P]>, S, HOC> : AttrsComponent<C, OA, EA, S, HOC>;
   compose: <P extends ComposeParam>(param: P) => P extends TObj ? AttrsComponent<C, OA, EA, S, MergeTypes<[HOC, P]>> : AttrsComponent<C, OA, EA, S, HOC>;
   statics: <P extends TObj | unknown = unknown>(param: P) => P extends TObj ? AttrsComponent<C, OA, EA, MergeTypes<[S, P]>, HOC> : AttrsComponent<C, OA, EA, S, HOC>;

package/lib/index.js

@@ -164,7 +164,7 @@ const attrs = ({ name, component }) => {
 //#region src/isAttrsComponent.ts
 /** Runtime type guard — checks if a component was created by `attrs()`. */
 const isAttrsComponent = (component) => {
-	if (component && (typeof component === "object" || typeof component === "function") && component !== null && Object.hasOwn(component, "IS_ATTRS")) return true;
+	if (component && (typeof component === "object" || typeof component === "function") && Object.hasOwn(component, "IS_ATTRS")) return true;
 	return false;
 };
 

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@pyreon/attrs",
-  "version": "0.2.0",
+  "version": "0.11.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/pyreon/ui-system",
-    "directory": "packages/attrs"
+    "directory": "packages/ui-system/attrs"
   },
   "description": "Attrs HOC chaining for Pyreon components",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
   "exports": {
+    "bun": "./src/index.ts",
     "source": "./src/index.ts",
     "import": "./lib/index.js",
     "types": "./lib/index.d.ts"
@@ -25,7 +26,7 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">= 18"
+    "node": ">= 22"
   },
   "publishConfig": {
     "access": "public"
@@ -41,11 +42,11 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@pyreon/core": ">=0.4.0 <1.0.0",
-    "@pyreon/ui-core": ">=0.2.0"
+    "@pyreon/core": "^0.11.0",
+    "@pyreon/ui-core": "^0.11.0"
   },
   "devDependencies": {
     "@vitus-labs/tools-rolldown": "^1.15.3",
-    "@vitus-labs/tools-typescript": "^1.15.3"
+    "@pyreon/typescript": "^0.11.0"
   }
 }