nesquick 0.0.9 → 0.0.11

package/lib/For/For.js

@@ -11,7 +11,7 @@ function renderChild(child, item, render) {
         child.setI = iState[1];
         return iState[0]();
     };
-    child.element = render(item, () => getI());
+    child.component = render(item, () => getI());
     return child;
 }
 ;
@@ -94,18 +94,18 @@ function For(props) {
                     id: id,
                     i: i,
                     setI: null,
-                    element: null,
+                    component: null,
                     cycle: cycle,
                     childs: null
                 }, item, props.children);
                 map.pushChild(id, child);
                 children.push(child);
-                fragment.appendElement(child.element);
+                fragment.appendComponent(child.component);
             }
         }
         else if (each.length === 0) {
             for (let i = 0; i < children.length; i++) {
-                fragment.removeElement(i);
+                fragment.removeComponent(i);
             }
             map.clearChilds();
             children.splice(0);
@@ -129,7 +129,7 @@ function For(props) {
                 const oldChild = children[i];
                 if (!map.equalsId(oldChild.id, id)) {
                     if (oldChild.cycle !== cycle) {
-                        fragment.removeElement(i);
+                        fragment.removeComponent(i);
                         children.splice(i--, 1);
                         map.popChild(oldChild);
                         if (children.length < each.length) {
@@ -145,11 +145,11 @@ function For(props) {
                                 id: id,
                                 i: i,
                                 setI: null,
-                                element: null,
+                                component: null,
                                 cycle: cycle,
                                 childs: null
                             }, item, props.children);
-                            fragment.spliceElement(i, child.element);
+                            fragment.spliceComponent(i, child.component);
                             map.pushChild(id, child);
                             children.splice(i, 0, child);
                             if (children.length <= each.length) {
@@ -163,7 +163,7 @@ function For(props) {
                             oldChild.i = child.i;
                             child.i = i;
                             child.setI?.(i);
-                            fragment.swapElements(oldChild.i + offset, child.i);
+                            fragment.swapComponents(oldChild.i + offset, child.i);
                         }
                     }
                 }
@@ -182,18 +182,18 @@ function For(props) {
                     id: id,
                     i: i,
                     setI: null,
-                    element: null,
+                    component: null,
                     cycle: cycle,
                     childs: null
                 }, item, props.children);
                 map.pushChild(id, child);
                 children.push(child);
-                fragment.appendElement(child.element);
+                fragment.appendComponent(child.component);
             }
             if (each.length < children.length) {
                 for (let i = children.length - 1; i >= each.length; i--) {
                     const oldChild = children[i];
-                    fragment.removeElement(i);
+                    fragment.removeComponent(i);
                     map.popChild(oldChild);
                 }
                 children.splice(each.length);

package/lib/Nesquick.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Nesquick = void 0;
 var Nesquick;
 (function (Nesquick) {
-    function render(element, parent) {
+    function render(component, parent) {
         if (parent != null) {
-            parent.appendChild(element.render(parent.ownerDocument));
+            parent.appendChild(component.render(parent.ownerDocument));
         }
         else {
-            document.body.appendChild(element.render(document));
+            document.body.appendChild(component.render(document));
         }
     }
     Nesquick.render = render;

package/lib/{NesquickElement.js → NesquickComponent.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NesquickElement = void 0;
+exports.NesquickComponent = void 0;
 const State_1 = require("./State");
 function functionizeProps(props) {
     for (const k in props) {
@@ -10,7 +10,7 @@ function functionizeProps(props) {
         }
     }
 }
-class NesquickElement {
+class NesquickComponent {
     constructor(_render, props) {
         this._render = _render;
         this.props = props;
@@ -60,7 +60,7 @@ class NesquickElement {
                 children = [children];
             }
             for (const child of children) {
-                if (child instanceof NesquickElement) {
+                if (child instanceof NesquickComponent) {
                     this._renderChild(document, parent, this._pushChild(), child);
                 }
                 else if (typeof child === "function") {
@@ -78,7 +78,7 @@ class NesquickElement {
     _pushChild() {
         const nesquickChild = {
             node: null,
-            element: null,
+            component: null,
             fragment: null
         };
         this._children.push(nesquickChild);
@@ -87,7 +87,7 @@ class NesquickElement {
     _spliceChild(i) {
         const nesquickChild = {
             node: null,
-            element: null,
+            component: null,
             fragment: null
         };
         this._children.splice(i, 0, nesquickChild);
@@ -118,8 +118,8 @@ class NesquickElement {
             if (ch.node) {
                 ch.node.parentNode?.removeChild(ch.node);
             }
-            if (ch.element != null) {
-                ch.element.dispose();
+            if (ch.component != null) {
+                ch.component.dispose();
             }
             else if (ch.fragment != null) {
                 ch.fragment.dispose();
@@ -127,14 +127,14 @@ class NesquickElement {
         }
     }
     _renderChild(document, parent, nesquickChild, child) {
-        if (nesquickChild.element != null) {
-            nesquickChild.element.dispose();
+        if (nesquickChild.component != null) {
+            nesquickChild.component.dispose();
         }
         else if (nesquickChild.fragment != null) {
             nesquickChild.fragment.clear();
         }
         if (child instanceof NesquickFragment_1.NesquickFragment || Array.isArray(child)) {
-            nesquickChild.element = null;
+            nesquickChild.component = null;
             nesquickChild.fragment = Array.isArray(child) ? new NesquickFragment_1.NesquickFragment(child) : child;
             const node = nesquickChild.fragment.render(document);
             const lastChild = node.lastChild;
@@ -146,8 +146,8 @@ class NesquickElement {
             }
             nesquickChild.node = lastChild;
         }
-        else if (child instanceof NesquickElement) {
-            nesquickChild.element = child;
+        else if (child instanceof NesquickComponent) {
+            nesquickChild.component = child;
             nesquickChild.fragment = null;
             const node = child.render(document);
             if (nesquickChild.node) {
@@ -160,8 +160,8 @@ class NesquickElement {
         }
         else {
             const value = child == null ? "" : String(child);
-            if (nesquickChild.node == null || nesquickChild.element != null || nesquickChild.fragment != null) {
-                nesquickChild.element = null;
+            if (nesquickChild.node == null || nesquickChild.component != null || nesquickChild.fragment != null) {
+                nesquickChild.component = null;
                 nesquickChild.fragment = null;
                 const node = document.createTextNode(value);
                 if (nesquickChild.node) {
@@ -180,11 +180,11 @@ class NesquickElement {
     dispose() {
         this._subscriptions.dispose();
         for (const child of this._children) {
-            if (child.element) {
-                child.element.dispose();
+            if (child.component) {
+                child.component.dispose();
             }
         }
     }
 }
-exports.NesquickElement = NesquickElement;
+exports.NesquickComponent = NesquickComponent;
 const NesquickFragment_1 = require("./NesquickFragment");

package/lib/NesquickFragment.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NesquickFragment = void 0;
-const NesquickElement_1 = require("./NesquickElement");
-class NesquickFragment extends NesquickElement_1.NesquickElement {
+const NesquickComponent_1 = require("./NesquickComponent");
+class NesquickFragment extends NesquickComponent_1.NesquickComponent {
     constructor(children) {
         super("", { children });
         this._lastNode = null;
@@ -40,7 +40,7 @@ class NesquickFragment extends NesquickElement_1.NesquickElement {
             parent.insertBefore(node, child || this._lastNode);
         }
     }
-    appendElement(child) {
+    appendComponent(child) {
         const document = this.getDocument();
         const parent = this.getParent();
         if (document && parent) {
@@ -51,16 +51,16 @@ class NesquickFragment extends NesquickElement_1.NesquickElement {
             this.props.children.push(child);
         }
     }
-    swapElements(i1, i2) {
+    swapComponents(i1, i2) {
         const parent = this.getParent();
         if (parent) {
             this._swapChilds(parent, i1, i2);
         }
     }
-    removeElement(i) {
+    removeComponent(i) {
         this._removeChild(i);
     }
-    spliceElement(i, child) {
+    spliceComponent(i, child) {
         const document = this.getDocument();
         const parent = this.getParent();
         if (document && parent) {

package/lib/index.js

@@ -19,4 +19,4 @@ __exportStar(require("./For/For"), exports);
 __exportStar(require("./cli/transformer"), exports);
 __exportStar(require("./State"), exports);
 __exportStar(require("./NesquickFragment"), exports);
-__exportStar(require("./NesquickElement"), exports);
+__exportStar(require("./NesquickComponent"), exports);

package/lib/jsx-dev-runtime.js

@@ -17,10 +17,6 @@ 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,
-        __source: source,
-        __self: self
-    }, key);
+function jsxDEV(type, props, key, _isStaticChildren, _source, _self) {
+    return (0, jsx_runtime_1.jsx)(type, props, key);
 }

package/lib/jsx-runtime.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JSX = exports.jsx = exports.Fragment = void 0;
 exports.jsxs = jsxs;
-const NesquickElement_1 = require("./NesquickElement");
+const NesquickComponent_1 = require("./NesquickComponent");
 const NesquickFragment_1 = require("./NesquickFragment");
 exports.Fragment = Symbol();
 function jsxs(type, props, key) {
@@ -12,7 +12,7 @@ function jsxs(type, props, key) {
     if (key !== undefined) {
         props.key = key;
     }
-    return new NesquickElement_1.NesquickElement(type, props);
+    return new NesquickComponent_1.NesquickComponent(type, props);
 }
 exports.jsx = jsxs;
 var JSX;

package/lib/types/Nesquick.d.ts

@@ -1,6 +1,6 @@
-import { NesquickElement, Children, Child } from "./NesquickElement";
+import { NesquickComponent, Children, Child } from "./NesquickComponent";
 export declare namespace Nesquick {
-    function render(element: NesquickElement<any>, parent?: HTMLElement | null): void;
+    function render(component: NesquickComponent<any>, parent?: HTMLElement | null): void;
 }
 export { Children, Child };
 export default Nesquick;

package/lib/types/{NesquickElement.d.ts → NesquickComponent.d.ts}

@@ -1,15 +1,15 @@
-export type Child = NesquickElement<any> | NesquickFragment | string | boolean | number | null | undefined | ChildFunc;
+export type Child = NesquickComponent<any> | NesquickFragment | string | boolean | number | null | undefined | ChildFunc;
 export type Children = Child | Child[];
 export type ChildFunc = () => Exclude<Child, ChildFunc> | Exclude<Child, ChildFunc>[];
-export type Props = Record<string, any>;
-export type FunctionComponent<P extends Props = {}> = (props: P) => NesquickElement<P>;
+export type ComponentProps = Record<string, any>;
+export type FunctionComponent<P extends ComponentProps = {}> = (props: P) => NesquickComponent<P>;
 type NesquickChild = {
     node: Node | null;
 } & ({
-    element: NesquickElement | null;
+    component: NesquickComponent | null;
     fragment: null;
 } | {
-    element: null;
+    component: null;
     fragment: NesquickFragment | null;
 });
 export type NesquickParent = {
@@ -17,7 +17,7 @@ export type NesquickParent = {
     replaceChild(newChild: Node, oldChild: Node): void;
     insertBefore(node: Node, child: Node | null): void;
 };
-export declare class NesquickElement<P extends Props = {}> {
+export declare class NesquickComponent<P extends ComponentProps = {}> {
     private _render;
     protected props: P;
     private _subscriptions;

package/lib/types/NesquickFragment.d.ts

@@ -1,6 +1,6 @@
 import { JSX } from "./jsx-runtime";
-import { NesquickElement, NesquickParent } from "./NesquickElement";
-export declare class NesquickFragment extends NesquickElement<{
+import { NesquickComponent, NesquickParent } from "./NesquickComponent";
+export declare class NesquickFragment extends NesquickComponent<{
     children: any[];
 }> implements NesquickParent {
     private _lastNode;
@@ -12,9 +12,9 @@ export declare class NesquickFragment extends NesquickElement<{
     appendChild(child: Node): void;
     replaceChild(newChild: Node, oldChild: Node): void;
     insertBefore(node: Node, child: Node | null): void;
-    appendElement(child: JSX.Element): void;
-    swapElements(i1: number, i2: number): void;
-    removeElement(i: number): void;
-    spliceElement(i: number, child: JSX.Element): void;
+    appendComponent(child: JSX.Element): void;
+    swapComponents(i1: number, i2: number): void;
+    removeComponent(i: number): void;
+    spliceComponent(i: number, child: JSX.Element): void;
     clear(): void;
 }

package/lib/types/index.d.ts

@@ -3,4 +3,4 @@ export * from "./For/For";
 export * from "./cli/transformer";
 export * from "./State";
 export * from "./NesquickFragment";
-export * from "./NesquickElement";
+export * from "./NesquickComponent";

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

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

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

@@ -1,7 +1,7 @@
-import { FunctionComponent, Props, NesquickElement } from "./NesquickElement";
+import { FunctionComponent, ComponentProps, NesquickComponent } from "./NesquickComponent";
 import { NesquickFragment } from "./NesquickFragment";
 export declare const Fragment: unique symbol;
-export declare function jsxs<P extends Props>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key?: string | number | null): NesquickFragment | NesquickElement<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;
 declare const WrappedFunctionType: unique symbol;
 type WrappedFunction<T> = (() => T) & {
@@ -17,7 +17,7 @@ type UnFunction<T> = T extends {
 type UserProps<T> = {
     [K in keyof T]: K extends "children" ? T[K] : UserProp<T[K]>;
 };
-type ComponentProps<T> = keyof T extends never ? {} : {
+type JSXProps<T> = keyof T extends never ? {} : {
     [K in keyof T]: K extends "children" ? UnFunction<T[K]> : ComponentProp<T[K]>;
 };
 export type Generic<T> = T extends (...args: any) => infer R ? R : T;
@@ -47,10 +47,10 @@ export declare namespace JSX {
     } & {
         [K in keyof SVGElementTagNameMap]: SVGProps<SVGElementTagNameMap[K]>;
     };
-    export type Element = NesquickElement<any>;
+    export type Element = NesquickComponent<any>;
     export interface IntrinsicElements extends JSXElements {
     }
-    export type ElementType = keyof IntrinsicElements | Component<any> | typeof NesquickElement<any>;
+    export type ElementType = keyof IntrinsicElements | Component<any> | typeof NesquickComponent<any>;
     const NotEmptyObject: unique symbol;
     export type IntrinsicAttributes = {
         [NotEmptyObject]?: typeof NotEmptyObject;
@@ -61,6 +61,6 @@ export declare namespace JSX {
     export interface ElementChildrenAttribute {
         children: {};
     }
-    export type LibraryManagedAttributes<_, P> = ComponentProps<P>;
+    export type LibraryManagedAttributes<_, P> = JSXProps<P>;
     export {};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nesquick",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "React-like library with focus on drawing performance",
   "types": "./lib/types",
   "main": "./lib",