nesquick 1.4.0 → 1.5.0

package/lib/For/getMap.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMap = getMap;
 function getMap(props) {
-    if ("ids" in props && props.ids) {
+    const idsCallback = "ids" in props && props.ids?.();
+    if (idsCallback) {
         const childrenMap = new Map();
         let idLength = 0;
         return {
             getId(item, i) {
-                const ids = props.ids(item, i);
+                const ids = idsCallback(item, i);
                 if (!ids || ids.length === 0) {
                     throw new Error(`Invalid ids array length. ids() should not return an empty array`);
                 }
@@ -77,8 +78,9 @@ function getMap(props) {
     }
     else {
         const childrenMap = new Map();
+        const idCallback = "id" in props && props.id?.() || (item => item);
         return {
-            getId: ("id" in props && props.id) || (item => item),
+            getId: idCallback,
             equalsId(a, b) {
                 return a === b;
             },

package/lib/NesquickComponent.js

@@ -29,7 +29,6 @@ class NesquickComponent {
         this._styleSubscriptions = null;
         this._xmlns = null;
         this._children = [];
-        this.props = props;
     }
     render(document) {
         State_1.subscriptions.set(this._subscriptions);

package/lib/cli/transformer.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformer = void 0;
-exports.createCheckFunction = createCheckFunction;
 const TS = require("typescript");
 function getSingleIdentifier(node) {
     let identifier = null;
@@ -25,49 +24,65 @@ function getSingleBody(node) {
     });
     return body;
 }
-function createCheckFunction(fName) {
-    return TS.factory.createFunctionDeclaration(void 0, void 0, fName, void 0, [TS.factory.createParameterDeclaration(void 0, void 0, TS.factory.createIdentifier("v"))], void 0, TS.factory.createBlock([
-        TS.factory.createReturnStatement(TS.factory.createConditionalExpression(TS.factory.createBinaryExpression(TS.factory.createTypeOfExpression(TS.factory.createIdentifier("v")), TS.factory.createToken(TS.SyntaxKind.EqualsEqualsEqualsToken), TS.factory.createStringLiteral("function")), TS.factory.createToken(TS.SyntaxKind.QuestionToken), TS.factory.createIdentifier("v"), TS.factory.createToken(TS.SyntaxKind.ColonToken), TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.factory.createIdentifier("v"))))
-    ]));
+function createSpreadCheckFunction(fName) {
+    const obj = TS.factory.createIdentifier("obj");
+    const check = TS.factory.createIdentifier("check");
+    const res = TS.factory.createIdentifier("res");
+    const k = TS.factory.createIdentifier("k");
+    const v = TS.factory.createIdentifier("v");
+    return TS.factory.createFunctionDeclaration(void 0, void 0, fName, void 0, [
+        TS.factory.createParameterDeclaration(void 0, void 0, obj),
+        TS.factory.createParameterDeclaration(void 0, void 0, check)
+    ], void 0, TS.factory.createBlock([
+        TS.factory.createVariableStatement(void 0, TS.factory.createVariableDeclarationList([
+            TS.factory.createVariableDeclaration(res, void 0, void 0, TS.factory.createCallExpression(TS.factory.createPropertyAccessExpression(TS.factory.createIdentifier("Object"), "create"), void 0, [TS.factory.createNull()]))
+        ], TS.NodeFlags.Const)),
+        TS.factory.createForInStatement(TS.factory.createVariableDeclarationList([TS.factory.createVariableDeclaration(k)], TS.NodeFlags.Const), obj, TS.factory.createBlock([
+            TS.factory.createVariableStatement(void 0, TS.factory.createVariableDeclarationList([
+                TS.factory.createVariableDeclaration(v, void 0, void 0, TS.factory.createElementAccessExpression(obj, k))
+            ], TS.NodeFlags.Const)),
+            TS.factory.createIfStatement(TS.factory.createBinaryExpression(TS.factory.createPrefixUnaryExpression(TS.SyntaxKind.ExclamationToken, check), TS.factory.createToken(TS.SyntaxKind.BarBarToken), TS.factory.createBinaryExpression(TS.factory.createTypeOfExpression(v), TS.factory.createToken(TS.SyntaxKind.ExclamationEqualsEqualsToken), TS.factory.createStringLiteral("function"))), TS.factory.createBlock([
+                TS.factory.createExpressionStatement(TS.factory.createBinaryExpression(TS.factory.createElementAccessExpression(res, k), TS.factory.createToken(TS.SyntaxKind.EqualsToken), TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), v)))
+            ], true), TS.factory.createBlock([
+                TS.factory.createExpressionStatement(TS.factory.createBinaryExpression(TS.factory.createElementAccessExpression(res, k), TS.factory.createToken(TS.SyntaxKind.EqualsToken), v))
+            ], true))
+        ], true)),
+        TS.factory.createReturnStatement(res)
+    ], true));
 }
 const transformer = context => {
     return sourceFile => {
-        let hasChecker = false;
-        const checkerName = TS.factory.createUniqueName("_check");
+        let hasSpreadChecker = false;
+        const spreadCheckerName = TS.factory.createUniqueName("_spread");
+        const processNode = (node, options) => {
+            let hasCallExpression = false;
+            node = TS.visitEachChild(node, node => {
+                const res = visitGeneric(node, options);
+                hasCallExpression = hasCallExpression || res.hasCallExpression;
+                return res.node;
+            }, context);
+            return { node, hasCallExpression };
+        };
         const visitGeneric = (node, options) => {
-            let hasSpread = options.userComponent && TS.isJsxSpreadAttribute(node);
             let hasCallExpression = TS.isCallExpression(node);
-            if (TS.isJsxOpeningLikeElement(node)) {
+            if (TS.isJsxSpreadAttribute(node)) {
+                hasSpreadChecker = true;
+                const expression = visitGeneric(node.expression, {}).node;
+                if (TS.isExpression(expression)) {
+                    const callExpression = TS.factory.createCallExpression(spreadCheckerName, void 0, [expression, options.userComponent ? TS.factory.createFalse() : TS.factory.createTrue()]);
+                    node = TS.factory.updateJsxSpreadAttribute(node, callExpression);
+                }
+            }
+            else if (TS.isJsxOpeningLikeElement(node)) {
                 const firstLetter = node.tagName.getText()[0];
                 const userComponent = firstLetter !== firstLetter.toLowerCase();
-                node = TS.visitEachChild(node, node => {
-                    const res = visitGeneric(node, { userComponent });
-                    hasSpread = hasSpread || res.hasSpread;
-                    hasCallExpression = hasCallExpression || res.hasCallExpression;
-                    return res.node;
-                }, context);
-                if (userComponent && hasSpread) {
-                    const symbol = TS.factory.createCallExpression(TS.factory.createPropertyAccessExpression(TS.factory.createIdentifier("Symbol"), "for"), void 0, [TS.factory.createStringLiteral("$nesquickSpreadProps")]);
-                    if (TS.isJsxOpeningLikeElement(node)) {
-                        const attributes = TS.factory.updateJsxAttributes(node.attributes, [
-                            ...node.attributes.properties,
-                            TS.factory.createJsxSpreadAttribute(TS.factory.createObjectLiteralExpression([
-                                TS.factory.createPropertyAssignment(TS.factory.createComputedPropertyName(symbol), TS.factory.createTrue())
-                            ]))
-                        ]);
-                        if (TS.isJsxOpeningElement(node)) {
-                            node = TS.factory.updateJsxOpeningElement(node, node.tagName, node.typeArguments, attributes);
-                        }
-                        else if (TS.isJsxSelfClosingElement(node)) {
-                            node = TS.factory.updateJsxSelfClosingElement(node, node.tagName, node.typeArguments, attributes);
-                        }
-                    }
-                }
+                const res = processNode(node, { userComponent });
+                node = res.node;
+                hasCallExpression = hasCallExpression || res.hasCallExpression;
             }
             else if (TS.isJsxAttribute(node)) {
                 node = TS.visitEachChild(node, node => {
                     const res = visitGeneric(node, { ...options, isJsxAttribute: true });
-                    hasSpread = hasSpread || res.hasSpread;
                     hasCallExpression = hasCallExpression || res.hasCallExpression;
                     return res.node;
                 }, context);
@@ -87,12 +102,11 @@ const transformer = context => {
             else {
                 node = TS.visitEachChild(node, node => {
                     const res = visitGeneric(node, { ...options, isJsxAttribute: false });
-                    hasSpread = hasSpread || res.hasSpread;
                     hasCallExpression = hasCallExpression || res.hasCallExpression;
                     return res.node;
                 }, context);
             }
-            return { hasSpread, hasCallExpression, node };
+            return { node, hasCallExpression };
         };
         const visitorExpression = (node, options) => {
             if (TS.isParenthesizedExpression(node)) {
@@ -104,32 +118,23 @@ const transformer = context => {
             if (TS.isCallExpression(node)) {
                 let identifier = null;
                 if (node.arguments.length === 0 && (identifier = getSingleIdentifier(node)) != null) {
-                    node = identifier;
-                }
-                else {
-                    node = TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.visitNode(node, node => visitGeneric(node, {}).node, TS.isConciseBody));
+                    return visitGeneric(identifier, {}).node;
                 }
             }
-            else {
-                const res = visitGeneric(node, {});
-                node = res.node;
-                if (TS.isExpression(node) && !TS.isFunctionLike(node) && !TS.isJsxElement(node) && !TS.isJsxOpeningLikeElement(node)) {
-                    if (res.hasCallExpression) {
-                        node = TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.visitNode(node, node => visitGeneric(node, {}).node, TS.isConciseBody));
-                    }
-                    else if (options.userComponent) {
-                        hasChecker = true;
-                        node = TS.factory.createCallExpression(checkerName, void 0, [node]);
-                    }
+            const res = visitGeneric(node, {});
+            node = res.node;
+            if (TS.isExpression(node)) {
+                if (options.userComponent || (res.hasCallExpression && !TS.isFunctionLike(node) && !TS.isJsxElement(node) && !TS.isJsxOpeningLikeElement(node))) {
+                    node = TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), node);
                 }
             }
             return node;
         };
         sourceFile = TS.visitNode(sourceFile, node => visitGeneric(node, {}).node, TS.isSourceFile);
-        if (hasChecker) {
+        if (hasSpreadChecker) {
             sourceFile = TS.factory.updateSourceFile(sourceFile, [
                 ...sourceFile.statements,
-                createCheckFunction(checkerName)
+                createSpreadCheckFunction(spreadCheckerName)
             ]);
         }
         return sourceFile;

package/lib/jsx-runtime.js

@@ -4,7 +4,6 @@ exports.JSX = exports.jsx = exports.Fragment = void 0;
 exports.jsxs = jsxs;
 const NesquickComponent_1 = require("./NesquickComponent");
 const NesquickFragment_1 = require("./NesquickFragment");
-const propsSpreadSymbol = Symbol.for("$nesquickSpreadProps");
 exports.Fragment = Symbol();
 function jsxs(type, props, key) {
     if (type === exports.Fragment) {

package/lib/types/For/For.d.ts

@@ -3,12 +3,12 @@ import { NesquickFragment } from "../NesquickFragment";
 type ChildRender<T> = (item: T, i: () => number) => JSX.Element;
 export type ForProps<T> = {
     each: T[];
-    children: ChildRender<T>;
+    children: ChildRender<NoInfer<T>>;
 } & ({
     ids?: never;
-    id: (item: T, i: number) => unknown;
+    id: (item: NoInfer<T>, i: number) => unknown;
 } | {
-    ids: (item: T, i: number) => unknown[];
+    ids: (item: NoInfer<T>, i: number) => unknown[];
     id?: never;
 } | {
     ids?: never;

package/lib/types/cli/transformer.d.ts

@@ -1,3 +1,2 @@
 import * as TS from "typescript";
-export declare function createCheckFunction(fName: TS.Identifier): TS.FunctionDeclaration;
 export declare const transformer: TS.TransformerFactory<TS.SourceFile>;

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

@@ -1,31 +1,24 @@
 import { FunctionComponent, ComponentProps, NesquickComponent } from "./NesquickComponent";
 import { NesquickFragment } from "./NesquickFragment";
-declare const propsSpreadSymbol: unique symbol;
 export declare const Fragment: unique symbol;
-export declare function jsxs<P extends ComponentProps & {
-    [propsSpreadSymbol]?: true;
-}>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key?: string | number | null): NesquickFragment | NesquickComponent<P>;
+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;
+    [L in K]-?: T[L] | undefined;
 } extends {
-    [L in K]?: T[K];
+    [L in K]?: T[L];
 } ? 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: any[]) => any ? T : WrappedFunction<T>;
 type UserProps<T> = {
-    readonly [K in keyof T]: K extends keyof JSX.ElementChildrenAttribute ? T[K] : HasUndefined<T, K> extends true ? UserProp<T[K] | undefined> : UserProp<Exclude<T[K], undefined>>;
+    readonly [K in keyof T]: K extends keyof JSX.ElementChildrenAttribute ? T[K] : WrappedFunction<HasUndefined<T, K> extends true ? T[K] : Exclude<T[K], undefined>>;
 };
-type JSXProp<T> = T extends {
-    readonly [WrappedFunctionType]?: infer R;
-} ? R : T;
+type JSXProp<T> = T extends WrappedFunction<infer R> ? R : T;
 type JSXProps<T> = keyof T extends never ? {} : {
     [K in keyof T]: JSXProp<T[K]>;
 };
-export type Generic<T> = T extends (...args: any) => infer R ? R : T;
 export { UserProps as Props };
 export type Component<P = {}> = (props: UserProps<P>) => JSX.Element;
 export declare namespace JSX {

package/package.json

@@ -1,16 +1,20 @@
 {
   "name": "nesquick",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "React-like library with focus on drawing performance",
   "types": "./lib/types/index.d.ts",
   "main": "./lib/index.js",
   "typesVersions": {
     "*": {
-      ".": ["./lib/types/index.d.ts"],
-      "jsx-runtime": ["./lib/types/jsx-runtime.d.ts"],
-      "jsx-dev-runtime": ["./lib/types/jsx-dev-runtime.d.ts"],
-      "no-transformer/jsx-runtime": ["./lib/types/jsx-runtime.d.ts"],
-      "no-transformer/jsx-dev-runtime": ["./lib/types/jsx-dev-runtime.d.ts"]
+      ".": [
+        "./lib/types/index.d.ts"
+      ],
+      "jsx-runtime": [
+        "./lib/types/jsx-runtime.d.ts"
+      ],
+      "jsx-dev-runtime": [
+        "./lib/types/jsx-dev-runtime.d.ts"
+      ]
     }
   },
   "exports": {
@@ -25,14 +29,6 @@
     "./jsx-dev-runtime": {
       "types": "./lib/types/jsx-dev-runtime.d.ts",
       "default": "./lib/jsx-dev-runtime.js"
-    },
-    "./no-transformer/jsx-runtime": {
-      "types": "./lib/types/no-transformer/jsx-runtime.d.ts",
-      "default": "./lib/no-transformer/jsx-runtime.js"
-    },
-    "./no-transformer/jsx-dev-runtime": {
-      "types": "./lib/types/no-transformer/jsx-dev-runtime.d.ts",
-      "default": "./lib/no-transformer/jsx-dev-runtime.js"
     }
   },
   "bin": {
@@ -42,7 +38,6 @@
   "sideEffects": false,
   "files": [
     "lib/",
-    "no-transformer/",
     "jsx-runtime.js",
     "jsx-dev-runtime.js"
   ],
@@ -70,7 +65,7 @@
   "devDependencies": {
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.7.8",
-    "arrange-act-assert": "^2.9.3",
+    "arrange-act-assert": "^2.10.0",
     "jsdom": "^26.1.0",
     "typescript": "^5.6.3"
   }

package/lib/no-transformer/jsx-dev-runtime.js

@@ -1,22 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsxDEV = jsxDEV;
-const jsx_runtime_1 = require("./jsx-runtime");
-__exportStar(require("./jsx-runtime"), exports);
-function jsxDEV(type, props, key, _isStaticChildren, _source, _self) {
-    return (0, jsx_runtime_1.jsx)(type, props, key);
-}

package/lib/no-transformer/jsx-runtime.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSX = exports.jsx = exports.Fragment = void 0;
-exports.functionizeProps = functionizeProps;
-exports.jsxs = jsxs;
-const NesquickComponent_1 = require("../NesquickComponent");
-const NesquickFragment_1 = require("../NesquickFragment");
-exports.Fragment = Symbol();
-function functionizeProps(props) {
-    for (const k in props) {
-        if (k !== "children" && typeof props[k] !== "function") {
-            const v = props[k];
-            props[k] = () => v;
-        }
-    }
-}
-function jsxs(type, props, key) {
-    if (type === exports.Fragment) {
-        return new NesquickFragment_1.NesquickFragment(props.children);
-    }
-    if (typeof type !== "string") {
-        functionizeProps(props);
-    }
-    else if (key !== undefined) {
-        props.key = key;
-    }
-    return new NesquickComponent_1.NesquickComponent(type, props);
-}
-exports.jsx = jsxs;
-var JSX;
-(function (JSX) {
-})(JSX || (exports.JSX = JSX = {}));

package/lib/types/no-transformer/jsx-dev-runtime.d.ts

@@ -1,9 +0,0 @@
-import { Fragment } from "./jsx-runtime";
-import { FunctionComponent, ComponentProps } from "../NesquickComponent";
-export * from "./jsx-runtime";
-type JsxSource = {
-    fileName: string;
-    lineNumber: number;
-    columnNumber?: number;
-};
-export declare function jsxDEV<P extends ComponentProps>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key: string | number | null, _isStaticChildren: boolean, _source: JsxSource, _self: any): import("..").NesquickFragment | import("../NesquickComponent").NesquickComponent<P>;

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

@@ -1,72 +0,0 @@
-import { FunctionComponent, ComponentProps, NesquickComponent } from "../NesquickComponent";
-import { NesquickFragment } from "../NesquickFragment";
-export declare const Fragment: unique symbol;
-export declare function functionizeProps(props: ComponentProps): void;
-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 UserProps<T> = {
-    readonly [K in keyof T]: K extends keyof JSX.ElementChildrenAttribute ? T[K] : HasUndefined<T, K> extends true ? UserProp<T[K] | undefined> : UserProp<Exclude<T[K], undefined>>;
-};
-type JSXProp<T> = T extends {
-    readonly [WrappedFunctionType]?: infer R;
-} ? (T | R) : T extends (...args: any[]) => any ? T : (T | (() => T));
-type JSXProps<T> = keyof T extends never ? {} : {
-    [K in keyof T]: JSXProp<T[K]>;
-};
-export type Generic<T> = T extends (...args: any) => infer R ? R : T;
-export { UserProps as Props };
-export type Component<P = {}> = (props: UserProps<P>) => JSX.Element;
-export declare namespace JSX {
-    export type JSXEvent<T extends Event, T2 extends EventTarget> = T & {
-        currentTarget: T2;
-    };
-    export type JSXHTMLEvent<T extends EventTarget> = {
-        [K in keyof HTMLElementEventMap as `on${Capitalize<K>}`]?: (e: JSXEvent<HTMLElementEventMap[K], T>) => void;
-    };
-    export type JSXSVGEvent<T extends EventTarget> = {
-        [K in keyof SVGElementEventMap as `on${Capitalize<K>}`]?: (e: JSXEvent<SVGElementEventMap[K], T>) => void;
-    };
-    export interface Props<T extends EventTarget = HTMLElement> extends JSXHTMLEvent<T>, JSXSVGEvent<T> {
-        [k: string]: any;
-        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 = {
-        [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 = {
-        [NotEmptyObject]?: typeof NotEmptyObject;
-    };
-    export interface ElementAttributesProperty {
-        props: {};
-    }
-    export interface ElementChildrenAttribute {
-        children: {};
-    }
-    export type LibraryManagedAttributes<_, P> = JSXProps<P>;
-    export {};
-}