nesquick 0.0.21 → 0.0.22

package/lib/NesquickComponent.js

@@ -2,14 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NesquickComponent = void 0;
 const State_1 = require("./State");
-function functionizeProps(props) {
-    for (const k in props) {
-        if (typeof props[k] !== "function") {
-            const v = props[k];
-            props[k] = () => v;
-        }
-    }
-}
 const SVGNamespaces = new Map([
     ["xlink", "http://www.w3.org/1999/xlink"],
     ["xml", "http://www.w3.org/XML/1998/namespace"]
@@ -27,7 +19,6 @@ class NesquickComponent {
     render(document) {
         State_1.subscriptions.set(this._subscriptions);
         if (typeof this._render === "function") {
-            functionizeProps(this.props);
             const element = this._render(this.props);
             if (this._xmlns) {
                 element.setXmlns(this._xmlns);

package/lib/types/jsx-runtime.d.ts

@@ -3,19 +3,24 @@ import { NesquickFragment } from "./NesquickFragment";
 export declare const Fragment: unique symbol;
 export declare function jsxs<P extends ComponentProps>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key?: string | number | null): NesquickFragment | NesquickComponent<P>;
 export declare const jsx: typeof jsxs;
+type HasUndefined<T, K extends keyof T> = {
+    [L in K]-?: T[K] | undefined;
+} extends {
+    [L in K]?: T[K];
+} ? undefined extends T[K] ? true : false : false;
 declare const WrappedFunctionType: unique symbol;
 type WrappedFunction<T> = (() => T) & {
     readonly [WrappedFunctionType]?: T;
 };
-type UserProp<T> = T extends (...args: infer A) => infer R ? (((...args: A) => R) | T) : WrappedFunction<T>;
-type ComponentProp<T> = T extends {
-    readonly [WrappedFunctionType]?: infer R;
-} ? (T | R) : T extends (...args: any[]) => any ? T : (T | (() => T));
+type UserProp<T> = T extends (...args: any[]) => any ? T : WrappedFunction<T>;
 type UserProps<T> = {
-    [K in keyof T]: UserProp<T[K]>;
+    readonly [K in keyof T]: HasUndefined<T, K> extends true ? UserProp<T[K] | undefined> : UserProp<Exclude<T[K], undefined>>;
 };
+type JSXProp<T> = T extends {
+    readonly [WrappedFunctionType]?: infer R;
+} ? R : T;
 type JSXProps<T> = keyof T extends never ? {} : {
-    [K in keyof T]: ComponentProp<T[K]>;
+    [K in keyof T]: JSXProp<T[K]>;
 };
 export type Generic<T> = T extends (...args: any) => infer R ? R : T;
 export { UserProps as Props };
@@ -32,23 +37,22 @@ export declare namespace JSX {
     };
     export interface Props<T extends EventTarget = HTMLElement> extends JSXHTMLEvent<T>, JSXSVGEvent<T> {
         [k: string]: any;
-        style?: StyleProps | string;
+        style?: Style;
         xmlns?: string | null;
         ref?: ((el: T) => void) | null;
     }
+    export type Style = StyleProps | string;
     export type StyleProps = {
         [K in keyof CSSStyleDeclaration]?: CSSStyleDeclaration[K] extends Function ? never : CSSStyleDeclaration[K] | (() => CSSStyleDeclaration[K]);
     };
     export type HTMLProps<T extends HTMLElement = HTMLElement> = Props<T>;
     export type SVGProps<T extends SVGElement = SVGElement> = Props<T>;
-    export type JSXElements = {
+    export type IntrinsicElements = {
         [K in keyof HTMLElementTagNameMap]: HTMLProps<HTMLElementTagNameMap[K]>;
     } & {
         [K in keyof SVGElementTagNameMap]: SVGProps<SVGElementTagNameMap[K]>;
     };
     export type Element = NesquickComponent<any>;
-    export interface IntrinsicElements extends JSXElements {
-    }
     export type ElementType = keyof IntrinsicElements | Component<any> | typeof NesquickComponent<any>;
     const NotEmptyObject: unique symbol;
     export type IntrinsicAttributes = {

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "nesquick",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "React-like library with focus on drawing performance",
   "types": "./lib/types",
   "main": "./lib",
   "typesVersions": {
     "*": {
       "jsx-runtime": ["./lib/types/jsx-runtime.d.ts"],
-      "jsx-dev-runtime": ["./lib/types/jsx-dev-runtime.d.ts"]
+      "jsx-dev-runtime": ["./lib/types/jsx-dev-runtime.d.ts"],
+      "no-transformer/jsx-runtime": ["./lib/types/no-transformer/jsx-runtime.d.ts"],
+      "no-transformer/jsx-dev-runtime": ["./lib/types/no-transformer/jsx-dev-runtime.d.ts"]
     }
   },
   "bin": {
@@ -17,6 +19,7 @@
   "sideEffects": false,
   "files": [
     "lib/",
+    "no-transformer/",
     "jsx-runtime.js",
     "jsx-dev-runtime.js"
   ],