nesquick 1.5.0 → 2.0.2

package/lib/For/For.js

@@ -85,7 +85,7 @@ function For(props) {
     const map = getCycleMap(props);
     (0, State_1.useRender)(() => {
         cycle = !cycle;
-        const each = props.each().slice();
+        const each = props.each.slice();
         if (children.length === 0) {
             for (let i = 0; i < each.length; i++) {
                 const item = each[i];

package/lib/For/getMap.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMap = getMap;
 function getMap(props) {
-    const idsCallback = "ids" in props && props.ids?.();
+    const idsCallback = "ids" in props && props.ids;
     if (idsCallback) {
         const childrenMap = new Map();
         let idLength = 0;
@@ -78,7 +78,7 @@ function getMap(props) {
     }
     else {
         const childrenMap = new Map();
-        const idCallback = "id" in props && props.id?.() || (item => item);
+        const idCallback = "id" in props && props.id || (item => item);
         return {
             getId: idCallback,
             equalsId(a, b) {

package/lib/NesquickComponent.js

@@ -21,6 +21,17 @@ function getAttributeNs(attributes, k) {
     }
     return null;
 }
+function getterFromFunctions(props) {
+    const res = Object.create(null);
+    for (const k in props) {
+        Object.defineProperty(res, k, {
+            get() {
+                return props[k]();
+            }
+        });
+    }
+    return res;
+}
 class NesquickComponent {
     constructor(_render, props) {
         this._render = _render;
@@ -33,6 +44,7 @@ class NesquickComponent {
     render(document) {
         State_1.subscriptions.set(this._subscriptions);
         if (typeof this._render === "function") {
+            this.props = getterFromFunctions(this.props);
             const element = this._render(this.props);
             if (this._xmlns) {
                 element.setXmlns(this._xmlns);

package/lib/NesquickFragment.js

@@ -4,9 +4,7 @@ exports.NesquickFragment = void 0;
 const NesquickComponent_1 = require("./NesquickComponent");
 class NesquickFragment extends NesquickComponent_1.NesquickComponent {
     constructor(children) {
-        super("", {
-            children: children != null ? Array.isArray(children) ? children : [children] : []
-        });
+        super("", { children });
         this._lastNode = null;
         this._fragment = null;
     }

package/lib/cli/transformer.js

@@ -34,6 +34,9 @@ function createSpreadCheckFunction(fName) {
         TS.factory.createParameterDeclaration(void 0, void 0, obj),
         TS.factory.createParameterDeclaration(void 0, void 0, check)
     ], void 0, TS.factory.createBlock([
+        TS.factory.createIfStatement(TS.factory.createPrefixUnaryExpression(TS.SyntaxKind.ExclamationToken, obj), TS.factory.createBlock([
+            TS.factory.createReturnStatement(obj)
+        ], true), void 0),
         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)),
@@ -73,6 +76,12 @@ const transformer = context => {
                     node = TS.factory.updateJsxSpreadAttribute(node, callExpression);
                 }
             }
+            else if (TS.isJsxElement(node)) {
+                const firstLetter = node.openingElement.tagName.getText()[0];
+                const userComponent = firstLetter !== firstLetter.toLowerCase();
+                const res = processNode(node, { userComponent });
+                node = res.node;
+            }
             else if (TS.isJsxOpeningLikeElement(node)) {
                 const firstLetter = node.tagName.getText()[0];
                 const userComponent = firstLetter !== firstLetter.toLowerCase();

package/lib/jsx-runtime.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSX = exports.jsx = exports.Fragment = void 0;
+exports.JSX = exports.Fragment = void 0;
 exports.jsxs = jsxs;
+exports.jsx = jsx;
 const NesquickComponent_1 = require("./NesquickComponent");
 const NesquickFragment_1 = require("./NesquickFragment");
 exports.Fragment = Symbol();
@@ -14,7 +15,15 @@ function jsxs(type, props, key) {
     }
     return new NesquickComponent_1.NesquickComponent(type, props);
 }
-exports.jsx = jsxs;
+function jsx(type, props, key) {
+    if (type === exports.Fragment) {
+        return new NesquickFragment_1.NesquickFragment([props.children]);
+    }
+    if (key !== undefined) {
+        props.key = key;
+    }
+    return new NesquickComponent_1.NesquickComponent(type, props);
+}
 var JSX;
 (function (JSX) {
 })(JSX || (exports.JSX = JSX = {}));

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

@@ -1,4 +1,4 @@
-import { Props, JSX } from "../Nesquick";
+import { JSX } from "../Nesquick";
 import { NesquickFragment } from "../NesquickFragment";
 type ChildRender<T> = (item: T, i: () => number) => JSX.Element;
 export type ForProps<T> = {
@@ -14,5 +14,5 @@ export type ForProps<T> = {
     ids?: never;
     id?: never;
 });
-export declare function For<T>(props: Props<ForProps<T>>): NesquickFragment;
+export declare function For<T>(props: ForProps<T>): NesquickFragment;
 export {};

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

@@ -1,4 +1,3 @@
-import { Props } from "../Nesquick";
 import { ForProps } from "./For";
 export type IdMap<T, ID, CHILD> = {
     getId(item: T, i: number): ID;
@@ -8,11 +7,11 @@ export type IdMap<T, ID, CHILD> = {
     deleteChild(id: ID): void;
     clearChilds(): void;
 };
-type IdMapProps<T> = Props<Pick<Extract<ForProps<T>, {
+type IdMapProps<T> = Pick<Extract<ForProps<T>, {
     id?: unknown;
 }>, "id"> | Pick<Extract<ForProps<T>, {
     ids?: unknown;
-}>, "ids">>;
+}>, "ids">;
 export declare function getMap<T, CHILD>(props: Required<Extract<IdMapProps<T>, {
     id?: unknown;
 }>>): IdMap<T, unknown, CHILD>;

package/lib/types/NesquickFragment.d.ts

@@ -1,11 +1,11 @@
 import { JSX } from "./Nesquick";
-import { Child, Children, NesquickComponent, NesquickParent, VeactDocument } from "./NesquickComponent";
+import { Child, NesquickComponent, NesquickParent, VeactDocument } from "./NesquickComponent";
 export declare class NesquickFragment extends NesquickComponent<{
     children: Child[];
 }> implements NesquickParent {
     private _lastNode;
     private _fragment;
-    constructor(children: Children);
+    constructor(children: Child[]);
     render(document: VeactDocument): Node;
     getDocument(): Document | null;
     getParent(): Node | null;

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

@@ -2,25 +2,8 @@ import { FunctionComponent, ComponentProps, NesquickComponent } from "./Nesquick
 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[L] | undefined;
-} extends {
-    [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 UserProps<T> = {
-    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 WrappedFunction<infer R> ? R : T;
-type JSXProps<T> = keyof T extends never ? {} : {
-    [K in keyof T]: JSXProp<T[K]>;
-};
-export { UserProps as Props };
-export type Component<P = {}> = (props: UserProps<P>) => JSX.Element;
+export declare function jsx<P extends ComponentProps>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key?: string | number | null): NesquickFragment | NesquickComponent<P>;
+export type Component<P extends Record<any, any> = {}> = (props: P) => JSX.Element;
 export declare namespace JSX {
     export type JSXEvent<T extends Event, T2 extends EventTarget> = T & {
         currentTarget: T2;
@@ -60,6 +43,5 @@ export declare namespace JSX {
     export interface ElementChildrenAttribute {
         children: {};
     }
-    export type LibraryManagedAttributes<_, P> = JSXProps<P>;
     export {};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nesquick",
-  "version": "1.5.0",
+  "version": "2.0.2",
   "description": "React-like library with focus on drawing performance",
   "types": "./lib/types/index.d.ts",
   "main": "./lib/index.js",